diff -Nru liferea-1.8.15/aclocal.m4 liferea-1.10.3/aclocal.m4 --- liferea-1.8.15/aclocal.m4 2013-06-24 22:13:47.000000000 +0200 +++ liferea-1.10.3/aclocal.m4 2013-10-08 20:14:30.000000000 +0200 @@ -20,51 +20,6 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -dnl AM_GCONF_SOURCE_2 -dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -dnl (i.e. pass to gconftool-2 -dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -dnl you should install foo.schemas files -dnl - -AC_DEFUN([AM_GCONF_SOURCE_2], -[ - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then - GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` - else - GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE - fi - - AC_ARG_WITH([gconf-source], - AC_HELP_STRING([--with-gconf-source=sourceaddress], - [Config database for installing schema files.]), - [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) - - AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) - AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) - - if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then - GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' - fi - - AC_ARG_WITH([gconf-schema-file-dir], - AC_HELP_STRING([--with-gconf-schema-file-dir=dir], - [Directory for installing schema files.]), - [GCONF_SCHEMA_FILE_DIR="$withval"],) - - AC_SUBST(GCONF_SCHEMA_FILE_DIR) - AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) - - AC_ARG_ENABLE(schemas-install, - AC_HELP_STRING([--disable-schemas-install], - [Disable the schemas installation]), - [case ${enableval} in - yes|no) ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; - esac]) - AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) -]) - # Copyright (C) 1995-2002 Free Software Foundation, Inc. # Copyright (C) 2001-2003,2004 Red Hat, Inc. # @@ -502,6 +457,90 @@ fi]) +dnl GLIB_GSETTINGS +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether +dnl the schema should be compiled +dnl + +AC_DEFUN([GLIB_GSETTINGS], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE(schemas-compile, + AS_HELP_STRING([--disable-schemas-compile], + [Disable regeneration of gschemas.compiled on install]), + [case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; + esac]) + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi + AC_SUBST(GLIB_COMPILE_SCHEMAS) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) + else + ifelse([$1],,[:],[$1]) + fi + + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ + +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas + +.SECONDARY: $(gsettings_SCHEMAS) + +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi + +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) + +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) +]) + +dnl _GSETTINGS_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_GSETTINGS_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) # serial 42 IT_PROG_INTLTOOL @@ -717,6 +756,103 @@ # AC_DEFUN([AC_PROG_INTLTOOL], ...) +dnl -*- mode: autoconf -*- +dnl Copyright 2009 Johan Dahlin +dnl +dnl This file is free software; the author(s) gives unlimited +dnl permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl + +# serial 1 + +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first + + dnl enable/disable introspection + m4_if([$2], [require], + [dnl + enable_introspection=yes + ],[dnl + AC_ARG_ENABLE(introspection, + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], + [Enable introspection for this build]),, + [enable_introspection=auto]) + ])dnl + + AC_MSG_CHECKING([for gobject-introspection]) + + dnl presence/version checking + AS_CASE([$enable_introspection], + [no], [dnl + found_introspection="no (disabled, use --enable-introspection to enable)" + ],dnl + [yes],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0],, + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], + found_introspection=yes, + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) + ],dnl + [auto],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + dnl Canonicalize enable_introspection + enable_introspection=$found_introspection + ],dnl + [dnl + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) + ])dnl + + AC_MSG_RESULT([$found_introspection]) + + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) + AC_SUBST(INTROSPECTION_CFLAGS) + AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) + + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +]) + + +dnl Usage: +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) + +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +]) + +dnl Usage: +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) + + +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +]) + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, diff -Nru liferea-1.8.15/AUTHORS liferea-1.10.3/AUTHORS --- liferea-1.8.15/AUTHORS 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/AUTHORS 2013-07-31 23:29:12.000000000 +0200 @@ -5,7 +5,7 @@ People that spent a lot of time on the Liferea code base: -Lars Lindner +Lars Windolf Nathan J. Conrad Arnold Noronha Emilio Pozuelo Monfort @@ -65,13 +65,14 @@ WebKit Rendering Support Jon Forsberg Enclosure context menu patch Mathie Leplatre Option to filter feed list -Mikel Olasagasti GeoRSS support +Mikel Olasagasti Uranga GeoRSS support, Gsettings port Rupert Swarbrick OPML duplicate id fix Yaron Sheffer Bidi support for LTR and RTL locales Ricardo Cruz Many GUI improvements Maia Kozheva Optional libindicate support Peter Oliver Google Reader Label Support Sergey Snitsaruk Google Reader Label Support +Sebastian Keller Gedit-like tab close buttons Maintainer Credits @@ -87,7 +88,8 @@ ============================== Polish Bart Kreska -Polish Myrda Wojciech +Polish Wojciech Myrda +Polish Piotr Sokół Italian Dario Conigliaro Italian Emanuele Grande Italian Gianvito Cavasoli @@ -129,7 +131,6 @@ Asturian Marquinos Asturian Iñigo Varela Hebrew Yaron Sheffer -Hebrew Genghis Khan Ukrainian Yuri Chornoivan Latvian Rūdolfs Mazurs Latvian Rihards Priedītis diff -Nru liferea-1.8.15/ChangeLog liferea-1.10.3/ChangeLog --- liferea-1.8.15/ChangeLog 2013-06-24 22:12:15.000000000 +0200 +++ liferea-1.10.3/ChangeLog 2013-10-08 20:13:49.000000000 +0200 @@ -1,6 +1,112 @@ -2013-06-24 Lars Windolf +2013-10-08 Lars Windolf - Version 1.8.15 + Version 1.10.3 + + * Asking for credentials again if TinyTinyRSS login fails + * Asking for TinyTinyRSS credentials only 3 times + * Checking wether TinyTinyRSS base URL is lost + * Added warning on TinyTinyRSS login when source is not self-updating + * "--debug-net --debug-verbose" now traces POST data + * Patch #230 Add GNOME AppData XML (Mikel Olasagasti) + + * Updated Italian translation (Gianvito Cavasoli) + * Updated Italian localized feed list (Gianvito Cavasoli) + + +2013-09-05 Lars Windolf + + Version 1.10.2 + + * Patch SF #222: Make media player seekable + (Simon Kågedal Reimer) + * Fixes SF #1102: Spelling error in man page + (David Smith) + * Fixes SF #1104: liferea.desktop missing keywords + (David Smith) + * Fixes SF #1105: Start Minimized to Tray Does Not Work + (reported by bitlord) + * Fixes SF #1114: Crashes opening browser on item without link via popup + (reported by Rich Coe, David Smith) + * Improved handling of broken Atom author information. + (Lars Windolf) + * Removed dead Google Reader code to avoid doing requests to Google. + Replaced with dummy source that even allows normal feed updates. + (Lars Windolf) + * Added hint to FAQ on how to workaround broken Flash support + (Lars Windolf) + * Dumping feedlist.opml with indentation for readability. + (suggested by Christoph Temmel and Simon Kågedal Reimer) + + +2013-07-28 Lars Windolf + + Version 1.10.1a + + * Fixes SF #1102: Liferea does not show a window + (reported by genodeftest) + +2013-07-28 Lars Windolf + + Version 1.10.1 + + * Fixes SF #1059: Liferea crashes with system proxy enabled + (reported by genodeftest) + * Fixes SF #1095: Theme color detection bug / white fonts. + (reported by David Smith and others) + * Fixes SF #1097: Default feed refresh interval cannot be set to 0 + (reported by stqn) + * Fixes SF #1100: --debug-gui crashes with segmentation fault + (reported by genodeftest) + * Fixes SF #1101: Outdated manpage + (reported by genodeftest) + * Patch SF #225: Make media player work with GStreamer 1.0 + (Simon Kågedal Reimer) + * Patch SF #226: Add trailing semi-colon to MimeType so that the desktop + file validates (Yanko Kaneti) + * Patch SF #227: Remove letfover square bracket configure.ac + (Yanko Kaneti) + * Patch SF #228: Add net.sf.liferea.gschema.xml to AC_CONFIG_FILES + (Yanko Kaneti) + + +2013-07-10 Lars Windolf + + Version 1.10.0 + + * Added experimental sync support for TheOldReader + (Lars Windolf) + * Removed 'Update' link in comments display as it is pretty useless + (Lars Windolf) + * Removed 'No Comments' display as it is rather useless + (Lars Windolf) + * Prevent re-rendering item display on setting item flagged + (Lars Windolf) + * Changed unread number rendering to be right bound and non-ellipsized + (Lars Windolf) + * Fixes g_strstr_len assertions caused by search folder item matching + (Rich Coe) + * Updated documentation to reflect Google Reader, TheOldReader changes + (Lars Windolf) + * Removed welcome text, restoring last feed/item selection instead + (Lars Windolf) + * autogen.sh now reports errors on missing autoconf or intltool + (suggested by Scott Kostyshak) + * Correctly check for gobject-introspection build dependency + (suggested by Scott Kostyshak) + + * Updated Basque translation (Mikel Olasagasti Uranga) + * Updated Danish translation (Joe Hansen) + * Updated Dutch translation (Erwin Poeze) + * Updated Finnish translation (Jorma Karvonen) + * Updated Russian translation (Leonid Selivanov) + * Updated Ukrainian translation (Yuri Chornoivan) + * Updated Vietnamese translation (Trần Ngọc Quân) + * Updated German translation (Lars Windolf) + + +2013-05-22 Lars Windolf + + Version 1.10-RC4 * Added an option to convert Google Reader subscriptions to local feeds (Lars Windolf) @@ -8,120 +114,201 @@ (reported by Adam Nielsen) * Fixes SF #1075: GLib warnings of "string != NULL" assertion failure (reported by Simon Kågedal Reimer) + * Fixes missing shading in 2-pane mode rendering + (reported by Zoho Vignochi) * Fixes search folders including comment items (reported by David Willmore) 2013-05-22 Lars Windolf - Version 1.8.14 + Version 1.10-RC3 - * Fixes SF #1069: broken rendering in tt-rss feeds - (patch by Simon Kagedal Reimer) + * Fixes SF #1069: broken rendering in tt-rss feeds + (patch by Simon Kågedal Reimer) + * Merged SF #219: View *.xml files along with *.opml files in file chooser + (patch by Simon Kågedal Reimer) + * Merged SF #233: Show feed name in item view when in merged views. + (patch by Simon Kågedal Reimer) + * Merged SF #193: Use GtkInfoBar for note in preferences window + (patch by Fred Morcos) + * Require intltool >= 0.40.4 (Adrian Bunk) + + * Updated Catalan translation (Gil Forcada) + * Updated Danish translation (Joe Hansen) + * Updated Polish translation (Piotr Sokół) 2013-05-12 Lars Windolf - Version 1.8.13 + Version 1.10-RC2 - * Fixes missing item list update when browsing item URLs in Liferea - * Fixes format string issues in several translations. - * Added Hebrew translation of reference manual page (Genghis Khan) + * Extended user agent by "AppleWebKit (KHTML, like Gecko)" + to solve incorrect mobile redirect with zdf.de + * Added social bookmarking support for Mister Wong + * Added social bookmarking support for Google Bookmarks + * Update of German FAQ + * Update of English FAQ * Added MimeType to .desktop file (Craig Barnes) + * Fixes SF #1063: Can't open preferences twice + (Emilio Pozuelo Monfort, reported by David Smith) * Fixes SF #1040: In feed entries, spaces are replaced with "+" (reported by Emmanuel Seyman) * Fixes SF #1051: Issues in RTL GUI of Liferea (reported by phixy) - * Fixes SF #1038, #1074: Updates ttrss feeds over and over + * Fixes SF #1038, #1074: Updates ttrss feeds over and over (reported by many users) + * Fix several memory leaks (Emilio Pozuelo Monfort) + * Require glib >= 2.28 for GApplication (Adrian Bunk) + * Use the GTK+ 3 version, not wrongly the GTK+ 2 version, + of the libindicate GTK+ bindings (Adrian Bunk) * Updated the default feedlists (Adrian Bunk) + * Removed support for libnotify < 0.7 (Adrian Bunk) * Added Vietnamese translation (Trần Ngọc Quân) * Updated Albanian translation (Besnik Bleta) * Updated Asturian translation (Iñigo Varela) - * Updated Czech translation (Peter Simacek) + * Updated Basque translation (Mikel Olasagasti Uranga) * Updated Danish translation (Joe Hansen) - * Updated Finnish translation (Adrian Bunk) + * Updated Finnish translation (Jorma Karvonen) * Updated German translation (Christian Stadelmann) - * Updated Hebrew translation (Genghis Khan) * Updated Hungarian translation (Gabor Kelemen) * Updated Japanese translation (Takeshi Hamasaki) * Updated Latvian translation (Rihards Priedītis) + * Updated Ukrainian translation (Yuri Chornoivan) -2013-01-03 Lars Windolf +2013-01-30 Lars Windolf - Version 1.8.12 - - * Fixes SF #1041: Some GPLv2 license headers were outdated - (reported by Emmanuel Seyman) - * Fixes SF #1044: tt-rss API changed (we now support only 1.6 API) - (patch by Sebastian Noel) - * Fixes XHTML errors caused by extra tags from tt-rss - * Update of German translation - - -2012-12-24 Lars Windolf - - Version 1.8.11 + Version 1.10-RC1 Please note that due to the SourceForge upgrade bug ticket numbering did change. This might be confusing... Old numbers are 7 figures, newer ones only 4! - * Added Google Plus to social bookmarking options. + * Patch SF #3407290: Migrate to GSettings + (by Mikel Olasagasti) + * Patch SF #3579177: Change .desktop category to News;Feed; + (by Stanislav Brabec) * Fix for Debian #668197: x-www-browser preference not working - (David Smith) - * Updated Hebrew translation (Genghis Khan, Yaron Sheffer) + (David Smith) + * Added slider and time display to media player plugin. + * Added Google Plus to social bookmarking options. + * Removing deprecated g_thread_init() call + * Auto-enable plugins on migration + * Added missing -a option to manpage + * Updated manpage to reflect XDG path migration + * Changing GSettings path from /apps/liferea to /org/gnome/liferea + * Changes default download thread concurrency from 2 to 3 + * Fixes regression about using the GNOME default font + * Improves all item/link launching menus to consistently provide + three options: Tab, Browser and External Browser * Fixes SF #1037: Incorrect notifications for Google Reader (patch by David Smith) * Fixes SF #1048: Removed all feedvalidator.org references from FAQ and XSLT as it was reported to host malware. (reported by bkat) + * Fixes SF #1041: Some GPLv2 license headers were outdated + (reported by Emmanuel Seyman) + * Fixes SF #1044: tt-rss API changed (we now support only 1.6 API) + (patch by Sebastian Noel) + * Fixes assertion when creating new tt-rss subscriptions + * Fixes XHTML errors caused by extra tags returned by tt-rss + * Fixes missing item list update when browsing item URLs in Liferea -2012-10-30 Lars Windolf +2012-10-28 Lars Windolf - Version 1.8.10 + Version 1.9.7 + * Added new preference for default viewing mode. + * Changing toolbar button order to prevent accidental clicks on + "Mark All Read" when clicking on more frequent buttons like + "Next Unread". + * Added Google Chrome as a browser choice to preferences. + * Roughly reordered browser choices after browser market share. + * Removed shading behaviour for unread items in combined view + as it doesn't match GTK theming well + * Removed auto-hide Javascript menu from combined view to simplify + rendering in 3-pane modes. + * Fixes items not removed from search folder count when feed is removed. + * Fixes search folder rebuilding (do not include comment items). + * Fixes SELECT offset handling when rebuilding search folders. + * Now gives feedback when rebuilding search folders in feed list. + + * Update of German translation + + +2012-10-09 Lars Windolf + + Version 1.9.6 + + * Removed "pass URL" check box from MIME type dialog. + * Removed "Save In" entry from "Download" tab in preferences. + * Removed "curl" choice in download tool preferences. + * Removed "wget" choice in download tool preferences. + * Added "steadyflow" choice in download tool preferences. + * Patch SF #3569056: Use symbolic close buttons and spacing on tabs like gedit + (Sebastian Keller) + + * Fixes reloading item when browsing the web inside the item view. + * Fixes preferences dialog not opening up a second time. + * Fixes padding/alignments in preferences dialog. + * Fixes SF #1418701: Remote server pounded into dirt on auto-download + (reported by anonymous) + * Fixes SF #3567827: Double border around webview + (reported by borschty) * Fixes SF #3572660: crash in google_source_remove_node (reported by Yanko Kaneti) * Prevents adding folders/search folders/newsbins to Google Reader * Prevents sorting subscriptions in Google Reader - * Fixes items not removed from search folder count when feed is removed. - * Fixes search folder rebuilding (do not include comment items). - * Fixes SELECT offset handling when rebuilding search folders. + + * Updated Polish translation (Wojciech Myrda) -2012-10-04 Lars Windolf +2012-09-14 Lars Windolf - Version 1.8.9 + Version 1.9.5 + * GIR dependencies are now mandatory + * Migration to XDG directory layout in $HOME + * Migrate from X session manager to GtkApplication + * Raising GTK dependency to 3.4 for GtkApplication + * Storing last window state in GConf now instead in the session command * Added Instapaper.com to social bookmarking sites (SF #3564393) (patch by prurigro) - * Updated Finnish translation - (Jorma Karvonen) + * Use hint label for manual browser command preference (SF #3129429) + (patch by Fred Morcos) + + * Fixes comments_deinit() never being called + * Fixes search folder counter update on feed removal * Fixes SF #3567715: Crash on network online status changes - (patch by Fabrice Bellet, Yanko Kaneti) - * Fixes preferences dialog not showing up a second time. - * Fixes reloading item when browsing inside the item view. + (patch by Yanko Kaneti) -2012-09-01 Lars Windolf +2012-08-24 Lars Windolf - Version 1.8.8 + Version 1.9.4 - * Fixes SF #3557513: Fixes crash on empty links in auto-load-link mode. - (patch by msquared84) + * Changes (c) name "Lars Lindner" -> "Lars Windolf" due to marriage + * Removed compilation support for GTK2 + * Added GIR plugin system with libpeas + * Added GnomeKeyring plugin that stores password in a keyring + instead of in the exported OPML. + * Added simple media player plugin to play audio and video enclosures. + * Only present enclosures of audio and video MIME type + * Raise libindicate minimum dependency to 0.6 + * Patch SF #3515882: Also support libindicate 0.7 (Chow Loong Jin) + * Dropping SIGSEGV signal handler to allow distro crash report tools to + work (as found in Ubuntu) * Ensure node ids are in DB node relation on startup. - * Include AM_PROG_AR in configure.ac to work with automake 1.12 - * Fixes search folder counter update on feed removal - - -2012-07-30 Lars Windolf - - Version 1.8.7 + * Adding AM_PROG_AR to configure.ac to work with automake 1.12 + * Moved tab close button from the URL bar to the right of the tab label. + * Smarter browser toolbar: appears now also in the item view when + browsing external content. + * Don't ask for Google Reader authentication more than three times + with auto-update to avoid annoying the user. * Fixes SF Trac #10: Crash on empty search folders within folders (reported by phyxi) * Fixes SF Trac #19: Auto-load-link doesn't work with feeds with comments @@ -129,57 +316,58 @@ * Fixes SF #2855990: Crash when dragging Google Reader feeds outside Google Reader. This is now prevented. (reported by algnod) - * Don't ask for Google Reader authentication more than three times - with auto-update to avoid annoying the user. - * Dropping SIGSEGV signal handler to allow distro crash report tools to - work (as found in Ubuntu) - - * Update of Hebrew translation (Ghengis Khan) - - -2012-06-15 Lars Lindner - - Version 1.8.6 - - * Fixes ever growing temporary DB files. - (patch by Sven Hartge) - * Fixes visibility of enclosure list view for Ubuntu. - - -2012-04-14 Lars Lindner - - Version 1.8.5 - - * Reimplemented feed title matching rule for search folders. - (patch by John Levon) - * Fixes SF #3515880: missing include when compiling with libindicate (patch by Chow Loong Jin) * Fixes search folders being invisible in reduced mode. + * Fixes ever growing temporary DB files. + (patch by Sven Hartge) + * Fixes visibility of enclosure list view for Ubuntu. + * Fixes crashes on enclosure list context menu. + * Fixes SF #3557513: Fixes crash on empty links in auto-load-link mode. + (patch by msquared84) + * Fixes unknown metadata types reported in trace when loading Google + Reader subscriptions from DB. -2012-03-28 Lars Lindner +2012-03-30 Lars Lindner - Version 1.8.4 + Version 1.9.3 + * Added a new item history feature that allows navigating + through recently viewed items. + * Added new "Fullscreen" toggle menu option. + * For GTK+3: request dark theme variant for better contrast + between GUI and content. (Jeff Fortin) + * Change schema defaults for folder display. Now unread + items are loaded per-default when clicking a folder. + * Patch SF #3473743: GTK2 dependency has to be 2.24 (bento) * Improve DB item counting statements. (patch by Regis Floret) * Change OpenStreetMap rendering from osmarender to mapnik. (patch by Mikel Olasagasti) + * Patch SF #3127016: Automatic scrollbars on enclosure actions view + (patch by Fred Morcos) + * SF Trac #7: Removing icon from "Cancel All" in update dialog + so that .gtkrc "gtk-button-images=0" does have correct effect. + (reported by phixy) * Fixes SF #3480238: crashes when double clicking find (reported by joeserneem) * Fixes Debian #660602: Item pane may be reset during feed update (reported by Ben Hutchings) * Reimplemented search folder rule for item with enclosures. * Reimplemented search folder rule for item categories. - * Fixes search folders being invisible in reduced mode. + * Reimplemented feed title matching rule for search folders. + (patch by John Levon) + + * Updated Catalan translation (Gil Forcada) -2012-03-24 Lars Lindner +2012-03-23 Lars Lindner - Version 1.8.3 + Version 1.9.2 + * Fixes another migration issue left from 1.9.1 * Increasing sqlite3 dependency to 3.7+ for WAL journaling. * Removed sqliteasync code in favour of WAL journaling. This significantly improves performance for ext4. @@ -189,9 +377,14 @@ 2012-03-18 Lars Lindner - Version 1.8.2 + Version 1.9.1 - * Do not update DB node and subscription info on startup + * Disabled migration to ~/.liferea_1.9 + * Revert ISO 8601 parsing using Glib due to Debian #653196 + This fixes SF #3465106 (reported by Vincent Lefevre) + * Fixes SF #3477582: welcome screen not using theme colors. + (reported by stqn) + * Do not update DB node and subscription info on startup for performance reasons. * Perform VACCUM only when page fragmentation ratio < 10%. (suggested by adriatic) @@ -200,20 +393,20 @@ through items. -2012-03-03 Lars Lindner +2011-12-23 Lars Lindner - Version 1.8.1 + Version 1.9.0 + * Add configure switch to compile against GTK2 or GTK3. + (Emilio Pozuelo Monfort, Adrian Bunk) + * Raise dependencies and updated code to compile against GTK3. + (Emilio Pozuelo Monfort, Adrian Bunk) * Fixes proxy preference not affecting the HTML widget. (reported by Chris Siebenmann) * Fixes SF #3363481: Feeds fail to update properly when entries ordered "wrong" (patch by Robert Trace) * Fixes writing subscriptions into DB when importing from OPML (reported by Dennis Nezic) - * Revert ISO 8601 parsing using Glib due to Debian #653196 - This fixes SF #3465106 (reported by Vincent Lefevre) - * Fixes #3484742: Can't drag and drop feed to empty folder - (reported by peterbuhk) 2011-12-10 Lars Lindner @@ -559,132 +752,4 @@ 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 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) - [truncated] diff -Nru liferea-1.8.15/config.h.in liferea-1.10.3/config.h.in --- liferea-1.8.15/config.h.in 2013-06-24 22:14:37.000000000 +0200 +++ liferea-1.10.3/config.h.in 2013-10-08 20:14:40.000000000 +0200 @@ -27,7 +27,7 @@ /* Define if libindicate support is enabled */ #undef HAVE_LIBINDICATE -/* Define if libnotify.so.1 support is enabled */ +/* Define if libnotify support is enabled */ #undef HAVE_LIBNOTIFY /* Define to 1 if you have the header file. */ @@ -97,9 +97,6 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define if we're using X Session Management. */ -#undef USE_SM - /* Version number of package */ #undef VERSION diff -Nru liferea-1.8.15/configure liferea-1.10.3/configure --- liferea-1.8.15/configure 2013-06-24 22:13:49.000000000 +0200 +++ liferea-1.10.3/configure 2013-10-08 20:14:33.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for liferea 1.8.15. +# Generated by GNU Autoconf 2.68 for liferea 1.10.3. # # Report bugs to . # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='liferea' PACKAGE_TARNAME='liferea' -PACKAGE_VERSION='1.8.15' -PACKAGE_STRING='liferea 1.8.15' +PACKAGE_VERSION='1.10.3' +PACKAGE_STRING='liferea 1.10.3' PACKAGE_BUGREPORT='liferea-devel@lists.sourceforge.net' PACKAGE_URL='' @@ -628,13 +628,18 @@ CATOBJEXT CATALOGS MSGFMT_OPTS +HAVE_INTROSPECTION_FALSE +HAVE_INTROSPECTION_TRUE +INTROSPECTION_MAKEFILE +INTROSPECTION_LIBS +INTROSPECTION_CFLAGS +INTROSPECTION_TYPELIBDIR +INTROSPECTION_GIRDIR +INTROSPECTION_GENERATE +INTROSPECTION_COMPILER +INTROSPECTION_SCANNER PACKAGE_LIBS PACKAGE_CFLAGS -GCONF_SCHEMAS_INSTALL_FALSE -GCONF_SCHEMAS_INSTALL_TRUE -GCONF_SCHEMA_FILE_DIR -GCONF_SCHEMA_CONFIG_SOURCE -GCONFTOOL WITH_LIBINDICATE_FALSE WITH_LIBINDICATE_TRUE LIBINDICATE_LIBS @@ -643,11 +648,13 @@ WITH_LIBNOTIFY_TRUE LIBNOTIFY_LIBS LIBNOTIFY_CFLAGS -SM_LIBS -SM_CFLAGS +GSETTINGS_RULES +GLIB_COMPILE_SCHEMAS +gsettingsschemadir PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG +GSETTINGS_DISABLE_SCHEMAS_COMPILE DATADIRNAME ALL_LINGUAS INTLTOOL_PERL @@ -810,12 +817,10 @@ enable_libtool_lock enable_nls enable_largefile -enable_sm +enable_schemas_compile enable_libnotify enable_libindicate -with_gconf_source -with_gconf_schema_file_dir -enable_schemas_install +enable_introspection ' ac_precious_vars='build_alias host_alias @@ -829,8 +834,6 @@ PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR -SM_CFLAGS -SM_LIBS LIBNOTIFY_CFLAGS LIBNOTIFY_LIBS LIBINDICATE_CFLAGS @@ -1379,7 +1382,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.8.15 to adapt to many kinds of systems. +\`configure' configures liferea 1.10.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1449,7 +1452,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of liferea 1.8.15:";; + short | recursive ) echo "Configuration of liferea 1.10.3:";; esac cat <<\_ACEOF @@ -1468,11 +1471,12 @@ --disable-libtool-lock avoid locking (might break parallel builds) --disable-nls do not use Native Language Support --disable-largefile omit support for large files - --disable-sm compile without X session management support + --disable-schemas-compile + Disable regeneration of gschemas.compiled on install --disable-libnotify compile without libnotify support --disable-libindicate compile without libindicate support - --disable-schemas-install - Disable the schemas installation + --enable-introspection=[no/auto/yes] + Enable introspection for this build Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1482,10 +1486,6 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-gconf-source=sourceaddress - Config database for installing schema files. - --with-gconf-schema-file-dir=dir - Directory for installing schema files. Some influential environment variables: CC C compiler command @@ -1501,8 +1501,6 @@ 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 @@ -1582,7 +1580,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -liferea configure 1.8.15 +liferea configure 1.10.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1951,7 +1949,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.8.15, which was +It was created by liferea $as_me 1.10.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2841,7 +2839,7 @@ # Define the identity of the package. PACKAGE='liferea' - VERSION='1.8.15' + VERSION='1.10.3' cat >>confdefs.h <<_ACEOF @@ -11612,16 +11610,16 @@ ;; esac -INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.4 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -if test -n "0.35.0"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 -$as_echo_n "checking for intltool >= 0.35.0... " >&6; } +if test -n "0.40.4"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.4" >&5 +$as_echo_n "checking for intltool >= 0.40.4... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 + as_fn_error $? "Your intltool is too old. You need intltool 0.40.4 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. @@ -12962,119 +12960,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -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} @@ -13305,13 +13190,238 @@ fi -# Check whether --enable-sm was given. -if test "${enable_sm+set}" = set; then : - enableval=$enable_sm; + + # Check whether --enable-schemas-compile was given. +if test "${enable_schemas_compile+set}" = set; then : + enableval=$enable_schemas_compile; case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;; + esac +fi + + + + + + + + + +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. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.16 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + gsettingsschemadir=${datadir}/glib-2.0/schemas + + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + # Extract the first word of "glib-compile-schemas", so it can be a program name with args. +set dummy glib-compile-schemas; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GLIB_COMPILE_SCHEMAS+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GLIB_COMPILE_SCHEMAS in + [\\/]* | ?:[\\/]*) + ac_cv_path_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GLIB_COMPILE_SCHEMAS=$ac_cv_path_GLIB_COMPILE_SCHEMAS +if test -n "$GLIB_COMPILE_SCHEMAS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5 +$as_echo "$GLIB_COMPILE_SCHEMAS" >&6; } else - enable_sm=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + + fi + + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + as_fn_error $? "glib-compile-schemas not found." "$LINENO" 5 + else + : + fi + + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@ + +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas + +.SECONDARY: $(gsettings_SCHEMAS) + +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi + +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) + +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" $^ > $@.tmp && mv $@.tmp $@ +endif +' + + + + + + + # Check whether --enable-libnotify was given. if test "${enable_libnotify+set}" = set; then : enableval=$enable_libnotify; @@ -13461,83 +13571,6 @@ fi -if test "x$enable_sm" = "xyes"; then - -pkg_failed=no -{ $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 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 ice" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -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 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 ice" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -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 - SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sm ice" 2>&1` - else - SM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sm ice" 2>&1` - 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 "no" >&6; } - enable_sm=no -else - SM_CFLAGS=$pkg_cv_SM_CFLAGS - SM_LIBS=$pkg_cv_SM_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define USE_SM 1" >>confdefs.h - -fi -fi - - if test "x$enable_libnotify" = "xyes"; then pkg_failed=no @@ -13612,25 +13645,41 @@ fi if test "x$enable_libnotify" = "xyes"; then -$as_echo "#define HAVE_LIBNOTIFY 4" >>confdefs.h +$as_echo "#define HAVE_LIBNOTIFY 1" >>confdefs.h fi - if test "x$enable_libnotify" = "xno"; then + + +else + enable_libnotify=no +fi + + if test "x$enable_libnotify" = "xyes"; then + WITH_LIBNOTIFY_TRUE= + WITH_LIBNOTIFY_FALSE='#' +else + WITH_LIBNOTIFY_TRUE='#' + WITH_LIBNOTIFY_FALSE= +fi + + + +if test "x$enable_libindicate" = "xyes"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 -$as_echo_n "checking for LIBNOTIFY... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBINDICATE" >&5 +$as_echo_n "checking for LIBINDICATE... " >&6; } -if test -n "$LIBNOTIFY_CFLAGS"; then - pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" +if test -n "$LIBINDICATE_CFLAGS"; then + pkg_cv_LIBINDICATE_CFLAGS="$LIBINDICATE_CFLAGS" elif test -n "$PKG_CONFIG"; then 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 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate-0.7 indicate-gtk3-0.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "indicate-0.7 indicate-gtk3-0.7") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.3.2" 2>/dev/null` + pkg_cv_LIBINDICATE_CFLAGS=`$PKG_CONFIG --cflags "indicate-0.7 indicate-gtk3-0.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13638,16 +13687,16 @@ else pkg_failed=untried fi -if test -n "$LIBNOTIFY_LIBS"; then - pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" +if test -n "$LIBINDICATE_LIBS"; then + pkg_cv_LIBINDICATE_LIBS="$LIBINDICATE_LIBS" elif test -n "$PKG_CONFIG"; then 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 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate-0.7 indicate-gtk3-0.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "indicate-0.7 indicate-gtk3-0.7") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.3.2" 2>/dev/null` + pkg_cv_LIBINDICATE_LIBS=`$PKG_CONFIG --libs "indicate-0.7 indicate-gtk3-0.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13668,48 +13717,29 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify >= 0.3.2" 2>&1` + LIBINDICATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "indicate-0.7 indicate-gtk3-0.7" 2>&1` else - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify >= 0.3.2" 2>&1` + LIBINDICATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "indicate-0.7 indicate-gtk3-0.7" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$LIBNOTIFY_PKG_ERRORS" >&5 + echo "$LIBINDICATE_PKG_ERRORS" >&5 - enable_libnotify=no + enable_libindicate=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - enable_libnotify=no + enable_libindicate=no else - LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS - LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS + LIBINDICATE_CFLAGS=$pkg_cv_LIBINDICATE_CFLAGS + LIBINDICATE_LIBS=$pkg_cv_LIBINDICATE_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_libnotify=yes -fi - if test "x$enable_libnotify" = "xyes"; then - -$as_echo "#define HAVE_LIBNOTIFY 1" >>confdefs.h - - fi - fi - - -else - enable_libnotify=no -fi - - if test "x$enable_libnotify" = "xyes"; then - WITH_LIBNOTIFY_TRUE= - WITH_LIBNOTIFY_FALSE='#' -else - WITH_LIBNOTIFY_TRUE='#' - WITH_LIBNOTIFY_FALSE= + enable_libindicate=yes fi -if test "x$enable_libindicate" = "xyes"; then + if test "x$enable_libindicate" = "xno"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBINDICATE" >&5 @@ -13719,12 +13749,12 @@ pkg_cv_LIBINDICATE_CFLAGS="$LIBINDICATE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate-0.5 indicate-gtk-0.5\""; } >&5 - ($PKG_CONFIG --exists --print-errors "indicate-0.5 indicate-gtk-0.5") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate-0.6 indicate-gtk3-0.6\""; } >&5 + ($PKG_CONFIG --exists --print-errors "indicate-0.6 indicate-gtk3-0.6") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBINDICATE_CFLAGS=`$PKG_CONFIG --cflags "indicate-0.5 indicate-gtk-0.5" 2>/dev/null` + pkg_cv_LIBINDICATE_CFLAGS=`$PKG_CONFIG --cflags "indicate-0.6 indicate-gtk3-0.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13736,12 +13766,12 @@ pkg_cv_LIBINDICATE_LIBS="$LIBINDICATE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate-0.5 indicate-gtk-0.5\""; } >&5 - ($PKG_CONFIG --exists --print-errors "indicate-0.5 indicate-gtk-0.5") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate-0.6 indicate-gtk3-0.6\""; } >&5 + ($PKG_CONFIG --exists --print-errors "indicate-0.6 indicate-gtk3-0.6") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBINDICATE_LIBS=`$PKG_CONFIG --libs "indicate-0.5 indicate-gtk-0.5" 2>/dev/null` + pkg_cv_LIBINDICATE_LIBS=`$PKG_CONFIG --libs "indicate-0.6 indicate-gtk3-0.6" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13762,9 +13792,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBINDICATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "indicate-0.5 indicate-gtk-0.5" 2>&1` + LIBINDICATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "indicate-0.6 indicate-gtk3-0.6" 2>&1` else - LIBINDICATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "indicate-0.5 indicate-gtk-0.5" 2>&1` + LIBINDICATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "indicate-0.6 indicate-gtk3-0.6" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBINDICATE_PKG_ERRORS" >&5 @@ -13783,6 +13813,7 @@ fi + fi else enable_libindicate=no fi @@ -13802,117 +13833,27 @@ fi -# Extract the first word of "gconftool-2", so it can be a program name with args. -set dummy gconftool-2; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GCONFTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GCONFTOOL in - [\\/]* | ?:[\\/]*) - ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no" - ;; -esac -fi -GCONFTOOL=$ac_cv_path_GCONFTOOL -if test -n "$GCONFTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5 -$as_echo "$GCONFTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - -if test "x$GCONFTOOL" = xno; then - as_fn_error $? "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5 -fi - - - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then - GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` - else - GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE - fi - - -# Check whether --with-gconf-source was given. -if test "${with_gconf_source+set}" = set; then : - withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval" -fi - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 -$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } +################################################################################ +# Mandatory library dependencies - if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then - GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' - fi - - -# Check whether --with-gconf-schema-file-dir was given. -if test "${with_gconf_schema_file_dir+set}" = set; then : - withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval" -fi - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 -$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } - - # Check whether --enable-schemas-install was given. -if test "${enable_schemas_install+set}" = set; then : - enableval=$enable_schemas_install; case ${enableval} in - yes|no) ;; - *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; - esac -fi - - if test "$enable_schemas_install" != no; then - GCONF_SCHEMAS_INSTALL_TRUE= - GCONF_SCHEMAS_INSTALL_FALSE='#' -else - GCONF_SCHEMAS_INSTALL_TRUE='#' - GCONF_SCHEMAS_INSTALL_FALSE= -fi - - - -pkg_modules=" gtk+-2.0 >= 2.18.0 - glib-2.0 >= 2.24.0 +pkg_modules=" gtk+-3.0 >= 3.4.0 + glib-2.0 >= 2.28.0 gio-2.0 >= 2.26.0 pango >= 1.4.0 - gconf-2.0 >= 1.1.9 libxml-2.0 >= 2.6.27 libxslt >= 1.1.19 sqlite3 >= 3.7.0 gmodule-2.0 >= 2.0.0 gthread-2.0 libsoup-2.4 >= 2.28.2 - unique-1.0 - webkit-1.0 >= 1.2.2 - json-glib-1.0" + webkitgtk-3.0 + json-glib-1.0 + gobject-introspection-1.0 + gsettings-desktop-schemas + libpeas-1.0 >= 1.0.0 + libpeas-gtk-1.0 >= 1.0.0" + +################################################################################ pkg_failed=no @@ -14023,6 +13964,106 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: user agent OS = $uname" >&5 $as_echo "user agent OS = $uname" >&6; } +################################################################################ +# Plugins via Introspection + + + + + # Check whether --enable-introspection was given. +if test "${enable_introspection+set}" = set; then : + enableval=$enable_introspection; +else + enable_introspection=auto +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5 +$as_echo_n "checking for gobject-introspection... " >&6; } + + case $enable_introspection in #( + no) : + found_introspection="no (disabled, use --enable-introspection to enable)" + ;; #( + yes) : + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + : +else + as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5 +fi + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.3\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.3") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + found_introspection=yes +else + as_fn_error $? "You need to have gobject-introspection >= 0.9.3 installed to build liferea" "$LINENO" 5 +fi + ;; #( + auto) : + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.3\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.3") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + found_introspection=yes +else + found_introspection=no +fi + enable_introspection=$found_introspection + ;; #( + *) : + as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5 +$as_echo "$found_introspection" >&6; } + + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + + + + + + + + + + if test "x$found_introspection" = "xyes"; then + HAVE_INTROSPECTION_TRUE= + HAVE_INTROSPECTION_FALSE='#' +else + HAVE_INTROSPECTION_TRUE='#' + HAVE_INTROSPECTION_FALSE= +fi + + + + +################################################################################ + for ac_header in locale.h do : @@ -14741,7 +14782,7 @@ -ac_config_files="$ac_config_files Makefile src/Makefile src/webkit/Makefile src/parsers/Makefile src/fl_sources/Makefile src/notification/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 src/liferea-add-feed" +ac_config_files="$ac_config_files Makefile net.sf.liferea.gschema.xml src/Makefile src/webkit/Makefile src/parsers/Makefile src/fl_sources/Makefile src/notification/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 src/liferea-add-feed" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14884,8 +14925,8 @@ as_fn_error $? "conditional \"WITH_LIBINDICATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then - as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. +if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then + as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -15297,7 +15338,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.8.15, which was +This file was extended by liferea $as_me 1.10.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15363,7 +15404,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.8.15 +liferea config.status 1.10.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -15775,6 +15816,7 @@ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "net.sf.liferea.gschema.xml") CONFIG_FILES="$CONFIG_FILES net.sf.liferea.gschema.xml" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/webkit/Makefile") CONFIG_FILES="$CONFIG_FILES src/webkit/Makefile" ;; "src/parsers/Makefile") CONFIG_FILES="$CONFIG_FILES src/parsers/Makefile" ;; @@ -17183,7 +17225,6 @@ echo echo "$PACKAGE $VERSION" echo -echo "Use X Session Management........ : $enable_sm" echo "Use libnotify................... : $enable_libnotify" echo "Use libindicate................. : $enable_libindicate" echo diff -Nru liferea-1.8.15/configure.ac liferea-1.10.3/configure.ac --- liferea-1.8.15/configure.ac 2013-06-24 22:12:31.000000000 +0200 +++ liferea-1.10.3/configure.ac 2013-10-08 20:14:07.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([liferea],[1.8.15],[liferea-devel@lists.sourceforge.net]) +AC_INIT([liferea],[1.10.3],[liferea-devel@lists.sourceforge.net]) AC_CANONICAL_HOST AC_CONFIG_SRCDIR([src/feedlist.c]) @@ -14,16 +14,14 @@ AC_PREREQ(2.59) LT_INIT -IT_PROG_INTLTOOL([0.35.0]) +IT_PROG_INTLTOOL([0.40.4]) AC_PROG_CC AM_PROG_CC_C_O -AC_HEADER_STDC -AC_PROG_INSTALL AC_PROG_MAKE_SET AC_SYS_LARGEFILE +GLIB_GSETTINGS -AC_ARG_ENABLE(sm, AS_HELP_STRING([--disable-sm],[compile without X session management support]),,enable_sm=yes) AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[compile without libnotify support]),,enable_libnotify=yes) AC_ARG_ENABLE(libindicate, AS_HELP_STRING([--disable-libindicate],[compile without libindicate support]),,enable_libindicate=yes) @@ -31,14 +29,6 @@ PKG_PROG_PKG_CONFIG() -dnl ####################################################################### -dnl # Check for X session management libs -dnl ####################################################################### - -if test "x$enable_sm" = "xyes"; then - PKG_CHECK_MODULES([SM], [sm ice], [AC_DEFINE(USE_SM, 1, [Define if we're using X Session Management.])],[enable_sm=no]) -fi - dnl ********* dnl libnotify dnl ********* @@ -46,13 +36,7 @@ if test "x$enable_libnotify" = "xyes"; then PKG_CHECK_MODULES([LIBNOTIFY], libnotify >= 0.7,enable_libnotify=yes,enable_libnotify=no) if test "x$enable_libnotify" = "xyes"; then - AC_DEFINE(HAVE_LIBNOTIFY, 4, [Define if libnotify.so.4 support is enabled]) - fi - if test "x$enable_libnotify" = "xno"; then - PKG_CHECK_MODULES([LIBNOTIFY], libnotify >= 0.3.2,enable_libnotify=yes,enable_libnotify=no) - if test "x$enable_libnotify" = "xyes"; then - AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify.so.1 support is enabled]) - fi + AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify support is enabled]) fi AC_SUBST(LIBNOTIFY_CFLAGS) AC_SUBST(LIBNOTIFY_LIBS) @@ -67,9 +51,17 @@ 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) + dnl Try 0.7 first + PKG_CHECK_MODULES([LIBINDICATE], indicate-0.7 indicate-gtk3-0.7,enable_libindicate=yes,enable_libindicate=no) AC_SUBST(LIBINDICATE_CFLAGS) AC_SUBST(LIBINDICATE_LIBS) + + dnl But 0.6 will also do... + if test "x$enable_libindicate" = "xno"; then + PKG_CHECK_MODULES([LIBINDICATE], indicate-0.6 indicate-gtk3-0.6,enable_libindicate=yes,enable_libindicate=no) + AC_SUBST(LIBINDICATE_CFLAGS) + AC_SUBST(LIBINDICATE_LIBS) + fi else enable_libindicate=no fi @@ -80,29 +72,27 @@ AM_CONDITIONAL(WITH_LIBINDICATE, test "x$enable_libindicate" = "xyes") -dnl Checking for gconftool-2 -AC_PATH_PROG(GCONFTOOL, gconftool-2, no) - -if test "x$GCONFTOOL" = xno; then - AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) -fi - -AM_GCONF_SOURCE_2 +################################################################################ +# Mandatory library dependencies -pkg_modules=" gtk+-2.0 >= 2.18.0 - glib-2.0 >= 2.24.0 +pkg_modules=" gtk+-3.0 >= 3.4.0 + glib-2.0 >= 2.28.0 gio-2.0 >= 2.26.0 - pango >= 1.4.0 - gconf-2.0 >= 1.1.9 + pango >= 1.4.0 libxml-2.0 >= 2.6.27 libxslt >= 1.1.19 sqlite3 >= 3.7.0 gmodule-2.0 >= 2.0.0 gthread-2.0 libsoup-2.4 >= 2.28.2 - unique-1.0 - webkit-1.0 >= 1.2.2 - json-glib-1.0" + webkitgtk-3.0 + json-glib-1.0 + gobject-introspection-1.0 + gsettings-desktop-schemas + libpeas-1.0 >= 1.0.0 + libpeas-gtk-1.0 >= 1.0.0" + +################################################################################ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) @@ -114,6 +104,13 @@ AC_DEFINE_UNQUOTED(OSNAME, "$uname", [defines a OS version string, used for the user agent string]) AC_MSG_RESULT(user agent OS = $uname) +################################################################################ +# Plugins via Introspection + +GOBJECT_INTROSPECTION_CHECK([0.9.3]) + +################################################################################ + AM_GLIB_GNU_GETTEXT GETTEXT_PACKAGE=liferea @@ -123,6 +120,7 @@ AC_CONFIG_FILES([ Makefile +net.sf.liferea.gschema.xml src/Makefile src/webkit/Makefile src/parsers/Makefile @@ -151,7 +149,6 @@ echo echo "$PACKAGE $VERSION" echo -echo "Use X Session Management........ : $enable_sm" echo "Use libnotify................... : $enable_libnotify" echo "Use libindicate................. : $enable_libindicate" echo diff -Nru liferea-1.8.15/debian/changelog liferea-1.10.3/debian/changelog --- liferea-1.8.15/debian/changelog 2013-07-15 08:51:35.000000000 +0200 +++ liferea-1.10.3/debian/changelog 2014-02-17 21:42:20.000000000 +0100 @@ -1,3 +1,54 @@ +liferea (1.10.3-1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable (LP: #1281283). Remaining changes: + + debian/patch/ubuntu-example-feeds.patch: + - refreshed. + - alphabetically ordered. + - add ubuntu-it planet to opml/feedlist_it.opml. + + debian/patch/port-to-messaging-menu.patch: + - refreshed. + - add an hook for src/ui/ui_indicator.h. + + debian/patch/add_X-Ubuntu-Gettext-Domain.patch: refreshed. + + debian/patch/libunity.patch: refreshed. + + debian/control: build-depends on libmessaging-menu-dev libunity-dev. + + debian/liferea.indicate: dropped since useless. + + debian/rules: enable messaging-menu + + -- Mattia Rizzolo Mon, 17 Feb 2014 19:58:20 +0100 + +liferea (1.10.3-1) unstable; urgency=low + + * New upstream release [October 2013] + * Removed patch "add_files_to_potfiles.patch". Fixed upstream. + * Refreshed "debian-example-feeds.patch". + + -- David Michael Smith Sun, 13 Oct 2013 00:11:46 +0800 + +liferea (1.10.2-1) unstable; urgency=low + + * New upstream release [September 2013] (Closes: 712961) + * wrap-and-sort maintenance. + * Remove lintian override. + * Added patch "add_files_to_potfiles.patch" to fix the fail to build due to + new translations files. + + -- David Michael Smith Mon, 29 Jul 2013 14:49:52 +0800 + +liferea (1.10.1-1) experimental; urgency=low + + * New upstream release [July 2013] + * Added recommends on gnome-icon-theme (Closes: #717028) + * Refreshed "debian-example-feeds.patch". + + -- David Michael Smith Tue, 16 Jul 2013 18:20:17 +0800 + +liferea (1.10~rc4-1) experimental; urgency=low + + * New upstream release [June 2013] + + fix segfault when opening audio/video attachment (Closes: #714074). + + -- David Michael Smith Wed, 10 Jul 2013 13:37:20 +0800 + liferea (1.8.15-1ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: @@ -59,6 +110,130 @@ -- David Michael Smith Fri, 05 Jul 2013 19:34:12 +0800 +liferea (1.10~rc3-1~exp0) experimental; urgency=low + + * New upstream release [May 2013] + + fixed rendering of TT-RSS feeds (Closes: #706960). + + -- Dmitry Smirnov Mon, 27 May 2013 10:19:51 +1000 + +liferea (1.10~rc2-1~exp0) experimental; urgency=low + + * New upstream release [May 2013] + + fixed continuous refresh of TTRSS feeds (Closes: #707098). + * Dropped patches (applied-upstream): + - configure-libindicate.patch + - fix-preferences.patch + * Refreshed "debian-example-feeds.patch". + + -- Dmitry Smirnov Mon, 13 May 2013 12:20:12 +1000 + +liferea (1.10~rc1-1~exp1) experimental; urgency=low + + * Fixed build failure on `dh_girepository` invocation by changing + provided path to .gir XML file (Arch:all packages are not built on + buildds hence files under "debian/liferea-data" may not be available + on build time). Thanks to Emilio Pozuelo Monfort. + + -- Dmitry Smirnov Fri, 12 Apr 2013 05:50:27 +1000 + +liferea (1.10~rc1-1~exp0) experimental; urgency=low + + [ Dmitry Smirnov ] + * New upstream release [January 2013] + * Dropped patches (applied-upstream): + - fix-browser-selections + - fix-crash-when-dragging-feeds-outside-google-reader + - fix-crash-when-online-status-changes + - fix-crash-when-removing-google-reader-folders + - fix-crash-in-empty-launch-url + * Dropped patch "libtool-dont-rearange-as-needed" (obsoleted by + "dh_autoreconf --as-needed"). + * Remaining patches are renamed to end with ".patch". + * Updated "www-browser.patch". + * Added backported "fix-preferences.patch" to fix preferences + dialog (thanks, Emilio). + * Build with libindicate: + + "libindicate-gtk3-dev" to Build-Depends. + + new patch "configure-libindicate.patch" to check for correct + library version. + * Build with libnotify: + + Pass "--enable-libnotify" to configure script. + + Disabled PIE hardening (incompatible). + * debian/control: + - dropped redundant "autotools-dev" from Build-Depends. + - dropped "${shlibs:Depends}" from (data|dbg) packages. + - dropped obsolete build-dependencies. + - dropped "gwget" from Recommends and Breaks ("gwget" was removed + from Debian). + - removed unnecessary versioned dependencies. + + updated package description to remove references to GNOME. + + alphabetised list of Build-Depends. + + moved packaging Build-Deps to first line of Build-Depends. + + Standards to "3.9.4". + + added myself to Uploaders. + + added python plugins' dependencies to Depends: + + gir1.2-peas-1.0, + + python-gi + + added new explicit Build-Depends as per upstream requirements: + + libpango1.0-dev + + libxml2-dev + * debian/copyright to copyright-format-1.0 + audit/update. + * debian/compat to version 9. + * xz compression for debian source and binary packages. + * debian/watch is corrected to mangle RC versions in case insensitive + way and to look for .bz2 and .xz archives (thanks, Barak). + * Removed "README.source" with instructions how to use `quilt`. + * Added debian/clean to remove generated files. + * Lintianisation: + + added "set -e" to postinit scripts (maintainer-script-without-set-e). + + updated Vcs fields (vcs-field-not-canonical). + + added lintian-override for false-positive in .desktop file. + * debian/rules re-written in dh style: + - dropped unsupported build options "--enable-gnutls --enable-lua". + - dropped redundant invocation of "intltool-update -p". + + increased log verbosity with "--disable-silent-rules". + + enabled parallel build. + + debhelper to version 9. + * Added dh_python2 to handle python plugins' dependencies: + + added corresponding "python" to Build-Depends and + "Depends: ${python:Depends}" + instead of "Recommends: python (>= 2.0)". + * Fixed invocation of `dh_girepository`; + added corresponding "gobject-introspection" to Build-Depends. + * debian/watch is corrected to mangle RC versions in case insensitive + way and to look for .bz2 and .xz archives (thanks, Barak). + + [ David M Smith ] + * New Upstream Release. (Closes: #512108, #692007, #692863, #694863) + * Item History for navigating recently viewed items. + (Closes: #356460) + * Media Player plugin. (Closes: #456283) + * Support new tt-rss API. (Closes: #697324) + * Clarified save options. (Closes: #587555) + * debian/watch: + - Watch bz2 upstream source. (Closes: #695697) + * debian/rules: + - Removed old compile flags that are no longer available. + - Added --with gir to dh to handle the typelib. + * debian/control: + - Replace obsolete build depends: + - libgconf2-dev: Replaced with gsettings-desktop-schemas-dev + - libgtk2.0-dev: Replaced with libgtk-3-dev + - libwebkitgtk-dev: Replaced with libwebkitgtk-3.0-dev + - libpeas-dev: Added plugin library + - libgirepository1.0-dev: Added GObject library + - Added ${gir:Depends} for typelib + - Recommend python, gir1.2-gnomekeyring-1.0 and gnome-keyring for + storing usernames and passwords encrypted. + - wget, curl downloader support dropped. Steadyflow added. + (Closes: #660599) + - Updated package description. (Closes: #691997) + * debian/liferea.install: + - Install schema, typelib, and plugins. + + -- Dmitry Smirnov Wed, 10 Apr 2013 13:09:30 +1000 + liferea (1.8.10-0ubuntu2) raring; urgency=low * Port to messaging-menu. (LP: #1040259) diff -Nru liferea-1.8.15/debian/clean liferea-1.10.3/debian/clean --- liferea-1.8.15/debian/clean 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/debian/clean 2014-02-13 19:08:49.000000000 +0100 @@ -0,0 +1,2 @@ +config.log +net.sf.liferea.gschema.xml diff -Nru liferea-1.8.15/debian/control liferea-1.10.3/debian/control --- liferea-1.8.15/debian/control 2013-07-15 08:51:35.000000000 +0200 +++ liferea-1.10.3/debian/control 2014-02-13 22:24:18.000000000 +0100 @@ -4,27 +4,30 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Luis Rodrigo Gallardo Cruz Uploaders: Emilio Pozuelo Monfort , - Dmitry Smirnov , + Dmitry Smirnov , David Michael Smith -Build-Depends: debhelper (>= 9), dh-autoreconf, intltool, dpkg-dev (>= 1.16.1~), - libgconf2-dev (>= 1.1.9), - libsm-dev, - libsoup2.4-dev (>= 2.28.2), +Build-Depends: debhelper (>= 9), + dh-autoreconf, + dpkg-dev (>= 1.16.1~), + gobject-introspection, + gsettings-desktop-schemas-dev, + intltool, + libgirepository1.0-dev, + libglib2.0-dev, + libgtk-3-dev, + libindicate-gtk3-dev, + libjson-glib-dev, + libmessaging-menu-dev, libnotify-dev (>= 0.7.0), - libxml-parser-perl, + libpango1.0-dev, + libpeas-dev, + libsoup2.4-dev, + libsqlite3-dev, + libunity-dev, + libwebkitgtk-3.0-dev, + libxml2-dev, libxslt1-dev, - libsqlite3-dev (>= 3.7), - libglade2-dev, - libgtk2.0-dev (>= 2.18.0), - libglib2.0-dev (>= 2.24.0), - libwebkitgtk-dev (>= 1.2.2), - libicu-dev, - libx11-dev, - libmessaging-menu-dev, - libunity-dev (>= 5.0.0), - libice-dev, - libunique-dev, - libjson-glib-dev, + python Standards-Version: 3.9.4 Homepage: http://liferea.sourceforge.net/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/liferea.git @@ -32,19 +35,29 @@ Package: liferea Architecture: any -Depends: ${shlibs:Depends}, +Depends: gir1.2-peas-1.0, + liferea-data (= ${source:Version}), + python-gi, + ${gir:Depends}, ${misc:Depends}, - liferea-data (= ${source:Version}) -Recommends: dbus (>= 1.0.2-5), + ${python:Depends}, + ${shlibs:Depends} +Recommends: dbus, dbus-x11, - wget | curl | gwget | kget + gir1.2-gnomekeyring-1.0, + gnome-icon-theme, + gnome-keyring, + steadyflow | kget Suggests: network-manager -Breaks: gwget (<< 1.0.2) Replaces: liferea-data (<< 1.4.26-4) -Description: feed aggregator for GNOME - Liferea is a simple FeedReader clone for GNOME. It is a reader for +Description: news aggregator for online news feeds + Liferea is a simple FeedReader clone. It is a reader for RSS/RDF feeds which also supports CDF channels, Atom/Echo/PIE feeds and - OCS directories. + OCS directories. Google Reader and TinyTinyRSS synchronization is supported + so that you can synchronize your feeds and (un)read items across multiple + devices automatically. It also supports social networking / web integration + so you can share your favorite news articles to Facebook, Google+, Reddit, + Twitter, Slashdot, Digg, Yahoo and many more. . Liferea is an abbreviation for Linux Feed Reader. @@ -54,7 +67,8 @@ Replaces: liferea (<< 1.4.26-4) Breaks: liferea (<< 1.4.26-1) Description: architecture independent data for liferea - This package contains data files for liferea, a feed reader for GNOME. + This package contains data files for liferea, a news aggregator for + online news feeds. . This package does not depend on liferea, but it is unlikely to be of use by itself. diff -Nru liferea-1.8.15/debian/copyright liferea-1.10.3/debian/copyright --- liferea-1.8.15/debian/copyright 2013-07-10 09:24:00.000000000 +0200 +++ liferea-1.10.3/debian/copyright 2014-02-13 19:08:49.000000000 +0100 @@ -5,31 +5,41 @@ Files: * Copyright: 2009 Adrian Bunk + 2004 Antoine Reversat 2008 Arnold Noronha 2004 ahmed el-helw 2002 Charles Kerr 2004 Christophe Barbe 2004 delusional 2009-2010 Emilio Pozuelo Monfort + 2004-2011 Free Software Foundation 2000 Helix Code, Inc. (www.helixcode.com) 2009 Hubert Figuiere + 2004-2005 Jakub W. Jozwicki 2004 Karl Soderstrom + 2006-2010 Khaled Hosny + 2003-2013 Lars Windolf 2003-2012 Lars Lindner 2003-2006 Lars Lindner 2008 Lars Strojny 2010 liferea & nedenstående oversættere 2010-2011 Maia Kozheva + 2008 Martin Picek 2009 Mikel Olasagasti 2007 mooonz 2004-2006 Nathan J. Conrad 2006 Nathan Conrad 2006 Norman Jonas + 2002-2005 Paolo Maggi 2011 Peter Oliver 2005 Raphael Slinckx 1999,2000 Red Hat Inc. 2011 Sergey Snitsaruk + 2003 Stéphane Jourdan + 2010 Steve Frécinaux 2003-2012 The Liferea Team 2010 Yaron Sheffer + 2004-2011 Vincent Lefèvre 2000,2001 Ximian, Inc Comment: The following authors do not have explicit copyright statements anywhere: @@ -41,12 +51,28 @@ Copyright: 2000, 2001, Ximian, Inc License: LGPL-2 +Files: ui/gedit-close-button.* +Copyright: 2010 Paolo Borelli +License: LGPL-2.1+ + gedit is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + gedit 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. + . + The complete text of the GNU Lesser General Public License version 2.1 + can be found in "/usr/share/common-licenses/LGPL-2.1" file. + Files: debian/* Copyright: 2003-2004 christophe barbe 2012 bojo42 2004-2006 David Moreno Garza 2012 David Smith - 2013 Dmitry Smirnov + 2013 Dmitry Smirnov 2010-2011 Emilio Pozuelo Monfort 2006 Franz Pletz 2006-2008 Luis Rodrigo Gallardo Cruz diff -Nru liferea-1.8.15/debian/liferea.indicate liferea-1.10.3/debian/liferea.indicate --- liferea-1.8.15/debian/liferea.indicate 2013-07-15 08:51:35.000000000 +0200 +++ liferea-1.10.3/debian/liferea.indicate 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -/usr/share/applications/liferea.desktop diff -Nru liferea-1.8.15/debian/liferea.install liferea-1.10.3/debian/liferea.install --- liferea-1.8.15/debian/liferea.install 2013-07-15 08:51:35.000000000 +0200 +++ liferea-1.10.3/debian/liferea.install 2014-02-17 19:49:02.000000000 +0100 @@ -1,6 +1,6 @@ +debian/liferea.xpm usr/share/liferea/pixmaps +debian/tmp/usr/bin/* +debian/tmp/usr/lib/* debian/tmp/usr/share/applications/* +debian/tmp/usr/share/glib-2.0/ debian/tmp/usr/share/man/* -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 diff -Nru liferea-1.8.15/debian/patches/add_X-Ubuntu-Gettext-Domain.patch liferea-1.10.3/debian/patches/add_X-Ubuntu-Gettext-Domain.patch --- liferea-1.8.15/debian/patches/add_X-Ubuntu-Gettext-Domain.patch 2013-07-15 08:51:35.000000000 +0200 +++ liferea-1.10.3/debian/patches/add_X-Ubuntu-Gettext-Domain.patch 2014-02-13 19:45:48.000000000 +0100 @@ -1,17 +1,14 @@ Description: add x-ubuntu-gettext-domain to .desktop file Bug-Ubuntu: https://bugs.launchpad.net/bugs/514272 Author: Marc Deslauriers -Last-Update: 2012-02-18 +Last-Update: 2014-02-13 -Index: liferea-1.8.15-1ubuntu1/liferea.desktop.in -=================================================================== ---- liferea-1.8.15-1ubuntu1.orig/liferea.desktop.in 2013-07-14 01:57:38.275014225 +0300 -+++ liferea-1.8.15-1ubuntu1/liferea.desktop.in 2013-07-14 02:27:07.038370386 +0300 -@@ -9,6 +9,7 @@ +--- a/liferea.desktop.in ++++ b/liferea.desktop.in +@@ -10,5 +10,6 @@ Terminal=false Type=Application - Categories=Network;News; + Categories=Network;Feed; +X-Ubuntu-Gettext-Domain=liferea Version=0.9.4 - MimeType=application/rss+xml;application/atom+xml;application/rdf+xml - + MimeType=application/rss+xml;application/atom+xml;application/rdf+xml; diff -Nru liferea-1.8.15/debian/patches/debian-example-feeds.patch liferea-1.10.3/debian/patches/debian-example-feeds.patch --- liferea-1.8.15/debian/patches/debian-example-feeds.patch 2013-07-10 09:24:00.000000000 +0200 +++ liferea-1.10.3/debian/patches/debian-example-feeds.patch 2014-02-13 19:08:49.000000000 +0100 @@ -1,8 +1,8 @@ Description: Add the Debian planets to the example feed lists. Origin: Debian Forwarded: not-needed -Reviewed-By: bojo42@gmail.com -Last-Update: 2013-07-09 +Reviewed-By: sidicas2@gmail.com +Last-Update: 2013-07-16 --- a/opml/feedlist_en.opml +++ b/opml/feedlist_en.opml @@ -13,7 +13,7 @@ + + + - + --- a/opml/feedlist_bg.opml @@ -24,7 +24,7 @@ + + - + --- a/opml/feedlist_ca.opml @@ -35,7 +35,7 @@ + + - + --- a/opml/feedlist_de.opml @@ -47,7 +47,7 @@ + + + - + --- a/opml/feedlist_es.opml @@ -59,7 +59,7 @@ + + + - + --- a/opml/feedlist_eu.opml @@ -70,7 +70,7 @@ + + - + --- a/opml/feedlist_fr.opml @@ -83,7 +83,7 @@ + + + - + --- a/opml/feedlist_gl.opml @@ -94,7 +94,7 @@ + + - + --- a/opml/feedlist_he.opml @@ -105,7 +105,7 @@ + + - + --- a/opml/feedlist_hu.opml @@ -116,18 +116,18 @@ + + - + --- a/opml/feedlist_it.opml +++ b/opml/feedlist_it.opml -@@ -24,6 +24,8 @@ +@@ -25,6 +25,8 @@ + + - + --- a/opml/feedlist_nl.opml @@ -138,7 +138,7 @@ + + - + --- a/opml/feedlist_pl.opml @@ -149,7 +149,7 @@ + + - + --- a/opml/feedlist_pt.opml @@ -160,8 +160,8 @@ + + -+ - ++ + --- a/opml/feedlist_pt_BR.opml @@ -173,7 +173,7 @@ + + + - + --- a/opml/feedlist_sk.opml @@ -184,7 +184,7 @@ + + - + --- a/opml/feedlist_sv.opml @@ -195,6 +195,6 @@ + + - + diff -Nru liferea-1.8.15/debian/patches/libunity.patch liferea-1.10.3/debian/patches/libunity.patch --- liferea-1.8.15/debian/patches/libunity.patch 2013-07-15 08:51:35.000000000 +0200 +++ liferea-1.10.3/debian/patches/libunity.patch 2014-02-13 22:22:07.000000000 +0100 @@ -4,23 +4,22 @@ Forwarded: no Author: Jean-Philippe Orsini Reviewed-By: Ken VanDine -Last-Update: 2012-03-29 +Last-Update: 2014-02-13 ---- liferea-1.8.0.orig/configure.ac -+++ liferea-1.8.0/configure.ac -@@ -23,6 +23,7 @@ - AC_ARG_ENABLE(sm, AS_HELP_STRING([--disable-sm],[compile without X session management support]),,enable_sm=yes) +--- a/configure.ac ++++ b/configure.ac +@@ -24,6 +24,7 @@ + AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[compile without libnotify support]),,enable_libnotify=yes) AC_ARG_ENABLE(libindicate, AS_HELP_STRING([--disable-libindicate],[compile without libindicate support]),,enable_libindicate=yes) +AC_ARG_ENABLE(libunity, AS_HELP_STRING([--disable-libunity],[compile without libunity support]),,enable_libunity=yes) AC_CHECK_FUNCS([strsep]) -@@ -76,6 +77,24 @@ - fi +@@ -72,6 +73,24 @@ AM_CONDITIONAL(WITH_LIBINDICATE, test "x$enable_libindicate" = "xyes") -+ + +dnl ********* +dnl libunity +dnl ********* @@ -38,31 +37,35 @@ +fi + +AM_CONDITIONAL(WITH_LIBUNITY, test "x$enable_libunity" = "xyes") ++ + ################################################################################ + # Mandatory library dependencies - dnl Checking for gconftool-2 - AC_PATH_PROG(GCONFTOOL, gconftool-2, no) @@ -151,6 +170,7 @@ - echo "Use X Session Management........ : $enable_sm" + echo echo "Use libnotify................... : $enable_libnotify" echo "Use libindicate................. : $enable_libindicate" +echo "Use libunity.................... : $enable_libunity" echo eval eval echo Liferea will be installed in $bindir. echo ---- liferea-1.8.0.orig/src/Makefile.am -+++ liferea-1.8.0/src/Makefile.am -@@ -82,3 +82,9 @@ - liferea_LDADD += $(LIBINDICATE_LIBS) +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -88,6 +88,12 @@ endif -+ + +if WITH_LIBUNITY + +liferea_LDADD += $(LIBUNITY_LIBS) + +endif ++ + -include $(INTROSPECTION_MAKEFILE) + INTROSPECTION_GIRS = Liferea-3.0.gir + --- /dev/null -+++ liferea-1.8.0/src/ui/ui_unity.h ++++ b/src/ui/ui_unity.h @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2011 Jean-Philippe Orsini @@ -93,8 +96,8 @@ +void ui_unity_destroy (); + +#endif /* _UI_UNITY_H */ ---- liferea-1.8.0.orig/src/ui/ui_tray.c -+++ liferea-1.8.0/src/ui/ui_tray.c +--- a/src/ui/ui_tray.c ++++ b/src/ui/ui_tray.c @@ -197,6 +197,7 @@ gchar *msg, *tmp; @@ -104,7 +107,7 @@ if (!trayIcon_priv) return; --- /dev/null -+++ liferea-1.8.0/src/ui/ui_unity.c ++++ b/src/ui/ui_unity.c @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2011 Jean-Philippe Orsini @@ -168,18 +171,18 @@ +void ui_unity_destroy (void) {} + +#endif /* HAVE_LIBUNITY */ ---- liferea-1.8.0.orig/src/ui/liferea_shell.c -+++ liferea-1.8.0/src/ui/liferea_shell.c -@@ -1272,6 +1272,7 @@ - { - feed_list_view_select (NULL); +--- a/src/ui/liferea_shell.c ++++ b/src/ui/liferea_shell.c +@@ -1408,6 +1408,7 @@ + feed_list_view_select (NULL); // FIXME: Move to feed list handling + liferea_shell_save_position (); + ui_unity_destroy (); ui_tray_enable (FALSE); g_object_unref (shell->priv->tabs); g_object_unref (shell->priv->feedlist); ---- liferea-1.8.0.orig/src/ui/Makefile.am -+++ liferea-1.8.0/src/ui/Makefile.am +--- a/src/ui/Makefile.am ++++ b/src/ui/Makefile.am @@ -8,7 +8,7 @@ noinst_LIBRARIES = libliui.a @@ -189,9 +192,9 @@ libliui_a_SOURCES = \ auth_dialog.c auth_dialog.h \ browser_tabs.c browser_tabs.h \ -@@ -33,4 +33,5 @@ - ui_prefs.c ui_prefs.h \ - ui_session.c ui_session.h \ +@@ -36,4 +36,5 @@ + ui_folder.c ui_folder.h \ + ui_indicator.c ui_indicator.h \ ui_tray.c ui_tray.h \ + ui_unity.c ui_unity.h \ ui_update.c ui_update.h diff -Nru liferea-1.8.15/debian/patches/port-to-messaging-menu.patch liferea-1.10.3/debian/patches/port-to-messaging-menu.patch --- liferea-1.8.15/debian/patches/port-to-messaging-menu.patch 2013-07-15 08:51:35.000000000 +0200 +++ liferea-1.10.3/debian/patches/port-to-messaging-menu.patch 2014-02-14 22:07:56.000000000 +0100 @@ -1,21 +1,20 @@ Description: port to messaging menu Author: Dmitrijs Ledkovs Bug-Ubuntu: https://bugs.launchpad.net/bugs/1040259 +Last-Update: 2014-02-13 -Index: liferea-1.8.15-1ubuntu1/configure.ac -=================================================================== ---- liferea-1.8.15-1ubuntu1.orig/configure.ac 2013-07-14 02:19:06.274968347 +0300 -+++ liferea-1.8.15-1ubuntu1/configure.ac 2013-07-14 02:19:06.250968348 +0300 -@@ -25,7 +25,7 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -23,7 +23,7 @@ + GLIB_GSETTINGS - AC_ARG_ENABLE(sm, AS_HELP_STRING([--disable-sm],[compile without X session management support]),,enable_sm=yes) AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[compile without libnotify support]),,enable_libnotify=yes) -AC_ARG_ENABLE(libindicate, AS_HELP_STRING([--disable-libindicate],[compile without libindicate support]),,enable_libindicate=yes) +AC_ARG_ENABLE(messaging-menu, AS_HELP_STRING([--disable-messaging-menu],[compile without messaging-menu support]),,enable_messaging_menu=yes) AC_ARG_ENABLE(libunity, AS_HELP_STRING([--disable-libunity],[compile without libunity support]),,enable_libunity=yes) AC_CHECK_FUNCS([strsep]) -@@ -64,22 +64,22 @@ +@@ -48,30 +48,22 @@ AM_CONDITIONAL(WITH_LIBNOTIFY, test "x$enable_libnotify" = "xyes") dnl ********* @@ -24,9 +23,17 @@ 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) +- dnl Try 0.7 first +- PKG_CHECK_MODULES([LIBINDICATE], indicate-0.7 indicate-gtk3-0.7,enable_libindicate=yes,enable_libindicate=no) - AC_SUBST(LIBINDICATE_CFLAGS) - AC_SUBST(LIBINDICATE_LIBS) +- +- dnl But 0.6 will also do... +- if test "x$enable_libindicate" = "xno"; then +- PKG_CHECK_MODULES([LIBINDICATE], indicate-0.6 indicate-gtk3-0.6,enable_libindicate=yes,enable_libindicate=no) +- AC_SUBST(LIBINDICATE_CFLAGS) +- AC_SUBST(LIBINDICATE_LIBS) +- fi +if test "x$enable_messaging_menu" = "xyes"; then + PKG_CHECK_MODULES([MESSAGING_MENU], messaging-menu,enable_messaging_menu=yes,enable_messaging_menu=no) + AC_SUBST(MESSAGING_MENU_CFLAGS) @@ -47,20 +54,18 @@ dnl ********* dnl libunity -@@ -172,7 +172,7 @@ +@@ -169,7 +161,7 @@ + echo "$PACKAGE $VERSION" echo - echo "Use X Session Management........ : $enable_sm" echo "Use libnotify................... : $enable_libnotify" -echo "Use libindicate................. : $enable_libindicate" +echo "Use messaging-menu.............. : $enable_messaging_menu" echo "Use libunity.................... : $enable_libunity" echo eval eval echo Liferea will be installed in $bindir. -Index: liferea-1.8.15-1ubuntu1/src/Makefile.am -=================================================================== ---- liferea-1.8.15-1ubuntu1.orig/src/Makefile.am 2013-07-14 02:19:06.274968347 +0300 -+++ liferea-1.8.15-1ubuntu1/src/Makefile.am 2013-07-14 02:19:06.250968348 +0300 -@@ -77,9 +77,9 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -82,9 +82,9 @@ endif @@ -72,10 +77,8 @@ endif -Index: liferea-1.8.15-1ubuntu1/src/ui/Makefile.am -=================================================================== ---- liferea-1.8.15-1ubuntu1.orig/src/ui/Makefile.am 2013-07-14 02:19:06.274968347 +0300 -+++ liferea-1.8.15-1ubuntu1/src/ui/Makefile.am 2013-07-14 02:19:06.250968348 +0300 +--- a/src/ui/Makefile.am ++++ b/src/ui/Makefile.am @@ -8,7 +8,7 @@ noinst_LIBRARIES = libliui.a @@ -85,10 +88,8 @@ libliui_a_SOURCES = \ auth_dialog.c auth_dialog.h \ browser_tabs.c browser_tabs.h \ -Index: liferea-1.8.15-1ubuntu1/src/ui/ui_indicator.c -=================================================================== ---- liferea-1.8.15-1ubuntu1.orig/src/ui/ui_indicator.c 2013-07-14 02:19:06.274968347 +0300 -+++ liferea-1.8.15-1ubuntu1/src/ui/ui_indicator.c 2013-07-14 10:28:09.488249806 +0300 +--- a/src/ui/ui_indicator.c ++++ b/src/ui/ui_indicator.c @@ -24,13 +24,10 @@ #include "ui_indicator.h" @@ -103,8 +104,8 @@ -#include +#include #include "feedlist.h" - #include "feed_list_view.h" - #include "liferea_shell.h" + #include "ui/feed_list_view.h" + #include "ui/liferea_shell.h" @@ -39,15 +36,9 @@ /* The maximum number of feeds to display in the indicator menu. */ @@ -237,8 +238,8 @@ + icon = g_file_icon_new (file); - /* display favicon */ -- indicate_indicator_set_property_icon (indicator, "icon", pixbuf); -- gdk_pixbuf_unref (pixbuf); +- indicate_gtk_indicator_set_property_icon (indicator, "icon", pixbuf); +- g_object_unref (pixbuf); - - sprintf (count, "%u", node->unreadCount); - indicate_indicator_set_property (indicator, "name", node->title); @@ -288,10 +289,33 @@ + return TRUE; } - #else -@@ -233,4 +187,4 @@ - void ui_indicator_update () {} - gboolean ui_indicator_is_visible () { return FALSE; } - -#endif /* HAVE_LIBINDICATE */ +#endif /* HAVE_MESSAGING_MENU */ +--- a/src/ui/ui_indicator.h ++++ b/src/ui/ui_indicator.h +@@ -23,7 +23,7 @@ + + #include + +-#ifdef HAVE_LIBINDICATE ++#ifdef HAVE_MESSAGING_MENU + + /** + * Setup indicator widget. +@@ -47,7 +47,7 @@ + */ + gboolean ui_indicator_is_visible (void); + +-#else /* HAVE_LIBINDICATE */ ++#else /* HAVE_MESSAGING_MENU */ + + /* + If Liferea is compiled without libindicate support, all indicator +@@ -60,6 +60,6 @@ + static inline void ui_indicator_update () {} + static inline gboolean ui_indicator_is_visible () { return FALSE; } + +-#endif /* HAVE_LIBINDICATE */ ++#endif /* HAVE_MESSAGING_MENU */ + + #endif /* _UI_INDICATOR_H */ diff -Nru liferea-1.8.15/debian/patches/series liferea-1.10.3/debian/patches/series --- liferea-1.8.15/debian/patches/series 2013-07-15 08:51:35.000000000 +0200 +++ liferea-1.10.3/debian/patches/series 2014-02-17 21:13:59.000000000 +0100 @@ -1,5 +1,5 @@ -www-browser.patch debian-example-feeds.patch +www-browser.patch ubuntu-example-feeds.patch add_X-Ubuntu-Gettext-Domain.patch libunity.patch diff -Nru liferea-1.8.15/debian/patches/ubuntu-example-feeds.patch liferea-1.10.3/debian/patches/ubuntu-example-feeds.patch --- liferea-1.8.15/debian/patches/ubuntu-example-feeds.patch 2013-07-15 08:51:35.000000000 +0200 +++ liferea-1.10.3/debian/patches/ubuntu-example-feeds.patch 2014-02-13 19:40:17.000000000 +0100 @@ -4,11 +4,12 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/51604 Forwarded: not-needed Reviewed-By: bojo42 -Last-Update: 2012-02-19 +Reviewed-By: Mattia Rizzolo +Last-Update: 2014-02-13 ---- liferea-1.8.0.orig/opml/feedlist_gl.opml -+++ liferea-1.8.0/opml/feedlist_gl.opml -@@ -24,8 +24,8 @@ +--- a/opml/feedlist_bg.opml ++++ b/opml/feedlist_bg.opml +@@ -19,8 +19,8 @@ @@ -16,25 +17,12 @@ - + + - + ---- liferea-1.8.0.orig/opml/feedlist_he.opml -+++ liferea-1.8.0/opml/feedlist_he.opml -@@ -35,8 +35,8 @@ - - - -- -- -+ -+ - - - ---- liferea-1.8.0.orig/opml/feedlist_ca.opml -+++ liferea-1.8.0/opml/feedlist_ca.opml -@@ -25,8 +25,9 @@ +--- a/opml/feedlist_ca.opml ++++ b/opml/feedlist_ca.opml +@@ -24,8 +24,9 @@ @@ -43,11 +31,11 @@ + + + - + ---- liferea-1.8.0.orig/opml/feedlist_de.opml -+++ liferea-1.8.0/opml/feedlist_de.opml +--- a/opml/feedlist_de.opml ++++ b/opml/feedlist_de.opml @@ -26,9 +26,9 @@ @@ -58,25 +46,25 @@ + + + - + ---- liferea-1.8.0.orig/opml/feedlist_pt.opml -+++ liferea-1.8.0/opml/feedlist_pt.opml -@@ -36,9 +36,8 @@ +--- a/opml/feedlist_en.opml ++++ b/opml/feedlist_en.opml +@@ -13,9 +13,8 @@ - - -- +- + + - + ---- liferea-1.8.0.orig/opml/feedlist_es.opml -+++ liferea-1.8.0/opml/feedlist_es.opml +--- a/opml/feedlist_es.opml ++++ b/opml/feedlist_es.opml @@ -21,9 +21,9 @@ @@ -87,157 +75,172 @@ + + + - + ---- liferea-1.8.0.orig/opml/feedlist_pl.opml -+++ liferea-1.8.0/opml/feedlist_pl.opml -@@ -20,8 +20,9 @@ +--- a/opml/feedlist_eu.opml ++++ b/opml/feedlist_eu.opml +@@ -24,8 +24,8 @@ - + - - + + -+ - + ---- liferea-1.8.0.orig/opml/feedlist_pt_BR.opml -+++ liferea-1.8.0/opml/feedlist_pt_BR.opml -@@ -18,9 +18,9 @@ +--- a/opml/feedlist_fr.opml ++++ b/opml/feedlist_fr.opml +@@ -24,9 +24,9 @@ - - -- +- + + -+ - ++ + + - ---- liferea-1.8.0.orig/opml/feedlist_sv.opml -+++ liferea-1.8.0/opml/feedlist_sv.opml -@@ -22,8 +22,8 @@ +--- a/opml/feedlist_gl.opml ++++ b/opml/feedlist_gl.opml +@@ -19,9 +19,9 @@ - - +- + + - ++ ---- liferea-1.8.0.orig/opml/feedlist_sk.opml -+++ liferea-1.8.0/opml/feedlist_sk.opml -@@ -15,8 +15,8 @@ - - - -- -- -+ -+ - - - ---- liferea-1.8.0.orig/opml/feedlist_bg.opml -+++ liferea-1.8.0/opml/feedlist_bg.opml -@@ -20,8 +20,8 @@ - + +--- a/opml/feedlist_he.opml ++++ b/opml/feedlist_he.opml +@@ -35,8 +35,8 @@ + + + +- +- ++ ++ + + + +--- a/opml/feedlist_hu.opml ++++ b/opml/feedlist_hu.opml +@@ -13,8 +13,8 @@ + - + - - + + - - - ---- liferea-1.8.0.orig/opml/feedlist_hu.opml -+++ liferea-1.8.0/opml/feedlist_hu.opml -@@ -14,8 +14,8 @@ - + + + +--- a/opml/feedlist_it.opml ++++ b/opml/feedlist_it.opml +@@ -25,8 +25,9 @@ + - + - - + + - - - ---- liferea-1.8.0.orig/opml/feedlist_fr.opml -+++ liferea-1.8.0/opml/feedlist_fr.opml -@@ -29,10 +29,9 @@ ++ + + + +--- a/opml/feedlist_nl.opml ++++ b/opml/feedlist_nl.opml +@@ -13,8 +13,9 @@ - - -- -- + + -+ - ++ + ---- liferea-1.8.0.orig/opml/feedlist_it.opml -+++ liferea-1.8.0/opml/feedlist_it.opml -@@ -28,8 +28,8 @@ +--- a/opml/feedlist_pl.opml ++++ b/opml/feedlist_pl.opml +@@ -20,8 +20,9 @@ - + - - + + - ++ + ---- liferea-1.8.0.orig/opml/feedlist_en.opml -+++ liferea-1.8.0/opml/feedlist_en.opml -@@ -13,9 +13,8 @@ +--- a/opml/feedlist_pt.opml ++++ b/opml/feedlist_pt.opml +@@ -31,9 +31,8 @@ - - -- +- + + - + ---- liferea-1.8.0.orig/opml/feedlist_nl.opml -+++ liferea-1.8.0/opml/feedlist_nl.opml -@@ -13,8 +13,9 @@ +--- a/opml/feedlist_pt_BR.opml ++++ b/opml/feedlist_pt_BR.opml +@@ -18,9 +18,9 @@ - - +- + + -+ - ++ + ---- liferea-1.8.0.orig/opml/feedlist_eu.opml -+++ liferea-1.8.0/opml/feedlist_eu.opml -@@ -26,8 +26,8 @@ +--- a/opml/feedlist_sk.opml ++++ b/opml/feedlist_sk.opml +@@ -15,8 +15,8 @@ + + + +- +- ++ ++ + + + +--- a/opml/feedlist_sv.opml ++++ b/opml/feedlist_sv.opml +@@ -22,8 +22,8 @@ - + - - + + - + diff -Nru liferea-1.8.15/debian/patches/www-browser.patch liferea-1.10.3/debian/patches/www-browser.patch --- liferea-1.8.15/debian/patches/www-browser.patch 2013-07-10 09:24:00.000000000 +0200 +++ liferea-1.10.3/debian/patches/www-browser.patch 2014-02-13 19:08:49.000000000 +0100 @@ -1,11 +1,11 @@ Description: www-browser by Franz Pletz Add Debian's x-www-browser as external browser option. (Closes: 415314) - Also set x-www-browser as default external browser in schema file. -Last-Update: 2012-03-27 +Last-Update: 2013-03-16 +Reviewed-by: Dmitry Smirnov --- a/src/browser.c +++ b/src/browser.c -@@ -66,6 +66,12 @@ +@@ -72,6 +72,12 @@ NULL, NULL, NULL, NULL }, @@ -18,14 +18,14 @@ { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } }; ---- a/liferea.schemas -+++ b/liferea.schemas -@@ -47,7 +47,7 @@ - /apps/liferea/browser - liferea - string -- mozilla %s -+ x-www-browser %s - - Selects the browser command to use when browser_module - is set to manual +--- a/net.sf.liferea.gschema.xml.in ++++ b/net.sf.liferea.gschema.xml.in +@@ -13,7 +13,7 @@ + Selects which key to use to pagedown or go to the next unread item. Set to 0 to use space, 1 to use ctrl-space, or 2 to use alt-space. + + +- 'mozilla %s' ++ 'x-www-browser %s' + Selects the browser command to use when browser_module is set to manual + Selects the browser command to use when browser_module is set to manual. + diff -Nru liferea-1.8.15/debian/rules liferea-1.10.3/debian/rules --- liferea-1.8.15/debian/rules 2013-07-15 08:51:35.000000000 +0200 +++ liferea-1.10.3/debian/rules 2014-02-13 19:08:49.000000000 +0100 @@ -3,30 +3,21 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie # minimise needless linking export DEB_LDFLAGS_MAINT_APPEND= -Wl,--as-needed -# Network Manager is only available for linux -ifeq (linux,$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)) -O_NM=--enable-nm -else -O_NM=--disable-nm -endif - %: - dh $@ --parallel --with autoreconf + dh $@ --parallel --with autoreconf,gir,python2 override_dh_autoreconf: dh_autoreconf --as-needed override_dh_auto_configure: - dh_auto_configure -- $(O_NM) \ - --prefix=/usr \ + dh_auto_configure -- --prefix=/usr \ --mandir=\$${prefix}/share/man \ --sysconfdir=/etc \ - --enable-sm \ --enable-libnotify \ --enable-messaging-menu \ --disable-silent-rules @@ -44,6 +35,13 @@ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \ dh_auto_install --destdir=$(CURDIR)/debian/tmp +override_dh_girepository: + dh_girepository -v -ldebian/tmp/usr/share/liferea/gir-1.0 \ + /usr/lib/$(DEB_BUILD_MULTIARCH)/liferea/girepository-1.0 + +override_dh_python2: + dh_python2 /usr/lib + override_dh_strip: dh_strip --dbg-package=liferea-dbg diff -Nru liferea-1.8.15/doc/html/concepts_de.html liferea-1.10.3/doc/html/concepts_de.html --- liferea-1.8.15/doc/html/concepts_de.html 2012-12-11 17:10:00.000000000 +0100 +++ liferea-1.10.3/doc/html/concepts_de.html 2013-07-31 23:29:12.000000000 +0200 @@ -62,7 +62,7 @@

- A online news aggregator (for example Google Reader) + A online news aggregator (for example TheOldReader) is run on a remote webserver which you can access from everywhere as long as you have network access. When you log in to the online news aggregator it usually doesn't need to fetch the most recent diff -Nru liferea-1.8.15/doc/html/concepts_en.html liferea-1.10.3/doc/html/concepts_en.html --- liferea-1.8.15/doc/html/concepts_en.html 2012-12-11 17:10:00.000000000 +0100 +++ liferea-1.10.3/doc/html/concepts_en.html 2013-07-31 23:29:12.000000000 +0200 @@ -62,7 +62,7 @@

- A online news aggregator (for example Google Reader) + A online news aggregator (for example TheOldReader) is run on a remote webserver which you can access from everywhere as long as you have network access. When you log in to the online news aggregator it usually doesn't need to fetch the most recent diff -Nru liferea-1.8.15/doc/html/enclosures_en.html liferea-1.10.3/doc/html/enclosures_en.html --- liferea-1.8.15/doc/html/enclosures_en.html 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/doc/html/enclosures_en.html 2013-07-31 23:29:12.000000000 +0200 @@ -71,7 +71,7 @@ After downloading a file Liferea will try to launch the file according to it's MIME type or file extension. The application used to view or play the downloaded file can be configured in the program preferences. - Note that it depends on the feed wether you can use MIME types + Note that it depends on the feed whether you can use MIME types to associate launcher programs or if you must rely on the file extension to do this.

diff -Nru liferea-1.8.15/doc/html/faq_de.html liferea-1.10.3/doc/html/faq_de.html --- liferea-1.8.15/doc/html/faq_de.html 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/doc/html/faq_de.html 2013-08-02 23:34:22.000000000 +0200 @@ -26,12 +26,28 @@

-Hinweis: Diese FAQ ist auch +Hinweis: Diese FAQ ist auch online verfügbar.

+
Q: +Warum funktioniert Flash nicht (mehr)?
+
+A: Automatische Flash-Unterstützung ging leider mit Liferea 1.10, +welches erstmal GTK3 nutzt, kaputt wenn es mit einer WebkitGTK3-Version älter als 2.0 +verwendet wird. Eine detaillierte Erklärung +findet sich hier (Englisch). +

+Es gibt die folgenden Workarounds: +

+
    +
  1. WebkitGTK3 auf 2.0 oder neuer aktualisieren
  2. +
  3. nspluginwrapper und das 32bit Flash-Plugin installieren (Anleitung, Englisch)
  4. +
+
+
Q: Wo finde ich die neueste Liferea-Version?
A: Der einfachste Weg ist es das neueste Binär- oder Quellpaket von der @@ -41,74 +57,25 @@
-
Q: Sicherheit und Liferea
-
A: -Liferea mag funktional das richtige Programm sein, ist aber nicht notwendigerweise die beste Lösung für sicherheitskritische Anwendung. Hier einige zu beachtende Einschränkungen: -
    -
  • Wird HTTP- oder Proxy-Authentifikation benutzt werden die Benutzernamen und Paßwörter unverschlüsselt in ~/.liferea/feedlist.opml abgespeichert. Diese Datei hat die Zugriffsberechtigung: 0600.
  • -
  • Abhängig von den umask Einstellungen kann das ~/.liferea Verzeichnis für jederman lesbar sein.
  • -
  • Das Cache-Verzeichnis in dem die Abonnement-Inhalte gespeichert werden ist ausschließlich für den Besitzer lesbar, die Inhalte werden allerdings im Klartext in XML abgelegt.
  • -
  • Das von Liferea benutzte Mozilla-Profil wird entsprechend der umask Einstellungen angelegt. Dies gilt ebenso für alle anderen temporär angelegten Dateien.
  • -
  • Das von Liferea benutzte Mozilla-Profil wird beim ersten Start des Programmes erstellt und ist ein praktisch unkonfiguriertes Mozilla-Profil! Das kann ein signifikantes Sicherheitsproblem darstellen (Javascript, Software Installation, Plugins...). Das kann umgangen werden, wenn es durch ein bereits konfiguriertes Profil z.B. eine existierenden Mozilla-Installation ersetzt wird.
  • +
    Q: Der Download von Anhängen mit Gwget funktioniert nicht!
    +
    A: Eine bekannte Ursache für dieses Problem ist Gwget Version 1.0.0 oder 1.0.1, welche +eine defekte DBUS API bereitstellt, die es Liferea nicht erlaubt Anhänge an Gwget weiterzugeben. +In diesem Falle muß Gwget auf eine neuere Version aktualisiert werden.
    -
  • Diese Liste ist sicher nicht komplett!
  • -
-
-
Q: Benutzt man Lifere mit dem Mozilla Rendering Modul wandert der Eingabe-Fokus immer zum HTML Widget. Das stört!
-
A: -In der Tat ist das ein Mozilla-Verhalten und kein Fehler von Liferea. In Bugzilla kann man dazu für die Behebung dieser Fehler votieren: #210373 und #226708. +
Q: Ich benutze Firefox/Seamonkey, und wenn ich Schlagzeilen mit dem Firefox/Seamonkey öffne wird immer dessen Fenster fokussiert.
+
A: Das ist ein Verhalten von Firefox/Seamonkey. Um es zu ändern muß mit about:config die Einstellung browser.tabs.loadDivertedInBackground auf "true" gestellt werden.
-
Q: Liferea ist fehlerhaft! Es beendet sich nicht wenn ich den Schließen-Button des Fenstermanagers anklicke und das Trayicon aktiviert ist.
-
A: -Wir sehen das als sinnvolles Verhalten und nicht als Fehler. Die Idee ist das die GUI aus zwei visuellen Schnittstellen für zwei verschiedene Benutzungsmodi besteht. Soll eine dieser beiden auf Benutzeranfrage hin geschlossen werden bedeutet das nicht, daß das Ganze - das Programm - beendet werden soll. "Schließen" des Hauptfenster meint das Schließen diese Fensters als solches. "Schließen des Fensters" heißt nicht "Beenden der Applikation". -

-Es gibt eine Reihe weitere Programme die auch diesem Ansatz folgen: -MS Outlook, licq, akregator, gaim, mail notification... -

-Um dieses Verhalten zu unterbinden kann das Trayicon im Einstellungen Dialog deaktiviert werden. -
- -
Q: I will Cookies! -
+
Q: Ich will Cookies!
A: -Liferea unterstützt Cookies wenn diese in Form einer Textdatei unter ~/.liferea/cookies.txt vorliegen. Diese Datei sollte dem Netscape Cookie Format entsprechen. Der leichteste Weg eine solche zu erstellen ist die Cookies erzeugenden Seite mit einer Mozilla-Installation zu besuchen und dann die Cookie-Datei aus dem Mozilla-Profil in das Liferea-Verzeichnis zu kopieren. +Liferea unterstützt Cookies wenn diese in Form einer Textdatei unter ~/.config/liferea/cookies.txt vorliegen. Diese Datei sollte dem Netscape Cookie Format entsprechen. Der leichteste Weg eine solche zu erstellen ist die Cookies erzeugenden Seite mit einer Mozilla-Installation zu besuchen und dann die Cookie-Datei aus dem Mozilla-Profil in das Liferea-Verzeichnis zu kopieren.
-
Q: Ich mag die HTML Styles von Liferea nicht! +
Q: Ich mag die HTML/CSS Styles von Liferea nicht!
-
A: Jeder kann eigene Stylesheets anlegen. Dazu muß ein liferea.css (für die 2 Spalten Ansicht) oder/und ein liferea2.css (für die Mail-Ansicht) in ~/.liferea hinterlegt werden. Wenn vorhanden werden diese zusätzlich zu den programmeigenen Stylesheets geladen. Auf diese Weise kann man die Style teilweise oder ganz anpassen. Um mehr über die benutzten CSS Klassen zu erfahren -einfach in den Default-Stylesheet in <install root>/share/liferea/css nachsehen. -
- -
Q: Wie kann ich ein Abonnement meiner Gmail Inbox anlegen? -
-
A: Google bietet ein Atom Feed mit einer Liste aller neuen Nachrichten unter https://mail.google.com/mail/feed/atom. Da dieses Feed über HTTPS erreichbar ist kann Liferea 1.0 es nicht direkt nutzen. Daher muß ein externes Download-Tool benutzt werden (z.B. curl oder wget). Um dies zu konfigurieren muß im Neues Abonnement Dialog "Kommado" als Quelltyp ausgewählt werden und z.B. das folgende Kommando eingetragen werden: -

-curl -s -u username:password https://mail.google.com/mail/feed/atom - -

-Dabei sind username und password mit den Gmail Login-Informationen zu ersetzen. - -
-
Q: I muß unbedingt HTTPS Feeds abonnieren! Aber Liferea unterstützt das einfach nicht!.
-
A: Liferea 1.0 unterstützt kein HTTPS (geplant für 1.1). -Wenn trotzdem ein nur über HTTPS erreichbares Abonnement eingerichtet werden soll hilft folgender Trick. Dazu muß im Neues Abonnement Dialog der Quelltyp "Kommando" ausgewählt werden ohne jedoch etwas in das Quellfeld einzutragen. Zusätzlich muß die "Benutze Konvertierungsfilter" Option angeschaltet und als Konvertierunsfilter "curl <your-HTTPS-URL>" angegeben werden. Damit das funktioniert muß natürlich curl oder ein ähnliches Programm installiert sein, daß die heruntergeladenen Daten auf stdout ausgibt. Dieser Idee stammt von Norbert Kiesel. -
- -
Q: Das Mozilla Browser Modul funktioniert nicht!
-
A: Folgende Punkte sind zu beachten: -
    - -
  • Um das Mozilla Browser Module zu benutzen ist eine vollständige Mozilla Installation notwendig. Mit Firefox funktioniert es meist nicht. Hinweis: man kann beide installiert haben, Firefox zum Surfen benutzen und Mozilla einfach nur als Liferea's Browser Module nutzen.
  • - -
  • Die Mozilla Installation muß die Datei libgtkembedmoz.soenthalten. Ohne diese Library geht es nicht.
  • - -
  • Mehr Informationen geben die Debugging-Ausgaben von Liferea (Aufruf mit --debug-all). Wird libgtkembedmoz.so: cannot open shared object file ausgeben, kann Liferea die Bibliothek nicht finden. Durch das Setzen von MOZILLA_FIVE_HOME kann Liferea auf ungewöhnliche Mozilla Installationspfade hingewiesen werden. Ist Mozilla z.B. in /usr/local/mozilla-1.7 installiert und wird die Bash verwendet hilft ein export MOZILLA_FIVE_HOME=/usr/local/mozilla-1.7 in der .profile.
  • - -
  • Das Mozilla Browser Modul kann nur benutzt werden wenn Liferea mit Mozilla Unterstützung kompiliert wurde. Wer selbst kompiliert sieht die Konfigurationsoptionen am Ende der Ausgaben des configure Skriptes. Hinweis: manche Distributionen wie z.B. Debian haben Liferea in mehrere Pakete aufgeteilt. Um Liferea mit Mozilla unter Debian zu nutzen werden z.B. die Pakete liferea und liferea-mozilla benötigt.
  • -
-Wenn keiner der obigen Hinweise geholfen hat sollte versucht werden eine andere Mozilla Version zu verwenden. Zwischen manchen Mozilla Versionen gibt es Symbol Inkompatibilitäten. Die letzte Möglichkeit ist es GtkHTML2 zu verwenden. Bei Abstürzen und Problemen einfach eine Mail an die Mailingliste schicken. +
A: Jeder kann die Styles ändern. Dazu kann das Stylesheet ~/.config/liferea/liferea.css +editiert werden. Die Datei enthält Beschreibungen der verschiedenen verwendeten Klassen +so daß es einfacher ist diese zu modifizieren.
Q: Wie kann ich die friends-only Posts von LiveJournal Abonnements sehen?
@@ -120,10 +87,6 @@ In den Abonnement-Eigenschaften muß zusätzlich noch Username und Paßwort des LiveJournal Accounts angegeben werden. -
Q: Was ist der Unterschied zwischen Ordnern und Directories?
- -
A: Ordner werden zur Gruppierung von Abonnements benutzt. Directories sind meist Listen von Feeds die abonniert werden können und ansonsten wie normale Abonnements behandelt werden. Directories liegen üblicherweise im OCS oder OPML Format vor.
-
Q: Warum werden manche Schlagzeilen immer wieder als ungelesen angezeigt?
A: Meistens sind fehlerhafte Feeds mit z.B. nicht eindeutigen oder fehlenden Schlagzeilen-Ids der Grund. Hier lohnt es sich, dass entsprechende Feed im Quelltext zu überprüfen und den Autor/Webmaster zu kontakieren. Ist das Feed in Ordnung lohnt es sich einen Eintrag im Liferea @@ -138,8 +101,10 @@ class="code">ulimit -c unlimited und dann liferea. So aufgerufen wird Liferea beim Absturz eine core-Datei erzeugen. Diese kann dann mit gdb liferea core geöffnet werden. Gibt man in der gdb Eingabeaufforderung dann bt ein wird der Backtrace des Absturzes ausgegeben.
-
Q: Warum fehlt Liferea das Feature X?
-
A: Feature Requests bitte im RFE Tracker der SourceForge Projektseite in Englisch eintragen!
+
Q: Warum fehlt Liferea die Funktion X?
+
A: Wenn du findest das weitere Funktionen in Liferea eingebaut werden sollten +beteilige dich bitte an der Weiterentwicklung des Programms. Um weitere Funktionen +zu realisieren benötigen wir mehr freiwillige Entwickler!
diff -Nru liferea-1.8.15/doc/html/faq_en.html liferea-1.10.3/doc/html/faq_en.html --- liferea-1.8.15/doc/html/faq_en.html 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/doc/html/faq_en.html 2013-08-02 23:31:51.000000000 +0200 @@ -26,12 +26,27 @@

-Note: This FAQ is also available +Note: This FAQ is also available online.

+
Q: +Why doesn't Flash work (anymore)?
+
+A: Easy flash support broke when Liferea 1.10 which uses +GTK3 is used with WebkitGTK3 versions before 2.0. For a detailed explanation +read this post. +

+There are the following known workarounds: +

+
    +
  1. Upgrade WebkitGTK3 to 2.0 or later
  2. +
  3. Install nspluginwrapper and the 32bit flash plugin (instructions)
  4. +
+
+
Q: Where can I get it?
A: The easiest way is to download the source package from @@ -42,23 +57,6 @@
-
Q: Security and Liferea
-
A: -Liferea might be quite functional but is not the best choice -when you consider security to be very important. There are -some points you should know: -
    -
  • When using feed or proxy authentication usernames and -passwords are saved plain text in ~/.liferea/feedlist.opml. -File Permissions: 0600.
  • -
  • The ~/.liferea directory depending on the users umask -can be readable for everyone. This is useful to allow other -programs access to the new_subscription pipe.
  • -
  • The feed cache is saved in a binary database file.
  • -
  • This list may not be complete!
  • -
-
-
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 @@ -80,18 +78,18 @@
Q: I want cookies!
A: -Liferea supports cookies provided by a text file ~/.liferea_1.6/cookies.txt +Liferea supports cookies provided by a text file ~/.config/liferea/cookies.txt which contains cookies in Netscape format. The easiest way is to copy the file from your Mozilla profile after you created the cookies with the browser.
-
Q: I don't like the HTML styles Liferea uses! +
Q: I don't like the HTML/CSS styles Liferea uses!
-
A: You can have your own stylesheet. Just place a liferea.css into ~/.liferea_1.6/. +
A: You can have your own stylesheet. Just edit ~/.config/liferea/liferea.css During startup it will be loaded additionally to the default stylesheets so you can -modify some or all style definitions. To learn about the styles have a -look at the default stylesheets in <install root>/share/liferea/css. +modify some or all style definitions. The file contains comments describing the +different style so it should be easy to modify them.
Q: How do I see my LiveJournal friend's friends-only entries?
@@ -109,7 +107,7 @@ formats please check the feed source code. If you find problems please contact the author/webmaster of the feed. If not please submit a bug report including the URL of the problem feed to the Liferea -bugtracker.
+bug tracker.

Note: If you experience this problem with a planet feed the reason diff -Nru liferea-1.8.15/doc/html/greader_de.html liferea-1.10.3/doc/html/greader_de.html --- liferea-1.8.15/doc/html/greader_de.html 2013-01-03 14:30:41.000000000 +0100 +++ liferea-1.10.3/doc/html/greader_de.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,85 +0,0 @@ - - - Google Reader/TinyTinyRSS Abonnements - - - - - - - - - - - - -
ZurückGoogle Reader/TinyTinyRSS AbonnementsVor
-
- - -

Was sind Google Reader und TinyTinyRSS?

-

- Google Reader (http://google.com/reader) und - TinyTinyRSS (http://tt-rss.org/redmine/) - sind Online-News-Aggregatoren. - Um diese Dienste zu benutzen ist jeweils ein Benutzerkonto notwendig. - Mit einem solchen können die im Konto verwalteten Feeds -

    -
  • mit Liferea
  • -
  • mit einem PC im Browser
  • -
  • mit einer Smartphone App
  • -
- also praktisch von überall aus gelesen werden vorausgesetzt - der Benutzer hat einen Internetzugang. -

- -

Warum einen Online-Aggregator mit Liferea nutzen?

-

- Liferea als "Desktop Aggregator" ist nicht auf - jedem PC und von praktisch überall verfügbar. Liferea als Programm - muß auf jedem PC, auf dem es genutzt werden soll, installiert und - konfiguriert werden. Es gibt aktuell zudem keine direkte Synchronisation - zwischen solchen verteilten Installationen. -

-

- Mit einem Online-Aggregator kann das Problem umgangen werden. Mit Hilfe - eines Online-Kontos können mehrere Liferea-Installation dieselbe - Liste von Abonnements haben. Durch den ständigen Abgleich mit dem - Online-Konto haben alle Installation dieselbe Liste von - Abonnements und dieselben Schlagzeilenlesezustände. Außerdem kann - der Nutzer weiterhin den Online-Aggregator direkt nutzen, sollte mal kein - PC mit Liferea in der Nähe sein. -

- -

Abonnieren

-

-

    -
  1. Zuerst muß, wenn nicht bereits vorhanden, ein Online-Konto angelegt werden.
  2. -
  3. Danach ist "Neu/Neue Quelle" aus dem Kontextmenü der Liste - der Abonnements auszuwählen und im nachfolgenden Dialog - "Google Reader" oder "TinyTinyRSS".
  4. -
  5. Um den Zugang zu konfigurieren müssen zuletzt Benutzername - und Passwort angegeben werden.
  6. -
-

-

- Kurz nach dem Abonnieren sollte alle Abonnements des Online-Kontos - in der Liste der Abonnements automatisch hinzugefügt werden. -

- -

Unterstützte TinyTinyRSS Versionen

- -

Liferea 1.8.12 unterstützt TinyTinyRSS ab Version 1.5.3.

- - -
- - - - - - -
ZurückInhaltVor
- - - diff -Nru liferea-1.8.15/doc/html/greader_en.html liferea-1.10.3/doc/html/greader_en.html --- liferea-1.8.15/doc/html/greader_en.html 2013-01-03 14:30:41.000000000 +0100 +++ liferea-1.10.3/doc/html/greader_en.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,79 +0,0 @@ - - - Subscribing to Google Reader/TinyTinyRSS - - - - - - - - - - - - -
PrevGoogle Reader/TinyTinyRSSNext
-
- - -

What is Google Reader and TinyTinyRSS?

-

- Google Reader (http://google.com/reader) and - TinyTinyRSS (http://tt-rss.org/redmine/) - are online news aggregators. To use these services you need an online user account. - With such an account you can read your subscriptions -

    -
  • from Liferea
  • -
  • using any web browser on any PC
  • -
  • or using a smartphone app
  • -
- which means you can read your news simply from everywhere you are. -

- -

Why Using an Online News Aggregator with Liferea?

-

- Liferea as a desktop aggregator cannot provide the global accessibility - that a online news aggregator provides. While you can access an online - aggregator from virtually everywhere, Liferea needs to be installed and configured - on every PC you use. Also it ensures no direct synchronisation between the - different installations. -

-

- Using an online aggregator you can workaround this situation. You can subscribe - to your online account from all your Liferea installations and - will have synchronous feed lists and item states everywhere. At the same - time you can still use a web browser to log in to the online aggregator directly - if you are at a public terminal for example. -

- -

How to Subscribe

-

-

    -
  1. Create a online aggregator account if you not already have one.
  2. -
  3. Click "New/New Source" and select "Google Reader" or "TinyTinyRSS" from the dialog.
  4. -
  5. Enter you account username and password.
  6. -
-

-

- Shortly after subscribing the feed list of your online account - should appear and items should be retrieved. -

- -

Supported TinyTinyRSS Versions

- -

Liferea 1.8.12 and later supports TinyTinyRSS versions starting with - version 1.5.3.

- - -
- - - - - - -
PrevContentsNext
- - - diff -Nru liferea-1.8.15/doc/html/Makefile.am liferea-1.10.3/doc/html/Makefile.am --- liferea-1.8.15/doc/html/Makefile.am 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/doc/html/Makefile.am 2013-07-31 23:29:12.000000000 +0200 @@ -10,7 +10,7 @@ updating_en.html \ enclosures_en.html \ newsbin_en.html \ - greader_en.html \ + onlineservices_en.html \ faq_en.html html_doc_de = about_de.html \ @@ -25,11 +25,9 @@ updating_de.html \ enclosures_de.html \ newsbin_de.html \ - greader_de.html \ + onlineservices_de.html \ faq_de.html -html_doc_he = reference_he.html - html_doc_pictures_en = help_feed_default.png \ help_feed_error.png \ help_folder.png \ @@ -54,7 +52,6 @@ EXTRA_DIST = $(html_doc_en) \ $(html_doc_de) \ - $(html_doc_he) \ $(html_doc_pictures_en) \ reference.css diff -Nru liferea-1.8.15/doc/html/Makefile.in liferea-1.10.3/doc/html/Makefile.in --- liferea-1.8.15/doc/html/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/doc/html/Makefile.in 2013-10-08 20:14:31.000000000 +0200 @@ -111,13 +111,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -133,6 +132,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -179,8 +186,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -209,6 +214,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -251,7 +257,7 @@ updating_en.html \ enclosures_en.html \ newsbin_en.html \ - greader_en.html \ + onlineservices_en.html \ faq_en.html html_doc_de = about_de.html \ @@ -266,10 +272,9 @@ updating_de.html \ enclosures_de.html \ newsbin_de.html \ - greader_de.html \ + onlineservices_de.html \ faq_de.html -html_doc_he = reference_he.html html_doc_pictures_en = help_feed_default.png \ help_feed_error.png \ help_folder.png \ @@ -294,7 +299,6 @@ EXTRA_DIST = $(html_doc_en) \ $(html_doc_de) \ - $(html_doc_he) \ $(html_doc_pictures_en) \ reference.css diff -Nru liferea-1.8.15/doc/html/newsbin_de.html liferea-1.10.3/doc/html/newsbin_de.html --- liferea-1.8.15/doc/html/newsbin_de.html 2012-12-11 17:10:00.000000000 +0100 +++ liferea-1.10.3/doc/html/newsbin_de.html 2013-07-31 23:29:12.000000000 +0200 @@ -11,7 +11,7 @@ Prev Schlagzeilen und Sammelordner - Next + Next
@@ -60,7 +60,7 @@ Prev Contents - Next + Next diff -Nru liferea-1.8.15/doc/html/newsbin_en.html liferea-1.10.3/doc/html/newsbin_en.html --- liferea-1.8.15/doc/html/newsbin_en.html 2012-12-11 17:10:00.000000000 +0100 +++ liferea-1.10.3/doc/html/newsbin_en.html 2013-07-31 23:29:12.000000000 +0200 @@ -11,7 +11,7 @@ Prev News Bins - Next + Next
@@ -55,7 +55,7 @@ Prev Contents - Next + Next diff -Nru liferea-1.8.15/doc/html/onlineservices_de.html liferea-1.10.3/doc/html/onlineservices_de.html --- liferea-1.8.15/doc/html/onlineservices_de.html 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/doc/html/onlineservices_de.html 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,126 @@ + + + Abonnements mit Online-Diensten + + + + + + + + + + + + +
ZurückAbonnements mit Online-DienstenVor
+
+ + +

Was sind TinyTinyRSS und TheOldReader?

+

+ TheOldReader (http://theoldreader.com/) und + TinyTinyRSS (http://tt-rss.org/redmine/) + sind Online-News-Aggregatoren. + Um diese Dienste zu benutzen ist jeweils ein Benutzerkonto notwendig. + Mit einem solchen können die im Konto verwalteten Feeds +

    +
  • mit Liferea
  • +
  • mit einem PC im Browser
  • +
  • mit einer Smartphone App
  • +
+ also praktisch von überall aus gelesen werden vorausgesetzt + der Benutzer hat einen Internetzugang. +

+ +

Warum einen Online-Aggregator mit Liferea nutzen?

+

+ Liferea als "Desktop Aggregator" ist nicht auf + jedem PC und von praktisch überall verfügbar. Liferea als Programm + muß auf jedem PC, auf dem es genutzt werden soll, installiert und + konfiguriert werden. Es gibt aktuell zudem keine direkte Synchronisation + zwischen solchen verteilten Installationen. +

+

+ Mit einem Online-Aggregator kann das Problem umgangen werden. Mit Hilfe + eines Online-Kontos können mehrere Liferea-Installation dieselbe + Liste von Abonnements haben. Durch den ständigen Abgleich mit dem + Online-Konto haben alle Installation dieselbe Liste von + Abonnements und dieselben Schlagzeilenlesezustände. Außerdem kann + der Nutzer weiterhin den Online-Aggregator direkt nutzen, sollte mal kein + PC mit Liferea in der Nähe sein. +

+ +

Abonnieren

+

+

    +
  1. Zuerst muß, wenn nicht bereits vorhanden, ein Online-Konto angelegt werden.
  2. +
  3. Danach ist "Neu/Neue Quelle" aus dem Kontextmenü der Liste + der Abonnements auszuwählen und im nachfolgenden Dialog + "TheOldReader" oder "TinyTinyRSS".
  4. +
  5. Um den Zugang zu konfigurieren müssen zuletzt Benutzername + und Passwort angegeben werden.
  6. +
+

+

+ Kurz nach dem Abonnieren sollte alle Abonnements des Online-Kontos + in der Liste der Abonnements automatisch hinzugefügt werden. +

+ +

Google Reader

+

+ Bis zum 01.07.2013 betrieb Google den Dienst "Google Reader" und + Liferea hat das Einbinden der "Google Reader"-Abonnements unterstützt. +

+

+ Existiert noch ein "Google Reader" Abonnement in Liferea so kann dieses + in normale durch Liferea verwaltete Abonnements umgewandelt werden. + Dazu dient die Option "Convert To Local Subscriptions" im Kontextmenü + des Abonnements. Der Vorteil dieser Umwandlung ist, daß alle + von Liferea geladenen Schlagzeilen erhalten bleiben. +

+ +

TheOldReader

+

+ Die Benutzung von TheOldReader setzt ein existierendes Benutzerkonto + bei diesem Online-Dienst voraus. Für dieses Konto muss zwingend + ein Passwort gesetzt werden! Dies kann auf + http://theoldreader.com + unter "Einstellungen" gesetzt werden. +

+ Wurde "TheOldReader" als Quelle ausgewählt müssen Benutzername + und Paßwort des Nutzerkontos angegeben werden. Liferea lädt dann + automatisch die Liste der Abonnements. +

+

+ Hinweis: Werden TheOldReader Abonnements oder Schlagzeilen + in Liferea gelöscht, so werden sie auch im Online-Dienst # + TheOldReader entfernt! +

+

+ Hinweis: TheOldReader Abonnements unterstützen aktuell leider + keinen Abgleich des Markierens wichtiger Schlagzeilen. Wird eine + solche Markierung in Liferea erstellt, bleibt sie auch nur dort sichtbar. + Analog gilt dies für in TheOldReader stellte "Likes". +

+ +

TinyTinyRSS

+ +

Liferea 1.10 unterstützt TinyTinyRSS ab Version 1.5.3.

+ +

TinyTinyRSS muss vom Benutzer selbst auf einem eigenen Server + installiert werden. Das erfordert Kenntnisse in Serveradministration! + Einmal installiert verhälft sich TinyTinyRSS aber wie andere Online-Dienste.

+ + +
+ + + + + + +
ZurückInhaltVor
+ + + diff -Nru liferea-1.8.15/doc/html/onlineservices_en.html liferea-1.10.3/doc/html/onlineservices_en.html --- liferea-1.8.15/doc/html/onlineservices_en.html 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/doc/html/onlineservices_en.html 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,119 @@ + + + Subscribing to Online Services + + + + + + + + + + + + +
PrevSubscribing to Online ServicesNext
+
+ + +

What is TheOldReader and TinyTinyRSS?

+

+ TheOldReader (http://theoldreader.com/) and + TinyTinyRSS (http://tt-rss.org/redmine/) + are online news aggregators. To use these services you need an online user account. + With such an account you can read your subscriptions +

    +
  • from Liferea
  • +
  • using any web browser on any PC
  • +
  • or using a smartphone app
  • +
+ which means you can read your news simply from everywhere you are. +

+ +

Why Using an Online News Aggregator with Liferea?

+

+ Liferea as a desktop aggregator cannot provide the global accessibility + that a online news aggregator provides. While you can access an online + aggregator from virtually everywhere, Liferea needs to be installed and configured + on every PC you use. Also it ensures no direct synchronisation between the + different installations. +

+

+ Using an online aggregator you can workaround this situation. You can subscribe + to your online account from all your Liferea installations and + will have synchronous feed lists and item states everywhere. At the same + time you can still use a web browser to log in to the online aggregator directly + if you are at a public terminal for example. +

+ +

How to Subscribe

+

+

    +
  1. Create a online aggregator account if you not already have one.
  2. +
  3. Click "New/New Source" and select "TheOldReader" or "TinyTinyRSS" from the dialog.
  4. +
  5. Enter you account username and password.
  6. +
+

+

+ Shortly after subscribing the feed list of your online account + should appear and items should be retrieved. +

+ +

Google Reader

+

+ Until 01.07.2013 Google did provide the "Google Reader" service which + Liferea was able to import into the subscription list. +

+

+ If you still have the "Google Reader" subscriptions in Liferea you can + convert them into normal Liferea feeds. To achieve this select the + "Convert To Local Subscriptions" option in the subscription context menu. + The advantage of converting is that Liferea can keep all downloaded + headline for further use and while fetching new headlines. +

+ +

TheOldReader

+

+ Using "TheOldReader" requires an existing user account with this online + service. For this user account having a password is mandatory! + You can set a password on http://theoldreader.com + under "Preferences". +

+ If you chose "TheOldReader" as source you need to provide user name and + password of your online account. After doing so Liferea will provide + you with the subscription list fetched from "TheOldReader". +

+

+ Note: If you delete "TheOldReader" subscriptions or headlines + in Liferea then those will also be deleted in the online service + "TheOldReader"! +

+

+ Note: "TheOldReader" doesn't support synchronizing the flagging + of important headlines. If you flag an item in Liferea, this flag will + only be visible in Liferea. The same is true for "TheOldReader" if you + "like" an headline this won't be visible in Liferea. +

+ +

TinyTinyRSS

+ +

Liferea 1.10 and later supports TinyTinyRSS versions starting with + version 1.5.3.

+ +

TinyTinyRSS muss vom Benutzer selbst auf einem eigenen Server + installiert werden. Das erfordert Kenntnisse in Serveradministration! + Einmal installiert verhälft sich TinyTinyRSS aber wie andere Online-Dienste.

+ + +
+ + + + + + +
PrevContentsNext
+ + + diff -Nru liferea-1.8.15/doc/html/preferences_en.html liferea-1.10.3/doc/html/preferences_en.html --- liferea-1.8.15/doc/html/preferences_en.html 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/doc/html/preferences_en.html 2013-07-31 23:29:12.000000000 +0200 @@ -108,7 +108,7 @@
  • Internal Browser Settings: Here you can configure two - things. First you can specify wether + things. First you can specify whether or not Liferea should open clicked links in the configured external browser or in the internal browser. The second option allows you to switch off Javascript. @@ -158,7 +158,7 @@
  • - Menu Settings: Here you can select wether you want to + Menu Settings: Here you can select whether you want to display both menu bar and tool bar or only one of them. Additionally can influence the toolbar button detail.
  • diff -Nru liferea-1.8.15/doc/html/reference_he.html liferea-1.10.3/doc/html/reference_he.html --- liferea-1.8.15/doc/html/reference_he.html 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/doc/html/reference_he.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ - - - עזרה מתומצתת - - - - -
    - -

    עזרה מתומצתת

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Ctrl-U -עדכון כל מינוייך בו־זמנית. -
    Ctrl-R -סימון כל הפריטים של ערוץ או תיקייה ככאלו שנקראו. -
    Ctrl-N -קפוץ אל כותרת ראשית באה שלא נקראה. -
    Ctrl-M -החלף מצב לא־נקרא של כותרת ראשית נבחרת. -
    Ctrl-T -החלף מצב דגל של כותרת ראשית נבחרת. -
    רווח -רפרף בתוך הכותרות. תלוי -בהעדפותייך, יתכן ויהיה עליך לעשות שימוש במשתנים -Ctrl או Alt. -
    u -הזז סמן מעלה ברשימת הערוצים. -
    d -הזז סמן מטה ברשימת הערוצים. -
    b -הזז סמן מעלה ברשימת הפריטים. -
    f -הזז סמן מטה ברשימת הפריטים. -
    Del -הסר את הערוץ או את הפריט הנוכחי שנבחר. -
    -
    - - diff -Nru liferea-1.8.15/doc/html/subscriptions_de.html liferea-1.10.3/doc/html/subscriptions_de.html --- liferea-1.8.15/doc/html/subscriptions_de.html 2012-12-11 17:10:00.000000000 +0100 +++ liferea-1.10.3/doc/html/subscriptions_de.html 2013-07-31 23:29:12.000000000 +0200 @@ -34,7 +34,8 @@
    • einzelne Feeds
    • OPML-Quellen (z.B. eine Planet-Feedliste, ein Blogroll...)
    • -
    • ein Google Reader-Konto
    • +
    • ein TheOldReader-Konto
    • +
    • ein TinyTinyRSS-Konto

    @@ -250,10 +251,10 @@ die Schlagzeilen automatisch auf "gelesen" zu stellen.
-

Abonnieren von OPML-Quellen und Google Reader-Konten

+

Abonnieren von OPML-Quellen und Online-Diensten

- Um eine OPML-Quelle oder ein Google Reader-Konto zu - abonnieren muß "Neue Quelle" vom Kontextmenü in der Feedliste oder aus + Um eine OPML-Quelle oder ein Konto eines Online-Dienstes zu + abonnieren muß "Neue Quelle" vom Kontextmenü in der Abonnements oder aus dem "Abonnements"-Menü ausgewählt werden. Im dann geöffneten Dialog kann die gewünschte Quelle ausgewählt werden.

@@ -269,18 +270,6 @@ mit der Zeit alte Feeds automatisch entfernt und neue hinzugefügt.

- -

Google Reader

-

- Wurde "Google Reader" als Quelle ausgewählt müssen Benutzername - und Paßwort des Google-Kontos angegeben werden. Wie bei OPML-Quellen - lädt Liferea automatisch die Liste der Abonnements des Google-Kontos - und blendet sie in der Feedliste ein. -

- Hinweis: Werden Abonnements oder Schlagzeilen eines Google-Kontos - in Liferea gelöscht, so werden sie auch im Google-Konto - entfernt! -


diff -Nru liferea-1.8.15/doc/html/subscriptions_en.html liferea-1.10.3/doc/html/subscriptions_en.html --- liferea-1.8.15/doc/html/subscriptions_en.html 2012-12-11 17:10:00.000000000 +0100 +++ liferea-1.10.3/doc/html/subscriptions_en.html 2013-07-31 23:29:12.000000000 +0200 @@ -34,7 +34,8 @@
  • a single feed
  • any OPML source (a planet feed list, a blog roll...)
  • -
  • a Google Reader subscription list
  • +
  • a TheOldReader online account
  • +
  • a TinyTinyRSS online account

Subscribing to a Feed

@@ -252,9 +253,9 @@ them "read" manually. -

Subscribing to OPML Sources and Google Reader Accounts

+

Subscribing to OPML Sources and Online Services

- To subscribe to OPML feed lists or a Google Reader account + To subscribe to OPML feed lists or a online service account select "New Source" from the context menu of the feed list or from the "Subscriptions" menu. From the following dialog select the source type you like to create. @@ -271,18 +272,6 @@ dropped and new ones are added.

-

Google Reader

-

- If you have selected "Google Reader" you just need to supply your Google Reader - username and password. Similar to the OPML source Liferea will automatically - retrieve the Google Reader subscription list and will automatically add all - Google Reader subscriptions. -

- Note: If you delete feeds or items in the "Google Reader" subscription - from within Liferea they will also be deleted in you Google Reader - account! -

-
diff -Nru liferea-1.8.15/doc/html/topics_de.html liferea-1.10.3/doc/html/topics_de.html --- liferea-1.8.15/doc/html/topics_de.html 2012-12-11 17:10:00.000000000 +0100 +++ liferea-1.10.3/doc/html/topics_de.html 2013-07-31 23:29:12.000000000 +0200 @@ -17,7 +17,7 @@

-Dies ist die Endnutzerdokumentation für Liferea 1.8. +Dies ist die Endnutzerdokumentation für Liferea 1.10.

Hilfe Themen

@@ -32,7 +32,7 @@
  • Schlagzeilen suchen
  • Enclosures/Podcasting
  • Schlagzeilen und Sammelordner
  • -
  • Google Reader/TinyTinyRSS Abonnements
  • +
  • Abonnieren von Online-Diensten
  • Online Support

    @@ -44,7 +44,7 @@
  • Mailing Liste
  • -

    Schnellhilfe benötigt? Einfach im IRC-Channel #liferea von freenode.org fragen!

    +

    Schnelle Hilfe benötigt? Einfach im IRC-Channel #liferea von freenode.org fragen!

    diff -Nru liferea-1.8.15/doc/html/topics_en.html liferea-1.10.3/doc/html/topics_en.html --- liferea-1.8.15/doc/html/topics_en.html 2012-12-11 17:10:00.000000000 +0100 +++ liferea-1.10.3/doc/html/topics_en.html 2013-07-31 23:29:12.000000000 +0200 @@ -16,7 +16,7 @@

    -This user documentation applies for Liferea 1.8. +This user documentation applies for Liferea 1.10.

    Help Topics

    @@ -32,14 +32,14 @@
  • Searching For Headlines
  • Enclosures/Podcasting
  • Collecting Items in News Bins
  • -
  • Subscribing to Google Reader/TinyTinyRSS
  • +
  • Subscribing to Online Services
  • Online Support

    diff -Nru liferea-1.8.15/doc/Makefile.in liferea-1.10.3/doc/Makefile.in --- liferea-1.8.15/doc/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/doc/Makefile.in 2013-10-08 20:14:31.000000000 +0200 @@ -121,13 +121,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -143,6 +142,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -189,8 +196,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -219,6 +224,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -Nru liferea-1.8.15/glade/auth.ui liferea-1.10.3/glade/auth.ui --- liferea-1.8.15/glade/auth.ui 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/glade/auth.ui 2013-07-31 23:29:12.000000000 +0200 @@ -8,7 +8,6 @@ AuthenticationFalsedialog - False True diff -Nru liferea-1.8.15/glade/inoreader_source.ui liferea-1.10.3/glade/inoreader_source.ui --- liferea-1.8.15/glade/inoreader_source.ui 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/glade/inoreader_source.ui 2013-08-10 00:31:01.000000000 +0200 @@ -0,0 +1,165 @@ + + + + + True + False + Add InoReader Account + dialog + + + True + False + vertical + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 12 + 12 + + + True + False + 0 + Please enter your InoReader account settings + True + + + False + False + 0 + + + + + True + False + 2 + 2 + 6 + 6 + + + True + True + False + + + 1 + 2 + 1 + 2 + + + + + + True + True + + + 1 + 2 + + + + + + True + False + 0 + _Password + True + passwordEntry + + + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + _Username (Email) + True + userEntry + + + GTK_FILL + + + + + + False + True + 1 + + + + + False + True + 2 + + + + + + cancelbutton1 + okbutton1 + + + diff -Nru liferea-1.8.15/glade/liferea.ui liferea-1.10.3/glade/liferea.ui --- liferea-1.8.15/glade/liferea.ui 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/glade/liferea.ui 2013-07-31 23:29:12.000000000 +0200 @@ -1,37 +1,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - @@ -340,7 +316,6 @@ True False none - True @@ -362,7 +337,6 @@ True - False 1 @@ -1139,2028 +1113,163 @@ 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 - - - - True - 2 - - - True - True - 5 - - - True - 12 - 18 - - - True - 6 - - - True - 0 - Feed Cache Handling - - - - - - 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 - Feed Update Settings - - - - - - False - False - 0 - - - - - True - 12 - - - True - 6 - - - _Update all subscriptions at startup. - True - True - False - True - True - - - - False - False - 0 - - - - - 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 - 1 - - - - - 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 - 2 - - - - - - - 1 - - - - - False - 1 - - - - - False - - - - - True - Feeds - - - False - - - - - True - 12 - 18 - - - True - 6 - - - True - 0 - Folder Display Settings - - - - - - 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 - - - - - _Hide read items. - True - True - False - True - True - - - - False - False - 1 - - - - - - - 1 - - - - - False - 0 - - - - - True - 6 - - - True - 0 - Feed Icons (Favicons) - - - - - - 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 - Reading Headlines - - - - - - 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 - Web Integration - - - - - - False - False - 0 - - - - - True - 12 - - - True - 2 - 2 - 6 - 6 - - - True - True - - - 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 - Internal Browser Settings - - - - - - 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 - External Browser Settings - - - - - - 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 - Notification Settings - - - - - - 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 - 10 - - - 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 - 0.51999998092651367 - Toolbar Settings - - - - - - False - False - 0 - - - - - True - 12 - - - True - 6 - - - _Hide toolbar. - True - True - False - True - True - - - - 0 - - - - - True - 12 - - - True - 0 - Toolbar _button labels: - 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 - HTTP Proxy Server - - - - - - 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 - 10 - - - 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 - Downloading Enclosures - - - - - - 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 - Opening Enclosures - - - - - - 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 - - + + + + True + 0 + User_name: + True + usernameEntry + + GTK_FILL + + - - False - False - 1 - False + False 1 + + + _Don't use proxy for download + True + True + False + True + True + + + False + False + 6 + 2 + + - 6 + 3 - + True - Enclosures + Download - 6 + 3 False - + + True 12 - 18 + 6 - + + _Automatically download all enclosures of this feed. True - 6 - - - True - 0 - Synchronized with Nearby Hosts - - - - - - 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 - - + 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 + + - 7 + 4 - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Sync + + True + Advanced - 7 + 4 False @@ -3170,18 +1279,17 @@ - + True end - - gtk-close + + gtk-cancel True True True False True - False @@ -3189,6 +1297,22 @@ 0 + + + gtk-ok + True + True + True + True + False + True + + + False + False + 1 + + False @@ -3199,7 +1323,8 @@ - prefclosebtn + prop_cancel + prop_ok @@ -3632,7 +1757,7 @@ True 5 - Downloading Enclosure + Open Enclosure False dialog @@ -3653,7 +1778,7 @@ True 0 - Downloading an enclosure of type: + Open an enclosure of type: False @@ -3680,7 +1805,7 @@ 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: + What should Liferea do with this enclosure? Please enter the command you want to be executed below. The enclosures URL will be supplied as an argument for this command: True @@ -3722,20 +1847,6 @@ - - _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 @@ -3747,7 +1858,7 @@ False False - 5 + 4 @@ -4046,17 +2157,6 @@ True 2 - - True - gtk-delete - - - False - False - 0 - - - True Cancel _All @@ -4217,9 +2317,6 @@ center-on-parent dialog Liferea - Copyright (c) 2003-2012 -The Liferea Team - Liferea is a news aggregator for GTK+ http://liferea.sf.net Liferea Homepage @@ -4573,7 +2670,7 @@ Developers: -Lars Lindner +Lars Windolf Nathan Conrad Arnold Noronha Adrian Bunk @@ -4625,6 +2722,8 @@ and many more... Lars Lindner Bart Kreska +Wojciech Myrda +Piotr Sokół Dario Conigliaro Emanuele Grande Gianvito Cavasoli @@ -5080,17 +3179,6 @@ 1000 1 - - 1 - 1 - 10000 - 1 - - - 1 - 1000000 - 1 - 10000 1 diff -Nru liferea-1.8.15/glade/Makefile.am liferea-1.10.3/glade/Makefile.am --- liferea-1.8.15/glade/Makefile.am 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/glade/Makefile.am 2013-08-10 00:31:20.000000000 +0200 @@ -6,9 +6,13 @@ new_subscription.ui \ simple_subscription.ui \ google_source.ui \ + inoreader_source.ui \ node_source.ui \ opml_source.ui \ - ttrss_source.ui + prefs.ui \ + reedah_source.ui \ + ttrss_source.ui \ + theoldreader_source.ui EXTRA_DIST = \ $(glade_DATA) diff -Nru liferea-1.8.15/glade/Makefile.in liferea-1.10.3/glade/Makefile.in --- liferea-1.8.15/glade/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/glade/Makefile.in 2013-10-08 20:14:31.000000000 +0200 @@ -111,13 +111,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -133,6 +132,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -179,8 +186,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -209,6 +214,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -245,9 +251,13 @@ new_subscription.ui \ simple_subscription.ui \ google_source.ui \ + inoreader_source.ui \ node_source.ui \ opml_source.ui \ - ttrss_source.ui + prefs.ui \ + reedah_source.ui \ + ttrss_source.ui \ + theoldreader_source.ui EXTRA_DIST = \ $(glade_DATA) diff -Nru liferea-1.8.15/glade/prefs.ui liferea-1.10.3/glade/prefs.ui --- liferea-1.8.15/glade/prefs.ui 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/glade/prefs.ui 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,2027 @@ + + + + + 1 + 10000 + 1 + 1 + + + 1000000 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + True + False + 5 + Liferea Preferences + False + center + 300 + dialog + + + + True + False + vertical + 2 + + + True + False + end + + + gtk-close + False + True + True + True + False + False + True + + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + True + 5 + True + + + True + False + 12 + 18 + + + True + False + 6 + + + True + False + 0 + Feed Cache Handling + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 12 + + + True + False + Default _number of items per feed to save: + True + True + itemCountBtn + + + False + False + 0 + + + + + 60 + True + True + adjustment3 + 1 + True + + + + False + False + 1 + + + + + + + False + False + 1 + + + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0 + Feed Update Settings + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 6 + + + _Update all subscriptions at startup. + False + True + True + False + False + True + 0 + True + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + Default Feed Refresh _Interval: + True + globalRefreshIntervalSpinButton + + + False + False + 0 + + + + + True + False + 6 + + + 60 + True + True + adjustment2 + 1 + + + + True + True + 0 + + + + + True + False + liststore5 + + + + 0 + + + + + False + False + 1 + + + + + False + True + 1 + + + + + False + True + 1 + + + + + True + info + + + + + 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 + True + 0 + + + + + + + False + False + 2 + + + + + + + False + False + 1 + + + + + False + False + 1 + + + + + False + + + + + True + False + Feeds + + + False + + + + + True + False + 12 + 18 + + + True + False + 6 + + + True + False + 0 + Folder Display Settings + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 6 + + + _Show the items of all child feeds when a folder is selected. + False + True + True + False + False + True + 0 + True + + + + False + False + 0 + + + + + _Hide read items. + False + True + True + False + False + True + 0 + True + + + + False + False + 1 + + + + + + + False + False + 1 + + + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0 + Feed Icons (Favicons) + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + + + _Update all favicons now + False + True + True + False + False + True + + + False + False + 0 + + + + + + + False + False + 1 + + + + + False + False + 1 + + + + + 1 + False + + + + + True + False + Folders + + + 1 + False + + + + + True + False + 12 + 18 + + + True + False + 6 + + + True + False + 0 + Reading Headlines + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 6 + 12 + + + True + False + liststore3 + + + + 0 + + + + + 1 + 0 + 1 + 1 + + + + + True + False + 0 + _Skim through articles with: + True + skimKeyCombo + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + _Default View Mode: + True + defaultViewModeCombo + + + 0 + 1 + 1 + 1 + + + + + True + False + liststore3 + + + + 0 + + + + + 1 + 1 + 1 + 1 + + + + + + + False + False + 1 + + + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0 + Web Integration + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 2 + 6 + 6 + + + True + True + + + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + _Post Bookmarks to + True + socialpopup + + + GTK_FILL + + + + + + + + False + False + 1 + + + + + False + False + 1 + + + + + 2 + False + + + + + True + False + Headlines + + + 2 + False + + + + + True + False + 12 + 18 + + + True + False + 6 + + + True + False + 6 + + + True + False + 0 + Internal Browser Settings + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 6 + + + Open links in Liferea's _window. + False + True + True + False + False + True + 0 + True + + + + False + False + 0 + + + + + _Disable Javascript. + False + True + True + False + False + True + 0 + True + + + + False + False + 1 + + + + + _Enable browser plugins. + False + True + True + False + False + True + 0 + True + + + + False + False + 2 + + + + + + + False + True + 6 + 1 + + + + + False + True + 0 + + + + + False + True + 0 + + + + + True + False + 6 + + + True + False + 0 + External Browser Settings + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 3 + 2 + 12 + 6 + + + True + True + + + 1 + 2 + GTK_FILL + + + + + + True + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + _Open link in: + True + browserlocpopup + + + 1 + 2 + GTK_FILL + + + + + + True + True + True + + + + 1 + 2 + 2 + 3 + + + + + + True + False + 0 + _Manual: + True + browsercmd + + + 2 + 3 + GTK_FILL + + + + + + True + False + 0 + <small>(%s for URL)</small> + True + True + browsercmd + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + + + + + + + + + + + + + + True + False + 0 + _Browser: + True + browserpopup + + + GTK_FILL + + + + + + + + False + True + 6 + 1 + + + + + False + True + 1 + + + + + 3 + + + + + True + False + Browser + + + 3 + False + + + + + True + False + 12 + 18 + + + True + False + 6 + + + True + False + 0 + Notification Settings + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 6 + + + Show a _popup window with new headlines. + False + True + True + False + False + True + 0 + True + + + + False + False + 0 + + + + + True + False + 6 + + + Show a status _icon in the notification area (system tray). + False + True + True + False + False + True + 0 + True + + + + False + False + 0 + + + + + True + False + + + True + False + 10 + + + False + False + 0 + + + + + True + False + 6 + + + Show _number of new items in the tray icon. + False + True + True + False + False + True + 0 + True + + + + False + False + 0 + + + + + T_erminate instead of minimizing to tray icon. + False + True + True + False + False + True + 0 + True + + + + False + False + 1 + + + + + _Start in tray icon. + False + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + 0 + True + + + + True + True + 2 + + + + + False + True + 1 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + + + True + True + 1 + + + + + False + True + 0 + + + + + True + False + 6 + + + True + False + 0 + 0.51999998092651367 + Toolbar Settings + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 6 + + + _Hide toolbar. + False + True + True + False + False + True + 0 + True + + + + True + True + 0 + + + + + True + False + 12 + + + True + False + 0 + Toolbar _button labels: + True + toolbarCombo + + + False + False + 0 + + + + + True + False + liststore2 + + + + 0 + + + + + False + False + 1 + + + + + True + False + 1 + + + + + + + True + True + 1 + + + + + False + True + 1 + + + + + 4 + + + + + True + False + GUI + + + 4 + False + + + + + True + False + + + True + False + 12 + 18 + + + True + False + 6 + + + True + False + 0 + HTTP Proxy Server + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 6 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + _Auto Detect (GNOME or environment) + False + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + 0 + True + True + + + True + True + 0 + + + + + _No Proxy + False + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + 0 + True + True + proxyAutoDetectRadio + + + True + True + 1 + + + + + _Manual Setting: + False + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + 0 + True + True + proxyAutoDetectRadio + + + True + True + 2 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 10 + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 2 + 2 + 12 + 6 + + + True + False + 0 + Proxy _Port: + True + proxyportentry + + + 1 + 2 + GTK_FILL + + + + + + True + True + True + + + 1 + 2 + 1 + 2 + + + + + + + True + True + True + + + 1 + 2 + + + + + + + True + False + 0 + Proxy _Host: + True + proxyhostentry + + + GTK_FILL + + + + + + True + True + 3 + 0 + + + + + Use Proxy Au_thentication + False + True + True + False + False + True + 0 + True + + + + False + False + 1 + + + + + True + False + 21 + + + True + False + 2 + 2 + 12 + 6 + + + True + False + 0 + Proxy Pass_word: + True + proxypasswordentry + + + 1 + 2 + GTK_FILL + + + + + + True + True + False + True + + + 1 + 2 + 1 + 2 + + + + + + + True + True + True + + + 1 + 2 + + + + + + + True + False + 0 + Proxy _Username: + True + + + GTK_FILL + + + + + + + + True + True + 2 + + + + + True + True + 1 + + + + + True + True + 3 + + + + + False + False + 0 + + + + + + + True + True + 1 + + + + + False + True + 0 + + + + + False + True + 0 + + + + + 5 + + + + + True + False + Proxy + + + 5 + False + + + + + True + False + 12 + 18 + + + True + False + 6 + + + True + False + 0 + Downloading Enclosures + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 2 + 12 + 6 + + + True + False + + + True + False + liststore1 + + + + 0 + + + + + False + False + 0 + + + + + True + False + + + True + False + 1 + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + _Download using + True + + + GTK_FILL + + + + + + + + False + False + 1 + + + + + False + False + 0 + + + + + True + False + True + 6 + + + True + False + 0 + Opening Enclosures + + + + + + False + False + 0 + + + + + True + False + True + 12 + + + True + False + True + 6 + + + True + True + True + in + + + 100 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + + + + + + + + True + True + 0 + + + + + True + False + 6 + + + gtk-properties + False + True + True + False + False + True + + + + False + False + 0 + + + + + gtk-delete + False + True + True + False + False + True + + + + False + False + 1 + + + + + False + False + 1 + + + + + + + True + True + 1 + + + + + False + True + 1 + + + + + 6 + False + + + + + True + False + Enclosures + + + 6 + False + + + + + True + False + vertical + 6 + + + + + + 7 + + + + + True + False + Plugins + + + 7 + False + + + + + + + + + + + False + True + 1 + + + + + + prefclosebtn + + + diff -Nru liferea-1.8.15/glade/reedah_source.ui liferea-1.10.3/glade/reedah_source.ui --- liferea-1.8.15/glade/reedah_source.ui 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/glade/reedah_source.ui 2013-08-07 22:38:41.000000000 +0200 @@ -0,0 +1,165 @@ + + + + + True + False + Add Reedah Account + dialog + + + True + False + vertical + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + False + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 12 + 12 + + + True + False + 0 + Please enter your Reedah account settings + True + + + False + False + 0 + + + + + True + False + 2 + 2 + 6 + 6 + + + True + True + False + + + 1 + 2 + 1 + 2 + + + + + + True + True + + + 1 + 2 + + + + + + True + False + 0 + _Password + True + passwordEntry + + + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + _Username (Email) + True + userEntry + + + GTK_FILL + + + + + + False + True + 1 + + + + + False + True + 2 + + + + + + cancelbutton1 + okbutton1 + + + diff -Nru liferea-1.8.15/glade/simple_subscription.ui liferea-1.10.3/glade/simple_subscription.ui --- liferea-1.8.15/glade/simple_subscription.ui 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/glade/simple_subscription.ui 2013-07-31 23:29:12.000000000 +0200 @@ -1,105 +1,30 @@ - + - - + True + False New Subscription dialog - + True - - - True - 12 - 6 - - - True - 0 - Feed Source - - - - - - False - False - 0 - - - - - True - - - True - 10 - - - 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 - - + False + vertical - + True + False end gtk-cancel + False True True True False + False True @@ -111,10 +36,12 @@ Advanced... + False True True True False + False True @@ -126,11 +53,13 @@ gtk-ok + False True True True True False + False True @@ -142,10 +71,88 @@ False + True end 0 + + + True + False + 12 + 6 + + + True + False + 0 + Feed Source + + + + + + False + False + 0 + + + + + True + False + 6 + 12 + + + True + False + vertical + 12 + + + True + False + 0 + 0 + Enter a website location to use feed autodiscovery or in case you know it the exact feed location. + True + + + False + True + 0 + + + + + True + True + + + + False + True + 1 + + + + + + + False + False + 1 + + + + + False + False + 2 + + diff -Nru liferea-1.8.15/glade/theoldreader_source.ui liferea-1.10.3/glade/theoldreader_source.ui --- liferea-1.8.15/glade/theoldreader_source.ui 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/glade/theoldreader_source.ui 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,149 @@ + + + + + + True + Add TheOldReader Account + dialog + + + True + + + True + 12 + 12 + + + True + 0 + Please enter your TheOldReader 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.8.15/liferea.appdata.xml liferea-1.10.3/liferea.appdata.xml --- liferea-1.8.15/liferea.appdata.xml 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/liferea.appdata.xml 2013-10-08 19:09:35.000000000 +0200 @@ -0,0 +1,30 @@ + + + liferea.desktop + CC0 + +

    Liferea is an abbreviation for Linux Feed Reader. It is a news aggregator for online news feeds. It supports a number of different feed formats including RSS/RDF, CDF and Atom. There are many other news readers available, but these others are not available for Linux or require many extra libraries to be installed. Liferea tries to fill this gap by creating a fast, easy to use, easy to install news aggregator for GTK/GNOME.

    +

    Distinguishing features:

    +
      +
    • Read articles when offline
    • +
    • Synchronizes with TheOldReader
    • +
    • Synchronizes with TinyTinyRSS
    • +
    • Permanently save headlines in news bins
    • +
    • Match items using search folders
    • +
    • Play Podcasts
    • +
    +
    + + http://lzone.de/liferea/screenshots/screenshot1.png + http://lzone.de/liferea/screenshots/screenshot2.png + http://lzone.de/liferea/screenshots/screenshot3.png + http://lzone.de/liferea/screenshots/screenshot4.png + http://lzone.de/liferea/screenshots/screenshot5.png + http://lzone.de/liferea/screenshots/screenshot6.png + http://lzone.de/liferea/screenshots/screenshot7.png + http://lzone.de/liferea/screenshots/screenshot8.png + http://lzone.de/liferea/screenshots/screenshot9.png + + http://lzone.de/liferea/ + liferea-devel@lists.sf.net +
    \ No newline at end of file diff -Nru liferea-1.8.15/liferea.appdata.xml.in liferea-1.10.3/liferea.appdata.xml.in --- liferea-1.8.15/liferea.appdata.xml.in 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/liferea.appdata.xml.in 2013-10-08 12:34:39.000000000 +0200 @@ -0,0 +1,36 @@ + + + liferea.desktop + CC0 + + <_p>Liferea is an abbreviation for Linux Feed Reader. It is a news aggregator for + online news feeds. It supports a number of different feed formats including + RSS/RDF, CDF and Atom. There are many other news readers available, but these + others are not available for Linux or require many extra libraries to be + installed. Liferea tries to fill this gap by creating a fast, easy to use, + easy to install news aggregator for GTK/GNOME. + + <_p>Distinguishing features: +
      + <_li>Read articles when offline + <_li>Synchronizes with TheOldReader + <_li>Synchronizes with TinyTinyRSS + <_li>Permanently save headlines in news bins + <_li>Match items using search folders + <_li>Play Podcasts +
    +
    + + http://lzone.de/liferea/screenshots/screenshot1.png + http://lzone.de/liferea/screenshots/screenshot2.png + http://lzone.de/liferea/screenshots/screenshot3.png + http://lzone.de/liferea/screenshots/screenshot4.png + http://lzone.de/liferea/screenshots/screenshot5.png + http://lzone.de/liferea/screenshots/screenshot6.png + http://lzone.de/liferea/screenshots/screenshot7.png + http://lzone.de/liferea/screenshots/screenshot8.png + http://lzone.de/liferea/screenshots/screenshot9.png + + http://lzone.de/liferea/ + liferea-devel@lists.sf.net +
    diff -Nru liferea-1.8.15/liferea.convert liferea-1.10.3/liferea.convert --- liferea-1.8.15/liferea.convert 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/liferea.convert 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,53 @@ +[net.sf.liferea:/org/gnome/liferea/] +browse-inside-application = /apps/liferea/browse-inside-application +browse-key-setting = /apps/liferea/browse-key-setting +browser = /apps/liferea/browser +browser-id = /apps/liferea/browser_id +browser-place = /apps/liferea/browser_place + +default-view-mode = /apps/liferea/default-view-mode +default-update-interval = /apps/liferea/default-update-interval + +disable-javascript = /apps/liferea/disable-javascript +disable-toolbar = /apps/liferea/disable-toolbar + +enable-fetch-retries = /apps/liferea/enable-fetch-retries + +last-hpane-pos = /apps/liferea/last-hpane-pos +last-vpane-pos = /apps/liferea/last-vpane-pos +last-wpane-pos = /apps/liferea/last-wpane-pos +last-itemlist-mode = /apps/liferea/last-itemlist-mode +last-window-height = /apps/liferea/last-window-height +last-window-maximized = /apps/liferea/last-window-maximized +last-window-width = /apps/liferea/last-window-width +last-window-x = /apps/liferea/last-window-x +last-window-y = /apps/liferea/last-window-y +last-window-state = /apps/liferea/last-window-state +last-zoomlevel = /apps/liferea/last-zoomlevel + +maxitemcount = /apps/liferea/maxitemcount +show-popup-windows = /apps/liferea/show-popup-windows +startup-feed-action = /apps/liferea/startup_feed_action +toolbar-style = /apps/liferea/toolbar_style +trayicon = /apps/liferea/trayicon +trayicon-new-count = /apps/liferea/trayicon-new-count +dont-minimize-to-tray = /apps/liferea/dont-minimize-to-tray +update-thread-concurrency = /apps/liferea/update-thread-concurrency +popup-placement = /apps/liferea/popup-placement +folder-display-mode = /apps/liferea/folder-display-mode +folder-display-hide-read = /apps/liferea/folder-display-hide-read +reduced-feedlist = /apps/liferea/reduced-feedlist +download-tool = /apps/liferea/enclosure-download-tool + +proxy-detect-mode = /apps/liferea/proxy/detect-mode +proxy-host = /apps/liferea/proxy/host +proxy-port = /apps/liferea/proxy/port +proxy-use-authentication = /apps/liferea/proxy/use_authentication +proxy-authentication-user = /apps/liferea/proxy/authentication_user +proxy-authentication-password = /apps/liferea/proxy/authentication_password + +social-bm-site = /apps/liferea/social-bm-site +start-in-tray = /apps/liferea/start-in-tray +enable-plugins = /apps/liferea/enable-plugins +browser-font = /apps/liferea/browser-font + diff -Nru liferea-1.8.15/liferea.desktop liferea-1.10.3/liferea.desktop --- liferea-1.8.15/liferea.desktop 2013-06-24 22:16:31.000000000 +0200 +++ liferea-1.10.3/liferea.desktop 2013-10-08 19:09:35.000000000 +0200 @@ -70,6 +70,7 @@ X-GNOME-FullName[ar]=قارئ التلقيمات لايفريا X-GNOME-FullName[ast]=Liferea, llector de noticies X-GNOME-FullName[be@latin]=Hartač RSS Liferea +X-GNOME-FullName[ca]=Lector de canals de notícies Liferea X-GNOME-FullName[cs]=Čtečka kanálů Liferea X-GNOME-FullName[da]=Liferea - Nyhedslæser X-GNOME-FullName[de]=Liferea Feedreader @@ -85,8 +86,8 @@ X-GNOME-FullName[ja]=Liferea フィード・リーダ X-GNOME-FullName[lt]=Liferea naujienų kanalų skaitytuvė X-GNOME-FullName[lv]=Liferea plūsmu lasītājs -X-GNOME-FullName[nl]=Liferea - Linux Feed Reader -X-GNOME-FullName[pl]=Czytnik Wiadomości RSS Liferea +X-GNOME-FullName[nl]=Liferea Feed Reader +X-GNOME-FullName[pl]=Czytnik wiadomości RSS Liferea X-GNOME-FullName[pt]=Leitor de Fontes Liferea X-GNOME-FullName[pt_BR]=Agregador de Notícias Liferea X-GNOME-FullName[ro]=Cititor fluxuri Liferea @@ -98,45 +99,25 @@ X-GNOME-FullName[uk]=Програма для читання подач Liferea X-GNOME-FullName[vi]=Bộ đọc Feed Liferea X-GNOME-FullName[zh_CN]=Lifera Feed 阅读器 -Comment=Download and view feeds -Comment[ar]=نزّل واعرض التلقيمات -Comment[ast]=Baxar y ver noticies -Comment[be@latin]=Atrymvaj i ahladaj kanały RSS -Comment[ca]=Baixeu i visualitzeu canals de notícies -Comment[cs]=Stahovat a prohlížet zdroje s novinkami -Comment[da]=Hent og vis nyhedskilder -Comment[de]=Herunterladen und Anzeigen von Feeds -Comment[el]=Λήψη και προβολή ροών -Comment[es]=Descarga y muestra noticias -Comment[eu]=Deskargatu eta ikusi iturriak -Comment[fi]=Lataa ja katso syötteitä -Comment[fr]=Télécharger et voir des flux -Comment[gl]=Descarga e amosa fontes -Comment[he]=טען וצפה בערוצים -Comment[hu]=Hírforrások letöltése és megjelenítése -Comment[it]=Scarica e visualizza notiziari -Comment[ja]=配信元をダウンロードして表示します -Comment[lt]=Parsiųskite ir skaitykite naujienas -Comment[lv]=Lejupielādēt un lasīt plūsmas -Comment[nl]=Feeds downloaden en bekijken -Comment[pl]=Subskrybuj kanały informacyjne -Comment[pt]=Transferir e exibir fontes -Comment[pt_BR]=Download e exibir fontes de notícias -Comment[ro]=Descarcă și vizualizează fluxuri -Comment[ru]=Скачать и просмотреть ленты -Comment[sk]=Stiahnuť a zobraziť kanály -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[uk]=Звантаження і перегляд подач -Comment[vi]=Tải về và trình bày feed -Comment[zh_CN]=下载并查看 Feed +Comment=Read news feeds and blogs +Comment[ca]=Llegiu canals de notícies i blocs +Comment[da]=Læs nyheds- og blogkilder +Comment[de]=News-Feeds und Blogs lesen +Comment[eu]=Irakurri berri jarioak eta blogak +Comment[fi]=Lue uutissyötteitä ja blogeja +Comment[hu]=Hírforrások és blogok olvasása +Comment[it]=Leggi notizie e blog +Comment[nl]=Nieuwsfeeds en blogs lezen +Comment[pl]=Odczytuje zawartość kanałów wiadomości i blogów +Comment[ru]=Читайте новостные ленты и блоги +Comment[uk]=Читання подач новин та блогів +Comment[vi]=Đọc các tin mới và blog +Keywords=news;feed;aggregator;blog;podcast; Exec=liferea Icon=liferea StartupNotify=true Terminal=false Type=Application -Categories=Network;News; +Categories=Network;Feed; Version=0.9.4 -MimeType=application/rss+xml;application/atom+xml;application/rdf+xml - +MimeType=application/rss+xml;application/atom+xml;application/rdf+xml; diff -Nru liferea-1.8.15/liferea.desktop.in liferea-1.10.3/liferea.desktop.in --- liferea-1.8.15/liferea.desktop.in 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/liferea.desktop.in 2013-07-31 23:29:12.000000000 +0200 @@ -2,13 +2,13 @@ _Name=Liferea _GenericName=Feed Reader _X-GNOME-FullName=Liferea Feed Reader -_Comment=Download and view feeds +_Comment=Read news feeds and blogs +_Keywords=news;feed;aggregator;blog;podcast; Exec=liferea Icon=liferea StartupNotify=true Terminal=false Type=Application -Categories=Network;News; +Categories=Network;Feed; Version=0.9.4 -MimeType=application/rss+xml;application/atom+xml;application/rdf+xml - +MimeType=application/rss+xml;application/atom+xml;application/rdf+xml; diff -Nru liferea-1.8.15/liferea.schemas liferea-1.10.3/liferea.schemas --- liferea-1.8.15/liferea.schemas 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/liferea.schemas 1970-01-01 01:00:00.000000000 +0100 @@ -1,445 +0,0 @@ - - - - - - - - /schemas/apps/liferea/browse-inside-application - /apps/liferea/browse-inside-application - liferea - bool - false - - Open links inside of Liferea? - If set to true, links clicked will be opened inside of - Liferea, otherwise they will be opened in the selected - external browser. - - - - /schemas/apps/liferea/browse-key-setting - /apps/liferea/browse-key-setting - liferea - int - 1 - - Selects which key to use to pagedown or go to the next - unread item - Selects which key to use to pagedown or go to the next - unread item. Set to 0 to use space, 1 to use ctrl-space, or 2 - to use alt-space. - - - - /schemas/apps/liferea/browser - /apps/liferea/browser - liferea - string - mozilla %s - - Selects the browser command to use when browser_module - is set to manual - Selects the browser command to use when browser_module - is set to manual. - - - - /schemas/apps/liferea/browser_id - /apps/liferea/browser_id - liferea - string - gnome - - Selects which browser to use to open external links - Selects which browser to use to open external - links. The choices include "gnome", "mozilla", "firefox", - "netscape", "opera", "konqueror", and "manual". - - - - /schemas/apps/liferea/browser-module - /apps/liferea/browser-module - liferea - string - liblihtmlm.so - - Selects which HTML rendering engine to use - Selects which HTML rendering engine to use. Usually - 'liblihtmlg.so' and 'liblihtmlm.so' are available. - - - - /schemas/apps/liferea/browser_place - /apps/liferea/browser_place - liferea - int - 0 - - Location of position to open up the link in the - selected browser - Selects the location in the browser to open up the - link. Use 0 for the browser's default, 1 for in an existing - window, 2 for in a new window, and 3 for in a new tab. - - - - /schemas/apps/liferea/default-update-interval - /apps/liferea/default-update-interval - liferea - int - 0 - - Default interval for fetching feeds. - - This value specifies how often Liferea tries to update - feeds. The value is given in minutes. When setting the - interval always consider the traffic it produces. Setting - a value less than 15min almost never makes sense. - - - - - /schemas/apps/liferea/disable-javascript - /apps/liferea/disable-javascript - liferea - bool - false - - Allows to disable Javascript. - - Allows to disable Javascript. - - - - - /schemas/apps/liferea/disable-toolbar - /apps/liferea/disable-toolbar - liferea - bool - false - - Disable displaying the toolbar in the Liferea main - window - Disable displaying the toolbar in the Liferea main - window. - - - - /schemas/apps/liferea/enable-fetch-retries - /apps/liferea/enable-fetch-retries - liferea - bool - true - - Try to refetch feeds after network errors? - If set to true, and a network error is encountered while - fetching a feed, Liferea will do a few more tries. This is useful - in case of temporary loss of network/internet connection. - - - - /schemas/apps/liferea/last-hpane-pos - /apps/liferea/last-hpane-pos - liferea - int - 0 - - Height of the itemlist pane in the mainwindow - Height of the itemlist pane in the mainwindow. Use 0 to - let GTK+ decide the height. - - - - /schemas/apps/liferea/last-itemlist-mode - /apps/liferea/last-itemlist-mode - liferea - bool - false - - Enables condensed mode - Set to true to make Liferea use condensed mode or false - to make Liferea use the three pane mode. - - - - /schemas/apps/liferea/last-vpane-pos - /apps/liferea/last-vpane-pos - liferea - int - 0 - - Width of the feedlist pane in the mainwindow - Width of the feedlist pane in the mainwindow. Use 0 to - let GTK+ decide the width. - - - - /schemas/apps/liferea/last-window-height - /apps/liferea/last-window-height - liferea - int - 0 - - Height of the Liferea main window - Height of the Liferea main window. Use 0 to let GTK+ - decide on the height. - - - - /schemas/apps/liferea/last-window-maximized - /apps/liferea/last-window-maximized - liferea - bool - false - - Mainwindow is maximized when Liferea starts up - Determines if the Liferea main window will be maximized - at startup. - - - - /schemas/apps/liferea/last-window-width - /apps/liferea/last-window-width - liferea - int - 0 - - Width of the Liferea main window - Width of the Liferea main window. Use 0 to let GTK+ - decide on the width. - - - - /schemas/apps/liferea/last-window-x - /apps/liferea/last-window-x - liferea - int - 0 - - Left position of the Liferea main window - Left position of the Liferea main window. - - - - /schemas/apps/liferea/last-window-y - /apps/liferea/last-window-y - liferea - int - 0 - - Top position of the Liferea main window - Top position of the Liferea main window. - - - - /schemas/apps/liferea/last-zoomlevel - /apps/liferea/last-zoomlevel - liferea - int - 100 - - Zoom level of the HTML view - Zoom level of the HTML view. (100 = 1:1) - - - - /schemas/apps/liferea/maxitemcount - /apps/liferea/maxitemcount - liferea - int - 100 - - Determines the default number of items saved on each - feed - This value is used to determine how many items are saved - in each feed when Liferea exits. Note that marked items are - always saved. - - - - /schemas/apps/liferea/show-popup-windows - /apps/liferea/show-popup-windows - liferea - bool - false - - Display popup window advertising new items as they are downloaded - Display popup window advertising new items as they are downloaded. - - - - /schemas/apps/liferea/startup_feed_action - /apps/liferea/startup_feed_action - liferea - int - 0 - - Determines if subscriptions are to be updated at startup - Numeric value determines wether Liferea shall updates - all subscriptions at startup (0=yes, otherwise=no). Inverse - logic for compatibility reasons. - - - - /schemas/apps/liferea/toolbar_style - /apps/liferea/toolbar_style - liferea - string - - - Determines the style of the toolbar buttons - Determines the style of the toolbar buttons locally, - overriding the GNOME settings. Valid values are "both", "both-horiz", - "icons", and "text". If empty or not specified, the GNOME settings are used. - - - - /schemas/apps/liferea/trayicon - /apps/liferea/trayicon - liferea - bool - true - - Determines if the system tray icon is to be shown - Determines if the system tray icon is to be shown - - - - /schemas/apps/liferea/trayicon-new-count - /apps/liferea/trayicon-new-count - liferea - bool - false - - Determines if the number of new items is shown in the system tray icon - Determines if the number of new items is shown in the system tray icon - - - - /schemas/apps/liferea/dont-minimize-to-tray - /apps/liferea/dont-minimize-to-tray - liferea - bool - false - - Determines if minimize to tray is not desired - Determines if minimize to tray is not desired. This is relevant when the user clicks the close button or presses the window close hotkey of the window manager. If this option is disabled Liferea will just hide the window and keep running. If the option is enabled the application will terminate. - - - - /schemas/apps/liferea/update-thread-concurrency - /apps/liferea/update-thread-concurrency - liferea - int - 2 - - Number of update threads used in downloading - Number of threads used to download feeds and web objects - in Liferea. An additional thread is created that only - services 'interactive' requests (for example when a user - manually selects a feed to update). - - - - /schemas/apps/liferea/popup-placement - /apps/liferea/popup-placement - liferea - int - 0 - - Placement of the mini popup window - - The placement of the mini popup window that is opened - to notify the user of new items. The popup window is - positioned at one of the desktop borders (1 = upper left, - 2 = upper right, 3 = lower right, 4 = lower left). - - - - - /schemas/apps/liferea/folder-display-mode - /apps/liferea/folder-display-mode - liferea - int - 0 - - Determine if folders show all child content. - - If set to 0 no items are displayed when selecting a folder. - If set to 1 all items of all childs are displayed when - selecting a folder. - - - - - /schemas/apps/liferea/folder-display-hide-read - /apps/liferea/folder-display-hide-read - liferea - bool - false - - Filter read items when displaying folders. - - If this option is enabled and folder-display-mode is - not 0 when clicking a folder only the unread items - of all childs will be displayed. - - - - - /schemas/apps/liferea/reduced-feedlist - /apps/liferea/reduced-feedlist - liferea - bool - false - - Filter feeds without unread items from feed list. - - If this option is enabled the feed list will contain - only feeds that have unread items. - - - - - /schemas/apps/liferea/enclosure-download-tool - /apps/liferea/enclosure-download-tool - liferea - int - 0 - - Which tool to download enclosures. - - This options determines which download tool Liferea - uses to download enclosures (0 = wget, 1 = curl). - - - - - /schemas/apps/liferea/enclosure-download-path - /apps/liferea/enclosure-download-path - liferea - string - - - The path where to store downloaded enclosures. - - This options determines where Liferea stores downloaded - enclosures. If not specified Liferea will uses the users - home directory. - - - - - diff -Nru liferea-1.8.15/Makefile.am liferea-1.10.3/Makefile.am --- liferea-1.8.15/Makefile.am 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/Makefile.am 2013-10-08 20:35:08.000000000 +0200 @@ -7,8 +7,11 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_DATA = liferea.schemas +appdatadir = $(datadir)/appdata +appdata_in_files = $(PACKAGE_TARNAME).appdata.xml.in +appdata_DATA = $(appdata_in_files:.xml.in=.xml) + +@INTLTOOL_XML_RULE@ cssdir = $(pkgdatadir)/css css_DATA = \ @@ -19,23 +22,41 @@ dtddir = $(pkgdatadir)/dtd dtd_DATA = dtd/html.ent +plugindir = $(pkglibdir)/plugins +plugin_DATA = \ + plugins/gnome-keyring.py \ + plugins/gnome-keyring.plugin \ + plugins/media-player.py \ + plugins/media-player.plugin + +gsettings_SCHEMAS = net.sf.liferea.gschema.xml +@INTLTOOL_XML_NOMERGE_RULE@ +@GSETTINGS_RULES@ + EXTRA_DIST = \ + net.sf.liferea.gschema.xml.in \ + liferea.convert \ po/liferea.pot \ $(desktop_in_files) \ $(desktop_DATA) \ $(schema_DATA) \ $(css_DATA) \ - $(dtd_DATA) - -install-data-local: -if GCONF_SCHEMAS_INSTALL - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/$(schema_DATA) -endif - @$(NORMAL_INSTALL) - + $(dtd_DATA) \ + $(plugin_DATA) \ + $(gsettings_SCHEMAS) \ + $(appdata_in_files) \ + $(appdata_DATA) DISTCLEANFILES = \ liferea.desktop \ intltool-extract \ intltool-merge \ - intltool-update + intltool-update \ + $(gsettings_SCHEMAS) + +CLEANFILES = \ + $(gsettings_SCHEMAS) + $(appdata_DATA) + +po/liferea.pot: + cd po && $(MAKE) liferea.pot diff -Nru liferea-1.8.15/Makefile.in liferea-1.10.3/Makefile.in --- liferea-1.8.15/Makefile.in 2013-06-24 22:13:49.000000000 +0200 +++ liferea-1.10.3/Makefile.in 2013-10-08 20:35:14.000000000 +0200 @@ -37,6 +37,7 @@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/net.sf.liferea.gschema.xml.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \ ar-lib compile config.guess config.sub depcomp install-sh \ ltmain.sh missing @@ -48,7 +49,7 @@ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = net.sf.liferea.gschema.xml CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) @@ -92,9 +93,11 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(cssdir)" "$(DESTDIR)$(desktopdir)" \ - "$(DESTDIR)$(dtddir)" "$(DESTDIR)$(schemadir)" -DATA = $(css_DATA) $(desktop_DATA) $(dtd_DATA) $(schema_DATA) +am__installdirs = "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(cssdir)" \ + "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(dtddir)" \ + "$(DESTDIR)$(plugindir)" +DATA = $(appdata_DATA) $(css_DATA) $(desktop_DATA) $(dtd_DATA) \ + $(plugin_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -172,13 +175,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -194,6 +196,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -240,8 +250,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -270,6 +278,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -304,8 +313,9 @@ desktop_in_files = liferea.desktop.in desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_DATA = liferea.schemas +appdatadir = $(datadir)/appdata +appdata_in_files = $(PACKAGE_TARNAME).appdata.xml.in +appdata_DATA = $(appdata_in_files:.xml.in=.xml) cssdir = $(pkgdatadir)/css css_DATA = \ css/liferea.css \ @@ -314,19 +324,37 @@ dtddir = $(pkgdatadir)/dtd dtd_DATA = dtd/html.ent +plugindir = $(pkglibdir)/plugins +plugin_DATA = \ + plugins/gnome-keyring.py \ + plugins/gnome-keyring.plugin \ + plugins/media-player.py \ + plugins/media-player.plugin + +gsettings_SCHEMAS = net.sf.liferea.gschema.xml EXTRA_DIST = \ + net.sf.liferea.gschema.xml.in \ + liferea.convert \ po/liferea.pot \ $(desktop_in_files) \ $(desktop_DATA) \ $(schema_DATA) \ $(css_DATA) \ - $(dtd_DATA) + $(dtd_DATA) \ + $(plugin_DATA) \ + $(gsettings_SCHEMAS) \ + $(appdata_in_files) \ + $(appdata_DATA) DISTCLEANFILES = \ liferea.desktop \ intltool-extract \ intltool-merge \ - intltool-update + intltool-update \ + $(gsettings_SCHEMAS) + +CLEANFILES = \ + $(gsettings_SCHEMAS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -381,6 +409,8 @@ distclean-hdr: -rm -f config.h stamp-h1 +net.sf.liferea.gschema.xml: $(top_builddir)/config.status $(srcdir)/net.sf.liferea.gschema.xml.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo @@ -390,6 +420,24 @@ distclean-libtool: -rm -f libtool config.lt +install-appdataDATA: $(appdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(appdatadir)" || $(MKDIR_P) "$(DESTDIR)$(appdatadir)" + @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \ + done + +uninstall-appdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir) install-cssDATA: $(css_DATA) @$(NORMAL_INSTALL) test -z "$(cssdir)" || $(MKDIR_P) "$(DESTDIR)$(cssdir)" @@ -444,24 +492,24 @@ @list='$(dtd_DATA)'; test -n "$(dtddir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(dtddir)'; $(am__uninstall_files_from_dir) -install-schemaDATA: $(schema_DATA) +install-pluginDATA: $(plugin_DATA) @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" + @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \ done -uninstall-schemaDATA: +uninstall-pluginDATA: @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ + @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) + dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -793,7 +841,7 @@ all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(cssdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(dtddir)" "$(DESTDIR)$(schemadir)"; do \ + for dir in "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(cssdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(dtddir)" "$(DESTDIR)$(plugindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -818,6 +866,7 @@ mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -849,8 +898,8 @@ info-am: -install-data-am: install-cssDATA install-data-local \ - install-desktopDATA install-dtdDATA install-schemaDATA +install-data-am: install-appdataDATA install-cssDATA \ + install-desktopDATA install-dtdDATA install-pluginDATA install-dvi: install-dvi-recursive @@ -896,8 +945,8 @@ ps-am: -uninstall-am: uninstall-cssDATA uninstall-desktopDATA \ - uninstall-dtdDATA uninstall-schemaDATA +uninstall-am: uninstall-appdataDATA uninstall-cssDATA \ + uninstall-desktopDATA uninstall-dtdDATA uninstall-pluginDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ ctags-recursive install-am install-strip tags-recursive @@ -909,23 +958,28 @@ dist-zip distcheck distclean distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-cssDATA install-data \ - install-data-am install-data-local install-desktopDATA \ + install install-am install-appdataDATA install-cssDATA \ + install-data install-data-am install-desktopDATA \ install-dtdDATA 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-schemaDATA install-strip \ + install-pluginDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs installdirs-am \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-cssDATA \ - uninstall-desktopDATA uninstall-dtdDATA uninstall-schemaDATA + tags tags-recursive uninstall uninstall-am \ + uninstall-appdataDATA uninstall-cssDATA uninstall-desktopDATA \ + uninstall-dtdDATA uninstall-pluginDATA @INTLTOOL_DESKTOP_RULE@ -install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/$(schema_DATA) - @$(NORMAL_INSTALL) +@INTLTOOL_XML_RULE@ +@INTLTOOL_XML_NOMERGE_RULE@ +@GSETTINGS_RULES@ + $(appdata_DATA) + +po/liferea.pot: + cd po && $(MAKE) liferea.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru liferea-1.8.15/man/liferea.1 liferea-1.10.3/man/liferea.1 --- liferea-1.8.15/man/liferea.1 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/man/liferea.1 2013-07-31 23:29:12.000000000 +0200 @@ -1,4 +1,4 @@ -.TH LIFEREA "1" "Sep 14, 2011" +.TH LIFEREA "1" "Jul 26, 2013" .SH NAME Liferea \- GTK desktop news aggregator @@ -10,18 +10,21 @@ \fBLiferea\fP (Linux Feed Reader) is an aggregator for online news feeds. It can be used to maintain a list of subscribed feeds, browse and search through their items and displays their contents. -Additionally Liferea allows to sync subscriptions and read +Additionally Liferea allows one to sync subscriptions and read headlines with online accounts of Google Reader and TinyTinyRSS. .SH OPTIONS Liferea options: .TP .B \-\-version -output version information and exit +Print version information and exit .TP .B \-\-help -display a option overview and exit +Display a option overview and exit .TP -.B \-\-mainwindow\-state=\fISTATE\fR +.B \-a, \-\-add\-feed=\fIURI\fR +Add a new subscription URI which can be a feed or website URL +.TP +.B \-w, \-\-mainwindow\-state=\fISTATE\fR Start Liferea with its mainwindow in STATE: shown, iconified, hidden .TP .B \-\-debug\-all @@ -39,7 +42,7 @@ .B \-\-debug\-html Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated -HTML into ~/.liferea_1.6/output.xhtml. +HTML into $XDG_CACHE_DIR/liferea/output.xhtml. .TP .B \-\-debug\-parsing Print debugging messages of all parsing functions @@ -73,25 +76,19 @@ .TP .B http_proxy If a proxy is not specified in the Liferea preferences (which uses the proxy -settings in gconf), then Liferea will use the proxy specified in $http_proxy. +settings provided by dconf), then Liferea will use the proxy specified in $http_proxy. $http_proxy should be set to a URI specifying the desired proxy, for example .RB \(oqhttp://proxy.example.com:3128/\(cq. .SH FILES .TP -/usr/share/liferea/css/ -Contains default stylesheets for feed display -.TP -/usr/share/liferea/opml/ -Contains default feedlists +$XDG_CONFIG_DIR/liferea/feedlist.opml +Contains the current list of subscriptions .TP -~/.liferea_1.8/ -Contains user feedlist and feed cache +$XDG_CONFIG_DIR/liferea/liferea.css +Stylesheet that can be used to override default HTML style .TP -~/.liferea_1.8/liferea.db +$XDG_DATA_DIR/liferea/liferea.db Sqlite3 database with all subscriptions and headlines -.TP -~/.liferea_1.8/liferea.css -Stylesheet that can be edited by user .SH AUTHOR -This manual page was written by Lars Lindner . +This manual page was written by Lars Windolf . diff -Nru liferea-1.8.15/man/Makefile.in liferea-1.10.3/man/Makefile.in --- liferea-1.8.15/man/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/man/Makefile.in 2013-10-08 20:14:31.000000000 +0200 @@ -152,13 +152,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -174,6 +173,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -220,8 +227,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -250,6 +255,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -Nru liferea-1.8.15/man/pl/liferea.1 liferea-1.10.3/man/pl/liferea.1 --- liferea-1.8.15/man/pl/liferea.1 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/man/pl/liferea.1 2013-07-31 23:29:12.000000000 +0200 @@ -73,6 +73,6 @@ \fI~/.liferea/\fR Listy subskrypcji uytkownika oraz pliki pamici podrcznej .SH AUTORZY -Lars Lindner +Lars Windolf .br Nathan J. Conrad diff -Nru liferea-1.8.15/man/pl/Makefile.in liferea-1.10.3/man/pl/Makefile.in --- liferea-1.8.15/man/pl/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/man/pl/Makefile.in 2013-10-08 20:14:31.000000000 +0200 @@ -112,13 +112,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -134,6 +133,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -180,8 +187,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -210,6 +215,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -Nru liferea-1.8.15/net.sf.liferea.gschema.xml liferea-1.10.3/net.sf.liferea.gschema.xml --- liferea-1.8.15/net.sf.liferea.gschema.xml 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/net.sf.liferea.gschema.xml 2013-10-08 20:14:38.000000000 +0200 @@ -0,0 +1,245 @@ + + + + + + false + Open links inside of Liferea? + If set to true, links clicked will be opened inside of Liferea, otherwise they will be opened in the selected external browser. + + + 1 + Selects which key to use to pagedown or go to the next unread item + Selects which key to use to pagedown or go to the next unread item. Set to 0 to use space, 1 to use ctrl-space, or 2 to use alt-space. + + + 'mozilla %s' + Selects the browser command to use when browser_module is set to manual + Selects the browser command to use when browser_module is set to manual. + + + 'gnome' + Selects which browser to use to open external links + Selects which browser to use to open external links. The choices include "gnome", "mozilla", "firefox", "netscape", "opera", "konqueror", and "manual". + + + 0 + Location of position to open up the link in the selected browser + Selects the location in the browser to open up the link. Use 0 for the browser's default, 1 for in an existing window, 2 for in a new window, and 3 for in a new tab. + + + 0 + The default view mode for feed list nodes. + The default view mode for displaying feed list nodes. Possible values: 0=email like 3-pane, 1=wide view 3-pane, 2=combined view 2-pane + + + 0 + Default interval for fetching feeds. + This value specifies how often Liferea tries to update feeds. The value is given in minutes. When setting the interval always consider the traffic it produces. Setting a value less than 15min almost never makes sense. + + + false + Allows to disable Javascript. + Allows to disable Javascript. + + + false + Disable displaying the toolbar in the Liferea main window + Disable displaying the toolbar in the Liferea main window. + + + true + Try to refetch feeds after network errors? + If set to true, and a network error is encountered while fetching a feed, Liferea will do a few more tries. This is useful in case of temporary loss of network/internet connection. + + + 0 + Height of the itemlist pane in the mainwindow + Height of the itemlist pane in the mainwindow. Use 0 to let GTK+ decide the height. + + + false + Enables condensed mode + Set to true to make Liferea use condensed mode or false to make Liferea use the three pane mode. + + + 0 + Width of the feedlist pane in the mainwindow + Width of the feedlist pane in the mainwindow. Use 0 to let GTK+ decide the width. + + + 0 + Height of the Liferea main window + Height of the Liferea main window. Use 0 to let GTK+ decide on the height. + + + false + Mainwindow is maximized when Liferea starts up + Determines if the Liferea main window will be maximized at startup. + + + 0 + Width of the Liferea main window + Width of the Liferea main window. Use 0 to let GTK+ decide on the width. + + + 0 + Left position of the Liferea main window + Left position of the Liferea main window. + + + 0 + Top position of the Liferea main window + Top position of the Liferea main window. + + + 0 + Last saved stat of the Liferea main window + Last saved of the Liferea main window. Controls how Liferea shows the window on next startup. Possible values see src/ui/liferea_shell.h + + + 100 + Zoom level of the HTML view + Zoom level of the HTML view. (100 = 1:1) + + + '' + Node id of the last feed list selection + When shutting down Liferea saves the last selected node id here to be restored on startup. + + + 0 + Item id of the last item list selection + When shutting down Liferea saves the last selected item id here to be restored on startup. + + + 100 + Determines the default number of items saved on each feed + This value is used to determine how many items are saved in each feed when Liferea exits. Note that marked items are always saved. + + + false + Display popup window advertising new items as they are downloaded + Display popup window advertising new items as they are downloaded. + + + 0 + Determines if subscriptions are to be updated at startup + Numeric value determines whether Liferea shall updates all subscriptions at startup (0=yes, otherwise=no). Inverse logic for compatibility reasons. + + + '' + Determines the style of the toolbar buttons + Determines the style of the toolbar buttons locally, overriding the GNOME settings. Valid values are "both", "both-horiz", "icons", and "text". If empty or not specified, the GNOME settings are used. + + + true + Determines if the system tray icon is to be shown + Determines if the system tray icon is to be shown + + + false + Determines if the number of new items is shown in the system tray icon + Determines if the number of new items is shown in the system tray icon + + + false + Determines if minimize to tray is not desired + Determines if minimize to tray is not desired. This is relevant when the user clicks the close button or presses the window close hotkey of the window manager. If this option is disabled Liferea will just hide the window and keep running. If the option is enabled the application will terminate. + + + 3 + Number of update threads used in downloading + Number of threads used to download feeds and web objects in Liferea. An additional thread is created that only services 'interactive' requests (for example when a user manually selects a feed to update). + + + 0 + Placement of the mini popup window + The placement of the mini popup window that is opened to notify the user of new items. The popup window is positioned at one of the desktop borders (1 = upper left, 2 = upper right, 3 = lower right, 4 = lower left). + + + 1 + Determine if folders show all child content. + If set to 0 no items are displayed when selecting a folder. If set to 1 all items of all childs are displayed when selecting a folder. + + + true + Filter read items when displaying folders. + If this option is enabled and folder-display-mode is not 0 when clicking a folder only the unread items of all childs will be displayed. + + + false + Filter feeds without unread items from feed list. + If this option is enabled the feed list will contain only feeds that have unread items. + + + 0 + Which tool to download enclosures. + This options determines which download tool Liferea uses to download enclosures (0 = steadyflow, 1 = gwget, 2=kget). + + + 0 + Proxy mode. + This options determines what kind of proxy will be used. + + + '' + Proxy host. + This options determines the proxy host. + + + 8080 + Proxy port. + This options determines the proxy port. + + + false + Proxy auth. + This options determines if auth is requiered. + + + '' + Proxy user. + This options determines auth username. + + + '' + Proxy password. + This options determines auth password. + + + '' + Social bookmark site + This option determines which social bookmark site use to save links. + + + false + Start in tray + This option determines if liferea should start in tray mode. + + + 0 + Width of the itemlist pane in the mainwindow + Width of the itemlist pane in the mainwindow. Use 0 to let GTK+ decide the Width. + + + false + Enable plugins + This options determines if liferea should enable plugins. + + + '' + User defined browser-font + This option defines which font should be used to render in the browser. If not specified system setting will be used. + + + + + + ['gnome-keyring','media-player'] + Active plugins + List of active plugins. It contains the "Location" of the active plugins. See the .liferea-plugin file for obtaining the "Location" of a given plugin. + + + + diff -Nru liferea-1.8.15/net.sf.liferea.gschema.xml.in liferea-1.10.3/net.sf.liferea.gschema.xml.in --- liferea-1.8.15/net.sf.liferea.gschema.xml.in 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/net.sf.liferea.gschema.xml.in 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,245 @@ + + + + + + false + Open links inside of Liferea? + If set to true, links clicked will be opened inside of Liferea, otherwise they will be opened in the selected external browser. + + + 1 + Selects which key to use to pagedown or go to the next unread item + Selects which key to use to pagedown or go to the next unread item. Set to 0 to use space, 1 to use ctrl-space, or 2 to use alt-space. + + + 'mozilla %s' + Selects the browser command to use when browser_module is set to manual + Selects the browser command to use when browser_module is set to manual. + + + 'gnome' + Selects which browser to use to open external links + Selects which browser to use to open external links. The choices include "gnome", "mozilla", "firefox", "netscape", "opera", "konqueror", and "manual". + + + 0 + Location of position to open up the link in the selected browser + Selects the location in the browser to open up the link. Use 0 for the browser's default, 1 for in an existing window, 2 for in a new window, and 3 for in a new tab. + + + 0 + The default view mode for feed list nodes. + The default view mode for displaying feed list nodes. Possible values: 0=email like 3-pane, 1=wide view 3-pane, 2=combined view 2-pane + + + 0 + Default interval for fetching feeds. + This value specifies how often Liferea tries to update feeds. The value is given in minutes. When setting the interval always consider the traffic it produces. Setting a value less than 15min almost never makes sense. + + + false + Allows to disable Javascript. + Allows to disable Javascript. + + + false + Disable displaying the toolbar in the Liferea main window + Disable displaying the toolbar in the Liferea main window. + + + true + Try to refetch feeds after network errors? + If set to true, and a network error is encountered while fetching a feed, Liferea will do a few more tries. This is useful in case of temporary loss of network/internet connection. + + + 0 + Height of the itemlist pane in the mainwindow + Height of the itemlist pane in the mainwindow. Use 0 to let GTK+ decide the height. + + + false + Enables condensed mode + Set to true to make Liferea use condensed mode or false to make Liferea use the three pane mode. + + + 0 + Width of the feedlist pane in the mainwindow + Width of the feedlist pane in the mainwindow. Use 0 to let GTK+ decide the width. + + + 0 + Height of the Liferea main window + Height of the Liferea main window. Use 0 to let GTK+ decide on the height. + + + false + Mainwindow is maximized when Liferea starts up + Determines if the Liferea main window will be maximized at startup. + + + 0 + Width of the Liferea main window + Width of the Liferea main window. Use 0 to let GTK+ decide on the width. + + + 0 + Left position of the Liferea main window + Left position of the Liferea main window. + + + 0 + Top position of the Liferea main window + Top position of the Liferea main window. + + + 0 + Last saved stat of the Liferea main window + Last saved of the Liferea main window. Controls how Liferea shows the window on next startup. Possible values see src/ui/liferea_shell.h + + + 100 + Zoom level of the HTML view + Zoom level of the HTML view. (100 = 1:1) + + + '' + Node id of the last feed list selection + When shutting down Liferea saves the last selected node id here to be restored on startup. + + + 0 + Item id of the last item list selection + When shutting down Liferea saves the last selected item id here to be restored on startup. + + + 100 + Determines the default number of items saved on each feed + This value is used to determine how many items are saved in each feed when Liferea exits. Note that marked items are always saved. + + + false + Display popup window advertising new items as they are downloaded + Display popup window advertising new items as they are downloaded. + + + 0 + Determines if subscriptions are to be updated at startup + Numeric value determines whether Liferea shall updates all subscriptions at startup (0=yes, otherwise=no). Inverse logic for compatibility reasons. + + + '' + Determines the style of the toolbar buttons + Determines the style of the toolbar buttons locally, overriding the GNOME settings. Valid values are "both", "both-horiz", "icons", and "text". If empty or not specified, the GNOME settings are used. + + + true + Determines if the system tray icon is to be shown + Determines if the system tray icon is to be shown + + + false + Determines if the number of new items is shown in the system tray icon + Determines if the number of new items is shown in the system tray icon + + + false + Determines if minimize to tray is not desired + Determines if minimize to tray is not desired. This is relevant when the user clicks the close button or presses the window close hotkey of the window manager. If this option is disabled Liferea will just hide the window and keep running. If the option is enabled the application will terminate. + + + 3 + Number of update threads used in downloading + Number of threads used to download feeds and web objects in Liferea. An additional thread is created that only services 'interactive' requests (for example when a user manually selects a feed to update). + + + 0 + Placement of the mini popup window + The placement of the mini popup window that is opened to notify the user of new items. The popup window is positioned at one of the desktop borders (1 = upper left, 2 = upper right, 3 = lower right, 4 = lower left). + + + 1 + Determine if folders show all child content. + If set to 0 no items are displayed when selecting a folder. If set to 1 all items of all childs are displayed when selecting a folder. + + + true + Filter read items when displaying folders. + If this option is enabled and folder-display-mode is not 0 when clicking a folder only the unread items of all childs will be displayed. + + + false + Filter feeds without unread items from feed list. + If this option is enabled the feed list will contain only feeds that have unread items. + + + 0 + Which tool to download enclosures. + This options determines which download tool Liferea uses to download enclosures (0 = steadyflow, 1 = gwget, 2=kget). + + + 0 + Proxy mode. + This options determines what kind of proxy will be used. + + + '' + Proxy host. + This options determines the proxy host. + + + 8080 + Proxy port. + This options determines the proxy port. + + + false + Proxy auth. + This options determines if auth is requiered. + + + '' + Proxy user. + This options determines auth username. + + + '' + Proxy password. + This options determines auth password. + + + '' + Social bookmark site + This option determines which social bookmark site use to save links. + + + false + Start in tray + This option determines if liferea should start in tray mode. + + + 0 + Width of the itemlist pane in the mainwindow + Width of the itemlist pane in the mainwindow. Use 0 to let GTK+ decide the Width. + + + false + Enable plugins + This options determines if liferea should enable plugins. + + + '' + User defined browser-font + This option defines which font should be used to render in the browser. If not specified system setting will be used. + + + + + + ['gnome-keyring','media-player'] + Active plugins + List of active plugins. It contains the "Location" of the active plugins. See the .liferea-plugin file for obtaining the "Location" of a given plugin. + + + + diff -Nru liferea-1.8.15/opml/feedlist_bg.opml liferea-1.10.3/opml/feedlist_bg.opml --- liferea-1.8.15/opml/feedlist_bg.opml 2013-04-28 22:47:08.000000000 +0200 +++ liferea-1.10.3/opml/feedlist_bg.opml 2013-06-24 22:46:14.000000000 +0200 @@ -19,7 +19,7 @@ - + diff -Nru liferea-1.8.15/opml/feedlist_ca.opml liferea-1.10.3/opml/feedlist_ca.opml --- liferea-1.8.15/opml/feedlist_ca.opml 2013-04-28 22:47:08.000000000 +0200 +++ liferea-1.10.3/opml/feedlist_ca.opml 2013-06-24 22:46:14.000000000 +0200 @@ -24,7 +24,7 @@ - + diff -Nru liferea-1.8.15/opml/feedlist_de.opml liferea-1.10.3/opml/feedlist_de.opml --- liferea-1.8.15/opml/feedlist_de.opml 2012-12-11 17:10:00.000000000 +0100 +++ liferea-1.10.3/opml/feedlist_de.opml 2013-06-24 22:46:14.000000000 +0200 @@ -26,7 +26,7 @@ - + diff -Nru liferea-1.8.15/opml/feedlist_en.opml liferea-1.10.3/opml/feedlist_en.opml --- liferea-1.8.15/opml/feedlist_en.opml 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/opml/feedlist_en.opml 2013-07-31 23:29:12.000000000 +0200 @@ -13,13 +13,17 @@ - + - + + + - + + + diff -Nru liferea-1.8.15/opml/feedlist_es.opml liferea-1.10.3/opml/feedlist_es.opml --- liferea-1.8.15/opml/feedlist_es.opml 2012-12-11 17:10:00.000000000 +0100 +++ liferea-1.10.3/opml/feedlist_es.opml 2013-06-24 22:46:14.000000000 +0200 @@ -21,7 +21,7 @@ - + diff -Nru liferea-1.8.15/opml/feedlist_eu.opml liferea-1.10.3/opml/feedlist_eu.opml --- liferea-1.8.15/opml/feedlist_eu.opml 2013-04-28 22:47:08.000000000 +0200 +++ liferea-1.10.3/opml/feedlist_eu.opml 2013-06-24 22:46:14.000000000 +0200 @@ -24,7 +24,7 @@ - + diff -Nru liferea-1.8.15/opml/feedlist_fr.opml liferea-1.10.3/opml/feedlist_fr.opml --- liferea-1.8.15/opml/feedlist_fr.opml 2013-04-28 22:47:08.000000000 +0200 +++ liferea-1.10.3/opml/feedlist_fr.opml 2013-06-24 22:46:14.000000000 +0200 @@ -24,7 +24,7 @@ - + diff -Nru liferea-1.8.15/opml/feedlist_gl.opml liferea-1.10.3/opml/feedlist_gl.opml --- liferea-1.8.15/opml/feedlist_gl.opml 2013-04-28 22:47:08.000000000 +0200 +++ liferea-1.10.3/opml/feedlist_gl.opml 2013-06-24 22:46:14.000000000 +0200 @@ -19,7 +19,7 @@ - + diff -Nru liferea-1.8.15/opml/feedlist_he.opml liferea-1.10.3/opml/feedlist_he.opml --- liferea-1.8.15/opml/feedlist_he.opml 2012-12-11 17:10:00.000000000 +0100 +++ liferea-1.10.3/opml/feedlist_he.opml 2013-06-24 22:46:14.000000000 +0200 @@ -35,7 +35,7 @@ - + diff -Nru liferea-1.8.15/opml/feedlist_hu.opml liferea-1.10.3/opml/feedlist_hu.opml --- liferea-1.8.15/opml/feedlist_hu.opml 2013-04-28 22:47:08.000000000 +0200 +++ liferea-1.10.3/opml/feedlist_hu.opml 2013-06-24 22:46:14.000000000 +0200 @@ -13,7 +13,7 @@ - + diff -Nru liferea-1.8.15/opml/feedlist_it.opml liferea-1.10.3/opml/feedlist_it.opml --- liferea-1.8.15/opml/feedlist_it.opml 2013-04-28 22:47:08.000000000 +0200 +++ liferea-1.10.3/opml/feedlist_it.opml 2013-09-27 11:07:18.000000000 +0200 @@ -6,14 +6,15 @@ - + + - - + + + - @@ -24,7 +25,7 @@ - + diff -Nru liferea-1.8.15/opml/feedlist_nl.opml liferea-1.10.3/opml/feedlist_nl.opml --- liferea-1.8.15/opml/feedlist_nl.opml 2013-04-28 22:47:08.000000000 +0200 +++ liferea-1.10.3/opml/feedlist_nl.opml 2013-06-24 22:46:14.000000000 +0200 @@ -13,7 +13,7 @@ - + diff -Nru liferea-1.8.15/opml/feedlist_pl.opml liferea-1.10.3/opml/feedlist_pl.opml --- liferea-1.8.15/opml/feedlist_pl.opml 2012-12-11 17:10:00.000000000 +0100 +++ liferea-1.10.3/opml/feedlist_pl.opml 2013-06-24 22:46:14.000000000 +0200 @@ -20,7 +20,7 @@ - + diff -Nru liferea-1.8.15/opml/feedlist_pt_BR.opml liferea-1.10.3/opml/feedlist_pt_BR.opml --- liferea-1.8.15/opml/feedlist_pt_BR.opml 2012-12-11 17:10:00.000000000 +0100 +++ liferea-1.10.3/opml/feedlist_pt_BR.opml 2013-06-24 22:46:14.000000000 +0200 @@ -18,7 +18,7 @@ - + diff -Nru liferea-1.8.15/opml/feedlist_pt.opml liferea-1.10.3/opml/feedlist_pt.opml --- liferea-1.8.15/opml/feedlist_pt.opml 2013-04-28 22:47:08.000000000 +0200 +++ liferea-1.10.3/opml/feedlist_pt.opml 2013-06-24 22:46:14.000000000 +0200 @@ -31,7 +31,7 @@ - + diff -Nru liferea-1.8.15/opml/feedlist_sk.opml liferea-1.10.3/opml/feedlist_sk.opml --- liferea-1.8.15/opml/feedlist_sk.opml 2012-12-11 17:10:00.000000000 +0100 +++ liferea-1.10.3/opml/feedlist_sk.opml 2013-06-24 22:46:14.000000000 +0200 @@ -15,7 +15,7 @@ - + diff -Nru liferea-1.8.15/opml/feedlist_sv.opml liferea-1.10.3/opml/feedlist_sv.opml --- liferea-1.8.15/opml/feedlist_sv.opml 2012-12-11 17:10:00.000000000 +0100 +++ liferea-1.10.3/opml/feedlist_sv.opml 2013-06-24 22:46:14.000000000 +0200 @@ -22,7 +22,7 @@ - + diff -Nru liferea-1.8.15/opml/Makefile.in liferea-1.10.3/opml/Makefile.in --- liferea-1.8.15/opml/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/opml/Makefile.in 2013-10-08 20:14:31.000000000 +0200 @@ -111,13 +111,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -133,6 +132,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -179,8 +186,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -209,6 +214,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -Nru liferea-1.8.15/pixmaps/16x16/Makefile.in liferea-1.10.3/pixmaps/16x16/Makefile.in --- liferea-1.8.15/pixmaps/16x16/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/pixmaps/16x16/Makefile.in 2013-10-08 20:14:31.000000000 +0200 @@ -111,13 +111,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -133,6 +132,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -179,8 +186,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -209,6 +214,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -Nru liferea-1.8.15/pixmaps/22x22/Makefile.in liferea-1.10.3/pixmaps/22x22/Makefile.in --- liferea-1.8.15/pixmaps/22x22/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/pixmaps/22x22/Makefile.in 2013-10-08 20:14:31.000000000 +0200 @@ -111,13 +111,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -133,6 +132,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -179,8 +186,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -209,6 +214,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -Nru liferea-1.8.15/pixmaps/24x24/Makefile.in liferea-1.10.3/pixmaps/24x24/Makefile.in --- liferea-1.8.15/pixmaps/24x24/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/pixmaps/24x24/Makefile.in 2013-10-08 20:14:31.000000000 +0200 @@ -111,13 +111,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -133,6 +132,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -179,8 +186,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -209,6 +214,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -Nru liferea-1.8.15/pixmaps/32x32/Makefile.in liferea-1.10.3/pixmaps/32x32/Makefile.in --- liferea-1.8.15/pixmaps/32x32/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/pixmaps/32x32/Makefile.in 2013-10-08 20:14:31.000000000 +0200 @@ -111,13 +111,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -133,6 +132,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -179,8 +186,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -209,6 +214,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -Nru liferea-1.8.15/pixmaps/48x48/Makefile.in liferea-1.10.3/pixmaps/48x48/Makefile.in --- liferea-1.8.15/pixmaps/48x48/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/pixmaps/48x48/Makefile.in 2013-10-08 20:14:31.000000000 +0200 @@ -111,13 +111,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -133,6 +132,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -179,8 +186,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -209,6 +214,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -Nru liferea-1.8.15/pixmaps/AUTHORS liferea-1.10.3/pixmaps/AUTHORS --- liferea-1.8.15/pixmaps/AUTHORS 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/pixmaps/AUTHORS 2013-07-31 23:29:12.000000000 +0200 @@ -1,9 +1,9 @@ The authorship or origin of the included images: default.png taken from feedicons.com (Matt Brett http://feedicons.com) -folder_empty.png derived from default.png (Lars Lindner ) +folder_empty.png derived from default.png (Lars Windolf ) -empty.png, modified GNOME stock icons (Lars Lindner ) +empty.png, modified GNOME stock icons (Lars Windolf ) vfolder.png directory.png, copy of GNOME stock icons @@ -13,7 +13,7 @@ liferea.png (news-reader-48.png) Jakub Steiner fl_opml.png OPML icon (Chris Pirillo ) -newsbin.png created for Liferea, Lars Lindner +newsbin.png created for Liferea, Lars Windolf 16x16/liferea.png, 22x22/liferea.png, 24x24/liferea.png, 32x32/liferea.png, 48x48/liferea.png and scalable/liferea.svg: Jeff Fortin , diff -Nru liferea-1.8.15/pixmaps/Makefile.in liferea-1.10.3/pixmaps/Makefile.in --- liferea-1.8.15/pixmaps/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/pixmaps/Makefile.in 2013-10-08 20:14:31.000000000 +0200 @@ -151,13 +151,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -173,6 +172,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -219,8 +226,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -249,6 +254,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -Nru liferea-1.8.15/pixmaps/scalable/Makefile.in liferea-1.10.3/pixmaps/scalable/Makefile.in --- liferea-1.8.15/pixmaps/scalable/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/pixmaps/scalable/Makefile.in 2013-10-08 20:14:31.000000000 +0200 @@ -111,13 +111,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -133,6 +132,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -179,8 +186,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -209,6 +214,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -Nru liferea-1.8.15/plugins/gnome-keyring.plugin liferea-1.10.3/plugins/gnome-keyring.plugin --- liferea-1.8.15/plugins/gnome-keyring.plugin 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/plugins/gnome-keyring.plugin 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,11 @@ +[Plugin] +Module=gnome-keyring +Loader=python +IAge=2 +Name=GNOME Keyring Support +Description=Allow Liferea to use GNOME keyring as password store +Authors=Lars Windolf +Copyright=Copyright © 2012 Lars Windolf +Website=http://liferea.sf.net +Help=http://liferea.sf.net + diff -Nru liferea-1.8.15/plugins/gnome-keyring.py liferea-1.10.3/plugins/gnome-keyring.py --- liferea-1.8.15/plugins/gnome-keyring.py 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/plugins/gnome-keyring.py 2013-08-11 19:05:16.000000000 +0200 @@ -0,0 +1,65 @@ +from gi.repository import GObject +from gi.repository import Peas +from gi.repository import PeasGtk +from gi.repository import Gtk +from gi.repository import Liferea +from gi.repository import GnomeKeyring + +class GnomeKeyringPlugin(GObject.Object, Liferea.AuthActivatable): + __gtype_name__ = 'GnomeKeyringPlugin' + + object = GObject.property(type=GObject.Object) + + def do_activate(self): + GnomeKeyring.unlock_sync("liferea", None) + # + # Dump all passwords for debugging: + # + #print "=== dump list on activate" + #(result, ids) = GnomeKeyring.list_item_ids_sync("liferea") + #for id in ids: + # (result, item) = GnomeKeyring.item_get_info_sync("liferea", id) + # if result != GnomeKeyring.Result.OK: + # print '%s is locked!' % (id) + # else: + # print '%s = %s' % (item.get_display_name(), item.get_secret()) + # self.attrs = GnomeKeyring.Attribute.list_new() + # result = GnomeKeyring.item_get_attributes_sync("liferea", id, self.attrs) + # for attr in GnomeKeyring.Attribute.list_to_glist(self.attrs): + # print ' %s => %s ' % (attr.name, attr.get_string()) + #print "=== dump list end" + + def do_deactivate(self): + window = self.object + + def do_query(self, id): + # Fetch secret by id + attrs = GnomeKeyring.Attribute.list_new() + GnomeKeyring.Attribute.list_append_string(attrs, 'id', id) + result, value = GnomeKeyring.find_items_sync(GnomeKeyring.ItemType.GENERIC_SECRET, attrs) + if result != GnomeKeyring.Result.OK: + return + + #print 'password %s = %s' % (id, value[0].secret) + #print 'password id = %s' % value[0].item_id + + username, password = value[0].secret.split('@@@') + Liferea.auth_info_from_store(id, username, password) + + def do_delete(self, id): + keyring = GnomeKeyring.get_default_keyring_sync()[1] + GnomeKeyring.item_delete_sync(keyring, id) + + def do_store(self, id, username, password): + GnomeKeyring.create_sync("liferea", None) + attrs = GnomeKeyring.Attribute.list_new() + GnomeKeyring.Attribute.list_append_string(attrs, 'id', id) + GnomeKeyring.Attribute.list_append_string(attrs, 'user', username) + GnomeKeyring.item_create_sync("liferea", GnomeKeyring.ItemType.GENERIC_SECRET, repr(id), attrs, '@@@'.join([username, password]), True) + +#class GnomeKeyringConfigurable(GObject.Object, PeasGtk.Configurable): +# __gtype_name__ = 'GnomeKeyringConfigurable' +# +# def do_create_configure_widget(self): +# return Gtk.Label.new("GNOME Keyring configure widget") + diff -Nru liferea-1.8.15/plugins/media-player.plugin liferea-1.10.3/plugins/media-player.plugin --- liferea-1.8.15/plugins/media-player.plugin 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/plugins/media-player.plugin 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,11 @@ +[Plugin] +Module=media-player +Loader=python +IAge=2 +Name=Media Player +Description=Play music and videos directly from Liferea +Authors=Lars Windolf +Copyright=Copyright © 2012 Lars Windolf +Website=http://liferea.sf.net +Help=http://liferea.sf.net + diff -Nru liferea-1.8.15/plugins/media-player.py liferea-1.10.3/plugins/media-player.py --- liferea-1.8.15/plugins/media-player.py 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/plugins/media-player.py 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,232 @@ +# Make code still work under Python 2.6/2.7 +from __future__ import print_function, division + +from gi.repository import GObject +from gi.repository import Peas +from gi.repository import PeasGtk +from gi.repository import GLib +from gi.repository import Gtk +from gi.repository import Liferea +from gi.repository import Gst + +# FIXME: Upgrade to 0.11 +#import gi +#gi.require_version('Gst', '0.11') +#from gi.repository import Gst + +class MediaPlayerPlugin(GObject.Object, Liferea.MediaPlayerActivatable): + __gtype_name__ = 'MediaPlayerPlugin' + + object = GObject.property(type=GObject.Object) + + def __init__(self): + Gst.init_check(None) + self.IS_GST010 = Gst.version() < (0, 11) + + playbin = "playbin2" if self.IS_GST010 else "playbin" + self.player = Gst.ElementFactory.make(playbin, "player") + if not self.IS_GST010: + fakesink = Gst.ElementFactory.make("fakesink", "fakesink") + self.player.set_property("video-sink", fakesink) + bus = self.player.get_bus() + bus.add_signal_watch() + bus.connect("message::eos", self.on_eos) + bus.connect("message::error", self.on_error) + self.player.connect("about-to-finish", self.on_finished) + + self.moving_slider = False + + def on_error(self, bus, message): + self.player.set_state(Gst.State.NULL) + err, debug = message.parse_error() + print("Error: %s" % err, debug) + self.playing = False + self.updateButtons() + + def on_eos(self, bus, message): + self.player.set_state(Gst.State.NULL) + self.playing = False + self.updateButtons() + + def on_finished(self, player): + self.playing = False + self.slider.set_value(0) + self.set_label(0) + self.updateButtons() + + def play(self): + uri = Liferea.enclosure_get_url(self.enclosures[self.pos]) + self.player.set_property("uri", uri) + self.player.set_state(Gst.State.PLAYING) + Liferea.ItemView.select_enclosure(self.pos) + GObject.timeout_add(1000, self.updateSlider) + + def stop(self): + self.player.set_state(Gst.State.NULL) + + def playToggled(self, w): + self.slider.set_value(0) + self.set_label(0) + + if(self.playing == False): + self.play() + else: + self.stop() + + self.playing=not(self.playing) + self.updateButtons() + + def next(self, w): + self.stop() + self.pos+=1 + self.play() + self.updateButtons() + + def prev(self, w): + self.stop() + self.pos-=1 + self.play() + self.updateButtons() + + def set_label(self, position): + format = "%d:%02d" + if self.moving_slider: + format = "%s" % format + self.label.set_markup (format % (position / 60, position % 60)) + + def get_player_position(self): + """Get the GStreamer player's position in nanoseconds""" + try: + if self.IS_GST010: + return self.player.query_position(Gst.Format.TIME)[2] + else: + return self.player.query_position(Gst.Format.TIME)[1] + except Exception as e: + # pipeline must not be ready and does not know position + print(e) + return 0 + + def get_player_duration(self): + """Get the GStreamer player's duration in nanoseconds""" + try: + if self.IS_GST010: + return self.player.query_duration(Gst.Format.TIME)[2] + else: + return self.player.query_duration(Gst.Format.TIME)[1] + except Exception as e: + # pipeline must not be ready and does not know position + print(e) + return 0 + + def updateSlider(self): + if not self.playing or self.moving_slider: + return False # cancel timeout + + duration = self.get_player_duration() / Gst.SECOND + position = self.get_player_position() / Gst.SECOND + self.slider.set_range(0, duration) + self.slider.set_value(position) + self.set_label(position) + + return True + + def updateButtons(self): + Gtk.Widget.set_sensitive(self.prevButton, (self.pos != 0)) + Gtk.Widget.set_sensitive(self.nextButton, (len(self.enclosures) - 1 > self.pos)) + + if(self.playing == False): + self.playButtonImage.set_from_stock("gtk-media-play", Gtk.IconSize.BUTTON) + else: + self.playButtonImage.set_from_stock("gtk-media-stop", Gtk.IconSize.BUTTON) + + def on_slider_change_value(self, widget, scroll, value): + self.set_label(value) + self.move_to_nanosecs = value * Gst.SECOND + + return False + + def on_slider_button_press(self, widget, event): + self.moving_slider = True + + def on_slider_button_release(self, widget, event): + self.moving_slider = False + + # Stop when moving slider to very near the end + end_cutoff = self.get_player_duration() - Gst.SECOND + if self.move_to_nanosecs > end_cutoff and self.playing: + self.playToggled(None) + else: + self.player.seek_simple(Gst.Format.TIME, + Gst.SeekFlags.FLUSH | + Gst.SeekFlags.KEY_UNIT, + self.move_to_nanosecs) + + + def do_load(self, parentWidget, enclosures): + if parentWidget == None: + print("ERROR: Could not find media player insertion widget!") + + # Test whether Media Player widget already exists + childList = Gtk.Container.get_children(parentWidget) + + if len(childList) == 1: + # We need to add a media player... + vbox = Gtk.Box(Gtk.Orientation.HORIZONTAL, 0) + vbox.set_margin_top(3) + vbox.set_margin_bottom(3) + Gtk.Box.pack_start(parentWidget, vbox, True, True, 0); + + image = Gtk.Image() + image.set_from_stock("gtk-media-previous", Gtk.IconSize.BUTTON) + self.prevButton = Gtk.Button.new() + self.prevButton.add(image) + self.prevButton.connect("clicked", self.prev) + Gtk.Box.pack_start(vbox, self.prevButton, False, False, 0) + + self.playButtonImage = Gtk.Image() + self.playButtonImage.set_from_stock("gtk-media-play", Gtk.IconSize.BUTTON) + self.playButton = Gtk.Button.new() + self.playButton.add(self.playButtonImage) + self.playButton.connect("clicked", self.playToggled) + Gtk.Box.pack_start(vbox, self.playButton, False, False, 0) + + image = Gtk.Image() + image.set_from_stock("gtk-media-next", Gtk.IconSize.BUTTON) + self.nextButton = Gtk.Button.new() + self.nextButton.add(image) + self.nextButton.connect("clicked", self.next) + Gtk.Box.pack_start(vbox, self.nextButton, False, False, 0) + + self.slider = Gtk.Scale(orientation = Gtk.Orientation.HORIZONTAL) + self.slider.set_margin_left(6) + self.slider.set_margin_right(6) + self.slider.set_draw_value(False) + self.slider.set_range(0, 100) + self.slider.set_increments(1, 10) + self.slider.connect("change-value", self.on_slider_change_value) + self.slider.connect("button-press-event", + self.on_slider_button_press) + self.slider.connect("button-release-event", + self.on_slider_button_release) + + Gtk.Box.pack_start(vbox, self.slider, True, True, 0) + + self.label = Gtk.Label() + self.set_label(0) + self.label.set_margin_left(6) + self.label.set_margin_right(6) + Gtk.Box.pack_start(vbox, self.label, False, False, 0) + + Gtk.Widget.show_all(vbox) + + self.enclosures = enclosures + self.pos = 0 + self.player.set_state(Gst.State.NULL) # FIXME: Make this configurable? + self.on_finished(self.player) + + #def do_activate(self): + #print("=== MediaPlayer activate") + + def do_deactivate(self): + window = self.object + diff -Nru liferea-1.8.15/po/ar.po liferea-1.10.3/po/ar.po --- liferea-1.8.15/po/ar.po 2013-06-24 22:16:14.000000000 +0200 +++ liferea-1.10.3/po/ar.po 2013-07-31 23:29:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: liferea_trunk_ar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2010-08-12 11:22+0300\n" "Last-Translator: Khaled Hosny \n" "Language-Team: Arabic \n" @@ -18,8 +18,7 @@ "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" "X-Generator: Virtaal 0.6.1\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "لايفريا" @@ -34,8 +33,8 @@ msgstr "قارئ التلقيمات لايفريا" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "نزّل واعرض التلقيمات" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -143,38 +142,26 @@ msgstr "المنشيء" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "شارة" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "علامة" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "تعليقات" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "لا تعليقات حتى الآن." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "التعليقات" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "يجري تحديث..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "حدِّث" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "القسم" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "المصلحة" @@ -198,12 +185,12 @@ msgid "Default Browser" msgstr "المتصفح المبدئي" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "فشل أمر المتصفح: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "يبدأ: \"%s\"" @@ -213,7 +200,7 @@ msgid "Authorization Error" msgstr "خطأ في الاستيثاق" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "تعذّر إنشاء مجلّد المخبئية \"%s\"!" @@ -243,72 +230,78 @@ msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "\"%s\" ليس ملف إعداد أنواع مغلّفات سليم!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "فشل تنزيل المغلّف: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "انتهى تنزيل المغلّف: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "خطأ أثناء إعادة تسمية %s إلى %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "خطأ XML أثناء قراءة ملف OPML! تعذّر استيراد \"%s\"!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "مستند فارغ! يجب ألا يكون مستند OPML \"%s\" فارغا أثناء التصدير." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "‏\"%s\" ليس مستند OPML صالحاً! لا يستطيع لايفريا استيراد هذا الملف!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "قائمة التلقيمات المستوردة" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "استورد قائمة التلقيمات" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "استورد" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 msgid "OPML Files" msgstr "ملفات OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "خطأ أثناء تصدير قائمة التلقيمات!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "صُدّرت قائمة التلقيمات!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "صدّر قائمة التلقيمات" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "صدّر" @@ -364,111 +357,100 @@ msgstr "تعذّر تحديد نوع التلقيمة." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "لا توجد عناصر غير مقروءة " -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" msgstr "" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "STATE" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "Add a new subscription" msgstr "أضف اشتراكا جديدا" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "" -#: ../src/main.c:187 +#: ../src/main.c:173 msgid "Print debugging messages for the configuration handling" msgstr "" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "" -#: ../src/main.c:196 +#: ../src/main.c:182 msgid "Print debugging messages of the search folder matching" msgstr "" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "" # ARABEYES: keep the html code, this is # intentional -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "

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

    " -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "للمزيد من المعلومات، طالع http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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 "" -"تستخدم هذه الإصدارة من لايفرريا نسق خبيئة جديدة وقد نقلت خبيئة تلقيماتك إلى " -"النسق الجديد. لم يحذف محتوى الخبيئة من %s تلقائيا. من فضلك احذف هذا الدليل " -"يدويا عندما تتأكد من نجاح النقل." +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "للمزيد من المعلومات، طالع http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -636,71 +618,71 @@ msgid "Feed title" msgstr "عنوان التلقيمة" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "يجري تحديث الاشتراك \"%s\" بالفعل!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "أُوقِف الاشتراك \"%s\". لن يقوم لايفريا بالتحديث بعد الآن!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "يجري تحديث أيقونة \"%s\"" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." 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:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "يجري تحديث \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "خطأ أثناء فتح الملف المؤقّت %s لاستخدامه في الترشيح!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "خرج %s بالحالة %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "خطأ: تعذّر فتح الأنبوب \"%s\"" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "خطأ: تعذّر فتح الملف \"%s\"" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "خطأ: ليس ثمّة ملف \"%s\"" @@ -709,59 +691,57 @@ msgid "New Search Folder" msgstr "مجلّد بحث جديد" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[كان هناك المزيد من الأخطاء. بُتِر الخرْج]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "محلّل XML: لا يمكن تحليل المستند:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "مرفقات" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "لا مرفقات" -msgstr[1] "مُرفق واحد" -msgstr[2] "مُرفقين" -msgstr[3] "%d مُرفقات" -msgstr[4] "%d مُرفقا" -msgstr[5] "%d مُرفق" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " بايت" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "ك.بايت" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "م.ب" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "ج.بايت" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "لا مرفقات" +msgstr[1] "مُرفق واحد" +msgstr[2] "مُرفقين" +msgstr[3] "%d مُرفقات" +msgstr[4] "%d مُرفقا" +msgstr[5] "%d مُرفق" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "اختر ملفا" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, fuzzy, c-format msgid "File Extension .%s" msgstr "امتداد الملف .%s" @@ -771,7 +751,7 @@ msgid "Couldn't find pixmap file: %s" msgstr "تعذّر العثور على ملف الصورة: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" @@ -782,7 +762,7 @@ msgstr[4] " (%d جديدا)" msgstr[5] " (%d جديد)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" @@ -793,338 +773,376 @@ msgstr[4] "%d غير مقروء%s" msgstr[5] "%d غير مقروء%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "مواضيع المساعدة" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "مرجع سريع" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "أسئلة شائعة" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "الآن لايفريا متّصل" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "اعمل دون اتّصال" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "الآن لايفريا غير متّصل" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "اعمل باتّصال" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "الا_شتراكات" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "حدّث ال_كل" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "حدّث كل الاشتراكات." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "علّم الكل _مقروء" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "علّم كل عنصر في كل اشتراك مقروء." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "ا_ستورد قائمة التلقيمات..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "استورد قائمة تلقيمات OPML." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_صدّر قائمة التلقيمات..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "يصدّر قائمة التلقيمات كـ OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "ا_خرج" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_تلقيم" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "احذف _كل العناصر" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "يحذف كل عناصر التلقيمات المُحددة حالياً." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_عنصر" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "العنصر غير المقروء ال_تالي" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "العنصر غير المقروء ال_تالي" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_عرض" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "زِ_د حجم النص" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "يزيد حجم النص عند عرض العنصر." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_قلل حجم النص" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "يقلل حجم النص عند عرض العنصر." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "أ_دوات" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "_مراقب التحديثات" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "اعرض قائمة بكل التلقيمات الموجودة حاليا في طابور التحديث" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "ال_تفضيلات" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "حرّر التفضيلات." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "_بحث" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "ابحث في كل التلقيمات..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "اعرض حوار البحث." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_مساعدة" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "الم_حتويات" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "اعرض مساعدة هذا التطبيق." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "مرجع _سريع" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "اعرض قائمة بكل اختصارات لايفريا." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "أ_سئلة شائعة" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "اعرض الأسئلة الشائعة عن التطبيق." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_عن" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "اعرض حوار عن." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "المنظور ال_عادي" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "اضبط نمط العرض كنمط عميل البريد." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "منظور _عريض" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "اضبط نمط العرض ليستخدم ثلاث ألواح رأسيّة." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "منظور مركّ_ب" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "اضبط نمط العرض إلى نمط اللوحين." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "_ضُم قائمة التلقيمات" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "أخفِ التلقيمات التي لا تحتوي عناصر غير مقروءة." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "اشتراك _جديد..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "أضِف اشتراك إلى قائمة التلقيمات." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "_مجلّد جديد..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "أضِف مجلّد إلى قائمة التلقيمات." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "مجلّد _بحث جديد..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "أضِف مجلّد بحث جديد إلى قائمة التلقيمات." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "م_صدر جديد..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "أضِف مصدر قائمة تلقيمات جديد." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "_سلّة أخبار جديدة..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "أضِف سلّة أخبار جديدة." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "_علّم العناصر مقروءة" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "علّم كل عناصر الاشتراك المحدد مقروءة." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_حدّث" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "يُحدّث الاشتراك المُحدد أو كل الاشتراكات في المجلّد المُحدد." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "ال_خصائص" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "يفتح حوار خصائص الاشتراك المحدد." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "ا_حذف" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "يحذف الاشتراك المحدد." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "بدّل حالة ال_قراءة" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "تبدّل حالة قراءة العناصر المحددة." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "بدّل _شارة العنصر" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "تبدّل حالة شارة العنصر المحدد." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "أ_زل" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "يحذف العنصر المحدد." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "يفتح وصله العنصر في المتصفّح المعدّ." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "ا_فتح في المتصفح" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." msgstr "يفتح وصله العنصر في المتصفّح المعدّ." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "إعدادات المتصفّخ الخارجي" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." +msgstr "يفتح وصله العنصر في المتصفّح المعدّ." + +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "ا_عمل دون اتّصال" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "يسمح لك هذا الخيار بتعطيل تحديث الاشتراك." +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + # ARABEYES: keep the html code, this is # intentional -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "

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

    " -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 #, fuzzy msgid "" "

    Welcome to Liferea, a desktop news aggregator for online news " @@ -1138,12 +1156,12 @@ "الاشتراكات -> اشتراك جديد. لتصفّح العناوين الرئيسية لتلقيمة اخترها في قائمة " "التلقيمات وستحمّل العناوين الرئيسية في اللوح الأيمن.

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "أدخل اسم المستخدم وكلمة السر لـ \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "مصدر مجهول" @@ -1173,250 +1191,251 @@ msgid "Liferea is in offline mode. No update possible." msgstr "لايفريا في وضع دون اتصال. لا يمكن التحديث." -#: ../src/ui/liferea_htmlview.c:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "فشل تنزيل المغلّف: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 +#: ../src/ui/liferea_htmlview.c:627 #, fuzzy -msgid "Download finished." -msgstr "_نزّل باستخدام" - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +msgid "Open Link In _Tab" msgstr "افتح الوصلة في _لسان" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "ا_فتح الوصلة في المتصفّح" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "ا_فتح الوصلة في المتصفّح" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "_علّم الوصلة في %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "ا_نسخ موقع الوصلة" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 #, fuzzy msgid "_Copy Image Location" msgstr "ا_نسخ موقع الوصلة" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 #, fuzzy msgid "S_ave Link As" msgstr "احفظ ك‍..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "ا_شترك..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** بلا عنوان ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "التاريخ" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "عنوان رئيسي" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "لم تختر أية عناصر" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "لا وصلة محددة لهذا العنصر!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "يجب أن تختار تلقيمة لحذف عناصرها!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "افتح العنصر في _لسان" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "ا_فتح العنصر في المتصفّح" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "انسخ لسلّة الأخبار" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "انسخ _عنوان العنصر إلى الحافظة" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "_علّم الوصلة في %s" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "ا_نسخ موقع الوصلة" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "أ_زل العنصر" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "افتح مغلّفا..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "احفظ ك‍..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "انسخ موقع الوصلة" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "_حدّث الكل" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "أ_ظهر لايفريا" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "_حدّث المجلّد" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "_علّم الكل مقروء" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_جديد" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "اشتراك _جديد..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "م_صدر جديد..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 msgid "Sort Feeds" msgstr "رتّب التلقيمات" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "اشتراك _جديد..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(فارغ)" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "افتراضي جنوم" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "نص تحت الأيقونات" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "نص بجانب الأيقونات" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "أيقونات فقط" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "نص فقط" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "دقائق" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "ساعات" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "أيّام" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "مسافة" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Space" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Space" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "اختر دليل التنزيل" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "المنظور ال_عادي" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "منظور _عريض" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "منظور مركّ_ب" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "يدوي" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "افتراضي المتصفح" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "نافذة موجودة" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "نافذة جديدة" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "لسان جديد" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 #, fuzzy msgid "Terminate instead of minimizing to the messaging menu" msgstr "أ_نهِ بدلا من التصغير إلى أيقونة اللوحة." -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "النوع" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "البرنامج" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "(فارغ)" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1433,7 +1452,7 @@ msgid "This feed specifies no default update interval." msgstr "لا تُحدِّد هذه التلقيمة فترة تحديث افتراضيّة." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "بدون عنوان" @@ -1500,7 +1519,7 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1510,11 +1529,11 @@ msgid "Google Reader login failed!" msgstr "فشل الولوج إلى قارئ جوجل!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "قارئ جوجل" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1547,22 +1566,15 @@ msgid "No feed list source types found!" msgstr "لم يُعثر على أنواع مصادر قائمة التلقيمات!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:269 msgid "Source Type" msgstr "نوع المصدر" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 #, fuzzy msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " @@ -1572,7 +1584,7 @@ "يتكامل مع قائمة تلقيمات حسابك في قارئ جوجل. سيعرض لايفريا اشتراكات قارئ " "جوجل وسيزامن قائمة التلقيمات مع قائمة قراءة جوجل." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1645,8 +1657,7 @@ msgid "Please enter your Google Reader account settings." msgstr "من فضلِك أدخل اعدادات حسابك في قارئ جوجل." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_كلمة السر" @@ -1670,7 +1681,7 @@ msgid "combined view" msgstr "المنظور المركّب" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "رؤوس العناوين" @@ -1722,7 +1733,7 @@ msgstr "عام" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 #, fuzzy msgid "Feed Source" msgstr "مصدر التلقيمة" @@ -1837,484 +1848,548 @@ msgstr "متقدّم" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "تفضيلات لايفريا" +msgid "New Folder" +msgstr "مجلّد جديد" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "ا_سم المجلّد:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "_عدد العناصر الافتراضي لحفظة في كل تلقيمة:" +msgid "Rename" +msgstr "أعِد التسمية" #: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "تحديث التلقيمة" +msgid "_New Name:" +msgstr "اسم _جديد:" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "ح_دّث كل الاشتراكات عند بدء التشغيل." +msgid "Search Folder Properties" +msgstr "خصائص مجلّد البحث" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "_فترة تحديث التلقيمات الافتراضيّة:" +msgid "Search _Name:" +msgstr "ا_سم البحث:" + +#: ../glade/liferea.ui.h:54 +#, fuzzy +msgid "Find Items that meet the following criteria" +msgstr "ابحث عن العناصر التي تُطابق هذه المعايير" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"ملحوظة: من فضلك تذكّر أن تضبط فترة تحديث معقولة. سحب التحديثات أكثر من مرّة " -"كل ساعة مضيعة للتحميل." +msgid "A_ny Rule Matches" +msgstr "أي _قاعدة تطابق" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "التلقيمات" +msgid "_All Rules Must Match" +msgstr "_كل القواعد يجب أن تطابق" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "إعدادات عرض المجلّد" +msgid "Open Enclosure" +msgstr "افتح مغلّفا..." #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "أ_ظهر العناصر لكل التلقيمات الإبنة عند اختيار مجلّد." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "يجريِ تنزيل مغلّف من نوع:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "أ_خفِ العناصر المقروءة." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"ماذا يجب على لايفريا عمله مع هذا المغلّف؟ من فضلك أدخل الأمر الذي تريد تنفيذه " +"بأسفل. سيكون الملف معطى لهذا الأمر:" #: ../glade/liferea.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "أيقونات التلقيمات (Favicons)" +msgid "_Browse" +msgstr "_تصفّح" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_حدّث كل الأيقونات الآن" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "ا_فعل هذا تلقائيا مع المغلّفات مثل هذا من الآن فصاعداَ." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "المجلّدات" +msgid "Search All Feeds" +msgstr "ابحث في كل التلقيمات" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "رؤوس العناوين لم تقرأ" +msgid "_Search for:" +msgstr "ا_بحث عن:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "_تصفّع عبر المقالات باستخدام:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "أدخل نص بحث ليبحث عنه ليعثر عليه لايفريا في عنصر أو مُحتواه." #: ../glade/liferea.ui.h:65 -#, fuzzy -msgid "Web Integration" -msgstr "الاتّجاه" +msgid "_Advanced..." +msgstr "_متقدّم..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "ا_نشر العلامات في" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"يبدأ البحث عن النصّ المحدد في كل التلقيمات. ستظهر نتيجة البحث في قائمة " +"العناصر." #: ../glade/liferea.ui.h:67 -#, fuzzy -msgid "Internal Browser Settings" -msgstr "إعدادات المتصفّح الداخلي" +msgid "Update Monitor" +msgstr "مراقب التحديثات" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "افتح الوصلات في _نافذة لايفريا." +#, fuzzy +msgid "Pending Requests" +msgstr "الطلبات المنتظرة" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_عطّل جافاسكريبت." +#, fuzzy +msgid "Downloading Now" +msgstr "يجريِ التنزيل الآن" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "_فعّل ملحقات المتصفح." +msgid "Cancel _All" +msgstr "ألغِ ال_كل" #: ../glade/liferea.ui.h:71 +msgid "Create News Bin" +msgstr "أنشئ سلّة أخبار" + +#: ../glade/liferea.ui.h:72 +msgid "_News Bin Name:" +msgstr "اسم سلّة الأ_خبار:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "عن" + +#: ../glade/liferea.ui.h:74 +#, fuzzy +msgid "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" +"حقوق النشر © 2003-2011\n" +"فريق لايفريا\n" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "لايفريا هو مُجمِّع أخبار لجتك+" + +# ARABEYES: keep the html code, this is +# intentional +#: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "صفحة لايفريا" + +#: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "بحث متقدّم" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "ا_بحث في المجلّد..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "أنشئ تلقيمة محرّك بحث" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "ادخل أي عبارة بحث ترغب فيها" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "ال_عدد الأقصى من عناصر الناتج:" + +#: ../glade/liferea.ui.h:84 +#, 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 "" +"ملحوظة: سيوّلد لايفريا اشتراك تلقيم سيستخدم للاستعلام عن نتائج محرّك البحث " +"لعبارة البحث المحدّدة. يمكنك إبقاء هذه التلقيمة وتحديثها كأي اشتراك آخر. " + +#: ../glade/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "تنزيل / معالجة بعديّة" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "اختيار المصدر" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "اختر نوع المصدر الذي ترغب بإضافته..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "أضِف OPML/Planet" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "من فضلك حدّد ملفا محلّيا أو مسارا لقائمة تلقيمات OPML سليمة." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "ال_مكان" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "ا_ختر ملفا" + +#: ../glade/ttrss_source.ui.h:1 +#, fuzzy +msgid "Add Tiny Tiny RSS Account" +msgstr "أضِف حساب Bloglines" + +#: ../glade/ttrss_source.ui.h:2 +#, fuzzy +msgid "Please enter your tt-rss account settings." +msgstr "من فضلِك أدخل اعدادات حسابك في Bloglines." + +#: ../glade/ttrss_source.ui.h:3 +#, fuzzy +msgid "_Server URL" +msgstr "خطأ خادوم" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "ا_سم المستخدم" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "متقدّم..." + +#: ../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 "" +"أدخِل موقع وب لتستخدم الاكتشاف التلقائي أو -في حال إذا كنت تعرفه- موقع " +"التلقيمة بالتحديد." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "تفضيلات لايفريا" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "_عدد العناصر الافتراضي لحفظة في كل تلقيمة:" + +#: ../glade/prefs.ui.h:4 +#, fuzzy +msgid "Feed Update Settings" +msgstr "تحديث التلقيمة" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "ح_دّث كل الاشتراكات عند بدء التشغيل." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "_فترة تحديث التلقيمات الافتراضيّة:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"ملحوظة: من فضلك تذكّر أن تضبط فترة تحديث معقولة. سحب التحديثات أكثر من مرّة " +"كل ساعة مضيعة للتحميل." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "التلقيمات" + +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "إعدادات عرض المجلّد" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "أ_ظهر العناصر لكل التلقيمات الإبنة عند اختيار مجلّد." + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "أ_خفِ العناصر المقروءة." + +#: ../glade/prefs.ui.h:13 +#, fuzzy +msgid "Feed Icons (Favicons)" +msgstr "أيقونات التلقيمات (Favicons)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_حدّث كل الأيقونات الآن" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "المجلّدات" + +#: ../glade/prefs.ui.h:16 +#, fuzzy +msgid "Reading Headlines" +msgstr "رؤوس العناوين لم تقرأ" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "_تصفّع عبر المقالات باستخدام:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +#, fuzzy +msgid "Web Integration" +msgstr "الاتّجاه" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "ا_نشر العلامات في" + +#: ../glade/prefs.ui.h:22 +#, fuzzy +msgid "Internal Browser Settings" +msgstr "إعدادات المتصفّح الداخلي" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "افتح الوصلات في _نافذة لايفريا." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_عطّل جافاسكريبت." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "_فعّل ملحقات المتصفح." + +#: ../glade/prefs.ui.h:26 #, fuzzy msgid "External Browser Settings" msgstr "إعدادات المتصفّخ الخارجي" -#: ../glade/liferea.ui.h:72 +#: ../glade/prefs.ui.h:27 msgid "_Open link in:" msgstr "ا_فتح الوصلة في:" -#: ../glade/liferea.ui.h:74 +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "يدوي" + +#: ../glade/prefs.ui.h:30 #, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" +msgid "(%s for URL)" msgstr "" -"_يدوي:\n" -"(%s للمسار)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "ال_متصفح:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "المتصفح" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 #, fuzzy msgid "Notification Settings" msgstr "إعدادات التنبيه" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "اعرض نافذة _منبثقة مع العناوين الرئيسية الجديدة." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "اعرض أ_يقونة حالة في منطقة التنبيه (لوح النظام)." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "اعرض _عدد العناصر الجديدة في أيقونة اللوحة." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "أ_نهِ بدلا من التصغير إلى أيقونة اللوحة." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "ابدأ _كأيقونة في اللوحة." -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 #, fuzzy msgid "Toolbar Settings" msgstr "عناوين أ_زرار شريط الأدوات:" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "أخفِ _شريط الأدوات." -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "عناوين أ_زرار شريط الأدوات:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "الواجهة" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "_تعرف آلي (جنوم أو البيئة)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "_لا وسيط" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "إعدادات _يدويّة:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "م_نفذ الوسيط:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "_مضيف الوسيط:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "استخدم استيثاق ال_وسيط" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "_كلمة سرّ الوسيط:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "اسم م_ستخدم الوسيط:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "الوسيط" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 #, fuzzy msgid "Downloading Enclosures" msgstr "تنزيل المغلّفات" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_تصفّح" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "ا_حفظ التنزيلات في" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_نزّل باستخدام" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 #, fuzzy msgid "Opening Enclosures" msgstr "افتح مغلّفا..." -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "المغلّفات" -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "زومنت مع مستضيف قريب" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_فعّل كل مزامنة الشبكة المحلية" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "اسم ال_خدمة" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "زامن" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "مجلّد جديد" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "ا_سم المجلّد:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "أعِد التسمية" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "اسم _جديد:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "خصائص مجلّد البحث" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "ا_سم البحث:" - -#: ../glade/liferea.ui.h:115 -#, fuzzy -msgid "Find Items that meet the following criteria" -msgstr "ابحث عن العناصر التي تُطابق هذه المعايير" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "أي _قاعدة تطابق" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "_كل القواعد يجب أن تطابق" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "تنزيل المغلّفات" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "يجريِ تنزيل مغلّف من نوع:" - -#: ../glade/liferea.ui.h:120 -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.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_مرر المسار ولا تُنزّل المغلف." - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "ا_فعل هذا تلقائيا مع المغلّفات مثل هذا من الآن فصاعداَ." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "ابحث في كل التلقيمات" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "ا_بحث عن:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "أدخل نص بحث ليبحث عنه ليعثر عليه لايفريا في عنصر أو مُحتواه." - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "_متقدّم..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -"يبدأ البحث عن النصّ المحدد في كل التلقيمات. ستظهر نتيجة البحث في قائمة " -"العناصر." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "مراقب التحديثات" -#: ../glade/liferea.ui.h:129 -#, fuzzy -msgid "Pending Requests" -msgstr "الطلبات المنتظرة" +#~ msgid "Download and view feeds" +#~ msgstr "نزّل واعرض التلقيمات" -#: ../glade/liferea.ui.h:130 -#, fuzzy -msgid "Downloading Now" -msgstr "يجريِ التنزيل الآن" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "ألغِ ال_كل" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "أنشئ سلّة أخبار" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "اسم سلّة الأ_خبار:" +#~ msgid "You may want to validate the feed using" +#~ msgstr "ربما تريد التأكد من سلامة التلقيمة باستخدام" -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "عن" +#~ msgid "Launch Item In _Tab" +#~ msgstr "افتح العنصر في _لسان" -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"حقوق النشر © 2003-2012\n" -"فريق لايفريا\n" +#~ msgid "_Launch Item In Browser" +#~ msgstr "ا_فتح العنصر في المتصفّح" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "لايفريا هو مُجمِّع أخبار لجتك+" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "انسخ _عنوان العنصر إلى الحافظة" -# ARABEYES: keep the html code, this is -# intentional -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "صفحة لايفريا" +#~ msgid "flag" +#~ msgstr "شارة" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "بحث متقدّم" +#~ msgid "bookmark" +#~ msgstr "علامة" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "ا_بحث في المجلّد..." +#~ msgid "comments" +#~ msgstr "تعليقات" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "أنشئ تلقيمة محرّك بحث" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "فشل تنزيل المغلّف: \"%s\"" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "ادخل أي عبارة بحث ترغب فيها" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "انتهى تنزيل المغلّف: \"%s\"" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "ال_عدد الأقصى من عناصر الناتج:" +#~ 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 "" +#~ "تستخدم هذه الإصدارة من لايفرريا نسق خبيئة جديدة وقد نقلت خبيئة تلقيماتك " +#~ "إلى النسق الجديد. لم يحذف محتوى الخبيئة من %s تلقائيا. من فضلك احذف هذا " +#~ "الدليل يدويا عندما تتأكد من نجاح النقل." -#: ../glade/liferea.ui.h:145 #, 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 "" -"ملحوظة: سيوّلد لايفريا اشتراك تلقيم سيستخدم للاستعلام عن نتائج محرّك البحث " -"لعبارة البحث المحدّدة. يمكنك إبقاء هذه التلقيمة وتحديثها كأي اشتراك آخر. " +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "فشل تنزيل المغلّف: \"%s\"" -#: ../glade/new_subscription.ui.h:9 #, fuzzy -msgid "Download / Postprocessing" -msgstr "تنزيل / معالجة بعديّة" - -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "اختيار المصدر" - -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "اختر نوع المصدر الذي ترغب بإضافته..." - -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "أضِف OPML/Planet" - -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "من فضلك حدّد ملفا محلّيا أو مسارا لقائمة تلقيمات OPML سليمة." +#~ msgid "Download finished." +#~ msgstr "_نزّل باستخدام" -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "ال_مكان" +#~ msgid "Choose download directory" +#~ msgstr "اختر دليل التنزيل" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "ا_ختر ملفا" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_يدوي:\n" +#~ "(%s للمسار)" -#: ../glade/ttrss_source.ui.h:1 -#, fuzzy -msgid "Add Tiny Tiny RSS Account" -msgstr "أضِف حساب Bloglines" +#~ msgid "_Save downloads in" +#~ msgstr "ا_حفظ التنزيلات في" -#: ../glade/ttrss_source.ui.h:2 #, fuzzy -msgid "Please enter your tt-rss account settings." -msgstr "من فضلِك أدخل اعدادات حسابك في Bloglines." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "زومنت مع مستضيف قريب" -#: ../glade/ttrss_source.ui.h:3 -#, fuzzy -msgid "_Server URL" -msgstr "خطأ خادوم" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "_فعّل كل مزامنة الشبكة المحلية" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "ا_سم المستخدم" +#~ msgid "_Service Name" +#~ msgstr "اسم ال_خدمة" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"أدخِل موقع وب لتستخدم الاكتشاف التلقائي أو -في حال إذا كنت تعرفه- موقع " -"التلقيمة بالتحديد." +#~ msgid "Sync" +#~ msgstr "زامن" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "متقدّم..." +#~ msgid "Downloading Enclosure" +#~ msgstr "تنزيل المغلّفات" -#~ msgid "You may want to validate the feed using" -#~ msgstr "ربما تريد التأكد من سلامة التلقيمة باستخدام" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "_مرر المسار ولا تُنزّل المغلف." #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " diff -Nru liferea-1.8.15/po/ast.po liferea-1.10.3/po/ast.po --- liferea-1.8.15/po/ast.po 2013-06-24 22:16:14.000000000 +0200 +++ liferea-1.10.3/po/ast.po 2013-07-31 23:29:12.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: liferea 1.8-rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-04-27 14:08+0300\n" "PO-Revision-Date: 2013-03-31 17:15+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian \n" @@ -18,8 +18,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Poedit-Language: Asturian\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -32,8 +31,8 @@ msgstr "Liferea, llector de noticies" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Baxar y ver noticies" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -141,38 +140,26 @@ msgstr "Creador" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "etiqueta" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "marcador" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "comentarios" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Entá nun hai comentarios." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Comentarios" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Anovando..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Anovar" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Seición" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Departamentu" @@ -196,12 +183,12 @@ msgid "Default Browser" msgstr "Restolador predefiníu" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Falló al llanzar el restolador: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Aniciando: \"%s\"" @@ -211,7 +198,7 @@ msgid "Authorization Error" msgstr "Fallu n'autorización" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "¡Nun pudo criase'l direutoriu d'almacenamientu \"%s\"!" @@ -241,73 +228,79 @@ msgid "%b %d %Y" msgstr "%b %d %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "\"%s\" nun ye un ficheru de configuración d'axuntos válidu" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Falló la descarga del axuntu: «%s»" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Completóse la baxada del axuntu: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Fallu al renomar %s a %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "XML erróneu nel documentu OPML «%s». Nun foi dable importalu." -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "El documentu OPML \"%s\", que se quería importar, taba vacíu." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "\"%s\" nun ye un documentu OPML válidu. Liferea nun pudo importar el ficheru." -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Llista de canales importaos" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importar llista de canales" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importar" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 msgid "OPML Files" msgstr "Ficheros OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Ocurrió un fallu mientres s'esportaba la llista de canales." -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "La llista de canales esportóse con ésitu." -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Esportar llista de canales" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Esportar" @@ -363,11 +356,11 @@ msgstr "Nun pudo determinase la triba de la canal." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "Nun hai artículos ensin lleer " -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" @@ -376,108 +369,96 @@ "p'amosala, «iconified» pa dexala na estaya de notificación, o «hidden» " "p'anubrila" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "ESTÁU" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Amosar información de la versión y colar" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "Add a new subscription" msgstr "Amestar una nueva soscripción" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "uri" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Amosar tolos mensaxes de depuración" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "" "Amosar mensaxes de depuración tocante a remanar l'área d'almacenamientu" -#: ../src/main.c:187 +#: ../src/main.c:173 msgid "Print debugging messages for the configuration handling" msgstr "Amosar mensaxes de depuración tocante a la configuración" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "Amosar mensaxes de depuración tocante a la base de datos" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "" "Amosar mensaxes de depuración tocante toles funciones de la interface gráfica" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" "Activa la depuración de la xeneración de HTML. Cada vegada que Liferea " -"xenere HTML atroxarálo en ~/.liferea_1.8/output.xhtml" +"xenere HTML atroxarálo en ~/.cache/liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "Amosar mensaxes de depuración tocante a los accesos a la rede" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "" "Amosar mensaxes de depuración tocante a toles funciones de procesamientu" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" "Amosar mensaxes de depuración cuando una función allánciase más de la cuenta" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Amosar mensaxes de depuración al entrar y colar de funciones" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "" "Amosar mensaxes de depuración tocante al procesu d'anovamientu de canales" -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr "" "Amosar mensaxes de depuración tocante a remanar l'área d'almacenamientu" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Amosar información estra nos mensaxes de depuración" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "Amosar mensaxes de depuración tocante al tema especificáu" -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, llector de noticies pa Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "Pa más información, visita http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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 "" -"Esta versión de Liferea usa un formatu nuevu d'almacenamientu y treslladó a " -"ésti lo que s'atroxara anteriormente. El conteníu del almacén anterior (en " -"%s) nun se desanició automáticamente. Por favor, desanicia talu direutoriu " -"de mou manual tres d'asegurate que l'anovamientu foi correutu." +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Pa más información, visita http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -646,23 +627,23 @@ msgid "Feed title" msgstr "El títulu de la canal" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "La canal \"%s\" yá ta anovándose!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "La canal \"%s\" yá nun esiste. Liferea nun volverá a anovala." -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Anovando'l iconu de \"%s\"" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -670,48 +651,48 @@ "Atopóse un problema al lleer la canal. Por favor, comprueba la URL y la " "salida na consola." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "La URL de \"%s\" camudó permanentemente y foi anovada" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "\"%s\" Abandonóse. Liferea yá nun va anovala." -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "El conteníu de \"%s\" nun camudó dende'l caberu anovamientu" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Anovando: \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Prodúxose un fallu al abrir el ficheru temporal %s pal filtráu" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s finóse col estáu %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Nun pudo abrise la tubería \"%s\"" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Fallu: Nun pudo abrise'l ficheru \"%s\"" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Fallu: Nun esiste'l ficheru \"%s\"" @@ -720,55 +701,53 @@ msgid "New Search Folder" msgstr "Nueva carpeta de gueta" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Hai más fallos. ¡La salida truncóse!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "XML Parser: Nun pudo procesase'l documentu:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Axuntos" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d axuntu" -msgstr[1] "%d axuntos" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " Bytes" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d axuntu" +msgstr[1] "%d axuntos" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Escoyer Ficheru" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "Estensión de ficheru .%s" @@ -778,286 +757,295 @@ msgid "Couldn't find pixmap file: %s" msgstr "Nun pudo atopase la imaxe: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d nuevu)" msgstr[1] " (%d nuevos)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d non lleíu%s" msgstr[1] "%d non lleíos%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Temes d'aida" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Manual de referencia" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "FAQ" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea ta coneutáu" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Trabayar ensin conexón" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea ta ensin conexón" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Trabayar coneutáu" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Soscripciones" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "_Anovar toes" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Anova toles soscripciones" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Conseñar _too como lleío" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Conseña como lleíos tolos artículos de toles soscripciones." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Importar llista de canales..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importa una llista de canales en formatu OPML." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Esportar llista de canales..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Esporta la llista de canales en formatu OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Colar" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Canal" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Desanici_ar tolos elementos" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Desaniciar tolos artículos de la canal seleccionada." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_Elementu" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "Siguiente artículu _nuevu" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "Siguiente artículu _nuevu" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Ver" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "_Aumentar el tamañu del testu" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Aumenta'l tamañu del testu na vista del artículu." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_Amenorgar el tamañu del testu" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Amenorga'l tamañu del testu de la vista del artículu" -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "_Ferramientes" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "Monitor d'anovamiento_s" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "Amosar llista de tolos canales con anovamientos pendientes" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Preferencies" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Editar Preferencies." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "Gu_etar" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Guetar en toles canales..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Amosar el ventanu de gueta." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "A_ida" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Conteníos" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Amosa aida pa esta aplicación." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Referencia rápida" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Amosar toles combinaciones de tecles de Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_FAQ" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Amosar les entrugues más frecuentes (FAQ) del programa." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_Tocante a" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Amosar el ventanu Tocante a." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "_Vista normal" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Visualiza en mou veceru de corréu." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "_Vista enantada" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Afita la visualización usando tres paneles verticales." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "Vista _combinada" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Afita la visualización usando dos paneles." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "Llista de canales _amenorgada" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Anubrir los canales ensin artículos nuevos" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "_Nueva soscripción..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Axuntar una soscripción a la llista de canales." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Nueva _carpeta..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Axuntar una carpeta a la llista de canales." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Nueva carpeta de _gueta..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Axuntar una carpeta de gueta a la llista de canales." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Nueva _fonte..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Axuntar una nueva fonte de llistes de canales." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "Nueva ban_dexa..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Axuntar una nueva bandexa de noticies." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "_Conseñar artículos lleíos" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "" "Conseña como lleíos tolos artículos de la canal esbillada o, nel casu d'una " "carpeta de tolos sos canales." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Anovar" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." @@ -1065,67 +1053,96 @@ "Anovar la canal seleicionáu o, nel casu d'una carpeta, tolos canales que " "caltenga." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "_Propiedaes" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Abre'l cuadru de propiedaes de la canal esbillada." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "D_esaniciar" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Desaniciar la canal esbillada." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "_Camudar ente lleíu y non lleíu" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Pasa'l artículu actual de lleíu a non lleíu o viceversa." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Asignar o quitar _etiqueta" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Crea o desanicia una etiqueta nel artículu seleccionáu." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "D_esaniciar" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Desaniciar l'artículu esbilláu." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Abre l'enllaz del artículu nel restolador." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "_Abrir nel restolador" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." msgstr "Abre l'enllaz del artículu nel restolador." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Opciones del restolador esternu" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." +msgstr "Abre l'enllaz del artículu nel restolador." + +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "Trabayar ensin conexón" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Esta opción permite deshabilitar l'anovamientu de soscripciones." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea, llector de noticies Linux" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 msgid "" "

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

    You can add new subscriptions

    • From main menu " @@ -1139,12 +1156,12 @@ "feeds dientro de la llista de soscripciones
    • Calcando col botón " "derechu y esbillando 'Soscribir' con Liferea

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Escribi'l nome d'usuariu y la contraseña pa \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Fonte desconocida" @@ -1174,248 +1191,250 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea ta trabayando ensin conexón. Nun pueden anovase les fontes" -#: ../src/ui/liferea_htmlview.c:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Falló la descarga: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "Descarga finada." - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +#: ../src/ui/liferea_htmlview.c:627 +#, fuzzy +msgid "Open Link In _Tab" msgstr "Abrir l'enllaz nuna lli_ngüeta nueva" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "Abrir l'enllaz n_el restolador" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "Abrir l'enllaz n_el restolador" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "Crear un marcador del enllaz en %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Copiar direición del enllaz" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 msgid "_Copy Image Location" msgstr "_Copiar direición de la imaxe" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 msgid "S_ave Link As" msgstr "Guardar enllaz c_omo" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "G_uarda imaxe como" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Soscribise..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Ensin títulu ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Data" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Titular" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Nun se seleicionó dengún artículu" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "¡Esti artículu nun tien un enllaz asignáu!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "¡Seleiciona una canal pa desaniciar los sos artículos!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Abrir l'artículu nuna llingü_eta nueva" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "Abrir l'artículu nel restolador" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "Copiar a una bandexa" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Copiar la _URL del artículu al cartafueyos" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "Crear un marcador del enllaz en %s" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "_Copiar direición de la imaxe" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "_Desaniciar artículu" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Abrir axuntu..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Guardar como..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "_Copiar la direición del enllaz" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "_Anovar too" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "_Amosar Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "_Anovar Carpeta" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "_Conseñar toos como lleíos" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_Nueva" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "Nueva _soscripción" -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "Nueva f_onte..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 msgid "Sort Feeds" msgstr "Ordenar canales" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "_Nueva soscripción..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "Predetermináu de Gnome" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Testu embaxo de los iconos" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Testu xunto a los iconos" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Namái iconos" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Namái testu" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minutos" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "hores" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "díes" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Espaciu" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Espaciu" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Espaciu" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Escueyi'l direutoriu de descarga" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "_Vista normal" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "_Vista enantada" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "Vista _combinada" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:505 msgid "Manual" msgstr "Manual" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:520 msgid "Browser default" msgstr "Restolador predetermináu" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:523 msgid "Existing window" msgstr "Ventana esistente" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:526 msgid "New window" msgstr "Nueva ventana" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:529 msgid "New tab" msgstr "Nueva llingüeta" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:688 #, fuzzy msgid "Integrate with the messaging menu (indicator)" msgstr "Aniciar amenorgáu nel menú mensaxería" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:691 #, fuzzy msgid "Terminate instead of minimizing to the messaging menu" msgstr "Finar, _en llugar de minimizar na estaya de notificación." -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:694 msgid "Start minimized to the messaging menu" msgstr "Aniciar amenorgáu nel menú mensaxería" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:794 msgid "Type" msgstr "Triba" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:797 msgid "Program" msgstr "Programa" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1428,7 +1447,7 @@ msgid "This feed specifies no default update interval." msgstr "Esta canal nun especifica un intervalu d'anovamientos predetermináu." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "" @@ -1479,7 +1498,7 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1489,11 +1508,11 @@ msgid "Google Reader login failed!" msgstr "Falló l'accesu a Google Reader" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Llector Google" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1527,22 +1546,15 @@ msgid "No feed list source types found!" msgstr "Nun s'atoparon tribes de fontes de llistes de canales." -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:269 msgid "Source Type" msgstr "Triba de fonte" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:367 msgid "Tiny Tiny RSS" msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:368 #, fuzzy msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " @@ -1553,7 +1565,7 @@ "presentará la soscripción a Google Reader como un subárbol na llista de " "canales y la caltendrala sincronizada." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:111 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1622,8 +1634,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Por favor escribi los datos de la to cuenta de Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "Cont_raseña" @@ -1647,7 +1658,7 @@ msgid "combined view" msgstr "vista combinada" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Titulares" @@ -1699,7 +1710,7 @@ msgstr "Xeneral" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Orixe de la canal" @@ -1817,486 +1828,548 @@ msgstr "Avanzáu" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Preferencies" +msgid "New Folder" +msgstr "Nueva carpeta" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "_Nome de la carpeta:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "_Númberu d'artículos de cada canal que van atroxase:" +msgid "Rename" +msgstr "Renomar" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "Axustes d'anovamientu de canal" +msgid "_New Name:" +msgstr "_Nuevu nome:" #: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Anova toles soscripciones" +msgid "Search Folder Properties" +msgstr "Propiedaes de la carpeta de gueta" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "_Intervalu d'anovamientu predetermináu" +msgid "Search _Name:" +msgstr "Guetar _Nome:" + +#: ../glade/liferea.ui.h:54 +#, fuzzy +msgid "Find Items that meet the following criteria" +msgstr "Alcontrar artículos colos criterios siguientes" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"Nota: Por favor, usa un tiempu razonable. Guetar anovamientos más d'una " -"vez por hora ye, casi siempres, un desperdiciu d'anchu de banda." +msgid "A_ny Rule Matches" +msgstr "Cúmpl_ese cualesquier regla" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Canales" +msgid "_All Rules Must Match" +msgstr "_Cúmplense toles regles" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "Opciones de presentación de carpetes" +msgid "Open Enclosure" +msgstr "Abrir axuntu..." #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "Amo_sar los elementos de toles fontes fíes al seleicionar una carpeta." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Baxando un axuntu de triba:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "_Anubrir elementos lleíos." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"¿Qué tien de facer Liferea con esti axuntu? Escribi debaxo la orde que quies " +"executar. El nome del ficheru descargáu va usase como parámetru pa la orde:" #: ../glade/liferea.ui.h:60 -msgid "Feed Icons (Favicons)" -msgstr "Iconos de los canales (Favicons)" +msgid "_Browse" +msgstr "Restolar" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_Anovar tolos favicons agora" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "Facer lo mesmo _de mou automáticu pa esta triba de ficheros." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Carpetes" +msgid "Search All Feeds" +msgstr "Guetar en toles canales" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" -msgstr "Leendo titulares" +msgid "_Search for:" +msgstr "Términu a guetar:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "_Saltar a artículos con:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Escribi un testu. Liferea va guetalu tanto nos títulos de los artículos como " +"nos conteníos." #: ../glade/liferea.ui.h:65 -msgid "Web Integration" -msgstr "Integración web" +msgid "_Advanced..." +msgstr "_Avanzáu…" #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Unviar los marcadores a" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"Gueta'l testu especificáu en tolos canales. El resultáu aparecerá na llista " +"d'artículos." #: ../glade/liferea.ui.h:67 -msgid "Internal Browser Settings" -msgstr "Axustes del restolador internu" +msgid "Update Monitor" +msgstr "Monitor d'anovamientos" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Abrir los enllaces na ventana de Liferea." +msgid "Pending Requests" +msgstr "Solicitúes pendientes" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Desautivar JavaScript." +msgid "Downloading Now" +msgstr "Baxando agora" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "Habilitar «plugins» del restolador." +msgid "Cancel _All" +msgstr "Encaboxar _too" #: ../glade/liferea.ui.h:71 -#, fuzzy -msgid "External Browser Settings" -msgstr "Opciones del restolador esternu" +msgid "Create News Bin" +msgstr "Crea una bandexa de noticies" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "Abrir enllaz en:" +msgid "_News Bin Name:" +msgstr "_Nome de la bandexa de noticies:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Tocante a" #: ../glade/liferea.ui.h:74 -#, no-c-format msgid "" -"_Manual:\n" -"(%s for URL)" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea ye un llector de noticies pa GTK+" + +#: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "Sitiu web de Liferea" + +#: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "Gueta Avanzada" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "_Guetar carpeta..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Crear una canal de resultaos de gueta" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "escribi una cadena de testu a guetar" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "_Númberu máximu de resultaos:" + +#: ../glade/liferea.ui.h:84 +#, 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 "" -"_Manual:\n" -"(%s pa URL)" +"Nota: Liferea xenerará una canal que podrá usase pa consultar los resultaos " +"de gueta de la cadena especificada. Puedes caltener esta canal de mou " +"permanente y anovala como cualisquier otra. " + +#: ../glade/new_subscription.ui.h:9 +msgid "Download / Postprocessing" +msgstr "Baxada / Postprocesamientu" -#: ../glade/liferea.ui.h:76 +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Seleición de fonte" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Seleiciona la triba de fonte que quies amestar..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Axuntar OPML/Planeta" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"Indica un ficheru llocal o una URL qu'apunte a una llista de canales en " +"formatu OPML." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "A_llugamientu" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "_Seleicionar Ficheru" + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "Amestar cuenta de Tiny Tiny RSS" + +#: ../glade/ttrss_source.ui.h:2 +#, fuzzy +msgid "Please enter your tt-rss account settings." +msgstr "Escribi los datos de la to cuenta de Bloglines." + +#: ../glade/ttrss_source.ui.h:3 +msgid "_Server URL" +msgstr "_Sirvidor URL" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "Nome d'_usuariu" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Avanzáu..." + +#: ../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 "" +"Escribi la direición d'un sitiu web pa usar l'autodescubrimientu o, si la " +"conoces, la direición esauta de la canal." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Preferencies" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "_Númberu d'artículos de cada canal que van atroxase:" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Axustes d'anovamientu de canal" + +#: ../glade/prefs.ui.h:5 +#, fuzzy +msgid "_Update all subscriptions at startup." +msgstr "Anova toles soscripciones" + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "_Intervalu d'anovamientu predetermináu" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"Nota: Por favor, usa un tiempu razonable. Guetar anovamientos más d'una " +"vez por hora ye, casi siempres, un desperdiciu d'anchu de banda." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Canales" + +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "Opciones de presentación de carpetes" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "Amo_sar los elementos de toles fontes fíes al seleicionar una carpeta." + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "_Anubrir elementos lleíos." + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Iconos de los canales (Favicons)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Anovar tolos favicons agora" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Carpetes" + +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Leendo titulares" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "_Saltar a artículos con:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Integración web" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Unviar los marcadores a" + +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Axustes del restolador internu" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Abrir los enllaces na ventana de Liferea." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Desautivar JavaScript." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "Habilitar «plugins» del restolador." + +#: ../glade/prefs.ui.h:26 +#, fuzzy +msgid "External Browser Settings" +msgstr "Opciones del restolador esternu" + +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "Abrir enllaz en:" + +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Manual" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "" + +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "Restolador:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Restolador" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 msgid "Notification Settings" msgstr "Axustes de notificación" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Amosar una ventana emerxente al recibir nuevos elementos." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "Amosar un iconu na estaya de notificación (system tray)." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Amosar el _númberu d'elementos nuevos nel iconu de la bandexa." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "Finar, _en llugar de minimizar na estaya de notificación." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "_Aniciar na bandexa d'iconos." -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 msgid "Toolbar Settings" msgstr "Axustes de la barra de ferramientes" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "Anubrir la barra de ferramientes." -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Etiquetes de los _botones de la barra de ferramientes:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "Interfaz gráfica" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "HTTP Proxy Server" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "_Auto deteición (GNOME o entornu)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "Ensin proxy" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "Configuración _manual:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "_Puertu del proxy:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "Sirvidor proxy:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "_Identificase énte'l proxy" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "Contraseña del proxy:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "Nome d'_usuariu nel proxy:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 #, fuzzy msgid "Downloading Enclosures" msgstr "Baxando axuntos" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "Restolar" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Guardar baxaes en" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "Baxar usan_do" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 #, fuzzy msgid "Opening Enclosures" msgstr "Abrir axuntu..." -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Axuntos" -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Sincronización con equipos cercanos" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "Habilitar sincronización c_ola rede llocal" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "Nome de _serviciu" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Sincronizar" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Nueva carpeta" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Nome de la carpeta:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Renomar" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Nuevu nome:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Propiedaes de la carpeta de gueta" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "Guetar _Nome:" - -#: ../glade/liferea.ui.h:115 -#, fuzzy -msgid "Find Items that meet the following criteria" -msgstr "Alcontrar artículos colos criterios siguientes" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "Cúmpl_ese cualesquier regla" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "_Cúmplense toles regles" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Baxando axuntos" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Baxando un axuntu de triba:" - -#: ../glade/liferea.ui.h:120 -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 "" -"¿Qué tien de facer Liferea con esti axuntu? Escribi debaxo la orde que quies " -"executar. El nome del ficheru descargáu va usase como parámetru pa la orde:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Pasar URL y non descargar l'axuntu." - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "Facer lo mesmo _de mou automáticu pa esta triba de ficheros." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Guetar en toles canales" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "Términu a guetar:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -"Escribi un testu. Liferea va guetalu tanto nos títulos de los artículos como " -"nos conteníos." - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "_Avanzáu…" -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Gueta'l testu especificáu en tolos canales. El resultáu aparecerá na llista " -"d'artículos." +#~ msgid "Download and view feeds" +#~ msgstr "Baxar y ver noticies" -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Monitor d'anovamientos" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "Solicitúes pendientes" - -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "Baxando agora" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "Encaboxar _too" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Crea una bandexa de noticies" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Nome de la bandexa de noticies:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Tocante a" - -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" +#~ msgid "You may want to validate the feed using" +#~ msgstr "Seique quieras validar el feed usáu" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea ye un llector de noticies pa GTK+" +#~ msgid "bookmark" +#~ msgstr "marcador" -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Sitiu web de Liferea" +#~ msgid "comments" +#~ msgstr "comentarios" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Gueta Avanzada" +#~ msgid "flag" +#~ msgstr "etiqueta" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "_Guetar carpeta..." +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Falló la descarga del axuntu: «%s»" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Crear una canal de resultaos de gueta" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Completóse la baxada del axuntu: \"%s\"" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "escribi una cadena de testu a guetar" +#~ 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 "" +#~ "Esta versión de Liferea usa un formatu nuevu d'almacenamientu y treslladó " +#~ "a ésti lo que s'atroxara anteriormente. El conteníu del almacén anterior " +#~ "(en %s) nun se desanició automáticamente. Por favor, desanicia talu " +#~ "direutoriu de mou manual tres d'asegurate que l'anovamientu foi correutu." -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "_Númberu máximu de resultaos:" +#~ msgid "" +#~ "Jumps to the next unread item. If necessary selects the next feed with " +#~ "unread items." +#~ msgstr "" +#~ "Salta al siguiente artículu nuevu. Si fore necesario, salta a la " +#~ "siguiente canal que tenga artículos nuevos." -#: ../glade/liferea.ui.h:145 -#, 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 "" -"Nota: Liferea xenerará una canal que podrá usase pa consultar los resultaos " -"de gueta de la cadena especificada. Puedes caltener esta canal de mou " -"permanente y anovala como cualisquier otra. " +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Falló la descarga: \"%s\"" -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" -msgstr "Baxada / Postprocesamientu" +#~ msgid "Download finished." +#~ msgstr "Descarga finada." -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Seleición de fonte" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Abrir l'artículu nuna llingü_eta nueva" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Seleiciona la triba de fonte que quies amestar..." +#~ msgid "_Launch Item In Browser" +#~ msgstr "Abrir l'artículu nel restolador" -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Axuntar OPML/Planeta" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Copiar la _URL del artículu al cartafueyos" -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Indica un ficheru llocal o una URL qu'apunte a una llista de canales en " -"formatu OPML." +#~ msgid "Choose download directory" +#~ msgstr "Escueyi'l direutoriu de descarga" -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "A_llugamientu" +#~ msgid "Liferea Sync %s@%s" +#~ msgstr "Sincronización de Liferea %s@%s" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "_Seleicionar Ficheru" +#~ msgid "Downloading Enclosure" +#~ msgstr "Baxando axuntos" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "Amestar cuenta de Tiny Tiny RSS" +#~ msgid "Sync" +#~ msgstr "Sincronizar" -#: ../glade/ttrss_source.ui.h:2 #, fuzzy -msgid "Please enter your tt-rss account settings." -msgstr "Escribi los datos de la to cuenta de Bloglines." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Sincronización con equipos cercanos" -#: ../glade/ttrss_source.ui.h:3 -msgid "_Server URL" -msgstr "_Sirvidor URL" - -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "Nome d'_usuariu" - -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Escribi la direición d'un sitiu web pa usar l'autodescubrimientu o, si la " -"conoces, la direición esauta de la canal." - -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Avanzáu..." - -#~ msgid "You may want to validate the feed using" -#~ msgstr "Seique quieras validar el feed usáu" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "Habilitar sincronización c_ola rede llocal" #~ msgid "" -#~ "Jumps to the next unread item. If necessary selects the next feed with " -#~ "unread items." +#~ "_Manual:\n" +#~ "(%s for URL)" #~ msgstr "" -#~ "Salta al siguiente artículu nuevu. Si fore necesario, salta a la " -#~ "siguiente canal que tenga artículos nuevos." +#~ "_Manual:\n" +#~ "(%s pa URL)" -#~ msgid "Liferea Sync %s@%s" -#~ msgstr "Sincronización de Liferea %s@%s" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "_Pasar URL y non descargar l'axuntu." + +#~ msgid "_Save downloads in" +#~ msgstr "_Guardar baxaes en" + +#~ msgid "_Service Name" +#~ msgstr "Nome de _serviciu" #~ msgid "link cosmos" #~ msgstr "universu d'enllaces" diff -Nru liferea-1.8.15/po/be@latin.po liferea-1.10.3/po/be@latin.po --- liferea-1.8.15/po/be@latin.po 2013-06-24 22:16:14.000000000 +0200 +++ liferea-1.10.3/po/be@latin.po 2013-07-31 23:29:12.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: liferea 1.2.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2007-08-19 13:26+0300\n" "Last-Translator: \n" "Language-Team: Belarusian Latin\n" @@ -18,8 +18,7 @@ "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" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -32,8 +31,8 @@ msgstr "Hartač RSS Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Atrymvaj i ahladaj kanały RSS" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -142,38 +141,26 @@ msgstr "Stvaralnik" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "ściah" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "zakładka" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "kamentary" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Jašče niama kamentaroŭ." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Kamentary" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Aktualizacyja..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Aktualizuj" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Raździeł" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Addzieł" @@ -198,12 +185,12 @@ msgid "Default Browser" msgstr "Zmoŭčany hartač GNOME'a" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Pamyłka zahadu hartača: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Startujecca: \"%s\"" @@ -213,7 +200,7 @@ msgid "Authorization Error" msgstr "Pamyłka aŭtaryzacyi" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Niemahčyma stvaryć kataloh padručnaj pamiaci \"%s\"!" @@ -243,77 +230,83 @@ msgid "%b %d %Y" msgstr "%b %d %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "\"%s\" nie źjaŭlajecca pravilnym fajłam kanfihuracyi typu dałučeńnia!" -#: ../src/enclosure.c:274 -#, fuzzy, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Zahruzka dałučeńnia skončanaja: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Zahruzka dałučeńnia skončanaja: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Pamyłka źmieny nazvy %s na %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, fuzzy, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "" "Pamyłka XML pry čytańni padručnaha fajłu! Niemahčyma impartavać \"%s\"!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "" "Pusty dakument! Dakument OPML \"%s\" nie pavinny być pustym pry impartavańni." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "\"%s\" nie źjaŭlajecca pravilnym dakumentam OPML! Liferea nia moža " "impartavać hety fajł!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Śpis impartavanych kanałaŭ" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Impartuj śpis kanałaŭ" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Impartuj" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 #, fuzzy msgid "OPML Files" msgstr "Abiary fajł OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Pamyłka pry ekspartavańni śpisu kanałaŭ!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Śpis kanałaŭ ekspartavany!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Ekspartuj śpis kanałaŭ" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Ekspartuj" @@ -369,143 +362,131 @@ msgstr "Niemahčyma vyznačyć typ kanału." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "Nia niečytanych elementaŭ " -#: ../src/main.c:175 +#: ../src/main.c:164 #, fuzzy msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" msgstr " STAN moža być `shown', `iconified' albo `hidden'" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "" -#: ../src/main.c:179 +#: ../src/main.c:165 #, fuzzy msgid "Show version information and exit" msgstr " --version Pakažy źviestki ab versii i vyjdzi" -#: ../src/main.c:180 +#: ../src/main.c:166 #, fuzzy msgid "Add a new subscription" msgstr "Novaja padpiska" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 #, fuzzy msgid "Print debugging messages of all types" msgstr " --debug-all Pakazvaj debugavyja paviedamleńni ŭsich typaŭ" -#: ../src/main.c:186 +#: ../src/main.c:172 #, fuzzy msgid "Print debugging messages for the cache handling" msgstr "" " --debug-conf Pakazvaj debugavyja paviedamleńni dla pracy z " "kanfihuracyjaj" -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr "" " --debug-conf Pakazvaj debugavyja paviedamleńni dla pracy z " "kanfihuracyjaj" -#: ../src/main.c:188 +#: ../src/main.c:174 #, fuzzy msgid "Print debugging messages of the database handling" msgstr "" " --debug-conf Pakazvaj debugavyja paviedamleńni dla pracy z " "kanfihuracyjaj" -#: ../src/main.c:189 +#: ../src/main.c:175 #, fuzzy msgid "Print debugging messages of all GUI functions" msgstr "" " --debug-gui Pakazvaj debugavyja paviedamleńni dla ŭsich funkcyj GUI" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" -#: ../src/main.c:191 +#: ../src/main.c:177 #, fuzzy msgid "Print debugging messages of all network activity" msgstr "" " --debug-net Pakazvaj debugavyja paviedamleńni dla dostupu da sietki" -#: ../src/main.c:192 +#: ../src/main.c:178 #, fuzzy msgid "Print debugging messages of all parsing functions" msgstr "" " --debug-parsing Pakazvaj debugavyja paviedamleńni dla ŭsich funkcyj " "razboru" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" -#: ../src/main.c:194 +#: ../src/main.c:180 #, fuzzy msgid "Print debugging messages when entering/leaving functions" msgstr "" " --debug-trace Pakazvaj debugavyja paviedamleńni dla dunkcyj uvachodu/" "vychadu" -#: ../src/main.c:195 +#: ../src/main.c:181 #, fuzzy msgid "Print debugging messages of the feed update processing" msgstr "" " --debug-update Pakazvaj debugavyja paviedamleńni dla aktualizacyj kanałaŭ" -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr "" " --debug-conf Pakazvaj debugavyja paviedamleńni dla pracy z " "kanfihuracyjaj" -#: ../src/main.c:197 +#: ../src/main.c:183 #, fuzzy msgid "Print verbose debugging messages" msgstr " --debug-verbose Pakazvaj padrabiaznyja debugavyja paviedamleńni" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 #, fuzzy msgid "Print debugging messages for the given topic" msgstr "" " --debug- Pakazvaj debugavyja paviedamleńni dla peŭnaj temypamiaćciu" -#: ../src/main.c:218 +#: ../src/main.c:202 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - Čytač kanałaŭ dla Linuksa" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" -#: ../src/migrate.c:340 -#, 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 "" -"Hetaja versija Liferea vykarystoŭvaje padručnuju pamiać u novym farmacie, " -"tamu tvaje padručnyja fajły byli skanvertavanyja. Padručnyja fajły versii " -"1.2 u ~/.liferea_1.2 nie byli vydalenyja aŭtamatyčna. Vydal hety kataloh " -"samastojna, jak tolki ŭpeŭniśsia ŭ paśpiachovaści mihracyi!" - #. Some libsoup transport errors #: ../src/net.c:320 msgid "The update request was cancelled" @@ -680,24 +661,24 @@ msgid "Feed title" msgstr "Zahałovak kanału" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Padpiska \"%s\" užo była aktualizavanaja!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "" "Padpiska \"%s\" skončyła pracu. Liferea bolš nia budzie jaje aktualizoŭvać!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Aktualizacyja ikony kanału dla \"%s\"" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -705,48 +686,48 @@ "Pry čytańni hetaj padpiski ŭźnikli prablemy. Pravier adras spasyłki i " "vyjście ŭ kansoli." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "Spasyłka na \"%s\" niadaŭna źmianiłasia i była aktualizavanaja" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "\"%s\" skončyŭ pracu. Liferea bolš nia budzie aktualizoŭvać jaho!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" nie źmianiŭsia ad apošniaj aktualizacyi" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Aktualizacyja \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Pamyłka adčynieńnia časovaha fajłu %s dziela filtracyi!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s vyjšaŭ sa statusam %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Pamyłka: Niemahčyma adčynić trubu \"%s\"" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Pamyłka: Niemahčyma adčynić fajł \"%s\"" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Pamyłka: Fajł \"%s\" nie isnuje" @@ -755,57 +736,55 @@ msgid "New Search Folder" msgstr "Novy kataloh pošuku" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Byli jašče pamyłki. Vyjście abatnutaje!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "Raźbiralnik XML: Niemahčyma razabrać dakument:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 #, fuzzy msgid "Attachments" msgstr "kamentary" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Abiary fajł" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, fuzzy, c-format msgid "File Extension .%s" msgstr "Pašyreńnie fajłu .%s" @@ -815,7 +794,7 @@ msgid "Couldn't find pixmap file: %s" msgstr "Niemahčyma znajści fajł pikselnaj mapy: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" @@ -823,7 +802,7 @@ msgstr[1] " (%d novyja)" msgstr[2] " (%d novych)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" @@ -831,266 +810,275 @@ msgstr[1] "%d niepračytanyja%s" msgstr[2] "%d niepračytanych%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Temy dapamohi" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Chutki ahlad" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "Pytańni j adkazy" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea ciapier spałučany" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Pracuj adłučana" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea ciapier adłučany" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Pracuj spałučana" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Padpiski" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "Aktualizuj _usie" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 #, fuzzy msgid "Updates all subscriptions." msgstr "Novaja padpiska" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Paznač usie jak _čytanyja" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Paznačaje čytanym kožny element z kožnaje padpiski." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Impartuj śpis kanałaŭ..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Impartuje śpis kanałaŭ u farmacie OPML." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Ekspartuj śpis kanałaŭ..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Ekspartuje śpis kanałaŭ u farmacie OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Vyjdzi" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "Kanał" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Vydal _usie elementy" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Vydalaje ŭsie elementy z dziejna abranaha kanału." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_Element" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "_Nastupny niečytany element" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "_Nastupny niečytany element" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Vyhlad" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "Pa_vialič pamier tekstu" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Pavialičvaje pamier tekstu ŭ vyhladzie elementaŭ." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "Pa_mienš pamier tekstu" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Pamianšaje pamier tekstu ŭ vyhladzie elementaŭ." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "_Pryładździe" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "_Manitor aktualizacyj" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "" "Pakažy śpis usich kanałaŭ, što dziejna znachdziacca ŭ čarzie na aktualizacyju" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Nałady" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Redahuj nałady." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 #, fuzzy msgid "S_earch" msgstr "_Šukaj" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Šukaj va ŭsich kanałach..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Pakažy dyjalohavaje vakno pošuku." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Dapamoha" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Źmieściva" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Pakažy dapamohu dla hetaje aplikacyi." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Chutki ahlad" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Pakažy śpis usich skarotaŭ Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_Pytańni j adkazy" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Pakažy Pytańni j Adkazy dla hetaje aplikacyi." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_Ab prahramie" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Pakazvaje dyjalohavaje vakno sa źviestkami ab prahramie." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "_Zvyčajny vyhlad" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Vyznač režym ahladu paštovaha klijenta." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "Š_yroki vyhlad" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Vyznač režym ahladu z tryma vertykalnymi panelami." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "_Kambinavany vyhlad" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Vyznač režym ahladu z dvuma panelami." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 #, fuzzy msgid "Hide feeds with no unread items." msgstr "Nia niečytanych elementaŭ " -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "_Novaja padpiska..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Dadaje padpisku ŭ śpis kanałaŭ." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Novy _kataloh..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Dadaje kataloh u śpis kanałaŭ." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Novy kataloh _pošuku..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Dadaje novy kataloh pošuku ŭ śpis kanałaŭ." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Novaja _krynica..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Dadaje novuju krynicu śpisu kanałaŭ." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "Novy _koš navinaŭ..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Dadaje novy koš navinaŭ." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 #, fuzzy msgid "_Mark Items Read" msgstr "/_Zaznač jak pračytanaje" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 #, fuzzy msgid "" "Marks all items of the selected feed list node / in the item list as read." @@ -1098,78 +1086,107 @@ "Zaznačaje ŭsie elementy abranaje padpiski albo ŭsich padpisak abranaha " "katalohu jak pračytanyja." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Aktualizuj" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "Aktualizuje abranuju padpisku albo ŭsie padpiski z abranaha katalohu." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 #, fuzzy msgid "_Properties" msgstr "_Ułaścivaści..." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Adčyniaje dyjalohavaje vakno ŭłaścivaściaŭ dla abranaje padpiski." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "_Vydal" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Vydalaje abranuju padpisku." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Źmiani _stan pračytanaści" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Źmianiaje stan pračytanaści abranaha elementu." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Źmiani ś_ciah elementu" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Źmianiaje stan ściahu dla abranaha elementu." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "_Vydal" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Vydalaje abrany element." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Adčyniaja spasyłku elementu ŭ skanfihuravanym hartačy." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "_Adčyni ŭ hartačy" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." +msgstr "Adčyniaja spasyłku elementu ŭ skanfihuravanym hartačy." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Nałady vonkavaha hartača" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." msgstr "Adčyniaja spasyłku elementu ŭ skanfihuravanym hartačy." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "_Pracuj adłučana" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Hetaja opcyja adklučaje aktualizacyi padpisak." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Čytač kanałaŭ dla Linuksa" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 #, fuzzy msgid "" "

    Welcome to Liferea, a desktop news aggregator for online news " @@ -1184,12 +1201,12 @@ "abiary jaho ŭ spisie kanałaŭ, i tady zahałoŭki buduć pakazanyja ŭ pravaj " "paneli.

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Nieviadomaja krynica" @@ -1220,270 +1237,266 @@ 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:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Zahruzka dałučeńnia skončanaja: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 +#: ../src/ui/liferea_htmlview.c:627 #, fuzzy -msgid "Download finished." -msgstr "_Zahružaj z dapamohaj" +msgid "Open Link In _Tab" +msgstr "/Adčyni spasyłku ŭ _kartcy" -#: ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_htmlview.c:628 #, fuzzy -msgid "Launch Link In _Tab" -msgstr "/Adčyni spasyłku ŭ _kartcy" +msgid "_Open Link In Browser" +msgstr "/_Adčyni spasyłku ŭ hartačy" -#: ../src/ui/liferea_htmlview.c:545 +#: ../src/ui/liferea_htmlview.c:629 #, fuzzy -msgid "_Launch Link In Browser" +msgid "_Open Link In External Browser" msgstr "/_Adčyni spasyłku ŭ hartačy" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, fuzzy, c-format msgid "_Bookmark Link at %s" msgstr "/_Zrabi zakładku dla spasyłki na %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 #, fuzzy msgid "_Copy Link Location" msgstr "/_Skapijuj adras spasyłki" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 #, fuzzy msgid "_Copy Image Location" msgstr "/_Skapijuj adras spasyłki" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 #, fuzzy msgid "S_ave Link As" msgstr "/Zapišy jak..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 #, fuzzy msgid "_Subscribe..." msgstr "/_Padpišysia..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Biaz nazvy ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Data" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Zahałovak" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Elementy nie zaznačanyja" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Hety element nia maje akreślenaje spasyłki!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Ty pavinny abrać kanał, dla jakoha vydalić elementy!" -#: ../src/ui/popup_menu.c:116 -#, fuzzy -msgid "Launch Item In _Tab" -msgstr "/Adčyni element u _kartcy" - -#: ../src/ui/popup_menu.c:117 -#, fuzzy -msgid "_Launch Item In Browser" -msgstr "/_Adčyni element u _hartačy" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 #, fuzzy msgid "Copy to News Bin" msgstr "/Skapijuj u koš navinaŭ/%s" -#: ../src/ui/popup_menu.c:147 +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "/_Zrabi zakładku dla spasyłki na %s" + +#: ../src/ui/popup_menu.c:160 #, fuzzy -msgid "Copy Item _URL to Clipboard" -msgstr "/Skapijuj adras elementu ŭ bufer" +msgid "Copy Item _Location" +msgstr "/_Skapijuj adras spasyłki" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 #, fuzzy msgid "R_emove Item" msgstr "/_Vydal element" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 #, fuzzy msgid "Open Enclosure..." msgstr "/Adčyni dałučeńnie..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 #, fuzzy msgid "Save As..." msgstr "/Zapišy jak..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 #, fuzzy msgid "Copy Link Location" msgstr "/_Skapijuj adras spasyłki" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 #, fuzzy msgid "_Update All" msgstr "/_Aktualizuj usie" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 #, fuzzy msgid "_Show Liferea" msgstr "Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 #, fuzzy msgid "_Update Folder" msgstr "/_Aktualizuj kataloh" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 #, fuzzy msgid "_Mark All As Read" msgstr "/_Zaznač usie jak pračytanyja" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 #, fuzzy msgid "_New" msgstr "/_Novy" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 #, fuzzy msgid "New _Subscription..." msgstr "_Novaja padpiska..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 #, fuzzy msgid "New S_ource..." msgstr "Novaja _krynica..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 #, fuzzy msgid "Sort Feeds" msgstr "Impartuj śpis kanałaŭ" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "_Novaja padpiska..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "zmoŭčany dla GNOME'a" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Tekst pad ikonami" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Tekst pa bakoch ikonaŭ" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Tolki ikony" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Tolki tekst" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "chvilin" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "hadzin" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "dzion" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Prabieł" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Prabieł" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Prabieł" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Abiary kataloh dziela zahruzak" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "_Zvyčajny vyhlad" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "Š_yroki vyhlad" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "_Kambinavany vyhlad" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Admysłovy" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Zmoŭčanaje dla hartača" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Najaŭnaje vakno" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Novaje vakno" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Novaja kartka" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 #, fuzzy msgid "Terminate instead of minimizing to the messaging menu" msgstr "_Zakančvaj pracu zamiest minimizacyi ŭ ikonu traju." -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Typ" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Prahrama" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1497,7 +1510,7 @@ msgid "This feed specifies no default update interval." msgstr "Dla hetaha kanału nie akreśleny zmoŭčany intervał aktualizacyi." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "Biaz nazvy" @@ -1552,7 +1565,7 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1562,11 +1575,11 @@ msgid "Google Reader login failed!" msgstr "Pamyłka ŭruchamleńnia kontu na Google Reader'y!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 #, fuzzy msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " @@ -1602,22 +1615,15 @@ 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:269 msgid "Source Type" msgstr "Typ krynicy" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 #, fuzzy msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " @@ -1628,7 +1634,7 @@ "padpisku na Google Reader'y ŭ vyhladzie abaronienaha ad źmienaŭ dreva ŭ " "śpisie kanałaŭ." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1698,8 +1704,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Uviadzi nałady tvajho kontu na Google Reader'y." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Parol" @@ -1723,7 +1728,7 @@ msgid "combined view" msgstr "kambinavany vyhlad" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Zahałoŭki" @@ -1775,7 +1780,7 @@ msgstr "Ahulnaje" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 #, fuzzy msgid "Feed Source" msgstr "Krynica kanału" @@ -1898,493 +1903,553 @@ msgstr "Admysłovaje" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Pieravahi Liferea" +msgid "New Folder" +msgstr "Novy kataloh" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "Nazva _katalohu:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Zmoŭčanaja _kolkaść elementaŭ na kanał dziela zapisu:" +msgid "Rename" +msgstr "Pieranazavi" #: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "Aktualizacyja kanału" +msgid "_New Name:" +msgstr "_Novaja nazva:" #: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Novaja padpiska" +msgid "Search Folder Properties" +msgstr "Ułaścivaści katalohu pošuku" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Zmoŭčany _intervał aktualizacyi kanału:" +#, fuzzy +msgid "Search _Name:" +msgstr "_Nazva kanału:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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." +msgid "A_ny Rule Matches" msgstr "" -"Uvaha: Kali łaska, nie zabudźsia akreślić sensoŭny termin pamiž " -"aktualizacyjami. Zvyčajna apytvańnie kanałaŭ čaściej za raz na hadzinu " -"źjaŭlajecca marnavańniem trafiku." #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Kanały" +msgid "_All Rules Must Match" +msgstr "" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "Nałady pakazu katalohaŭ" +msgid "Open Enclosure" +msgstr "/Adčyni dałučeńnie..." #: ../glade/liferea.ui.h:58 -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." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Zahruzka dałučeńnia typu:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "_Schavaj pračytanyja elementy." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"Š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.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Ikony kanałaŭ" +msgid "_Browse" +msgstr "_Ahladaj" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_Aktualizuj zaraz usie ikony kanałaŭ" +#, 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.ui.h:62 -msgid "Folders" -msgstr "Katalohi" +msgid "Search All Feeds" +msgstr "Šukaj va ŭsich kanałach" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "niečytanyja zahałoŭki" +msgid "_Search for:" +msgstr "_Šukaj:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "_Pierachodź pa artykułach z:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Uviadzi radok pošuku, jaki Liferea musić šukać albo ŭ zahaloŭkach elementaŭ, " +"albo ŭ ichnym źmieścivie." #: ../glade/liferea.ui.h:65 #, fuzzy -msgid "Web Integration" -msgstr "Aryjentacyja" +msgid "_Advanced..." +msgstr "Admysłovaje..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "Ź_miaści zakładki na" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"Pačynaje pošuk akreślenaha tekstu va ŭsich kanałach. Vynik pošuku źjavicca ŭ " +"śpisie elementaŭ." #: ../glade/liferea.ui.h:67 -#, fuzzy -msgid "Internal Browser Settings" -msgstr "Nałady ŭnutranaha hartača" +msgid "Update Monitor" +msgstr "Manitor aktualizacyj" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Adčyniaj spasyłki ŭ _vaknie Liferea." +#, fuzzy +msgid "Pending Requests" +msgstr "Zapyty ŭ čakańni" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Adklučy Javascript." +#, fuzzy +msgid "Downloading Now" +msgstr "Zahružajecca zaraz" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "" +msgid "Cancel _All" +msgstr "Anuluj _usie" #: ../glade/liferea.ui.h:71 -#, fuzzy -msgid "External Browser Settings" -msgstr "Nałady vonkavaha hartača" - +msgid "Create News Bin" +msgstr "Stvary koš navinaŭ" + #: ../glade/liferea.ui.h:72 +msgid "_News Bin Name:" +msgstr "_Nazva dla koša navinaŭ:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Ab prahramie" + +#: ../glade/liferea.ui.h:74 +msgid "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea - heta ahrehatar navinaŭ dziela GTK+" + +#: ../glade/liferea.ui.h:78 +#, fuzzy +msgid "Liferea Homepage" +msgstr "Hartač RSS Liferea" + +#: ../glade/liferea.ui.h:79 +#, fuzzy +msgid "Advanced Search" +msgstr "Admysłovaje" + +#: ../glade/liferea.ui.h:80 +#, fuzzy +msgid "_Search Folder..." +msgstr "Kataloh pošuku" + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Stvary kanał pošukavika" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "uviadzi luby radok dziela pošuku" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "Maksymalnaja _kolkaść vynikovych elementaŭ:" + +#: ../glade/liferea.ui.h:84 +#, 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 "" +"Uvaha: Liferea zhieneruje padpisku na kanał, jakaja vykarystoŭvajecca dziela " +"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/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "Zahruzka / Kancavaja apracoŭka" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Vybar krynicy" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Abiary typ krynicy, jakuju chočaš dadać..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Dadaj OPML/Planet" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"Akreśl lakalny fajł albo spasyłku na pravilny śpis kanałaŭ u farmacie OPML." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Adras" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "_Abiary fajł" + +#: ../glade/ttrss_source.ui.h:1 +#, fuzzy +msgid "Add Tiny Tiny RSS Account" +msgstr "Dadaj kont na Bloglines" + +#: ../glade/ttrss_source.ui.h:2 +#, fuzzy +msgid "Please enter your tt-rss account settings." +msgstr "Uviadzi nałady tvajho kontu na Bloglines." + +#: ../glade/ttrss_source.ui.h:3 +#, fuzzy +msgid "_Server URL" +msgstr "Pamyłka servera" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "_Nazva karystalnika" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Admysłovaje..." + +#: ../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 "" +"Uviadzi adras web-placoŭki, kab užyć aŭtamatyčny pošuk kanałaŭ, albo, kali " +"ty viedaješ, dakładny adras kanału." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Pieravahi Liferea" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Zmoŭčanaja _kolkaść elementaŭ na kanał dziela zapisu:" + +#: ../glade/prefs.ui.h:4 +#, fuzzy +msgid "Feed Update Settings" +msgstr "Aktualizacyja kanału" + +#: ../glade/prefs.ui.h:5 +#, fuzzy +msgid "_Update all subscriptions at startup." +msgstr "Novaja padpiska" + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Zmoŭčany _intervał aktualizacyi kanału:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"Uvaha: Kali łaska, nie zabudźsia akreślić sensoŭny termin pamiž " +"aktualizacyjami. Zvyčajna apytvańnie kanałaŭ čaściej za raz na hadzinu " +"źjaŭlajecca marnavańniem trafiku." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Kanały" + +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "Nałady pakazu katalohaŭ" + +#: ../glade/prefs.ui.h:11 +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/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "_Schavaj pračytanyja elementy." + +#: ../glade/prefs.ui.h:13 +#, fuzzy +msgid "Feed Icons (Favicons)" +msgstr "Ikony kanałaŭ" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Aktualizuj zaraz usie ikony kanałaŭ" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Katalohi" + +#: ../glade/prefs.ui.h:16 +#, fuzzy +msgid "Reading Headlines" +msgstr "niečytanyja zahałoŭki" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "_Pierachodź pa artykułach z:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +#, fuzzy +msgid "Web Integration" +msgstr "Aryjentacyja" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "Ź_miaści zakładki na" + +#: ../glade/prefs.ui.h:22 +#, fuzzy +msgid "Internal Browser Settings" +msgstr "Nałady ŭnutranaha hartača" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Adčyniaj spasyłki ŭ _vaknie Liferea." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Adklučy Javascript." + +#: ../glade/prefs.ui.h:25 +#, fuzzy +msgid "_Enable browser plugins." +msgstr "Nałady vonkavaha hartača" + +#: ../glade/prefs.ui.h:26 +#, fuzzy +msgid "External Browser Settings" +msgstr "Nałady vonkavaha hartača" + +#: ../glade/prefs.ui.h:27 msgid "_Open link in:" msgstr "_Adčyni spasyłku ŭ:" -#: ../glade/liferea.ui.h:74 +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Admysłovy" + +#: ../glade/prefs.ui.h:30 #, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" +msgid "(%s for URL)" msgstr "" -"_Admysłovy:\n" -"(%s dziela adrasu)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Hartač:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Hartač" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 #, fuzzy msgid "Notification Settings" msgstr "Nałady nahadvańnia" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Pakažy _padručnaje vakno z novymi zahałoŭkami." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "Pakazvaj _ikonu stanu ŭ abšary nahadvańniaŭ (systemnym trai)." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Pakazvaj _kolkaść novych elementaŭ na ikonie ŭ trai." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Zakančvaj pracu zamiest minimizacyi ŭ ikonu traju." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 #, fuzzy msgid "Toolbar Settings" msgstr "_Etykiety knopak z paneli pryładździa:" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "_Etykiety knopak z paneli pryładździa:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "_Aŭtamatyčna vyznač (GNOME albo asiarodździe)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "_Biaz proxy" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "_Admysłovaje akreśleńnie:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "_Port proxy:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "_Host proxy:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Užyj _aŭtaryzacyju proxy" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "Pa_rol proxy:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "_Nazva karystalnika proxy:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 #, fuzzy msgid "Downloading Enclosures" msgstr "Zahruzka dałučeńnia" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Ahladaj" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Zapisvaj zahružanaje ŭ" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Zahružaj z dapamohaj" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 #, fuzzy msgid "Opening Enclosures" msgstr "/Adčyni dałučeńnie..." -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Dałučeńni" -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Nazva kanału" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "" - -#: ../glade/liferea.ui.h:106 -#, fuzzy -msgid "_Service Name" -msgstr "Nazva skryptu" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Novy kataloh" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "Nazva _katalohu:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Pieranazavi" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Novaja nazva:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Ułaścivaści katalohu pošuku" - -#: ../glade/liferea.ui.h:114 -#, fuzzy -msgid "Search _Name:" -msgstr "_Nazva kanału:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Zahruzka dałučeńnia" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Zahruzka dałučeńnia typu:" - -#: ../glade/liferea.ui.h:120 -#, 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 "" -"Š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.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "" - -#: ../glade/liferea.ui.h:122 -#, 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.ui.h:123 -msgid "Search All Feeds" -msgstr "Šukaj va ŭsich kanałach" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Šukaj:" +#~ msgid "Download and view feeds" +#~ msgstr "Atrymvaj i ahladaj kanały RSS" -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Uviadzi radok pošuku, jaki Liferea musić šukać albo ŭ zahaloŭkach elementaŭ, " -"albo ŭ ichnym źmieścivie." +#~ msgid "You may want to validate the feed using" +#~ msgstr "Ty možaš pravieryć kanał z dapamohaj" -#: ../glade/liferea.ui.h:126 #, fuzzy -msgid "_Advanced..." -msgstr "Admysłovaje..." +#~ msgid "Launch Item In _Tab" +#~ msgstr "/Adčyni element u _kartcy" -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Pačynaje pošuk akreślenaha tekstu va ŭsich kanałach. Vynik pošuku źjavicca ŭ " -"śpisie elementaŭ." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Manitor aktualizacyj" - -#: ../glade/liferea.ui.h:129 #, fuzzy -msgid "Pending Requests" -msgstr "Zapyty ŭ čakańni" +#~ msgid "_Launch Item In Browser" +#~ msgstr "/_Adčyni element u _hartačy" -#: ../glade/liferea.ui.h:130 #, fuzzy -msgid "Downloading Now" -msgstr "Zahružajecca zaraz" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "/Skapijuj adras elementu ŭ bufer" -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "Anuluj _usie" +#~ msgid "flag" +#~ msgstr "ściah" -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Stvary koš navinaŭ" +#~ msgid "bookmark" +#~ msgstr "zakładka" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Nazva dla koša navinaŭ:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Ab prahramie" +#~ msgid "comments" +#~ msgstr "kamentary" -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea - heta ahrehatar navinaŭ dziela GTK+" - -#: ../glade/liferea.ui.h:139 #, fuzzy -msgid "Liferea Homepage" -msgstr "Hartač RSS Liferea" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Zahruzka dałučeńnia skončanaja: \"%s\"" -#: ../glade/liferea.ui.h:140 -#, fuzzy -msgid "Advanced Search" -msgstr "Admysłovaje" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Zahruzka dałučeńnia skončanaja: \"%s\"" -#: ../glade/liferea.ui.h:141 #, fuzzy -msgid "_Search Folder..." -msgstr "Kataloh pošuku" - -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Stvary kanał pošukavika" - -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "uviadzi luby radok dziela pošuku" - -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Maksymalnaja _kolkaść vynikovych elementaŭ:" +#~ 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 "" +#~ "Hetaja versija Liferea vykarystoŭvaje padručnuju pamiać u novym farmacie, " +#~ "tamu tvaje padručnyja fajły byli skanvertavanyja. Padručnyja fajły versii " +#~ "1.2 u ~/.liferea_1.2 nie byli vydalenyja aŭtamatyčna. Vydal hety kataloh " +#~ "samastojna, jak tolki ŭpeŭniśsia ŭ paśpiachovaści mihracyi!" -#: ../glade/liferea.ui.h:145 #, 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 "" -"Uvaha: Liferea zhieneruje padpisku na kanał, jakaja vykarystoŭvajecca dziela " -"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. " +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Zahruzka dałučeńnia skončanaja: \"%s\"" -#: ../glade/new_subscription.ui.h:9 #, fuzzy -msgid "Download / Postprocessing" -msgstr "Zahruzka / Kancavaja apracoŭka" - -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Vybar krynicy" +#~ msgid "Download finished." +#~ msgstr "_Zahružaj z dapamohaj" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Abiary typ krynicy, jakuju chočaš dadać..." +#~ msgid "Choose download directory" +#~ msgstr "Abiary kataloh dziela zahruzak" -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Dadaj OPML/Planet" - -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Akreśl lakalny fajł albo spasyłku na pravilny śpis kanałaŭ u farmacie OPML." - -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Adras" - -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "_Abiary fajł" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Admysłovy:\n" +#~ "(%s dziela adrasu)" -#: ../glade/ttrss_source.ui.h:1 -#, fuzzy -msgid "Add Tiny Tiny RSS Account" -msgstr "Dadaj kont na Bloglines" +#~ msgid "_Save downloads in" +#~ msgstr "_Zapisvaj zahružanaje ŭ" -#: ../glade/ttrss_source.ui.h:2 #, fuzzy -msgid "Please enter your tt-rss account settings." -msgstr "Uviadzi nałady tvajho kontu na Bloglines." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Nazva kanału" -#: ../glade/ttrss_source.ui.h:3 #, fuzzy -msgid "_Server URL" -msgstr "Pamyłka servera" +#~ msgid "_Service Name" +#~ msgstr "Nazva skryptu" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "_Nazva karystalnika" - -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Uviadzi adras web-placoŭki, kab užyć aŭtamatyčny pošuk kanałaŭ, albo, kali " -"ty viedaješ, dakładny adras kanału." - -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Admysłovaje..." - -#~ msgid "You may want to validate the feed using" -#~ msgstr "Ty možaš pravieryć kanał z dapamohaj" +#~ msgid "Downloading Enclosure" +#~ msgstr "Zahruzka dałučeńnia" #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " diff -Nru liferea-1.8.15/po/bg.po liferea-1.10.3/po/bg.po --- liferea-1.8.15/po/bg.po 2013-06-24 22:16:14.000000000 +0200 +++ liferea-1.10.3/po/bg.po 2013-07-31 23:29:12.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Liferea Bulgarian translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2006-03-17 12:10+0200\n" "Last-Translator: Vladimir Petkov \n" "Language-Team: Bulgarian \n" @@ -18,8 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Събирач на RSS емисии (Liferea)" @@ -34,7 +33,7 @@ msgstr "Събирач на RSS емисии (Liferea)" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" +msgid "Read news feeds and blogs" msgstr "" #: ../xslt/feed.xml.in.h:1 @@ -155,41 +154,29 @@ msgstr "създател" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "коментари" - -#: ../xslt/item.xml.in.h:13 #, fuzzy msgid "No comments yet." msgstr "коментари" -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 #, fuzzy msgid "Comments" msgstr "коментари" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 #, fuzzy msgid "Updating..." msgstr "Актуализиране на „%s“" -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "" @@ -214,12 +201,12 @@ msgid "Default Browser" msgstr "Браузър" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Командата за стартиране на браузъра е неуспешна: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Стартиране: „%s“" @@ -230,7 +217,7 @@ msgid "Authorization Error" msgstr "Идентифициране" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Не може да създаде директорията за временните файлове „%s“!" @@ -260,76 +247,82 @@ msgid "%b %d %Y" msgstr "" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "„%s“ не е валиден тип за файл с настройки за приложенията!" -#: ../src/enclosure.c:274 -#, fuzzy, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Свалянето на прикачения файл приключи: „%s“" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Свалянето на прикачения файл приключи: „%s“" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Грешка при преименуването на %s в %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, fuzzy, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "" "Грешка в XML по време на четенето на временния файл! „%s“ не може да бъде " "внесен!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "" "Празен документ! OPML документа „%s“ не трябва да е празен при внасяне." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "„%s“ не е валиден OPML документ! Liferea не може да внесе този файл!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Списък с внесените емисии" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Вмъкване на списък с емисии" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Внасяне" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 #, fuzzy msgid "OPML Files" msgstr "Избор на файл" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Грешка при изнасянето на списъкът с емисии!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Списъкът с емисии е изнесен успешно!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Изнасяне на списък с емисиите" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Изнасяне" @@ -391,12 +384,12 @@ msgstr "

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

    " #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "Няма непрочетени записи " -#: ../src/main.c:175 +#: ../src/main.c:164 #, fuzzy msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " @@ -404,130 +397,122 @@ msgstr "" " СЪСТОЯНИЕ-то може да е „shown“, „iconified“ или „hidden“" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "" -#: ../src/main.c:179 +#: ../src/main.c:165 #, fuzzy msgid "Show version information and exit" msgstr " --version Изписване на информация за версията и напускане" -#: ../src/main.c:180 +#: ../src/main.c:166 #, fuzzy msgid "Add a new subscription" msgstr "Нова емисия" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 #, fuzzy msgid "Print debugging messages of all types" msgstr "" " --debug-all Отпечатване на всички съобщения за откриване на грешки" -#: ../src/main.c:186 +#: ../src/main.c:172 #, fuzzy msgid "Print debugging messages for the cache handling" msgstr "" " --debug-cache Отпечатване на съобщенията за откриване на грешки при " "обработката на кеша" -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr "" " --debug-conf Отпечатване на съобщенията за откриване на грешки при " "обработката на настройките" -#: ../src/main.c:188 +#: ../src/main.c:174 #, fuzzy msgid "Print debugging messages of the database handling" msgstr "" " --debug-cache Отпечатване на съобщенията за откриване на грешки при " "обработката на кеша" -#: ../src/main.c:189 +#: ../src/main.c:175 #, fuzzy msgid "Print debugging messages of all GUI functions" msgstr "" " --debug-gui Отпечатване на съобщенията за откриване на грешки във " "всички функции за графичния интерфейс" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" -#: ../src/main.c:191 +#: ../src/main.c:177 #, fuzzy msgid "Print debugging messages of all network activity" msgstr "" " --debug-all Отпечатване на всички съобщения за откриване на грешки" -#: ../src/main.c:192 +#: ../src/main.c:178 #, fuzzy msgid "Print debugging messages of all parsing functions" msgstr "" " --debug-parsing Отпечатване на съобщенията за откриване на грешки във " "всички функции за синтактичен анализ" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" -#: ../src/main.c:194 +#: ../src/main.c:180 #, fuzzy msgid "Print debugging messages when entering/leaving functions" msgstr "" " --debug-trace Отпечатване на съобщенията за откриване на грешки при " "влизане и излизане от функции" -#: ../src/main.c:195 +#: ../src/main.c:181 #, fuzzy msgid "Print debugging messages of the feed update processing" msgstr "" " --debug-update Отпечатване на съобщенията за откриване на грешки при " "обработката на обновяването на емисиите" -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr "" " --debug-cache Отпечатване на съобщенията за откриване на грешки при " "обработката на кеша" -#: ../src/main.c:197 +#: ../src/main.c:183 #, fuzzy msgid "Print verbose debugging messages" msgstr "" " --debug-verbose Отпечатване на подробни съобщения за откриване на грешки" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 #, fuzzy msgid "Print debugging messages for the given topic" msgstr "" " --debug-cache Отпечатване на съобщенията за откриване на грешки при " "обработката на кеша" -#: ../src/main.c:218 +#: ../src/main.c:202 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Събирач на RSS емисии (Liferea)" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" - -#: ../src/migrate.c:340 -#, 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!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" #. Some libsoup transport errors @@ -708,23 +693,23 @@ msgid "Feed title" msgstr "Заглавие на емисията" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, fuzzy, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Тази емисия „%s“ вече беше актуализирана!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, fuzzy, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "Емисията „%s“ няма продължение. Liferea няма да я актуализира повече!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, fuzzy, c-format msgid "Updating favicon for \"%s\"" msgstr "Актуализиране иконата на емисията „%s“" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -732,48 +717,48 @@ "Имаше проблем при прочитането на емисията. Проверете адреса и изходната " "информация в конзолата." -#: ../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“ не е продължен. Liferea няма да го осъвременява повече!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "„%s“ не се промени след последното осъвременяване" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Актуализиране на „%s“" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Грешка при отваряне на временния файл %s за филтриране!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s приключи работа със статус %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Грешка: Тръбата „%s“ не може да бъде отворена" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Грешка: Файлът „%s“ не може да бъде отворен" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Грешка: Файлът „%s“ не съществува" @@ -783,60 +768,58 @@ msgid "New Search Folder" msgstr "Нова папка" -#: ../src/xml.c:451 +#: ../src/xml.c:424 #, fuzzy msgid "[There were more errors. Output was truncated!]" msgstr "[Четенето беше прекъснато!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 #, fuzzy msgid "XML Parser: Could not parse document:\n" msgstr "" "xmlReadMemory(): Документът не може да бъде анализиран:\n" "%s%s" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 #, fuzzy msgid "Attachments" msgstr "коментари" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "" -msgstr[1] "" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "" +msgstr[1] "" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Избор на файл" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, fuzzy, c-format msgid "File Extension .%s" msgstr "Файлово разширение .%s" @@ -846,381 +829,419 @@ msgid "Couldn't find pixmap file: %s" msgstr "Файлът с картата с пиксели %s не може да бъде открит." -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, fuzzy, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] "%d нов запис" msgstr[1] "%d нови записа" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, fuzzy, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "е непрочетен" msgstr[1] "е непрочетен" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Раздели в помощта" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Бърз справочник" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "Често задавани въпроси" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea е в режим „включен“" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 #, fuzzy msgid "Work Offline" msgstr "Режим: „_изключен“" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea е в режим „изключен“" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 #, fuzzy msgid "Work Online" msgstr "Режим: „_изключен“" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 #, fuzzy msgid "_Subscriptions" msgstr "Нова емисия" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "Актуализиране на _всички" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 #, fuzzy msgid "Updates all subscriptions." msgstr "Добавяне на нова емисия." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Отбелязване на всички като _прочетени" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Отбелязване на абсолютно всички обекти като прочетени" -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Внасяне на списък с емисии..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Внасяне на списък с емисии в OPML формат." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Изнасяне на списък с емисии..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 #, fuzzy msgid "Exports the feed list as OPML." msgstr ">Изнасяне на списък с емисии във формат OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Спиране на програмата" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 #, fuzzy msgid "_Feed" msgstr "_Емисии" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 #, fuzzy msgid "Remove _All Items" msgstr "Премахване на _всички" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Премахване на всички записи от текущата емисия." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 #, fuzzy msgid "_Item" msgstr "_Записи" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "_Следващ непрочетен запис" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "_Следващ непрочетен запис" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Изглед" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "_Увеличаване на големината на шрифта" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Увеличаване на размера на текста на записите." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_Намаляване на големината на шрифта" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Намаляване на размера на текста, при прегледа на записи." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 #, fuzzy msgid "_Update Monitor" msgstr "/_Актуализиране на папка" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Настройки" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Промяна на настройките." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 #, fuzzy msgid "S_earch" msgstr "Търсене" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 #, fuzzy msgid "Search All Feeds..." msgstr "Търсене във всички емисии" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Показване на полето за търсене." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Помощ" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Ръководство" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Преглед на помощта за тази програма." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Бърз справочник" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Преглед на списък с всички бързи клавиши в Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_Често задавани въпроси" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Преглед на често задаваните въпроси." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_Относно програмата" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Показване на диалогов прозорец с информация за програмата." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 #, fuzzy msgid "_Normal View" msgstr "Локален _файл" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 #, fuzzy msgid "_Wide View" msgstr "_Изглед" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 #, fuzzy msgid "_Combined View" msgstr "_Общ изглед" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 #, fuzzy msgid "Hide feeds with no unread items." msgstr "Няма непрочетени записи " -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "_Нова емисия..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 #, fuzzy msgid "Adds a subscription to the feed list." msgstr "Добавяне на нова емисия." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Нова _папка..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 #, fuzzy msgid "Adds a folder to the feed list." msgstr "Добавяне на папка към списъка с емисии." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 #, fuzzy msgid "New S_earch Folder..." msgstr "Нова _папка..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 #, fuzzy msgid "Adds a new search folder to the feed list." msgstr "Добавяне на нова виртуална папка към списъка с емисии." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 #, fuzzy msgid "New _Source..." msgstr "/_Нов/_Нова папка..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 #, fuzzy msgid "Adds a new feed list source." msgstr "Добавяне на нова виртуална папка към списъка с емисии." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 #, fuzzy msgid "New _News Bin..." msgstr "/_Нов/Нова _приставка..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 #, fuzzy msgid "Adds a new news bin." msgstr "Добавяне на нова емисия." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 #, fuzzy msgid "_Mark Items Read" msgstr "Избиране като прочетен" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 #, fuzzy msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "Отбелязване като прочетено на всичко в избраната папка." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 #, fuzzy msgid "_Update" msgstr "/_Актуализиране" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "" "Актуализиране на избраните емисии или на всички емисии от избраната папка." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 #, fuzzy msgid "_Properties" msgstr "_Настройки..." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Отваряне на прозореца за предпочитанията за избраната емисия." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 #, fuzzy msgid "_Remove" msgstr "Премахване на _всички" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Изтриване на избраната емисия." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "П_ревключване на състояние: \"прочетено/непрочетено“" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Превключване на състоянието „прочетено/непрочетено“ на избрания запис." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Прикрепяне на флаг към записа" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Превключване на флага за състоянието на избрания запис." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 #, fuzzy msgid "R_emove" msgstr "/Пре_махване на запис" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Премахване на избрания запис." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Отваряне на адреса на записа в настроения за това браузър." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "_Отваряне в браузър" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." +msgstr "Отваряне на адреса на записа в настроения за това браузър." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Външен браузър" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." msgstr "Отваряне на адреса на записа в настроения за това браузър." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "Режим: „_изключен“" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Тази настройка ще Ви позволи да спрете актуализирането на емисията." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 #, fuzzy msgid "Liferea - Linux Feed Reader" msgstr "Събирач на RSS емисии (Liferea)" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 #, fuzzy msgid "" "

    Welcome to Liferea, a desktop news aggregator for online news " @@ -1236,12 +1257,12 @@ "разгледате заглавията на дадена емисия, изберете емисията и заглавията ще се " "покажат в дясната част на програмата.

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Въведете потребителското име и паролата за „%s“ (%s):" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Непознат източник" @@ -1272,270 +1293,266 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea е в режим „изключен“. Не е възможно да актуализирате емисиите." -#: ../src/ui/liferea_htmlview.c:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Свалянето на прикачения файл приключи: „%s“" - -#: ../src/ui/liferea_htmlview.c:437 +#: ../src/ui/liferea_htmlview.c:627 #, fuzzy -msgid "Download finished." -msgstr "_Чрез програмата" +msgid "Open Link In _Tab" +msgstr "/_Зареждане на връзката в _таб" -#: ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_htmlview.c:628 #, fuzzy -msgid "Launch Link In _Tab" -msgstr "/_Зареждане на връзката в _таб" +msgid "_Open Link In Browser" +msgstr "/_Зареждане на връзката в браузър" -#: ../src/ui/liferea_htmlview.c:545 +#: ../src/ui/liferea_htmlview.c:629 #, fuzzy -msgid "_Launch Link In Browser" +msgid "_Open Link In External Browser" msgstr "/_Зареждане на връзката в браузър" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 #, fuzzy msgid "_Copy Link Location" msgstr "/_Копиране адреса на записа" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 #, fuzzy msgid "_Copy Image Location" msgstr "/_Копиране адреса на записа" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 #, fuzzy msgid "S_ave Link As" msgstr "/Запазване като..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 #, fuzzy msgid "_Subscribe..." msgstr "/_Абониране..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 #, fuzzy msgid "*** No title ***" msgstr "[Без заглавие]" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Дата" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Заглавие" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Няма избран запис" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Този запис няма не съдържа връзка!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Трябва да изберете емисия, за да изтриете нейните записи!" -#: ../src/ui/popup_menu.c:116 -#, fuzzy -msgid "Launch Item In _Tab" -msgstr "/Стартиране на записа в _таб" - -#: ../src/ui/popup_menu.c:117 -#, fuzzy -msgid "_Launch Item In Browser" -msgstr "/Стартиране на записа в браузър" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "" -#: ../src/ui/popup_menu.c:147 +#: ../src/ui/popup_menu.c:156 +#, c-format +msgid "_Bookmark at %s" +msgstr "" + +#: ../src/ui/popup_menu.c:160 #, fuzzy -msgid "Copy Item _URL to Clipboard" -msgstr "/Копиране на _адреса на записа в буфера за обмен" +msgid "Copy Item _Location" +msgstr "/_Копиране адреса на записа" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 #, fuzzy msgid "R_emove Item" msgstr "/Пре_махване на запис" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 #, fuzzy msgid "Open Enclosure..." msgstr "/Отваряне на приложение..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 #, fuzzy msgid "Save As..." msgstr "/Запазване като..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 #, fuzzy msgid "Copy Link Location" msgstr "/_Копиране адреса на записа" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 #, fuzzy msgid "_Update All" msgstr "/_Актуализиране на всички" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 #, fuzzy msgid "_Show Liferea" msgstr "Събирач на RSS емисии (Liferea)" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 #, fuzzy msgid "_Update Folder" msgstr "/_Актуализиране на папка" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 #, fuzzy msgid "_Mark All As Read" msgstr "/_Отбелязване на всички като прочетени" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 #, fuzzy msgid "_New" msgstr "/_Нов" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 #, fuzzy msgid "New _Subscription..." msgstr "_Нова емисия..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 #, fuzzy msgid "New S_ource..." msgstr "/_Нов/_Нова папка..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 #, fuzzy msgid "Sort Feeds" msgstr "Вмъкване на списък с емисии" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "_Нова емисия..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 #, fuzzy msgid "minutes" msgstr "минути." -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Space" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Space" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Space" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Избор на папка за запазване на изтеглянията" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "Локален _файл" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "_Изглед" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "_Общ изглед" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Ръчно зададено" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Стандартен браузър" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Съществуващ прозорец" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Нов прозорец" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Нов подпрозорец" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 msgid "Terminate instead of minimizing to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Тип" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Програма" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, fuzzy, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1552,7 +1569,7 @@ msgid "This feed specifies no default update interval." msgstr "Този източник няма подразбиращ се интервал за осъвременяване" -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "Без име" @@ -1603,7 +1620,7 @@ msgid "%b %d %H:%M" msgstr "" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1613,12 +1630,12 @@ msgid "Google Reader login failed!" msgstr "" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 #, fuzzy msgid "Google Reader" msgstr "Временни файлове на емисията" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1649,30 +1666,23 @@ msgid "No feed list source types found!" msgstr "" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:269 #, fuzzy msgid "Source Type" msgstr "Вид на източника:" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " "present your tt-rss subscriptions, and will synchronize your feed list and " "reading lists." msgstr "" -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1745,8 +1755,7 @@ msgid "Please enter your Google Reader account settings." msgstr "" -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 #, fuzzy msgid "_Password" msgstr "_Парола:" @@ -1772,7 +1781,7 @@ msgid "combined view" msgstr "" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Заглавия" @@ -1826,7 +1835,7 @@ msgstr "Основен" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Източник на емисията" @@ -1946,496 +1955,535 @@ msgstr "" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Настройки на Liferea" +msgid "New Folder" +msgstr "Нова папка" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "_Име на папката:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Стандартен _брой записи, за запазване от източник:" +#, fuzzy +msgid "Rename" +msgstr "Преименуване на папката" #: ../glade/liferea.ui.h:51 #, fuzzy -msgid "Feed Update Settings" -msgstr "Временни файлове на емисията" +msgid "_New Name:" +msgstr "_Име:" #: ../glade/liferea.ui.h:52 #, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Добавяне на нова емисия." +msgid "Search Folder Properties" +msgstr "Настройки на виртуалната папка" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "_Период за актуализиране на емисията:" +#, fuzzy +msgid "Search _Name:" +msgstr "_Име на емисията:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -#, fuzzy -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." +msgid "A_ny Rule Matches" msgstr "" -"Забележка: Не пропускайте да настройте разумен период на осъвременяване. " -"Не е удобно да настроите емисиите да бъдат проверявани през 15 минути! За да " -"изключите автоматичното осъвременяване - поставете за период на " -"осъвременяване 0." #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Емисии" +msgid "_All Rules Must Match" +msgstr "" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "Изобразяване на папките" +msgid "Open Enclosure" +msgstr "/Отваряне на приложение..." #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "Показване на всички заглавия от всички под-емисии при избор на папка." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Изтегля се приложения от вида:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "_Скриване на прочетените записи." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"Какво да прави Liferea с това приложение? Въведете командата, която искате " +"да бъде изпълнена, отдолу. Изтегленият файл ще бъде подаден като аргумент на " +"следната команда:" #: ../glade/liferea.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Икони на емисиите" +msgid "_Browse" +msgstr "_Преглед:" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_Актуализиране на всички икони на емисии" +#, fuzzy +msgid "_Do this automatically for enclosures like this from now on." +msgstr "" +"_Действието да се извършва автоматично за файловете подобни на този от сега " +"нататък." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Папки" +msgid "Search All Feeds" +msgstr "Търсене във всички емисии" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "Заглавия" +msgid "_Search for:" +msgstr "_Търсене за:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "Бърз преглед чрез:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Въведете низа, който Liferea са търси както в заглавията, така и в " +"съдържанието на емисиите." #: ../glade/liferea.ui.h:65 -#, fuzzy -msgid "Web Integration" -msgstr "Ориентация" +msgid "_Advanced..." +msgstr "" #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." msgstr "" +"Стартиране на търсене на указания текст във всички емисии. Резултатът от " +"търсенето ще се появи в списъка със записи." #: ../glade/liferea.ui.h:67 #, fuzzy -msgid "Internal Browser Settings" -msgstr "Вътрешен браузър" +msgid "Update Monitor" +msgstr "/_Актуализиране на папка" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Отваряне на връзките в _Liferea." +msgid "Pending Requests" +msgstr "" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Забраняване на Javascript." +#, fuzzy +msgid "Downloading Now" +msgstr "Изтегля се приложения" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "" +#, fuzzy +msgid "Cancel _All" +msgstr "Актуализиране на _всички" #: ../glade/liferea.ui.h:71 -#, fuzzy -msgid "External Browser Settings" -msgstr "Външен браузър" +msgid "Create News Bin" +msgstr "" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "_Отваряне на връзката в:" +msgid "_News Bin Name:" +msgstr "" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Относно програмата" #: ../glade/liferea.ui.h:74 -#, no-c-format msgid "" -"_Manual:\n" -"(%s for URL)" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" msgstr "" -"Ръчно зададено:\n" -"(%s за URL)" - -#: ../glade/liferea.ui.h:76 -msgid "_Browser:" -msgstr "_Браузър:" #: ../glade/liferea.ui.h:77 -msgid "Browser" -msgstr "Браузър" +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea е събирач на RSS емисии за GTK+" #: ../glade/liferea.ui.h:78 #, fuzzy -msgid "Notification Settings" -msgstr "Уведомяване" +msgid "Liferea Homepage" +msgstr "Събирач на RSS емисии (Liferea)" #: ../glade/liferea.ui.h:79 -msgid "Show a _popup window with new headlines." -msgstr "Показване на _изскачащ прозорец с новите заглавия." +#, fuzzy +msgid "Advanced Search" +msgstr "Търсене с Feedster" #: ../glade/liferea.ui.h:80 -msgid "Show a status _icon in the notification area (system tray)." -msgstr "Показване на _икона в зоната за уведомяване." +#, fuzzy +msgid "_Search Folder..." +msgstr "Нова _папка..." #: ../glade/liferea.ui.h:81 -msgid "Show _number of new items in the tray icon." +msgid "Create Search Engine Feed" msgstr "" #: ../glade/liferea.ui.h:82 -msgid "T_erminate instead of minimizing to tray icon." -msgstr "" +msgid "enter any search string you want" +msgstr "въведете дума за търсене" #: ../glade/liferea.ui.h:83 -msgid "_Start in tray icon." -msgstr "" +msgid "Maximal _Number Of Result Items:" +msgstr "Максимален брой резултати:" #: ../glade/liferea.ui.h:84 -msgid "Toolbar Settings" +#, 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. Можете да запазите тази емисия за постоянно и да я " +"осъвременявате като всяка друга обикновена емисия." -#: ../glade/liferea.ui.h:85 -msgid "_Hide toolbar." -msgstr "" +#: ../glade/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "_Чрез програмата" -#: ../glade/liferea.ui.h:86 -msgid "Toolbar _button labels:" +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" msgstr "" -#: ../glade/liferea.ui.h:87 -msgid "GUI" -msgstr "Интерфейс" +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "" -#: ../glade/liferea.ui.h:88 -msgid "HTTP Proxy Server" +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" msgstr "" -#: ../glade/liferea.ui.h:89 -msgid "_Auto Detect (GNOME or environment)" +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." msgstr "" -#: ../glade/liferea.ui.h:90 +#: ../glade/opml_source.ui.h:3 #, fuzzy -msgid "_No Proxy" -msgstr "Сървър-посредник" +msgid "_Location" +msgstr "/_Копиране адреса на записа" -#: ../glade/liferea.ui.h:91 -msgid "_Manual Setting:" -msgstr "" +#: ../glade/opml_source.ui.h:4 +#, fuzzy +msgid "_Select File" +msgstr "Избиране на файл..." -#: ../glade/liferea.ui.h:92 -msgid "Proxy _Port:" -msgstr "_Порт:" +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "" -#: ../glade/liferea.ui.h:93 -msgid "Proxy _Host:" -msgstr "_Адрес:" +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "" -#: ../glade/liferea.ui.h:94 +#: ../glade/ttrss_source.ui.h:3 #, fuzzy -msgid "Use Proxy Au_thentication" -msgstr "Използване на _идентификация" - -#: ../glade/liferea.ui.h:95 -msgid "Proxy Pass_word:" -msgstr "_Парола:" +msgid "_Server URL" +msgstr "Грешка в сървъра" -#: ../glade/liferea.ui.h:96 -msgid "Proxy _Username:" +#: ../glade/ttrss_source.ui.h:5 +#, fuzzy +msgid "_Username" msgstr "Потребителско _име:" -#: ../glade/liferea.ui.h:97 -msgid "Proxy" -msgstr "Сървър-посредник" +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "" -#: ../glade/liferea.ui.h:98 -#, fuzzy -msgid "Downloading Enclosures" -msgstr "Изтегля се приложения" +#: ../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 "" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Преглед:" +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Настройки на Liferea" -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Запазване на изтеглянията в" +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "" -#: ../glade/liferea.ui.h:101 -msgid "_Download using" -msgstr "_Чрез програмата" +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Стандартен _брой записи, за запазване от източник:" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:4 #, fuzzy -msgid "Opening Enclosures" -msgstr "/Отваряне на приложение..." - -#: ../glade/liferea.ui.h:103 -msgid "Enclosures" -msgstr "Приложения" +msgid "Feed Update Settings" +msgstr "Временни файлове на емисията" -#: ../glade/liferea.ui.h:104 +#: ../glade/prefs.ui.h:5 #, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Име на емисията" +msgid "_Update all subscriptions at startup." +msgstr "Добавяне на нова емисия." -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "" +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "_Период за актуализиране на емисията:" -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +#, fuzzy +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 "" +"Забележка: Не пропускайте да настройте разумен период на осъвременяване. " +"Не е удобно да настроите емисиите да бъдат проверявани през 15 минути! За да " +"изключите автоматичното осъвременяване - поставете за период на " +"осъвременяване 0." -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "" +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Емисии" -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Нова папка" +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "Изобразяване на папките" -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Име на папката:" +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "Показване на всички заглавия от всички под-емисии при избор на папка." -#: ../glade/liferea.ui.h:111 -#, fuzzy -msgid "Rename" -msgstr "Преименуване на папката" +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "_Скриване на прочетените записи." -#: ../glade/liferea.ui.h:112 +#: ../glade/prefs.ui.h:13 #, fuzzy -msgid "_New Name:" -msgstr "_Име:" +msgid "Feed Icons (Favicons)" +msgstr "Икони на емисиите" -#: ../glade/liferea.ui.h:113 -#, fuzzy -msgid "Search Folder Properties" -msgstr "Настройки на виртуалната папка" +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Актуализиране на всички икони на емисии" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Папки" -#: ../glade/liferea.ui.h:114 +#: ../glade/prefs.ui.h:16 #, fuzzy -msgid "Search _Name:" -msgstr "_Име на емисията:" +msgid "Reading Headlines" +msgstr "Заглавия" -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "" +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "Бърз преглед чрез:" -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" msgstr "" -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" +#: ../glade/prefs.ui.h:19 +#, fuzzy +msgid "Web Integration" +msgstr "Ориентация" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" msgstr "" -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Изтегля се приложения" +#: ../glade/prefs.ui.h:22 +#, fuzzy +msgid "Internal Browser Settings" +msgstr "Вътрешен браузър" -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Изтегля се приложения от вида:" +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Отваряне на връзките в _Liferea." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Забраняване на Javascript." -#: ../glade/liferea.ui.h:120 +#: ../glade/prefs.ui.h:25 #, 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 с това приложение? Въведете командата, която искате " -"да бъде изпълнена, отдолу. Изтегленият файл ще бъде подаден като аргумент на " -"следната команда:" +msgid "_Enable browser plugins." +msgstr "Външен браузър" -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "" +#: ../glade/prefs.ui.h:26 +#, fuzzy +msgid "External Browser Settings" +msgstr "Външен браузър" -#: ../glade/liferea.ui.h:122 +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "_Отваряне на връзката в:" + +#: ../glade/prefs.ui.h:28 #, fuzzy -msgid "_Do this automatically for enclosures like this from now on." +msgid "_Manual:" +msgstr "Ръчно зададено" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" msgstr "" -"_Действието да се извършва автоматично за файловете подобни на този от сега " -"нататък." -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Търсене във всички емисии" +#: ../glade/prefs.ui.h:31 +msgid "_Browser:" +msgstr "_Браузър:" -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Търсене за:" +#: ../glade/prefs.ui.h:32 +msgid "Browser" +msgstr "Браузър" -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." +#: ../glade/prefs.ui.h:33 +#, fuzzy +msgid "Notification Settings" +msgstr "Уведомяване" + +#: ../glade/prefs.ui.h:34 +msgid "Show a _popup window with new headlines." +msgstr "Показване на _изскачащ прозорец с новите заглавия." + +#: ../glade/prefs.ui.h:35 +msgid "Show a status _icon in the notification area (system tray)." +msgstr "Показване на _икона в зоната за уведомяване." + +#: ../glade/prefs.ui.h:36 +msgid "Show _number of new items in the tray icon." msgstr "" -"Въведете низа, който Liferea са търси както в заглавията, така и в " -"съдържанието на емисиите." -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." +#: ../glade/prefs.ui.h:37 +msgid "T_erminate instead of minimizing to tray icon." msgstr "" -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." +#: ../glade/prefs.ui.h:38 +msgid "_Start in tray icon." msgstr "" -"Стартиране на търсене на указания текст във всички емисии. Резултатът от " -"търсенето ще се появи в списъка със записи." -#: ../glade/liferea.ui.h:128 +#: ../glade/prefs.ui.h:39 #, fuzzy -msgid "Update Monitor" -msgstr "/_Актуализиране на папка" +msgid "Toolbar Settings" +msgstr "Изобразяване на папките" -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" +#: ../glade/prefs.ui.h:40 +msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.ui.h:130 -#, fuzzy -msgid "Downloading Now" -msgstr "Изтегля се приложения" +#: ../glade/prefs.ui.h:41 +msgid "Toolbar _button labels:" +msgstr "" -#: ../glade/liferea.ui.h:131 -#, fuzzy -msgid "Cancel _All" -msgstr "Актуализиране на _всички" +#: ../glade/prefs.ui.h:42 +msgid "GUI" +msgstr "Интерфейс" -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" +#: ../glade/prefs.ui.h:43 +msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" +#: ../glade/prefs.ui.h:44 +msgid "_Auto Detect (GNOME or environment)" msgstr "" -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Относно програмата" +#: ../glade/prefs.ui.h:45 +#, fuzzy +msgid "_No Proxy" +msgstr "Сървър-посредник" -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" +#: ../glade/prefs.ui.h:46 +msgid "_Manual Setting:" msgstr "" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea е събирач на RSS емисии за GTK+" - -#: ../glade/liferea.ui.h:139 -#, fuzzy -msgid "Liferea Homepage" -msgstr "Събирач на RSS емисии (Liferea)" +#: ../glade/prefs.ui.h:47 +msgid "Proxy _Port:" +msgstr "_Порт:" -#: ../glade/liferea.ui.h:140 -#, fuzzy -msgid "Advanced Search" -msgstr "Търсене с Feedster" +#: ../glade/prefs.ui.h:48 +msgid "Proxy _Host:" +msgstr "_Адрес:" -#: ../glade/liferea.ui.h:141 +#: ../glade/prefs.ui.h:49 #, fuzzy -msgid "_Search Folder..." -msgstr "Нова _папка..." +msgid "Use Proxy Au_thentication" +msgstr "Използване на _идентификация" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "" +#: ../glade/prefs.ui.h:50 +msgid "Proxy Pass_word:" +msgstr "_Парола:" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "въведете дума за търсене" +#: ../glade/prefs.ui.h:51 +msgid "Proxy _Username:" +msgstr "Потребителско _име:" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Максимален брой резултати:" +#: ../glade/prefs.ui.h:52 +msgid "Proxy" +msgstr "Сървър-посредник" -#: ../glade/liferea.ui.h:145 +#: ../glade/prefs.ui.h:53 #, 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. Можете да запазите тази емисия за постоянно и да я " -"осъвременявате като всяка друга обикновена емисия." +msgid "Downloading Enclosures" +msgstr "Изтегля се приложения" -#: ../glade/new_subscription.ui.h:9 -#, fuzzy -msgid "Download / Postprocessing" +#: ../glade/prefs.ui.h:54 +msgid "_Download using" msgstr "_Чрез програмата" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "" +#: ../glade/prefs.ui.h:55 +#, fuzzy +msgid "Opening Enclosures" +msgstr "/Отваряне на приложение..." -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "" +#: ../glade/prefs.ui.h:56 +msgid "Enclosures" +msgstr "Приложения" -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "" +#: ../glade/prefs.ui.h:57 +#, fuzzy +msgid "Plugins" +msgstr "Нова _приставка" -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" +#, fuzzy +#~ msgid "Launch Item In _Tab" +#~ msgstr "/Стартиране на записа в _таб" -#: ../glade/opml_source.ui.h:3 #, fuzzy -msgid "_Location" -msgstr "/_Копиране адреса на записа" +#~ msgid "_Launch Item In Browser" +#~ msgstr "/Стартиране на записа в браузър" -#: ../glade/opml_source.ui.h:4 #, fuzzy -msgid "_Select File" -msgstr "Избиране на файл..." +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "/Копиране на _адреса на записа в буфера за обмен" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "" +#~ msgid "comments" +#~ msgstr "коментари" -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "" +#, fuzzy +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Свалянето на прикачения файл приключи: „%s“" + +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Свалянето на прикачения файл приключи: „%s“" -#: ../glade/ttrss_source.ui.h:3 #, fuzzy -msgid "_Server URL" -msgstr "Грешка в сървъра" +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Свалянето на прикачения файл приключи: „%s“" -#: ../glade/ttrss_source.ui.h:5 #, fuzzy -msgid "_Username" -msgstr "Потребителско _име:" +#~ msgid "Download finished." +#~ msgstr "_Чрез програмата" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" +#~ msgid "Choose download directory" +#~ msgstr "Избор на папка за запазване на изтеглянията" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "Ръчно зададено:\n" +#~ "(%s за URL)" + +#~ msgid "_Save downloads in" +#~ msgstr "_Запазване на изтеглянията в" + +#, fuzzy +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Име на емисията" + +#~ msgid "Downloading Enclosure" +#~ msgstr "Изтегля се приложения" #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " @@ -3159,9 +3207,6 @@ #~ msgid "New _VFolder..." #~ msgstr "Нова _виртуална папка..." -#~ msgid "New P_lugin" -#~ msgstr "Нова _приставка" - #~ msgid "Adds a new plugin instance to the feed list." #~ msgstr "Добавяне на нова приставка към списъка с емисии." @@ -3266,7 +3311,7 @@ #~ msgid "" #~ "

    Could not determine the feed type. Please check that it is a valid type and listed in the supported " +#~ "\"http://lzone.de/liferea/supported_formats.htm\">supported " #~ "formats.

    " #~ msgstr "" #~ "

    Типът на емисията не може да бъде определен. Проверете дали той е , 2005. -# Gil Forcada , 2007, 2009. +# Gil Forcada , 2007, 2009, 2012, 2013. # msgid "" msgstr "" -"Project-Id-Version: liferea\n" +"Project-Id-Version: liferea 1.10-rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" -"PO-Revision-Date: 2009-12-06 20:19+0100\n" -"Last-Translator: Gil Forcada \n" -"Language-Team: Catalan \n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" +"PO-Revision-Date: 2013-05-21 12:31+0200\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" -"Plural-Forms: nplurals=2; plural=n!=1;\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -28,31 +27,20 @@ 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" +msgstr "Lector de canals de notícies Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Baixeu i visualitzeu canals de notícies" +msgid "Read news feeds and blogs" +msgstr "Llegiu canals de notícies i blocs" #: ../xslt/feed.xml.in.h:1 -msgid "" -"This feed is discontinued. It's no longer available. Liferea won't update it " -"anymore but you can still access the cached headlines." -msgstr "" -"Aquest canal ja no es manté i no està disponible. El Liferea ja no " -"l'actualitzarà més, però encara podeu accedir als titulars que hi ha a la " -"memòria cau." +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 "Aquest canal ja no es manté i no està disponible. El Liferea ja no l'actualitzarà més, però encara podeu accedir als titulars que hi ha a la memòria cau." #: ../xslt/feed.xml.in.h:2 -msgid "" -"The last update of this subscription failed!
    HTTP error code : " -msgstr "" -"Ha fallat l'última actualització d'aquesta subscripció
    Codi d'error " -"HTTP : " +msgid "The last update of this subscription failed!
    HTTP error code : " +msgstr "Ha fallat l'última actualització d'aquesta subscripció
    Codi d'error HTTP : " #: ../xslt/feed.xml.in.h:3 msgid "There were errors while parsing this feed!" @@ -68,7 +56,7 @@ #: ../xslt/feed.xml.in.h:6 msgid "You may want to contact the author/webmaster of the feed about this!" -msgstr "" +msgstr "Us podeu posar en contacte amb l'autor/administrador del canal per explicar-li això." #: ../xslt/feed.xml.in.h:7 msgid "There were errors while filtering this feed!" @@ -144,38 +132,26 @@ msgstr "Creador" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "senyalador" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "adreça d'interès" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "comentaris" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Encara no hi ha cap comentari." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Comentaris" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "S'està actualitzant..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Actualitza" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Secció" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Departament" @@ -184,28 +160,23 @@ msgstr "Contenidor de notícies:" #: ../xslt/newsbin.xml.in.h:2 -msgid "" -"Add items to this news bin by selecting \"Copy to News Bin\" from the item " -"list context menu." -msgstr "" -"Podeu afegir elements a aquest contenidor de notícies si seleccioneu «Copia " -"al contenidor de notícies» del menú contextual de la llista d'elements." +msgid "Add items to this news bin by selecting \"Copy to News Bin\" from the item list context menu." +msgstr "Podeu afegir elements a aquest contenidor de notícies si seleccioneu «Copia al contenidor de notícies» del menú contextual de la llista d'elements." #: ../xslt/vfolder.xml.in.h:1 msgid "Search Folder:" msgstr "Carpeta de cerca:" #: ../src/browser.c:32 -#, fuzzy msgid "Default Browser" -msgstr "Navegador predeterminat del GNOME" +msgstr "Navegador predeterminat" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Ha fallat l'ordre del navegador: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "S'està iniciant: «%s»" @@ -215,30 +186,26 @@ msgid "Authorization Error" msgstr "Error d'autenticació" -#: ../src/common.c:63 +#: ../src/common.c:62 #, 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/date.c:80 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/date.c:91 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/date.c:104 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/date.c:113 msgid "%b %d %l:%M %p" @@ -247,90 +214,87 @@ #. translation hint: date format for dates from the last years, reorder format codes as necessary #: ../src/date.c:116 msgid "%b %d %Y" -msgstr "%b %d %Y" +msgstr "%d %b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, 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:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Ha fallat la baixada de l'adjunció: «%s»" +#: ../src/enclosure.c:288 +msgid "You have not configured a download tool yet! Please do so in the 'Download' tab in Tools/Preferences." +msgstr "Encara no heu configurat cap eina de baixada. Ho podeu fer des de la pestanya «Baixada» del diàleg que trobareu a Eines/Preferències." -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "S'ha acabat de baixar l'adjunció: «%s»" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" +"Ha fallat l'ordre:\n" +"\n" +"%s\n" +"\n" +"Comproveu que l'eina de baixada està instal·lada i funciona correctament. La podeu canviar des de la pestanya «Baixada» del diàleg que trobareu a Eines/Preferències." -#: ../src/export.c:174 +#: ../src/export.c:177 #, 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:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, 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»" +msgstr "S'ha detectat un error en la sintaxi XML en llegir el fitxer OPML. No s'ha pogut importar «%s»" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, 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." +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." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, 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." +msgstr "«%s» no és un document OPML vàlid. El Liferea no el pot importar." -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Llista de canals importats" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importa la llista de canals" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importa" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 msgid "OPML Files" msgstr "Fitxers OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "S'ha produït un error en exportar la llista de canals" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "S'ha exportat la llista de canals" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Exporta la llista de canals" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Exporta" #: ../src/feed.c:255 -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 "" -"

    No s'ha pogut detectar el tipus d'aquest canal. Verifiqueu que la font " -"apunti realment a un recurs proporcionat per un dels formats de sindicació " -"coneguts.

    Sortida de l'analitzador 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 "

    No s'ha pogut detectar el tipus d'aquest canal. Verifiqueu que la font apunti realment a un recurs proporcionat per un dels formats de sindicació coneguts.

    Sortida de l'analitzador XML:
    " #: ../src/feed.c:284 #, c-format @@ -343,21 +307,13 @@ msgstr "no està disponible «%s»" #: ../src/feed_parser.c:137 -msgid "" -"The URL you want Liferea to subscribe to points to a webpage and the auto " -"discovery found no feeds on this page. Maybe this webpage just does not " -"support feed auto discovery." -msgstr "" -"L'URL de subscripció que heu proporcionat al Liferea apunta a una pàgina web " -"i el descobridor automàtic no hi ha trobat cap canal. Potser aquesta pàgina " -"web no permet el descobriment automàtic del canal." +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 de subscripció que heu proporcionat al Liferea apunta a una pàgina web 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:170 #, 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." +msgstr "S'ha detectat un error en la sintaxi XML en llegir el canal. No s'ha pogut carregar el canal «%s»." #: ../src/feed_parser.c:175 msgid "Empty document!" @@ -376,119 +332,93 @@ 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:403 -#, fuzzy +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "No hi ha elements sense llegir " -#: ../src/main.c:175 -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)" +#: ../src/main.c:164 +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)" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "ESTAT" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Mostra la informació sobre la versió i surt" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "Add a new subscription" msgstr "Afegeix una subscripció nova" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "URI" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Mostra tot tipus de missatges de depuració" -#: ../src/main.c:186 +#: ../src/main.c:172 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 +#: ../src/main.c:173 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:174 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:175 msgid "Print debugging messages of all GUI functions" -msgstr "" -"Mostra missatges de depuració de totes les funcions de l'interfície gràfica" +msgstr "Mostra missatges de depuració de totes les funcions de l'interfície 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.8/output.xhtml" -msgstr "" -"Habilita la depuració del renderitzat de l'HTML. Cada vegada que el Liferea " -"renderitzi HTML per a mostrar-lo també en crearà una còpia a ~/.liferea_1.8/" -"output.xhtml" +#: ../src/main.c:176 +msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.cache/liferea/output.xhtml" +msgstr "Habilita la depuració del renderitzat de l'HTML. Cada vegada que el Liferea renderitzi HTML també crearà una còpia de l'HTML generat a ~/.cache/liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:177 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:178 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:179 msgid "Print debugging messages when a function takes too long to process" -msgstr "" -"Mostra missatges de depuració quan alguna funció tardi massa a processar" +msgstr "Mostra missatges de depuració quan alguna funció tardi massa a processar" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Mostra missatges de depuració en entrar/sortir de les funcions" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "Mostra missatges de depuració del procés d'actualització dels canals" -#: ../src/main.c:196 -#, fuzzy +#: ../src/main.c:182 msgid "Print debugging messages of the search folder matching" -msgstr "Mostra missatges de depuració de la gestió de la memòria cau" +msgstr "Mostra missatges de depuració de les coincidències de les carpetes de cerca" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Mostra missatges de depuració detallats" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "Mostra missatges de depuració del tema seleccionat" -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, el lector de canals per a Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "Per a més informació, visiteu http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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 "" -"Aquesta versió del Liferea utilitza un format de memòria cau nova a la qual " -"s'ha migrat la vostra memòria cau dels canals. No s'ha suprimit " -"automàticament el contingut de %s. Un cop estigueu segur que la migració ha " -"estat satisfactòria podeu suprimir aquest directori manualment." +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Per a més informació, visiteu http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -512,11 +442,8 @@ msgstr "No s'ha pogut connectar al servidor intermediari" #: ../src/net.c:325 -msgid "" -"A network error occurred, or the other end closed the connection unexpectedly" -msgstr "" -"S'ha produït un error de xarxa o l'altre extrem ha tancat la connexió " -"inesperadament" +msgid "A network error occurred, or the other end closed the connection unexpectedly" +msgstr "S'ha produït un error de xarxa o l'altre extrem ha tancat la connexió inesperadament" #. http 3xx redirection #: ../src/net.c:328 @@ -525,12 +452,8 @@ #. http 4xx client error #: ../src/net.c:331 -msgid "" -"You are unauthorized to download this feed. Please update your username and " -"password in the feed properties dialog box" -msgstr "" -"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" +msgid "You are unauthorized to download this feed. Please update your username and password in the feed properties dialog box" +msgstr "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:333 msgid "Payment required" @@ -562,7 +485,7 @@ #: ../src/net.c:340 msgid "Gone. Resource doesn't exist. Please unsubscribe!" -msgstr "Ja no hi és, el recurs ja no existeix. Cancel·leu la subscripció." +msgstr "El recurs ja no existeix, cancel·leu la subscripció." #: ../src/net.c:345 msgid "There was an internal error in the update process" @@ -570,9 +493,7 @@ #: ../src/net.c:347 msgid "Feed not available: Server requested unsupported redirection!" -msgstr "" -"El canal no és disponible: el servidor ha sol·licitat una redirecció no " -"implementada" +msgstr "El canal no és disponible: el servidor ha sol·licitat una redirecció no implementada" #: ../src/net.c:349 msgid "Client Error" @@ -660,75 +581,67 @@ msgid "Feed title" msgstr "Títol del canal" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Ja s'està actualitzant la subscripció «%s»" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format -msgid "" -"The subscription \"%s\" was discontinued. Liferea won't update it anymore!" -msgstr "" -"Ja no es manté la subscripció «%s». El Liferea ja no l'actualitzarà més." +msgid "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" +msgstr "Ja no es manté la subscripció «%s». El Liferea ja no l'actualitzarà més." -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "S'està actualitzant la icona del canal «%s»" -#: ../src/subscription.c:192 -msgid "" -"There was a problem while reading this subscription. Please check the URL " -"and console output." -msgstr "" -"S'ha produït un problema en llegir aquesta subscripció. Verifiqueu-ne l'URL " -"i la sortida del terminal." +#: ../src/subscription.c:193 +msgid "There was a problem while reading this subscription. Please check the URL and console output." +msgstr "S'ha produït un error en llegir aquesta subscripció. Verifiqueu-ne l'URL i la sortida del terminal." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, 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:219 #, 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:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "«%s» no ha canviat des de l'última actualització" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "S'està actualitzant «%s»" -#: ../src/update.c:255 +#: ../src/update.c:259 #, 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" +msgstr "S'ha produït un error en obrir el fitxer temporal %s per utilitzar-lo per al filtratge" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s ha sortit amb l'estat %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, 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:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Error: no s'ha pogut obrir el fitxer «%s»" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Error: no hi ha cap fitxer «%s»" @@ -737,435 +650,444 @@ msgid "New Search Folder" msgstr "Carpeta de cerca nova" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Hi ha hagut altres errors. S'ha truncat la sortida]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "Analitzador XML: no s'ha pogut analitzar el document:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Adjuncions" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d adjunció" -msgstr[1] "%d adjuncions" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " Bytes" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d adjunció" +msgstr[1] "%d adjuncions" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Escolliu un fitxer" -#: ../src/ui/enclosure_list_view.c:404 -#, fuzzy, c-format +#: ../src/ui/enclosure_list_view.c:438 +#, c-format msgid "File Extension .%s" -msgstr "Extensió de fitxer .%s" +msgstr "Extensió de fitxer .%s" #: ../src/ui/icons.c:54 #, 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/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d nova)" msgstr[1] " (%d noves)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, 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:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Temes d'ajuda (en anglès)" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Referència ràpida (en anglès)" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "PMF (en anglès)" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "El Liferea és en línia" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Treballa fora de línia" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "El Liferea és fora de línia" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Treballa en línia" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Subscripcions" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "_Actualitza'ls tots" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Actualitza totes les subscripcions." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Marca'ls tots com a _llegits" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Marca cada element de cada subscripció com a llegit." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Importa una llista de canals..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importa una llista de canals OPML." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Exporta la llista de canals..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Exporta la llista de canals com a OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Surt" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Canal" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Suprimeix tots els _elements" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Suprimeix tots els elements del canal seleccionat." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_Element" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "Element anterior" + +#: ../src/ui/liferea_shell.c:924 +msgid "Next Item" +msgstr "Element següent" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "Element sense llegir _següent" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Visualitza" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "_Augmenta la mida del text" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Augmenta la mida del text de l'element visualitzat." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_Redueix la mida del text" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Redueix la mida del text de l'element visualitzat." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "E_ines" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" -msgstr "_Actualitza el monitor" +msgstr "_Monitor d'actualització" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 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ó" +msgstr "Mostra una llista de tots els canals que hi ha a la cua d'actualització" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Preferències" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Edita les preferències." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "_Cerca" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Cerca a tots els canals..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Mostra el diàleg de cerca." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "A_juda" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Continguts" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Visualitza l'ajuda d'aquesta aplicació." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Referència ràpida" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Visualitza una llista de totes les dreceres del Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_PMF" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Visualitza les PMF d'aquesta aplicació." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_Quant a" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Mostra el diàleg de quant a." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "Visualització _normal" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." -msgstr "" -"Estableix el mode de visualització semblant al mode del client de correu." +msgstr "Estableix el mode de visualització semblant al mode del client de correu." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "Visualització àmpli_a" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Estableix el mode de visualització a tres quadres verticals." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "Visualització _combinada" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Estableix el mode de visualització a dos quadres." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "Llista de canals _reduïda" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Oculta els canals sense cap element no llegit." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "Subscripció _nova..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Afegeix una subscripció a la llista de canals." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "_Carpeta nova..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Afegeix una carpeta a la llista de canals." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Carpeta de c_erca nova..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 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:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "_Font nova..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Afegeix una font de llista de canals nova." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "C_ontenidor de notícies nou..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Afegeix un contenidor de notícies nou." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "_Marca'ls tots com a llegits" -#: ../src/ui/liferea_shell.c:911 -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:979 +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 o de la llista d'elements seleccionada." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Actualitza" -#: ../src/ui/liferea_shell.c:913 -msgid "" -"Updates the selected subscription or all subscriptions of the selected " -"folder." -msgstr "" -"Actualitza la subscripció seleccionada o totes les subscripcions de la " -"carpeta seleccionada." +#: ../src/ui/liferea_shell.c:981 +msgid "Updates the selected subscription or all subscriptions of the selected folder." +msgstr "Actualitza la subscripció seleccionada o totes les subscripcions de la carpeta seleccionada." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "_Propietats" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 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:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "_Suprimeix" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Suprimeix la subscripció seleccionada." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Commuta l'estat de _lectura" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Commuta l'estat de lectura de l'element seleccionat." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Commuta el _senyalador de l'element" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Commuta l'estat del senyalador de l'element seleccionat." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "_Suprimeix" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Suprimeix l'element seleccionat." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "Obre en una _pestanya" + +#: ../src/ui/liferea_shell.c:997 +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Obre l'enllaç de l'element en una pestanya nova del navegador del Liferea." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +msgid "_Open In Browser" msgstr "_Obre'l en el navegador" -#: ../src/ui/liferea_shell.c:929 -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:999 +msgid "Launches the item's link in the Liferea item pane." +msgstr "Obre l'enllaç de l'element en el quadre d'elements del Lifera." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +msgid "Open In _External Browser" +msgstr "Obre'l en un navegador _extern" + +#: ../src/ui/liferea_shell.c:1001 +msgid "Launches the item's link in the configured external browser." +msgstr "Obre l'enllaç de l'element en el navegador extern preconfigurat." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "_Treballa fora de línia" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." -msgstr "" -"Aquesta opció us permet inhabilitar l'actualització de les subscripcions." +msgstr "Aquesta opció us permet inhabilitar l'actualització de les subscripcions." + +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "_Pantalla completa" -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "Navega a pantalla completa" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Lector de canals per a Linux" -#: ../src/ui/liferea_shell.c:1246 -#, fuzzy -msgid "" -"

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

    You can add new subscriptions

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

    " -msgstr "" -"

    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 " -"llista de les vostres subscripcions. Per a afegir-ne de noves seleccioneu " -"Canals -> Subscripció nova. Per a navegar pels titulars d'un canal, " -"seleccioneu-lo a la llista de canals i els seus titulars es carregaran al " -"quadre de la dreta.

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

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

    You can add new subscriptions

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

    " +msgstr "

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

    Podeu afegir subscripcions noves

    • des del menú principal «Subscripcions» -> «Subscripció nova...»
    • arrossegant i deixant anar enllaços de canals de notícies a la llista de subscripcions
    • fent clic amb el botó secundari a enllaços i seleccionant «Subscriu...» dins del Liferea

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../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):" +msgstr "Introduïu el nom d'usuari i la contrasenya per a «%s» (%s):" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Font desconeguda" @@ -1180,7 +1102,7 @@ #: ../src/ui/feed_list_view.c:342 #, 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?" +msgstr "Segur que voleu suprimir «%s» i el seus continguts?" #: ../src/ui/feed_list_view.c:342 #, c-format @@ -1193,273 +1115,259 @@ #: ../src/ui/feed_list_view.c:385 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:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Ha fallat la baixada de l'adjunció: «%s»" - -#: ../src/ui/liferea_htmlview.c:437 -#, fuzzy -msgid "Download finished." -msgstr "_Baixa-les utilitzant" +msgstr "El Liferea és en mode de fora de línia. No és poden fer actualitzacions." -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +#: ../src/ui/liferea_htmlview.c:627 +msgid "Open Link In _Tab" msgstr "Obre l'enllaç en una _pestanya" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +msgid "_Open Link In Browser" msgstr "_Obre l'enllaç en el navegador" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:629 +msgid "_Open Link In External Browser" +msgstr "Obre l'enllaç en el navegador _extern" + +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "_Publica l'enllaç a %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Copia la ubicació de l'enllaç" -#: ../src/ui/liferea_htmlview.c:555 -#, fuzzy +#: ../src/ui/liferea_htmlview.c:639 msgid "_Copy Image Location" -msgstr "_Copia la ubicació de l'enllaç" +msgstr "_Copia la ubicació de la imatge" -#: ../src/ui/liferea_htmlview.c:557 -#, fuzzy +#: ../src/ui/liferea_htmlview.c:641 msgid "S_ave Link As" -msgstr "Anomena i desa..." +msgstr "Anomena i desa l'enllaç" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" -msgstr "" +msgstr "Anomena i desa la _imatge" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Subscriu..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Sense títol ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Data" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Titular" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "No s'ha seleccionat cap element" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Aquest element no te cap enllaç especificat" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" -msgstr "Heu de seleccionar un canal per a poder suprimir-ne els seus elements" +msgstr "Heu de seleccionar un canal per poder-ne suprimir els seus elements" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Obre l'element en una _pestanya" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "_Obre l'element en el navegador" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "Copia'l al contenidor de notícies" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Copia l'_URL de l'element al porta-retalls" +#: ../src/ui/popup_menu.c:156 +#, c-format +msgid "_Bookmark at %s" +msgstr "_Adreça d'interès a %s" + +#: ../src/ui/popup_menu.c:160 +msgid "Copy Item _Location" +msgstr "_Copia la ubicació de l'element" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "_Suprimeix l'element" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Obre l'adjunció..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Anomena i desa..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "Copia la ubicació de l'enllaç" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "_Actualitza-ho tot" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "_Mostra el Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "_Actualitza la carpeta" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "_Marca'ls tots com a llegits" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_Nou" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "Subscripció _nova..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "_Font nova..." -#: ../src/ui/popup_menu.c:323 -#, fuzzy +#: ../src/ui/popup_menu.c:329 msgid "Sort Feeds" -msgstr "Importa la llista de canals" +msgstr "Ordena els canals" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" -msgstr "" - -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "Subscripció _nova..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" +msgstr "_Reconstrueix" -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" -msgstr "Predeterminat del GNOME" +msgstr "Per defecte del GNOME" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Text sota les icones" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Text al costat de les icones" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Només icones" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Només text" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minuts" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "hores" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "dies" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Tecla espaiadora" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " tecla espaiadora" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " tecla espaiadora" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Escolliu el directori de baixada" +#: ../src/ui/preferences_dialog.c:114 +msgid "Normal View" +msgstr "Visualització normal" + +#: ../src/ui/preferences_dialog.c:115 +msgid "Wide View" +msgstr "Visualització àmplia" + +#: ../src/ui/preferences_dialog.c:116 +msgid "Combined View" +msgstr "Visualització combinada" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Manual" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" -msgstr "Predeterminat pel navegador" +msgstr "Per defecte del navegador" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Finestra existent" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Finestra nova" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Pestanya nova" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" -msgstr "" +msgstr "Integra't amb el menú de missatgeria (indicació)" -#: ../src/ui/ui_prefs.c:684 -#, fuzzy +#: ../src/ui/preferences_dialog.c:685 msgid "Terminate instead of minimizing to the messaging menu" -msgstr "_Finalitza en comptes de minimitzar a la icona de la safata." +msgstr "Finalitza en comptes de minimitzar al menú de missatgeria" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" -msgstr "" +msgstr "Inicia minimitzat al menú de missatgeria" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Tipus" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Programa" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "(buit)" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" +"%s\n" +"S'està reconstruint" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." -msgid_plural "" -"The provider of this feed suggests an update interval of %d minutes." -msgstr[0] "" -"El proveïdor d'aquest canal suggereix un interval d'actualització de %d " -"minut." -msgstr[1] "" -"El proveïdor d'aquest canal suggereix un interval d'actualització de %d " -"minuts." +msgid_plural "The provider of this feed suggests an update interval of %d minutes." +msgstr[0] "El proveïdor d'aquest canal suggereix un interval d'actualització de %d minut." +msgstr[1] "El proveïdor d'aquest canal suggereix un interval d'actualització de %d minuts." #: ../src/ui/subscription_dialog.c:434 msgid "This feed specifies no default update interval." -msgstr "Aquest canal no especifica cap interval d'actualització predeterminat." +msgstr "Aquest canal no especifica cap interval d'actualització recomanat." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" -msgstr "" +msgstr "Sense títol" #: ../src/ui/ui_tray.c:221 #, c-format @@ -1498,17 +1406,17 @@ #: ../src/parsers/atom10.c:241 ../src/parsers/pie_feed.c:141 msgid "Website" -msgstr "" +msgstr "Lloc web" #: ../src/parsers/atom10.c:251 msgid "Invalid Atom feed: unknown author" -msgstr "Canal de tipus Atom no vàlid: autor desconegut" +msgstr "El canal de tipus Atom no és vàlid: autor desconegut" #: ../src/parsers/ns_ag.c:70 msgid "%b %d %H:%M" -msgstr "%b %d %H:%M" +msgstr "%d %b %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1518,32 +1426,21 @@ msgid "Google Reader login failed!" msgstr "Ha fallat l'entrada al Google Reader" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 -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 llista de canals del vostre compte de Google Reader. El Liferea " -"us mostrarà les vostres subscripcions del Google Reader i us sincronitzarà " -"les vostres llistes de canals i de lectura." +#: ../src/fl_sources/google_source.c:384 +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 llista de canals del compte de Google Reader. El Liferea us mostrarà les subscripcions del Google Reader i us sincronitzarà les llistes de canals i de lectura." #: ../src/fl_sources/opml_source.c:325 msgid "Planet, BlogRoll, OPML" msgstr "Planeta, llista de blocs, OPML" #: ../src/fl_sources/opml_source.c:326 -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 llistes de blocs o planetes en la vostra llista de canals. El " -"Liferea afegirà o suprimirà canals d'acord amb els canvis del document OPML " -"font" +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 llistes de blocs o planetes a la llista de canals. El Liferea afegirà o suprimirà canals d'acord amb els canvis del document OPML font" #: ../src/fl_sources/opml_source.c:387 msgid "Choose OPML File" @@ -1557,35 +1454,21 @@ 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:269 msgid "Source Type" msgstr "Tipus de font" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" -msgstr "" +msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 -#, fuzzy -msgid "" -"Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " -"present your tt-rss subscriptions, and will synchronize your feed list and " -"reading lists." -msgstr "" -"Integra la llista de canals del vostre compte de Google Reader. El Liferea " -"us mostrarà les vostres subscripcions del Google Reader i us sincronitzarà " -"les vostres llistes de canals i de lectura." +#: ../src/fl_sources/ttrss_source.c:363 +msgid "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will present your tt-rss subscriptions, and will synchronize your feed list and reading lists." +msgstr "Integra la llista de canals del compte de Tiny Tiny RSS 1.5+. El Liferea us mostrarà les subscripcions del tt-rss i us sincronitzarà les llistes de canals i de lectura." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" -msgstr "" +msgstr "No s'ha pogut analitzar el JSON que ha retornat l'API del tt-rss." #: ../src/notification/libnotify.c:61 ../src/notification/libnotify.c:83 #: ../src/notification/libnotify.c:152 @@ -1595,7 +1478,7 @@ #: ../src/notification/libnotify.c:125 #, c-format msgid "This news entry has no headline" -msgstr "Aquesta entrada de notícies no té titular" +msgstr "L'entrada de notícies no té titular" #: ../src/notification/libnotify.c:130 msgid "Visit" @@ -1613,8 +1496,8 @@ #, c-format msgid "%s has %d update" msgid_plural "%s has %d updates" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s%d actualització" +msgstr[1] "%s%d actualitzacions" #: ../src/notification/libnotify.c:257 ../src/notification/libnotify.c:259 msgid "Feed Update" @@ -1637,12 +1520,8 @@ msgstr "_Nom d'usuari:" #: ../glade/auth.ui.h:6 -msgid "" -"Note: The username and password will be saved to your Liferea feedlist " -"file without using encryption." -msgstr "" -"Nota: Es desarà, sense xifrar, el nom d'usuari i la contrasenya al fitxer " -"de la vostra llista de canals del Liferea." +msgid "Note: The username and password will be saved to your Liferea feedlist file without using encryption." +msgstr "Nota: es desarà, sense xifrar, el nom d'usuari i la contrasenya al fitxer de la llista de canals del Liferea." #: ../glade/google_source.ui.h:1 msgid "Add Google Reader Account" @@ -1652,8 +1531,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Introduïu les vostres dades del compte de Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Contrasenya" @@ -1677,7 +1555,7 @@ msgid "combined view" msgstr "visualització combinada" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Titulars" @@ -1690,22 +1568,20 @@ msgstr "Propietats de la subscripció" #: ../glade/liferea.ui.h:9 -#, fuzzy msgid "Feed Name" -msgstr "_Nom del canal:" +msgstr "Nom del canal" #: ../glade/liferea.ui.h:10 msgid "Feed _Name:" msgstr "_Nom del canal:" #: ../glade/liferea.ui.h:11 -#, fuzzy msgid "Update Interval" -msgstr "Monitor d'actualitzacions" +msgstr "Interval d'actualització" #: ../glade/liferea.ui.h:12 msgid "_Use global default update interval." -msgstr "_Utilitza l'interval d'actualització global predeterminat." +msgstr "_Utilitza l'interval d'actualització global per defecte." #: ../glade/liferea.ui.h:13 msgid "_Feed specific update interval of" @@ -1722,19 +1598,16 @@ #: ../glade/liferea.ui.h:17 #, 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." +msgstr "El proveïdor d'aquest canal suggereix un interval d'actualització de %d minuts." #: ../glade/liferea.ui.h:18 msgid "General" msgstr "General" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 -#, fuzzy +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" -msgstr "Font del canal" +msgstr "Font del canal" #: ../glade/liferea.ui.h:20 ../glade/new_subscription.ui.h:8 msgid "Source Type:" @@ -1758,38 +1631,27 @@ #: ../glade/liferea.ui.h:25 ../glade/new_subscription.ui.h:7 msgid "Select File..." -msgstr "Seleccioneu el fitxer..." +msgstr "Seleccioneu un fitxer..." #: ../glade/liferea.ui.h:26 ../glade/new_subscription.ui.h:11 msgid "Use conversion _filter" msgstr "_Utilitza un filtre de conversió" #: ../glade/liferea.ui.h:27 ../glade/new_subscription.ui.h:12 -msgid "" -"Liferea can use external filter plugins in order to access feeds and " -"directories in non-supported formats. See the documentation for more " -"information." -msgstr "" -"El Liferea pot utilitzar connectors de filtres externs per a poder accedir a " -"canals i carpetes que utilitzin formats no implementats. Vegeu la " -"documentació per a més informació." +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 "El Liferea pot utilitzar connectors de filtres externs per poder accedir a canals i carpetes que utilitzin formats no implementats pel propi Liferea. Vegeu la documentació per a més informació." #: ../glade/liferea.ui.h:28 ../glade/new_subscription.ui.h:13 msgid "Convert _using:" msgstr "Converteix _utilitzant:" #: ../glade/liferea.ui.h:30 -msgid "" -"The cache setting controls if the contents of feeds are saved when Liferea " -"exits. Marked items are always saved to the cache." -msgstr "" -"Els paràmetres de la memòria cau controlen si els continguts dels canals es " -"desen quan es surt del Liferea. Els elements marcats es desen sempre a la " -"memòria cau." +msgid "The cache setting controls if the contents of feeds are saved when Liferea exits. Marked items are always saved to the cache." +msgstr "Els paràmetres de la memòria cau controlen si els continguts dels canals es desen quan es surt del Liferea. Els elements marcats es desen sempre a la memòria cau." #: ../glade/liferea.ui.h:31 msgid "_Default cache settings" -msgstr "Paràmetres _predeterminats de la memòria cau" +msgstr "Paràmetres _per defecte de la memòria cau" #: ../glade/liferea.ui.h:32 msgid "Di_sable cache" @@ -1825,9 +1687,7 @@ #: ../glade/liferea.ui.h:42 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." +msgstr "Carrega automàticament _l'enllaç de l'element en el navegador configurat quan es seleccionin els articles." #: ../glade/liferea.ui.h:43 msgid "Ignore _comment feeds for this subscription." @@ -1850,433 +1710,152 @@ msgstr "Avançat" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Preferències del Liferea" +msgid "New Folder" +msgstr "Carpeta nova" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "Nom de la _carpeta:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "_Nombre d'elements predeterminat a desar per canal:" +msgid "Rename" +msgstr "Canvia el nom" #: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "Actualització de canal" +msgid "_New Name:" +msgstr "Nom _nou:" #: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Actualitza totes les subscripcions." +msgid "Search Folder Properties" +msgstr "Propietats de la carpeta de cerca" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "_Interval d'actualització predeterminat dels canals:" +msgid "Search _Name:" +msgstr "_Nom de la cerca:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "Cerca elements que coincideixen amb els criteris següents" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"Nota: Establiu un temps d'actualització raonable. Normalment no serveix " -"de res actualitzar més d'un cop cada hora." +msgid "A_ny Rule Matches" +msgstr "Coincidència de _qualsevol regla" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Canals" +msgid "_All Rules Must Match" +msgstr "Han de coincidir _totes les regles" #: ../glade/liferea.ui.h:57 -#, fuzzy -msgid "Folder Display Settings" -msgstr "" -"Paràmetres de visualització de les carpetes" +msgid "Open Enclosure" +msgstr "Obre l'adjunció" #: ../glade/liferea.ui.h:58 -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." +msgid "Open an enclosure of type:" +msgstr "Obre l'adjunció de tipus:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "_Oculta els elements llegits." +msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. The enclosures URL will be supplied as an argument for this command:" +msgstr "Què voleu que faci el Liferea amb aquesta adjunció? Escriviu aquí sota l'ordre que voleu que s'executi. L'URL de l'adjunt s'utilitzarà com a argument d'aquesta ordre:" #: ../glade/liferea.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Icones dels canals (Favicons)" +msgid "_Browse" +msgstr "_Navega" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_Actualitza totes les icones dels canals ara" +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.ui.h:62 -msgid "Folders" -msgstr "Carpetes" +msgid "Search All Feeds" +msgstr "Cerca a tots els canals" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "titulars sense llegir" +msgid "_Search for:" +msgstr "_Cerca:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "_Fulleja els articles amb:" +msgid "Enter a search string Liferea should find either in a items title or in its content." +msgstr "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.ui.h:65 -msgid "Web Integration" -msgstr "" +msgid "_Advanced..." +msgstr "_Avançat..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Publica les adreces d'interès a" +msgid "Starts searching for the specified text in all feeds. The search result will appear in the item list." +msgstr "Inicia la cerca del text especificat a tots els canals. Els resultats de la cerca apareixeran a la llista d'elements." #: ../glade/liferea.ui.h:67 -#, fuzzy -msgid "Internal Browser Settings" -msgstr "Paràmetres del navegador intern" +msgid "Update Monitor" +msgstr "Monitor d'actualitzacions" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Obre els enllaços en la _finestra del Liferea." +msgid "Pending Requests" +msgstr "Sol·licituds pendents" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Inhabilita el Javascript." +msgid "Downloading Now" +msgstr "S'està baixant" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "_Habilita els connectors del navegador." +msgid "Cancel _All" +msgstr "Cancel·la-ho _tot" #: ../glade/liferea.ui.h:71 -#, fuzzy -msgid "External Browser Settings" -msgstr "Paràmetres del navegador extern" +msgid "Create News Bin" +msgstr "Crea un contenidor de notícies" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "_Obre l'enllaç a:" - -#: ../glade/liferea.ui.h:74 -#, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" -msgstr "" -"_Manual:\n" -"(per l'URL utilitzeu %s)" - -#: ../glade/liferea.ui.h:76 -msgid "_Browser:" -msgstr "_Navegador:" - -#: ../glade/liferea.ui.h:77 -msgid "Browser" -msgstr "Navegador" - -#: ../glade/liferea.ui.h:78 -#, fuzzy -msgid "Notification Settings" -msgstr "Paràmetres de notificació" - -#: ../glade/liferea.ui.h:79 -msgid "Show a _popup window with new headlines." -msgstr "Mostra una finestra _emergent amb els titulars nous." - -#: ../glade/liferea.ui.h:80 -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.ui.h:81 -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.ui.h:82 -msgid "T_erminate instead of minimizing to tray icon." -msgstr "_Finalitza en comptes de minimitzar a la icona de la safata." - -#: ../glade/liferea.ui.h:83 -msgid "_Start in tray icon." -msgstr "_Inicia a la icona de la safata." - -#: ../glade/liferea.ui.h:84 -#, fuzzy -msgid "Toolbar Settings" -msgstr "Etiquetes dels _botons de la barra d'eines:" - -#: ../glade/liferea.ui.h:85 -msgid "_Hide toolbar." -msgstr "_Oculta la barra d'eines." - -#: ../glade/liferea.ui.h:86 -msgid "Toolbar _button labels:" -msgstr "Etiquetes dels _botons de la barra d'eines:" - -#: ../glade/liferea.ui.h:87 -msgid "GUI" -msgstr "Interfície gràfica" - -#: ../glade/liferea.ui.h:88 -msgid "HTTP Proxy Server" -msgstr "" - -#: ../glade/liferea.ui.h:89 -msgid "_Auto Detect (GNOME or environment)" -msgstr "Detecta _automàticament (del GNOME o de l'entorn)" - -#: ../glade/liferea.ui.h:90 -msgid "_No Proxy" -msgstr "_Sense servidor intermediari" - -#: ../glade/liferea.ui.h:91 -msgid "_Manual Setting:" -msgstr "Paràmetres _manuals:" - -#: ../glade/liferea.ui.h:92 -msgid "Proxy _Port:" -msgstr "_Port del servidor intermediari:" - -#: ../glade/liferea.ui.h:93 -msgid "Proxy _Host:" -msgstr "_Ordinador del servidor intermediari:" - -# és una casella de verificació -#: ../glade/liferea.ui.h:94 -msgid "Use Proxy Au_thentication" -msgstr "Utilitza l'autenticació del _servidor intermediari" - -#: ../glade/liferea.ui.h:95 -msgid "Proxy Pass_word:" -msgstr "_Contrasenya del servidor intermediari:" - -#: ../glade/liferea.ui.h:96 -msgid "Proxy _Username:" -msgstr "_Usuari del servidor intermediari:" - -#: ../glade/liferea.ui.h:97 -msgid "Proxy" -msgstr "Servidor intermediari" - -#: ../glade/liferea.ui.h:98 -#, fuzzy -msgid "Downloading Enclosures" -msgstr "S'estan baixant les adjuncions" - -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Navega" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Desa les baixades a" - -#: ../glade/liferea.ui.h:101 -msgid "_Download using" -msgstr "_Baixa-les utilitzant" - -#: ../glade/liferea.ui.h:102 -#, fuzzy -msgid "Opening Enclosures" -msgstr "Obre l'adjunció..." - -#: ../glade/liferea.ui.h:103 -msgid "Enclosures" -msgstr "Adjuncions" - -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Sincronització amb els equips propers" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_Habilita la sincronitza en la xarxa local" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "Nom del _servei" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Sincronitza" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Carpeta nova" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "Nom de la _carpeta:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Canvia el nom" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "Nom _nou:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Propietats de la carpeta de cerca" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "_Nom de la cerca:" - -#: ../glade/liferea.ui.h:115 -#, fuzzy -msgid "Find Items that meet the following criteria" -msgstr "Cerca elements que coincideixen amb els criteris següents" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "Coincidència de _qualsevol regla" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "Han de coincidir _totes les regles" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "S'estan baixant les adjuncions" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "S'està baixant una adjunció de tipus:" - -#: ../glade/liferea.ui.h:120 -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 "" -"Què voleu que faci el Liferea amb una adjunció d'aquest tipus? Escriviu aquí " -"sota l'ordre que voleu que s'executi. El fitxer baixat s'utilitzarà com a " -"argument d'aquesta ordre:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Passa l'URL i no baixis l'adjunció." - -#: ../glade/liferea.ui.h:122 -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.ui.h:123 -msgid "Search All Feeds" -msgstr "Cerca a tots els canals" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Cerca:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"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.ui.h:126 -msgid "_Advanced..." -msgstr "_Avançat..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Inicia la cerca del text especificat a tots els canals. Els resultats de la " -"cerca apareixeran a la llista d'elements." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Monitor d'actualitzacions" - -#: ../glade/liferea.ui.h:129 -#, fuzzy -msgid "Pending Requests" -msgstr "Sol·licituds pendents" - -#: ../glade/liferea.ui.h:130 -#, fuzzy -msgid "Downloading Now" -msgstr "S'està baixant ara" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "Cancel·la-ho _tot" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Crea un contenidor de notícies" - -#: ../glade/liferea.ui.h:133 msgid "_News Bin Name:" msgstr "_Nom del contenidor de notícies:" -#: ../glade/liferea.ui.h:134 +#: ../glade/liferea.ui.h:73 msgid "About" msgstr "Quant a" -#: ../glade/liferea.ui.h:135 -#, fuzzy +#: ../glade/liferea.ui.h:74 msgid "" "Copyright (c) 2003-2012\n" "The Liferea Team\n" msgstr "" -"Copyright (c) 2003-2009\n" +"Copyright (c) 2003-2012\n" "L'equip del Liferea\n" -#: ../glade/liferea.ui.h:138 +#: ../glade/liferea.ui.h:77 msgid "Liferea is a news aggregator for GTK+" -msgstr "El Liferea és un agregador de notícies per al GTK+" +msgstr "El Liferea és un agregador de notícies per a GTK+" -#: ../glade/liferea.ui.h:139 +#: ../glade/liferea.ui.h:78 msgid "Liferea Homepage" msgstr "Pàgina inicial del Liferea" -#: ../glade/liferea.ui.h:140 +#: ../glade/liferea.ui.h:79 msgid "Advanced Search" msgstr "Cerca avançada" -#: ../glade/liferea.ui.h:141 +#: ../glade/liferea.ui.h:80 msgid "_Search Folder..." msgstr "Carpeta de _cerca..." -#: ../glade/liferea.ui.h:142 +#: ../glade/liferea.ui.h:81 msgid "Create Search Engine Feed" msgstr "Crea un canal de motor de cerca" -#: ../glade/liferea.ui.h:143 +#: ../glade/liferea.ui.h:82 msgid "enter any search string you want" msgstr "introduïu la cadena que voleu cercar" -#: ../glade/liferea.ui.h:144 +#: ../glade/liferea.ui.h:83 msgid "Maximal _Number Of Result Items:" msgstr "_Nombre màxim de resultats:" -#: ../glade/liferea.ui.h:145 -#, 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 "" -"Nota: el Liferea generarà un canal de subscripció que es farà servir per a " -"consultar els resultats del motor de cerca generats a partir de la cadena de " -"cerca especificada. Podeu mantenir aquest canal permanentment i actualitzar-" -"lo de la mateixa manera que qualsevol altra subscripció. " +#: ../glade/liferea.ui.h:84 +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: el Liferea generarà un canal de subscripció que es farà servir per consultar els resultats del motor de cerca generats a partir de la cadena de cerca especificada. Podeu mantenir aquest canal permanentment i actualitzar-lo de la mateixa manera que qualsevol altra subscripció." #: ../glade/new_subscription.ui.h:9 -#, fuzzy msgid "Download / Postprocessing" -msgstr "Baixada / Post processament" +msgstr "Baixada / Post processament" #: ../glade/node_source.ui.h:1 msgid "Source Selection" @@ -2288,14 +1867,11 @@ #: ../glade/opml_source.ui.h:1 msgid "Add OPML/Planet" -msgstr "Afegeix un OPML/Planeta" +msgstr "Afegeix un OPML/planeta" #: ../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." +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.ui.h:3 msgid "_Location" @@ -2306,193 +1882,319 @@ msgstr "_Seleccioneu un fitxer" #: ../glade/ttrss_source.ui.h:1 -#, fuzzy msgid "Add Tiny Tiny RSS Account" -msgstr "Afegeix un compte de Bloglines" +msgstr "Afegeix un compte de Tiny Tiny RSS" #: ../glade/ttrss_source.ui.h:2 -#, fuzzy msgid "Please enter your tt-rss account settings." -msgstr "Introduïu les vostres dades del compte de Bloglines." +msgstr "Introduïu les dades del compte del tt-rss." #: ../glade/ttrss_source.ui.h:3 -#, fuzzy msgid "_Server URL" -msgstr "Error del servidor" +msgstr "URL del _servidor" #: ../glade/ttrss_source.ui.h:5 msgid "_Username" msgstr "Nom d'_usuari" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"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." - -#: ../glade/simple_subscription.ui.h:4 +#: ../glade/simple_subscription.ui.h:2 msgid "Advanced..." msgstr "Avançat..." -#~ msgid "You may want to validate the feed using" -#~ msgstr "Podeu validar el canal amb" +#: ../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 "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 "" -#~ "Jumps to the next unread item. If necessary selects the next feed with " -#~ "unread items." -#~ msgstr "" -#~ "Salta a l'element següent sense llegir. Si és necessari selecciona el " -#~ "canal següent amb elements sense llegir." +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Preferències del Liferea" -#~ msgid "Liferea Sync %s@%s" -#~ msgstr "Sincronització del Liferea %s@%s" +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Gestió de la memòria cau dels canals" -# FIXME -#~ msgid "link cosmos" -#~ msgstr "núvol d'enllaços" +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "_Nombre per defecte d'elements a desar per canal:" -#~ msgid "Update status" -#~ msgstr "Estat d'actualització" +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Paràmetres de l'actualització del canal" -#~ msgid "was updated" -#~ msgstr "s'ha actualitzat" +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "_Actualitza totes les subscripcions en iniciar." -#~ msgid "was not updated" -#~ msgstr "no s'ha actualitzat" +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "_Interval d'actualització per defecte dels canals:" -#~ msgid "topics_en.html" -#~ msgstr "topics_en.html" +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "Note: Please remember to set a reasonable refresh time. Usually it is a waste of bandwidth to poll feeds more often than each hour." +msgstr "Nota: Establiu un temps d'actualització raonable. Normalment no serveix de res actualitzar més d'un cop cada hora." -#~ msgid "reference_en.html" -#~ msgstr "reference_en.html" +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Canals" -#~ msgid "faq_en.html" -#~ msgstr "faq_en.html" +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Paràmetres de visualització de les carpetes" -#~ msgid "_Script Manager" -#~ msgstr "_Gestor d'scripts" +#: ../glade/prefs.ui.h:11 +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." -#~ msgid "Allows to configure and edit LUA hook scripts" -#~ msgstr "Us permet configurar i editar els scripts de lligam LUA" +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "_Oculta els elements llegits." -#~ msgid "Attention Profile" -#~ msgstr "Perfil d'atenció" +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Icones dels canals (Favicons)" -#~ msgid "Presents statistics on your most read categories" -#~ msgstr "Mostra estadístiques de les categories més llegides" +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Actualitza totes les icones dels canals ara" -#~ msgid "Search With ..." -#~ msgstr "Cerca amb ..." +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Carpetes" -#~ msgid "%d Search Result for \"%s\"" -#~ msgid_plural "%d Search Results for \"%s\"" -#~ msgstr[0] "%d resultat de cerca per a «%s»" -#~ msgstr[1] "%d resultats de cerca per a «%s»" +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Lectura de titulars" -#~ msgid "%d Search Result" -#~ msgid_plural "%d Search Results" -#~ msgstr[0] "%d resultat de cerca" -#~ msgstr[1] "%d resultats de cerca" +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "_Fulleja els articles amb:" -#~ 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 "" -#~ "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." +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "Mode de visualització per _defecte:" -#~ msgid "Count" -#~ msgstr "Comptatge" +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Integració web" -#~ msgid "(empty)" -#~ msgstr "(buit)" +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Publica les adreces d'interès a" -#~ msgid "_Delete" -#~ msgstr "_Suprimeix" +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Paràmetres del navegador intern" -#~ msgid "_Properties..." -#~ msgstr "_Propietats..." +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Obre els enllaços a la _finestra del Liferea." -#~ msgid "Update out-dated feeds" -#~ msgstr "Actualitza els canals desactualitzats" +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Inhabilita el Javascript." -#~ msgid "Force update of all feeds" -#~ msgstr "Força l'actualització de tots els canals" +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "_Habilita els connectors del navegador." -#~ msgid "No feed update at all" -#~ msgstr "No s'ha actualitzat cap canal" +#: ../glade/prefs.ui.h:26 +msgid "External Browser Settings" +msgstr "Paràmetres del navegador extern" -#~ msgid "startup" -#~ msgstr "a l'inici" +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "_Obre l'enllaç a:" -#~ msgid "feed updated" -#~ msgstr "s'ha actualitzat el canal" +#: ../glade/prefs.ui.h:28 +msgid "_Manual:" +msgstr "_Manual:" -#~ msgid "feed added" -#~ msgstr "s'ha afegit el canal" +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "(%s per l'URL)" -#~ msgid "item selected" -#~ msgstr "s'ha seleccionat un element" +#: ../glade/prefs.ui.h:31 +msgid "_Browser:" +msgstr "_Navegador:" -#~ msgid "feed selected" -#~ msgstr "s'ha seleccionat un canal" +#: ../glade/prefs.ui.h:32 +msgid "Browser" +msgstr "Navegador" -#~ msgid "item unselected" -#~ msgstr "s'ha desseleccionat l'element" +#: ../glade/prefs.ui.h:33 +msgid "Notification Settings" +msgstr "Paràmetres de notificació" -#~ msgid "feed unselected" -#~ msgstr "s'ha desseleccionat el canal" +#: ../glade/prefs.ui.h:34 +msgid "Show a _popup window with new headlines." +msgstr "Mostra una finestra _emergent amb els titulars nous." -#~ msgid "shutdown" -#~ msgstr "apaga" +#: ../glade/prefs.ui.h:35 +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)." -#~ 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." +#: ../glade/prefs.ui.h:36 +msgid "Show _number of new items in the tray icon." +msgstr "Mostra el _nombre d'elements nous a la icona de la safata." -#~ msgid "Script Name" -#~ msgstr "Nom de l'script" +#: ../glade/prefs.ui.h:37 +msgid "T_erminate instead of minimizing to tray icon." +msgstr "_Finalitza en comptes de minimitzar a la icona de la safata." -#~ msgid "No script selected!" -#~ msgstr "No heu seleccionat cap script" +#: ../glade/prefs.ui.h:38 +msgid "_Start in tray icon." +msgstr "_Inicia a la icona de la safata." -#~ msgid "Create a new search feed." -#~ msgstr "Crea un canal de cerca nou." +#: ../glade/prefs.ui.h:39 +msgid "Toolbar Settings" +msgstr "Paràmetres de la barra d'eines" -#~ msgid "Liferea is unable to display this item's content." -#~ msgstr "El Liferea no pot mostrar el contingut d'aquest element." +#: ../glade/prefs.ui.h:40 +msgid "_Hide toolbar." +msgstr "_Oculta la barra d'eines." -#~ msgid "

    View this item's content.

    " -#~ msgstr "

    Visualitza el contingut de l'element.

    " +#: ../glade/prefs.ui.h:41 +msgid "Toolbar _button labels:" +msgstr "Etiquetes dels _botons de la barra d'eines:" -#~ msgid "Bloglines" -#~ msgstr "Bloglines" +#: ../glade/prefs.ui.h:42 +msgid "GUI" +msgstr "Interfície gràfica" + +#: ../glade/prefs.ui.h:43 +msgid "HTTP Proxy Server" +msgstr "Servidor intermediari HTTP" + +#: ../glade/prefs.ui.h:44 +msgid "_Auto Detect (GNOME or environment)" +msgstr "Detecta _automàticament (del GNOME o de l'entorn)" + +#: ../glade/prefs.ui.h:45 +msgid "_No Proxy" +msgstr "_Sense servidor intermediari" + +#: ../glade/prefs.ui.h:46 +msgid "_Manual Setting:" +msgstr "Paràmetres _manuals:" + +#: ../glade/prefs.ui.h:47 +msgid "Proxy _Port:" +msgstr "_Port del servidor intermediari:" + +#: ../glade/prefs.ui.h:48 +msgid "Proxy _Host:" +msgstr "_Ordinador del servidor intermediari:" + +#: ../glade/prefs.ui.h:49 +msgid "Use Proxy Au_thentication" +msgstr "Utilitza l'autenticació del _servidor intermediari" + +#: ../glade/prefs.ui.h:50 +msgid "Proxy Pass_word:" +msgstr "_Contrasenya del servidor intermediari:" + +#: ../glade/prefs.ui.h:51 +msgid "Proxy _Username:" +msgstr "_Usuari del servidor intermediari:" + +#: ../glade/prefs.ui.h:52 +msgid "Proxy" +msgstr "Servidor intermediari" + +#: ../glade/prefs.ui.h:53 +msgid "Downloading Enclosures" +msgstr "S'estan baixant les adjuncions" + +#: ../glade/prefs.ui.h:54 +msgid "_Download using" +msgstr "_Baixa-les utilitzant" + +#: ../glade/prefs.ui.h:55 +msgid "Opening Enclosures" +msgstr "Obre les adjuncions" + +#: ../glade/prefs.ui.h:56 +msgid "Enclosures" +msgstr "Adjuncions" + +#: ../glade/prefs.ui.h:57 +msgid "Plugins" +msgstr "Connectors" + +#~ msgid "Download and view feeds" +#~ msgstr "Baixeu i visualitzeu canals de notícies" + +#~ msgid "You may want to validate the feed using" +#~ msgstr "Podeu validar el canal amb" + +#~ msgid "Launch Item In _Tab" +#~ msgstr "Obre l'element en una _pestanya" + +#~ msgid "_Launch Item In Browser" +#~ msgstr "_Obre l'element en el navegador" + +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Copia l'_URL de l'element al porta-retalls" + +#~ msgid "bookmark" +#~ msgstr "adreça d'interès" + +#~ msgid "comments" +#~ msgstr "comentaris" + +#~ msgid "flag" +#~ msgstr "senyalador" + +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Ha fallat la baixada de l'adjunció: «%s»" + +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "S'ha acabat de baixar l'adjunció: «%s»" + +#~ msgid "This version of Liferea uses a new cache format and has migrated your feed cache. The cache content in %s was not deleted automatically. Please remove this directory manually once you are sure migration was successful!" +#~ msgstr "Aquesta versió del Liferea utilitza un format de memòria cau nova a la qual s'ha migrat la memòria cau dels canals existent. No s'ha suprimit automàticament el contingut de %s. Un cop estigueu segur que la migració ha estat satisfactòria podeu suprimir el directori manualment." + +#~ msgid "Jumps to the next unread item. If necessary selects the next feed with unread items." +#~ msgstr "Salta a l'element següent sense llegir. Si és necessari selecciona el canal següent amb elements sense llegir." + +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Ha fallat la baixada: «%s»" + +#~ msgid "Download finished." +#~ msgstr "Ha finalitzat la baixada." + +#~ msgid "Choose download directory" +#~ msgstr "Escolliu el directori de baixada" + +#~ msgid "Downloading Enclosure" +#~ msgstr "S'estan baixant l'adjunció" + +#~ msgid "Sync" +#~ msgstr "Sincronitza" + +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Sincronització amb els equips propers" + +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "_Habilita la sincronitza en la xarxa local" #~ msgid "" -#~ "Integrate the feed list of your Bloglines account. Liferea will present " -#~ "your Bloglines subscription as a read-only subtree in the feed list." +#~ "_Manual:\n" +#~ "(%s for URL)" #~ msgstr "" -#~ "Integra la llista de canals del vostre compte de Bloglines. El Liferea us " -#~ "mostrarà les vostres subscripcions del Bloglines com a subarbre de només " -#~ "lectura en la llista de canals." +#~ "_Manual:\n" +#~ "(per l'URL utilitzeu %s)" -#~ msgid "feedlist.opml" -#~ msgstr "feedlist_ca.opml" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "_Passa l'URL i no baixis l'adjunció." -#~ 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" +#~ msgid "_Save downloads in" +#~ msgstr "_Desa les baixades a" + +#~ msgid "_Service Name" +#~ msgstr "Nom del _servei" #~ msgid " " #~ msgstr " " @@ -2503,6 +2205,21 @@ #~ msgid " " #~ msgstr " " +#~ msgid "%d Search Result" +#~ msgid_plural "%d Search Results" +#~ msgstr[0] "%d resultat de cerca" +#~ msgstr[1] "%d resultats de cerca" + +#~ msgid "%d Search Result for \"%s\"" +#~ msgid_plural "%d Search Results for \"%s\"" +#~ msgstr[0] "%d resultat de cerca per a «%s»" +#~ msgstr[1] "%d resultats de cerca per a «%s»" + +#~ 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" + #~ msgid "Hook" #~ msgstr "Lligam" @@ -2515,12 +2232,14 @@ #~ msgid "text/plain" #~ msgstr "text/pla" -#~ msgid "" -#~ "This option can cause significant delays when loading folders " -#~ "containing many feeds." -#~ msgstr "" -#~ "Aquesta opció pot provocar retards significatius quan es carreguin " -#~ "carpetes amb molts canals." +#~ msgid "(empty)" +#~ msgstr "(buit)" + +#~ msgid "This option can cause significant delays when loading folders containing many feeds." +#~ msgstr "Aquesta opció pot provocar retards significatius quan es carreguin carpetes amb molts canals." + +#~ msgid "

    View this item's content.

    " +#~ msgstr "

    Visualitza el contingut de l'element.

    " #~ msgid "Downloading Enclosures" #~ msgstr "Baixada de les adjuncions" @@ -2555,20 +2274,128 @@ #~ msgid "Add Script" #~ msgstr "Afegeix un script" +#~ msgid "Allows to configure and edit LUA hook scripts" +#~ msgstr "Us permet configurar i editar els scripts de lligam LUA" + #~ msgid "At _startup:" #~ msgstr "A l'_inici:" +#~ msgid "Attention Profile" +#~ msgstr "Perfil d'atenció" + +#~ msgid "Bloglines" +#~ msgstr "Bloglines" + +#~ msgid "Count" +#~ msgstr "Comptatge" + +#~ msgid "Create a new search feed." +#~ msgstr "Crea un canal de cerca nou." + #~ msgid "Create new script" #~ msgstr "Crea un script nou" #~ msgid "Exec Command" #~ msgstr "Executa una ordre" +#~ msgid "Force update of all feeds" +#~ msgstr "Força l'actualització de tots els canals" + +#~ 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 llista de canals del vostre compte de Bloglines. El Liferea us mostrarà les vostres subscripcions del Bloglines com a subarbre de només lectura en la llista de canals." + +#~ msgid "Liferea Sync %s@%s" +#~ msgstr "Sincronització del Liferea %s@%s" + +#~ msgid "Liferea is unable to display this item's content." +#~ msgstr "El Liferea no pot mostrar el contingut d'aquest element." + +#~ msgid "No feed update at all" +#~ msgstr "No s'ha actualitzat cap canal" + +#~ msgid "No script selected!" +#~ msgstr "No heu seleccionat cap script" + +#~ msgid "Presents statistics on your most read categories" +#~ msgstr "Mostra estadístiques de les categories més llegides" + #~ msgid "Reuse existing script" #~ msgstr "Reutilitza un script existent" #~ msgid "Script Manager" #~ msgstr "Gestor d'scripts" +#~ msgid "Script Name" +#~ msgstr "Nom de l'script" + +#~ msgid "Search With ..." +#~ msgstr "Cerca amb ..." + #~ msgid "Search _Link Cosmos with" #~ msgstr "Cerca al núvol d'_enllaços amb" + +#~ 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." + +#~ 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 "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." + +#~ msgid "Update out-dated feeds" +#~ msgstr "Actualitza els canals desactualitzats" + +#~ msgid "Update status" +#~ msgstr "Estat d'actualització" + +#~ msgid "_Delete" +#~ msgstr "_Suprimeix" + +#~ msgid "_Properties..." +#~ msgstr "_Propietats..." + +#~ msgid "_Script Manager" +#~ msgstr "_Gestor d'scripts" + +#~ msgid "faq_en.html" +#~ msgstr "faq_en.html" + +#~ msgid "feed added" +#~ msgstr "s'ha afegit el canal" + +#~ msgid "feed selected" +#~ msgstr "s'ha seleccionat un canal" + +#~ msgid "feed unselected" +#~ msgstr "s'ha desseleccionat el canal" + +#~ msgid "feed updated" +#~ msgstr "s'ha actualitzat el canal" + +#~ msgid "feedlist.opml" +#~ msgstr "feedlist_ca.opml" + +#~ msgid "item selected" +#~ msgstr "s'ha seleccionat un element" + +#~ msgid "item unselected" +#~ msgstr "s'ha desseleccionat l'element" + +#~ msgid "link cosmos" +#~ msgstr "núvol d'enllaços" + +#~ msgid "reference_en.html" +#~ msgstr "reference_en.html" + +#~ msgid "shutdown" +#~ msgstr "apaga" + +#~ msgid "startup" +#~ msgstr "a l'inici" + +#~ msgid "topics_en.html" +#~ msgstr "topics_en.html" + +#~ msgid "was not updated" +#~ msgstr "no s'ha actualitzat" + +#~ msgid "was updated" +#~ msgstr "s'ha actualitzat" diff -Nru liferea-1.8.15/po/ChangeLog liferea-1.10.3/po/ChangeLog --- liferea-1.8.15/po/ChangeLog 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/po/ChangeLog 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -2010-08-16 Lars Lindner - - * added Galician translation from Anxo Outeiral Vidal - -2008-03-24 Lars Lindner - - * added Czech translation for v1.5 from Martin Picek - -2007-01-14 Lars Lindner - - * added Turkish translation for v1.2 from Mehmet Atif Ergun - -2007-01-04 Lars Lindner - - * added Arabic translation for v1.2 from Khaled Hosny - -2006-12-11 Lars Lindner - - * added French translation for v1.2 from Vincent Lefèvre - -2006-11-25 Lars Lindner - - * added Spanish translation for v1.2 from Sargate Kanogan - -2006-11-19 Lars Lindner - - * added Italian translation for v1.2 from Dario Conigliaro - * added Brazilian Portuguese translation for v1.2 from - Fernando Ike de Oliveira - -2006-11-10 Lars Lindner - - * added Japanese translation from Takeshi AIHANA - -2006-11-03 Lars Lindner - - * added German translation diff -Nru liferea-1.8.15/po/cs.po liferea-1.10.3/po/cs.po --- liferea-1.8.15/po/cs.po 2013-06-24 22:16:14.000000000 +0200 +++ liferea-1.10.3/po/cs.po 2013-07-31 23:29:12.000000000 +0200 @@ -4,9 +4,9 @@ msgstr "" "Project-Id-Version: Liferea 1.5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" -"PO-Revision-Date: 2013-01-08 08:50+0100\n" -"Last-Translator: Petr Šimáček \n" +"POT-Creation-Date: 2013-01-25 23:54+0100\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" @@ -17,8 +17,7 @@ "X-Poedit-Country: CZECH REPUBLIC\n" "X-Poedit-SourceCharset: utf-8\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -31,8 +30,8 @@ msgstr "Čtečka kanálů Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Stahovat a prohlížet zdroje s novinkami" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -92,7 +91,7 @@ #: ../xslt/source.xml.in.h:2 ../xslt/folder.xml.in.h:2 msgid "children with" -msgstr "s podsložkami" +msgstr "" #: ../xslt/source.xml.in.h:3 ../xslt/folder.xml.in.h:3 #: ../xslt/vfolder.xml.in.h:2 @@ -121,11 +120,11 @@ #: ../xslt/item.xml.in.h:5 msgid "Shared by" -msgstr "Sdíleno " +msgstr "" #: ../xslt/item.xml.in.h:6 msgid "Via" -msgstr "Přes" +msgstr "" #: ../xslt/item.xml.in.h:7 msgid "Related" @@ -140,38 +139,26 @@ msgstr "Tvůrce" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "označení" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "záložka" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "komentáře" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Zatím žádné komentáře." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Komentáře" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Aktualizuje se…" -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Aktualizovat" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Sekce" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Oddělení" @@ -192,15 +179,16 @@ msgstr "Složka hledání:" #: ../src/browser.c:32 +#, fuzzy msgid "Default Browser" -msgstr "Výchozí internetový prohlížeč" +msgstr "Výchozí prohlížeč GNOME" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Příkaz pro prohlížeč selhal: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Spouští se: „%s“" @@ -210,7 +198,7 @@ msgid "Authorization Error" msgstr "Chyba autorizace" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Nepodařilo se vytvořit adresář „%s“ pro vyrovnávací paměť!" @@ -240,74 +228,83 @@ msgid "%b %d %Y" msgstr "%d. %b %Y, %l.%M" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" -msgstr "\"%s\" není platný typ přílohy konfiguračního souboru!" +msgstr "" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Stahování přílohy se nezdařilo: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Stahování přílohy dokončeno: „%s“" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Chyba při přejmenovávání %s na %s\n" -#: ../src/export.c:388 ../src/export.c:390 -#, c-format +#: ../src/export.c:406 ../src/export.c:408 +#, fuzzy, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" -msgstr "Chyba XML při čtení OPML souboru! Nepodařilo se importovat \"%s\"!" +msgstr "" +"Chyba XML při čtení souboru s vyrovnávací pamětí! Nepodařilo se importovat " +"„%s“!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "" "Prázdný dokument! Dokument OPML „%s“ by neměl být při importování prázdný." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "„%s“ není platným dokumentem OPML! Liferea nemohla tento soubor importovat!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Seznam importovaných kanálů" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importovat seznam kanálů" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importovat" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 +#, fuzzy msgid "OPML Files" -msgstr "OPML soubory" +msgstr "Vybrat soubor OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Chyba při exportování seznamu kanálů!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Seznam kanálů exportován!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Exportovat seznam kanálů" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Exportovat" @@ -363,161 +360,159 @@ msgstr "Nepodařilo se určit typ kanálu." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 +#, fuzzy msgid "There are no unread items" msgstr "Nejsou zde žádné nepřečtené články" -#: ../src/main.c:175 +#: ../src/main.c:164 +#, fuzzy msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" -msgstr "" -"Otevřít program Liferea s hlavním oknem ve STAVU. STAV může být „zobrazený“, " -"„ikonový“ nebo „skrytý“." +msgstr " STAV může být „shown“, „iconified“ nebo „hidden“." -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" -msgstr "STAV" +msgstr "" -#: ../src/main.c:179 +#: ../src/main.c:165 +#, fuzzy msgid "Show version information and exit" -msgstr "Zobrazit informace o verzi a ukončit." +msgstr " --version Vypsat informace o verzi a ukončit." -#: ../src/main.c:180 +#: ../src/main.c:166 +#, fuzzy msgid "Add a new subscription" -msgstr "Přidat nový odběr" +msgstr "Nový odběr" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" -msgstr "uri" +msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 +#, fuzzy msgid "Print debugging messages of all types" -msgstr "Vytisknout ladící zprávy pro všechny typy." +msgstr " --debug- Vypsat ladící zprávy pro zadané téma." -#: ../src/main.c:186 +#: ../src/main.c:172 #, fuzzy msgid "Print debugging messages for the cache handling" msgstr " --debug- Vypsat ladící zprávy pro zadané téma." -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr " --debug- Vypsat ladící zprávy pro zadané téma." -#: ../src/main.c:188 +#: ../src/main.c:174 #, fuzzy msgid "Print debugging messages of the database handling" msgstr " --debug- Vypsat ladící zprávy pro zadané téma." -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" -msgstr "Tisk zprávy o ladění všech GUI funkcí" +msgstr "" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "" -#: ../src/main.c:195 +#: ../src/main.c:181 #, fuzzy msgid "Print debugging messages of the feed update processing" msgstr " --debug- Vypsat ladící zprávy pro zadané téma." -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr " --debug- Vypsat ladící zprávy pro zadané téma." -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 #, fuzzy 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:202 +#, fuzzy msgid "Liferea, the Linux Feed Reader" -msgstr "Liferea, čtečka internetových zdrojů pro Linux " - -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "Pro více informací, navštivte http://liferea.sourceforge.net/" +msgstr "Liferea – Linux Feed Reader" -#: ../src/migrate.c:340 -#, 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!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" #. Some libsoup transport errors #: ../src/net.c:320 msgid "The update request was cancelled" -msgstr "Požadavek na aktualizaci byl zrušen" +msgstr "" #: ../src/net.c:321 msgid "Unable to resolve destination host name" -msgstr "Nelze vyřešit cílový název hostitele" +msgstr "" #: ../src/net.c:322 msgid "Unable to resolve proxy host name" -msgstr "Nelze vyřešit proxy název hostitele" +msgstr "" #: ../src/net.c:323 msgid "Unable to connect to remote host" -msgstr "Nelze spojit se vzdáleným hostitelem" +msgstr "" #: ../src/net.c:324 msgid "Unable to connect to proxy" -msgstr "Nelze připojit k proxy" +msgstr "" #: ../src/net.c:325 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" -msgstr "Došlo k chybě sítě, nebo druhý konec uzavřel neočekávaně spojení " +msgstr "" #. http 3xx redirection #: ../src/net.c:328 msgid "The resource moved permanently to a new location" -msgstr "Zdroj byl trvale přemístěn do nového umístění" +msgstr "" #. http 4xx client error #: ../src/net.c:331 +#, fuzzy msgid "" "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" msgstr "" -"Nemáte oprávnění odebírat tento kanál. Prosím, aktualizujte své uživatelské " +"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:333 +#, fuzzy msgid "Payment required" msgstr "Požadována platba" #: ../src/net.c:334 msgid "You're not allowed to access this resource" -msgstr "Nemáte oprávnění k přístupu na tento zdroj" +msgstr "" #: ../src/net.c:335 msgid "Resource Not Found" @@ -532,10 +527,12 @@ msgstr "Neakceptovatelné" #: ../src/net.c:338 +#, fuzzy msgid "Proxy authentication required" msgstr "Požadována autentizace proxy" #: ../src/net.c:339 +#, fuzzy msgid "Request timed out" msgstr "Požadovat časový limit" @@ -545,7 +542,7 @@ #: ../src/net.c:345 msgid "There was an internal error in the update process" -msgstr "Došlo k vnitřní chybě v procesu aktualizace" +msgstr "" #: ../src/net.c:347 msgid "Feed not available: Server requested unsupported redirection!" @@ -560,8 +557,9 @@ msgstr "Chyba serveru" #: ../src/net.c:353 +#, fuzzy msgid "An unknown networking error happened!" -msgstr "Vyskytla se neznámá chyba síťování" +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 #. ======================================================================================================================================================================================== @@ -637,23 +635,23 @@ msgid "Feed title" msgstr "Titulek kanálu" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Odběr „%s“ již byl aktualizován!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "Odběr „%s“ byl přerušen. Liferea jej již nebude aktualizovat!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Aktualizuje se ikonka pro „%s“" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -661,48 +659,48 @@ "Při čtení tohoto odběru se vyskytl problém. Prosím, zkontrolujte URL a " "výstup na konzoli." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "URL „%s“ bylo natrvalo změněno, a proto bylo aktualizováno" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "Kanál „%s“ je přerušen. Liferea jej již nebude aktualizovat!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "Kanál „%s“ se od poslední aktualizace nezměnil" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Aktualizuje se kanál „%s“" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Chyba při otevírání dočasného souboru %s k užití při filtrování!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s zavřeno se stavem %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Chyba: nepodařilo se otevřít rouru „%s“" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Chyba: nepodařilo se otevřít soubor „%s“" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Chyba: Soubor „%s“ neexistuje" @@ -711,66 +709,65 @@ msgid "New Search Folder" msgstr "Nová složka hledání" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "(Vyskytlo se více chyb. Výstup byl zkrácen!)" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "Zpracovatel XML: Nepodařilo se zpracovat dokument:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 +#, fuzzy msgid "Attachments" -msgstr "Přílohy" - -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d příloha" -msgstr[1] "%d přílohy" -msgstr[2] "%d příloh" +msgstr "%d příloha" #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" -msgstr " Bajtů" +msgstr "" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" -msgstr "kB" +msgstr "" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" -msgstr "MB" +msgstr "" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" -msgstr "GB" +msgstr "" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" -msgstr "%d%s" +msgstr "" + +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d příloha" +msgstr[1] "%d přílohy" +msgstr[2] "%d příloh" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Vybrat soubor" -#: ../src/ui/enclosure_list_view.c:404 -#, c-format +#: ../src/ui/enclosure_list_view.c:438 +#, fuzzy, c-format msgid "File Extension .%s" -msgstr "Přípona souboru: .%s" +msgstr "Přípona souboru: .%s" #: ../src/ui/icons.c:54 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Nepodařilo se najít soubor pixmap: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" @@ -778,7 +775,7 @@ msgstr[1] " %d nové" msgstr[2] " %d nových" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" @@ -786,338 +783,382 @@ msgstr[1] "%d nepřečtené%s" msgstr[2] "%d nepřečtených%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Témata nápovědy" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Klávesové zkratky" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "Časté otázky" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea je nyní připojena k síti" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Odpojit od sítě" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea je nyní odpojena od sítě" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Připojit k síti" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Odběry" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "_Aktualizovat vše" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 +#, fuzzy msgid "Updates all subscriptions." -msgstr "Aktualizace všech odběrů." +msgstr "Nový odběr" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Označit vše jako _přečtené" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Označit všechny články všech kanálů jako přečtené." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Importovat seznam kanálů…" -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importovat seznam kanálů OPML." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Exportovat seznam kanálů…" -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Exportovat seznam kanálů jako OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Ukončit" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Kanál" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Odstranit _všechny články" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Odstranit všechny články právě vybraného kanálu." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "Č_lánek" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "_Další nepřečtený článek" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "_Další nepřečtený článek" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Zobrazit" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "Z_většit text" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Zvětšit velikost textu článku." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "Z_menšit text" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Změnšit velikost textu článku." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "_Nástroje" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "Sledování _aktualizací" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "Zobrazit seznam všech kanálů ve frontě na aktualizaci" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Nastavení" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Měnit nastavení." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 +#, fuzzy msgid "S_earch" -msgstr "H_ledání" +msgstr "_Hledání" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Prohledat všechny kanály…" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Zobrazit dialog hledání." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "Nápo_věda" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Témata nápovědy" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Zobrazit nápovědu této aplikace." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Klávesové zkratky" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Zobrazit seznam klávesových zkratek Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "Časté _otázky" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Zobrazit časté otázky ohledně této aplikace." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "O _aplikaci" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Zobrazit dialog s informacemi o aplikaci." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "_Normální zobrazení" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Nastavit zobrazení na mód poštovního klienta." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "Ši_roké zobrazení" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Nastavit zobrazení na tři vertikální oblasti." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "_Kombinované zobrazení" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Nastavit zobrazení na mód dvou oblastí." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" -msgstr "_Zmenšený seznam kanálů" +msgstr "" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 +#, fuzzy msgid "Hide feeds with no unread items." -msgstr "Skrýt kanály s nepřečtenými články." +msgstr "Nejsou zde žádné nepřečtené články" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "Nový _odběr…" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Přidat odběr do seznamu kanálů." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Nová _složka…" -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Přidat novou složku do seznamu kanálů." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Nová složka _hledání…" -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Přidat novou složku hledání do seznamu kanálů." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Nový _zdroj…" -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Přidat nový zdroj seznamu kanálů." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "Nová _rubrika…" -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Přidat novou rubriku." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 +#, fuzzy msgid "_Mark Items Read" -msgstr "_Označit jako přečtené" +msgstr "Označit jako _přečtené" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 +#, fuzzy msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "" -"Označí všechny články vybraného seznamu odběrů / v seznamu článků jako " -"přečtené." +"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:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Aktualizovat" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "Aktualizovat vybraný odběr nebo všechny odběry vybrané složky." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "Vlastnos_ti" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Otevřít dialog s vlastnostmi vybraného odběru." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "_Odstranit" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Odstranit vybraný odběr." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Přepnout stav _přečtení" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Přepnout stav přečtení vybraného článku." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Přepnout stav _označení" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Přepnout stav označení vybraného článku." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "Odst_ranit" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Odstranit vybraný článek." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Otevřít odkaz článku v nastaveném prohlížeči." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "Otevřít v pro_hlížeči" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." +msgstr "Otevřít odkaz článku v nastaveném prohlížeči." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Nastavení externího prohlížeče" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." msgstr "Otevřít odkaz článku v nastaveném prohlížeči." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "O_dpojit od sítě" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Zakázat aktualizaci odběrů." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" -msgstr "Liferea – čtečka internetových kanálů pro Linux" +msgstr "Liferea – Linux Feed Reader" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 +#, fuzzy msgid "" "

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

    You can add new subscriptions

    • From main menu " @@ -1125,24 +1166,24 @@ "the subscription list
    • By right clicking links and choosing " "'Subscribe' within Liferea

    " msgstr "" -"

    Vítejte v programu Liferea, agregátoru novinek z online kanálů.

    Můžete přidat nové odběry

    • z hlavní nabídky 'Odběry' -> 'Nový " -"odběr'
    • zadáním odkazů do seznamu odběrů
    • odkazy kliknutím " -"pravým tlačítkem na myši a vybráním položky 'Odebírat' v programu Liferea

    " +"

    Vítejte v Liferea, agregátoru novinkových kanálů.

    Levá " +"oblast okna obsahuje seznam vašich odběrů; nový odběr lze přidat vybráním " +"položky Nový odběr v nabídce Kanály. Články lze prohlížet vybráním kanálu z " +"jejich seznamu, načtou se do pravé oblasti okna.

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Neznámý zdroj" #: ../src/ui/ui_common.c:205 +#, fuzzy msgid "All Files" -msgstr "Všechny soubory" +msgstr "_Místní soubor" #: ../src/ui/feed_list_view.c:341 msgid "Deleting entry" @@ -1166,246 +1207,266 @@ 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:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Stahování SELHALO: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "Stahování dokončeno." +#: ../src/ui/liferea_htmlview.c:627 +#, fuzzy +msgid "Open Link In _Tab" +msgstr "/O_tevřít odkaz v kartě" -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" -msgstr "Otevřít odkaz v _kartě" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "/Otevřít odkaz v proh_lížeči" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" -msgstr "_Otevřít odkaz v prohlížeči" +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" +msgstr "/Otevřít odkaz v proh_lížeči" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 -#, c-format +#: ../src/ui/liferea_htmlview.c:632 +#, fuzzy, c-format msgid "_Bookmark Link at %s" -msgstr "_Vytvořit záložku odkazu do %s" +msgstr "/_Zazáložkovat odkaz do %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 +#, fuzzy msgid "_Copy Link Location" -msgstr "_Kopírovat umístění odkazu" +msgstr "/_Kopírovat umístění odkazu" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 +#, fuzzy msgid "_Copy Image Location" -msgstr "_Kopírovat umístění obrázku" +msgstr "/_Kopírovat umístění odkazu" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 +#, fuzzy msgid "S_ave Link As" -msgstr "U_ložit jako…" +msgstr "/Uložit jako…" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" -msgstr "U_ložit obrázek jako" +msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 +#, fuzzy msgid "_Subscribe..." -msgstr "_Odebírat…" +msgstr "/_Odebírat…" -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Žádný titulek ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Datum" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Titulek" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Žádný článek nebyl vybrán" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Tento článek nemá specifikován žádný odkaz!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Musíte vybrat kanál, aby šlo odstranit články!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Otevřít článek v _kartě" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "_Otevřít článek v prohlížeči" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 +#, fuzzy msgid "Copy to News Bin" -msgstr "Kopírovat do rubriky Novinky" +msgstr "/Kopírovat do rubriky/%s" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Kopírovat _URL článku do schránky" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "/_Zazáložkovat odkaz do %s" -#: ../src/ui/popup_menu.c:153 -msgid "R_emove Item" -msgstr "O_dstranit článek" +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "/_Kopírovat umístění odkazu" #: ../src/ui/popup_menu.c:166 +#, fuzzy +msgid "R_emove Item" +msgstr "/_Odstranit článek" + +#: ../src/ui/popup_menu.c:179 +#, fuzzy msgid "Open Enclosure..." -msgstr "Otevřít přílohu…" +msgstr "/Otevřít přílohy…" -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 +#, fuzzy msgid "Save As..." -msgstr "Uložit jako…" +msgstr "/Uložit jako…" -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 +#, fuzzy msgid "Copy Link Location" -msgstr "Kopírovat umístění odkazu" +msgstr "/_Kopírovat umístění odkazu" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 +#, fuzzy msgid "_Update All" -msgstr "_Aktualizovat vše" +msgstr "/_Aktualizovat vše" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 +#, fuzzy msgid "_Show Liferea" -msgstr "Zobrazit Lifereau" +msgstr "Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 +#, fuzzy msgid "_Update Folder" -msgstr "_Aktualizovat složku" +msgstr "/_Aktualizovat složku" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 +#, fuzzy msgid "_Mark All As Read" -msgstr "_Označit vše jako přečtené" +msgstr "/Označit vše jako _přečtené" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 +#, fuzzy msgid "_New" -msgstr "_Nový" +msgstr "/_Vytvořit" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 +#, fuzzy msgid "New _Subscription..." msgstr "Nový _odběr…" -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 +#, fuzzy msgid "New S_ource..." -msgstr "Nový z_droj…" - -#: ../src/ui/popup_menu.c:323 -msgid "Sort Feeds" -msgstr "Třídit kanály" +msgstr "Nový _zdroj…" #: ../src/ui/popup_menu.c:329 -msgid "_Rebuild" -msgstr "_Znovu sestavit" - -#: ../src/ui/popup_menu.c:341 #, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "Nový _odběr…" - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(Prázdný)" +msgid "Sort Feeds" +msgstr "Importovat seznam kanálů" -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" +#: ../src/ui/popup_menu.c:335 +msgid "_Rebuild" msgstr "" -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "Výchozí v GNOME" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Text pod ikonkami" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Text vedle ikonek" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Pouze ikonky" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Pouze text" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minuty" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "hodiny" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "dny" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Mezerník" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr "Ctrl+Mezerník" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr "Alt+Mezerník" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Vybrat adresář pro stahování" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "_Normální zobrazení" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "Ši_roké zobrazení" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "_Kombinované zobrazení" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Ručně" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Výchozí dle prohlížeče" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Existující okno" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Nové okno" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Nová karta" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" -msgstr "Integrace se systémovou oblastí (indikátorem)" +msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 +#, fuzzy msgid "Terminate instead of minimizing to the messaging menu" -msgstr "Ukončovat namísto minimalizování do stavové ikonky." +msgstr "_Ukončovat namísto minimalizování do stavové ikonky." -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" -msgstr "Spustit čtečku skrytou do ikony v systémové oblasti" +msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Typ" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Program" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1419,9 +1480,9 @@ msgid "This feed specifies no default update interval." msgstr "Tento kanál nespecifikuje žádný výchozí interval aktualizace." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" -msgstr "Bez názvu" +msgstr "" #: ../src/ui/ui_tray.c:221 #, c-format @@ -1464,7 +1525,7 @@ #: ../src/parsers/atom10.c:241 ../src/parsers/pie_feed.c:141 msgid "Website" -msgstr "Webová stránka" +msgstr "" #: ../src/parsers/atom10.c:251 msgid "Invalid Atom feed: unknown author" @@ -1474,7 +1535,7 @@ msgid "%b %d %H:%M" msgstr "%d. %M., %G.%i" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1484,18 +1545,20 @@ msgid "Google Reader login failed!" msgstr "Přihlášení ke Google Reader selhalo!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 +#, fuzzy 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 "" -"Integrovat seznam vašich kanálů z Google Reader. Liferea bude zobrazovat " -"vaše odběry z Google Reader a bude synchronizovat seznamy kanálů a čtení." +"Integrovat seznam vašich kanálů z Google Reader. Liferea bude brát vaše " +"odběry na Google Reader jako podstrom ve vašem seznamu kanálů určený pouze " +"ke čtení." #: ../src/fl_sources/opml_source.c:325 msgid "Planet, BlogRoll, OPML" @@ -1522,33 +1585,28 @@ 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:269 msgid "Source Type" msgstr "Typ zdroje" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" -msgstr "Tiny Tiny RSS" +msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 +#, fuzzy msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " "present your tt-rss subscriptions, and will synchronize your feed list and " "reading lists." msgstr "" -"Integrovat seznam vašich kanálů z Tiny Tiny RSS 1.5+. Liferea bude " -"zobrazovat vaše odběry z tt-rss a bude synchronizovat seznamy kanálů a čtení." +"Integrovat seznam vašich kanálů z Google Reader. Liferea bude brát vaše " +"odběry na Google Reader jako podstrom ve vašem seznamu kanálů určený pouze " +"ke čtení." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" -msgstr "Nelze analyzovat JSON vrácený tt-rss API!" +msgstr "" #: ../src/notification/libnotify.c:61 ../src/notification/libnotify.c:83 #: ../src/notification/libnotify.c:152 @@ -1576,9 +1634,9 @@ #, c-format msgid "%s has %d update" msgid_plural "%s has %d updates" -msgstr[0] "%s má k dispozici %d aktualizaci" -msgstr[1] "%s má k dispozici %d aktualizace" -msgstr[2] "%s má k dispozici %d aktualizací" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: ../src/notification/libnotify.c:257 ../src/notification/libnotify.c:259 msgid "Feed Update" @@ -1616,8 +1674,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Prosím, vložte nastavení svého účtu na Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Heslo" @@ -1641,7 +1698,7 @@ msgid "combined view" msgstr "kombinované zobrazení" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Články" @@ -1654,16 +1711,18 @@ msgstr "Vlastnosti odběru" #: ../glade/liferea.ui.h:9 +#, fuzzy msgid "Feed Name" -msgstr "Název kanálu" +msgstr "_Název kanálu:" #: ../glade/liferea.ui.h:10 msgid "Feed _Name:" msgstr "_Název kanálu:" #: ../glade/liferea.ui.h:11 +#, fuzzy msgid "Update Interval" -msgstr "Interval aktualizací" +msgstr "Sledování aktualizací" #: ../glade/liferea.ui.h:12 msgid "_Use global default update interval." @@ -1691,9 +1750,10 @@ msgstr "Obecné" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 +#, fuzzy msgid "Feed Source" -msgstr "Zdroj kanálu" +msgstr "Zdroj kanálu" #: ../glade/liferea.ui.h:20 ../glade/new_subscription.ui.h:8 msgid "Source Type:" @@ -1758,8 +1818,9 @@ msgstr "_Neomezená vyrovnávací paměť" #: ../glade/liferea.ui.h:34 +#, fuzzy msgid "_Number of items to save:" -msgstr "_Počet článků k uložení:" +msgstr "Výchozí _počet uložených článků v jednom kanálu:" #: ../glade/liferea.ui.h:35 msgid "Archive" @@ -1786,482 +1847,568 @@ msgstr "Automaticky načíst č_lánek v nastaveném prohlížeči při jeho _označení." #: ../glade/liferea.ui.h:43 +#, fuzzy msgid "Ignore _comment feeds for this subscription." -msgstr "Ignorovat _komentáře pro tento odběr." +msgstr "Otevřít dialog s vlastnostmi vybraného odběru." #: ../glade/liferea.ui.h:44 +#, fuzzy msgid "_Enforce popup notification for this subscription." -msgstr "_Otevřít dialog s upozorněním pro tento odběr." +msgstr "Otevřít dialog s vlastnostmi vybraného odběru." #: ../glade/liferea.ui.h:45 msgid "_Never do popup notification for this subscription." -msgstr "_Nikdy nezobrazovat upozornění pro tento odběr." +msgstr "" #: ../glade/liferea.ui.h:46 msgid "_Mark downloaded items as read." -msgstr "_Označit stažené články jako přečtené." +msgstr "" #: ../glade/liferea.ui.h:47 msgid "Advanced" msgstr "Pokročilé" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Nastavení Liferea" +msgid "New Folder" +msgstr "Nová složka" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "Manipulace s mezipamětí kanálů" +msgid "_Folder name:" +msgstr "_Název složky:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Výchozí _počet uložených článků v jednom kanálu:" +msgid "Rename" +msgstr "Přejmenovat" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "Nastavení aktualizace kanálu" +msgid "_New Name:" +msgstr "_Nový název:" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "_Aktualizovat všechny odběry na začátku" +msgid "Search Folder Properties" +msgstr "Vlastnosti složky hledání" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Výchozí _interval aktualizace kanálů:" +msgid "Search _Name:" +msgstr "_Název hledání:" + +#: ../glade/liferea.ui.h:54 +#, fuzzy +msgid "Find Items that meet the following criteria" +msgstr "Najít články, které vyhovují následujícím kritériím" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -msgid "" -"Note: Please remember to set a reasonable refresh time. Usually it is a " +msgid "A_ny Rule Matches" +msgstr "" + +#: ../glade/liferea.ui.h:56 +msgid "_All Rules Must Match" +msgstr "Všechn_a pravidla musí souhlasit" + +#: ../glade/liferea.ui.h:57 +#, fuzzy +msgid "Open Enclosure" +msgstr "/Otevřít přílohy…" + +#: ../glade/liferea.ui.h:58 +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Stahování příloh typu:" + +#: ../glade/liferea.ui.h:59 +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"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.ui.h:60 +msgid "_Browse" +msgstr "_Procházet" + +#: ../glade/liferea.ui.h:61 +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.ui.h:62 +msgid "Search All Feeds" +msgstr "Prohledat všechny kanály" + +#: ../glade/liferea.ui.h:63 +msgid "_Search for:" +msgstr "_Vyhledat:" + +#: ../glade/liferea.ui.h:64 +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Vložte text, který má Liferea vyhledat buď v titulku článku, nebo jeho " +"obsahu." + +#: ../glade/liferea.ui.h:65 +#, fuzzy +msgid "_Advanced..." +msgstr "Pokročilé…" + +#: ../glade/liferea.ui.h:66 +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"Spustit vyhledávání zadaného textu ve všech kanálech. Výsledky hledání se " +"objeví v seznamu článků." + +#: ../glade/liferea.ui.h:67 +msgid "Update Monitor" +msgstr "Sledování aktualizací" + +#: ../glade/liferea.ui.h:68 +#, fuzzy +msgid "Pending Requests" +msgstr "Nevyřešené požadavky" + +#: ../glade/liferea.ui.h:69 +#, fuzzy +msgid "Downloading Now" +msgstr "Právě stahované" + +#: ../glade/liferea.ui.h:70 +msgid "Cancel _All" +msgstr "Zrušit _vše" + +#: ../glade/liferea.ui.h:71 +msgid "Create News Bin" +msgstr "Vytvořit rubriku" + +#: ../glade/liferea.ui.h:72 +msgid "_News Bin Name:" +msgstr "_Nová rubrika:" + +#: ../glade/liferea.ui.h:73 +#, fuzzy +msgid "About" +msgstr "O _aplikaci" + +#: ../glade/liferea.ui.h:74 +msgid "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea je agregátor novinek pro GTK+" + +#: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "Domovská stránka Liferea" + +#: ../glade/liferea.ui.h:79 +#, fuzzy +msgid "Advanced Search" +msgstr "Pokročilé" + +#: ../glade/liferea.ui.h:80 +#, fuzzy +msgid "_Search Folder..." +msgstr "Složka hledání" + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Vytvořit vyhledávač kanálů" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "vložte řetězec, který chcete najít" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "Maximál_ní počet článků ve výsledku:" + +#: ../glade/liferea.ui.h:84 +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/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "Stahování a následné zpracování" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Výběr zdroje" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Vyberte typ zdroje, který chcete přidat…" + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Přidat OPML/Planet" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"Prosím, specifikujte místní soubor nebo URL ukazující na platný seznam " +"kanálů OPML." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Umístění" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "Vybrat _soubor" + +#: ../glade/ttrss_source.ui.h:1 +#, fuzzy +msgid "Add Tiny Tiny RSS Account" +msgstr "Přidat účet Bloglines" + +#: ../glade/ttrss_source.ui.h:2 +#, fuzzy +msgid "Please enter your tt-rss account settings." +msgstr "Prosím, vložte nastavení svého účtu na Bloglines." + +#: ../glade/ttrss_source.ui.h:3 +#, fuzzy +msgid "_Server URL" +msgstr "Chyba serveru" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "_Uživatelské jméno" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Pokročilé…" + +#: ../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 "" +"Vložte umístění webové stránky, kde se má automaticky najít kanál, nebo " +"přesnou adresu kanálu." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Nastavení Liferea" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Výchozí _počet uložených článků v jednom kanálu:" + +#: ../glade/prefs.ui.h:4 +#, fuzzy +msgid "Feed Update Settings" +msgstr "Aktualizovaný kanál" + +#: ../glade/prefs.ui.h:5 +#, fuzzy +msgid "_Update all subscriptions at startup." +msgstr "Nový odběr" + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Výchozí _interval aktualizace kanálů:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " "waste of bandwidth to poll feeds more often than each hour." msgstr "" "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.ui.h:56 +#: ../glade/prefs.ui.h:9 msgid "Feeds" msgstr "Kanály" -#: ../glade/liferea.ui.h:57 +#: ../glade/prefs.ui.h:10 +#, fuzzy msgid "Folder Display Settings" -msgstr "Nastavení zobrazování složek" +msgstr "Nastavení zobrazování složek" -#: ../glade/liferea.ui.h:58 +#: ../glade/prefs.ui.h:11 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.ui.h:59 +#: ../glade/prefs.ui.h:12 msgid "_Hide read items." msgstr "Skrývat _přečtené články." -#: ../glade/liferea.ui.h:60 +#: ../glade/prefs.ui.h:13 +#, fuzzy msgid "Feed Icons (Favicons)" -msgstr "Ikonky kanálu" +msgstr "Ikonky kanálu" -#: ../glade/liferea.ui.h:61 +#: ../glade/prefs.ui.h:14 msgid "_Update all favicons now" msgstr "_Aktualizovat všechny ikonky" -#: ../glade/liferea.ui.h:62 +#: ../glade/prefs.ui.h:15 msgid "Folders" msgstr "Složky" -#: ../glade/liferea.ui.h:63 +#: ../glade/prefs.ui.h:16 +#, fuzzy msgid "Reading Headlines" -msgstr "Čtení aktualit" +msgstr "nepřečtené články" -#: ../glade/liferea.ui.h:64 +#: ../glade/prefs.ui.h:17 msgid "_Skim through articles with:" msgstr "_Otevírat články klávesou:" -#: ../glade/liferea.ui.h:65 +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +#, fuzzy msgid "Web Integration" -msgstr "Integrace s webovými službami" +msgstr "Orientace" -#: ../glade/liferea.ui.h:66 +#: ../glade/prefs.ui.h:20 msgid "_Post Bookmarks to" msgstr "_Posílat záložky do" -#: ../glade/liferea.ui.h:67 +#: ../glade/prefs.ui.h:22 +#, fuzzy msgid "Internal Browser Settings" -msgstr "Nastavení interního prohlížeče" +msgstr "Nastavení interního prohlížeče" -#: ../glade/liferea.ui.h:68 +#: ../glade/prefs.ui.h:23 msgid "Open links in Liferea's _window." msgstr "Otevírat odkazy v okně _Liferea." -#: ../glade/liferea.ui.h:69 +#: ../glade/prefs.ui.h:24 msgid "_Disable Javascript." msgstr "Zakázat _JavaScript." -#: ../glade/liferea.ui.h:70 +#: ../glade/prefs.ui.h:25 +#, fuzzy msgid "_Enable browser plugins." -msgstr "_Povolit zásuvné moduly prohlížeče" +msgstr "Nastavení externího prohlížeče" -#: ../glade/liferea.ui.h:71 +#: ../glade/prefs.ui.h:26 +#, fuzzy msgid "External Browser Settings" -msgstr "Nastavení externího prohlížeče" +msgstr "Nastavení externího prohlížeče" -#: ../glade/liferea.ui.h:72 +#: ../glade/prefs.ui.h:27 msgid "_Open link in:" msgstr "Otevírat _odkazy v:" -#: ../glade/liferea.ui.h:74 +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Ručně" + +#: ../glade/prefs.ui.h:30 #, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" +msgid "(%s for URL)" msgstr "" -"_Ručně:\n" -"(%s je URL)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Prohlížeč:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Prohlížeč" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 +#, fuzzy msgid "Notification Settings" -msgstr "Nastavení notifikací" +msgstr "Nastavení notifikací" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Zobrazovat _vyskakovací okno s novými články." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "Zobrazovat stavovou _ikonku v oznamovací oblasti." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Zobrazovat počet _nových článků ve stavové ikonce." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Ukončovat namísto minimalizování do stavové ikonky." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." -msgstr "_Spouštět minimalizované do stavové ikonky." +msgstr "_Spouštět do stavové ikonky." -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 +#, fuzzy msgid "Toolbar Settings" -msgstr "Nastavení nástrojové lišty" +msgstr "_Popisky tlačítek na liště nástrojů:" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." -msgstr "_Skrýt nástrojovou lištu" +msgstr "" -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "_Popisky tlačítek na liště nástrojů:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "Uživatelské rozhraní" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "Určit _automaticky (dle GNOME)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "Žád_ná proxy" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "_Ruční nastavení:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "_Port proxy:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "_Hostitel proxy:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Použít au_tentizaci proxy" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "Heslo pro pro_xy:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "_Uživatelské jméno pro proxy:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 +#, fuzzy msgid "Downloading Enclosures" msgstr "Stahování příloh" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Procházet" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "Stahovat _do" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "Stahovat _pomocí" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 +#, fuzzy msgid "Opening Enclosures" -msgstr "Otevírání příloh…" +msgstr "/Otevřít přílohy…" -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Přílohy" -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "Synchronizováno s nejbližším hostitelem" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "Povol_it místní synchronizaci LAN" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "Název _služby" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Synchronizace" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Nová složka" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Název složky:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Přejmenovat" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Nový název:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Vlastnosti složky hledání" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "_Název hledání:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "Najít články, které vyhovují následujícím kritériím" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "K_aždé pravidlo se shoduje" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "Všechn_a pravidla musí souhlasit" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Stahování příloh" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Stahování příloh typu:" - -#: ../glade/liferea.ui.h:120 -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 "" -"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.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Předat URL a nestahovat přílohu" - -#: ../glade/liferea.ui.h:122 -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.ui.h:123 -msgid "Search All Feeds" -msgstr "Prohledat všechny kanály" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Vyhledat:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -"Vložte text, který má Liferea vyhledat buď v titulku článku, nebo jeho " -"obsahu." -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "_Pokročilé…" +#~ msgid "Download and view feeds" +#~ msgstr "Stahovat a prohlížet novinkové kanály" -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Spustit vyhledávání zadaného textu ve všech kanálech. Výsledky hledání se " -"objeví v seznamu článků." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Sledování aktualizací" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "Nevyřešené požadavky" - -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "Právě stahované" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "Zrušit _vše" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Vytvořit rubriku" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Nová rubrika:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "O aplikaci" - -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea je agregátor novinek pro GTK+" - -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Domovská stránka Liferea" - -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Pokročilé hledání" - -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "_Prohledat složku..." - -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Vytvořit vyhledávač kanálů" +#, fuzzy +#~ msgid "Launch Item In _Tab" +#~ msgstr "/Otevřít článek v _kartě" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "vložte řetězec, který chcete najít" +#, fuzzy +#~ msgid "_Launch Item In Browser" +#~ msgstr "/Otevřít článek v _prohlížeči" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Maximál_ní počet článků ve výsledku:" +#, fuzzy +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "/Kopírovat _URL článku do schránky" -#: ../glade/liferea.ui.h:145 -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 "" +#~ msgid "flag" +#~ msgstr "označení" -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" -msgstr "Stahování / Následné zpracování" +#~ msgid "bookmark" +#~ msgstr "záložka" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Výběr zdroje" +#~ msgid "comments" +#~ msgstr "komentáře" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Vyberte typ zdroje, který chcete přidat…" +#, fuzzy +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Stahování přílohy dokončeno: „%s“" -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Přidat OPML/Planet" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Stahování přílohy dokončeno: „%s“" -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Prosím, specifikujte místní soubor nebo URL ukazující na platný seznam " -"kanálů OPML." +#, fuzzy +#~ 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 "" +#~ "Tato verze Liferea používá nový formát vyrovnávací paměti; vaše " +#~ "vyrovnávací paměť byla migrována do nového formátu. Obsah staré " +#~ "vyrovnávací paměti v adresáři ~/.liferea_1.2 ale nebyl smazán. Smažte jej " +#~ "ručně, jste-li si jisti, že migrace proběhla úspěšně." -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Umístění" +#, fuzzy +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Stahování přílohy dokončeno: „%s“" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "Vybrat _soubor" +#, fuzzy +#~ msgid "Download finished." +#~ msgstr "Stahovat _pomocí" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "Přidat účet Tiny Tiny RSS" +#~ msgid "Choose download directory" +#~ msgstr "Vybrat adresář pro stahování" -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "Prosím, vložte tt-rss nastavení svého účtu." +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Ručně:\n" +#~ "(%s je URL)" -#: ../glade/ttrss_source.ui.h:3 -msgid "_Server URL" -msgstr "_URL serveru" +#~ msgid "_Save downloads in" +#~ msgstr "Stahovat _do" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "_Uživatelské jméno" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "Povol_it místní synchronizaci LAN" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Vložte umístění webové stránky, kde se má automaticky najít kanál, nebo " -"přesnou adresu kanálu." +#~ msgid "_Service Name" +#~ msgstr "Název _služby" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Pokročilé…" +#~ msgid "Sync" +#~ msgstr "Synchronizace" -#~ msgid "You may want to validate the feed using" -#~ msgstr "Možná budete chtít ověřit kanál" +#~ msgid "Downloading Enclosure" +#~ msgstr "Stahování příloh" #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " @@ -2289,6 +2436,9 @@ #~ msgid "was not updated" #~ msgstr "nebylo aktualizováno" +#~ msgid "%s" +#~ msgstr "%s" + #~ msgid "topics_en.html" #~ msgstr "topics_en.html" @@ -2496,9 +2646,6 @@ #~ msgid "Script Manager" #~ msgstr "Správa skriptů" -#~ msgid "%s" -#~ msgstr "%s" - #, fuzzy #~ msgid "FAILED to download enclosure: \"%s\"" #~ msgstr "Stahování přílohy dokončeno: „%s“" diff -Nru liferea-1.8.15/po/da.po liferea-1.10.3/po/da.po --- liferea-1.8.15/po/da.po 2013-06-24 22:16:15.000000000 +0200 +++ liferea-1.10.3/po/da.po 2013-07-31 23:29:12.000000000 +0200 @@ -1,13 +1,16 @@ # Danish translation liferea. -# Copyright (C) 2012 liferea & nedenstående oversættere. +# Copyright (C) 2013 liferea & nedenstående oversættere. # This file is distributed under the same license as the liferea package. -# Joe Hansen , 2010, 2011, 2012. +# Joe Hansen , 2010, 2011, 2012, 2013. # korrekturlæst Ask, 2010. +# korrekturlæst Torben, 2013. # # konventioner: # attachment -> bilag # comment -> bemærkning (kommentar) -# enclosure -> pakke +# enclosure -> pakke +# "vedhæftning"? Det virker lidt på den måde. "Pakke" kan også +# bruges, og brugeren vender sig nok hurtig til terminologien. # entry -> post # favicon -> http://da.wikipedia.org/wiki/Favicon # feed -> nyhedskilde @@ -16,6 +19,7 @@ # feed source -> nyhedskilde # hook -> tilbagekaldsfunktion # item -> punkt +# link -> adresse (rettet fra henvisning i 2013) # Link Cosmos -> Link Cosmos # news bin -> nyhedsbakke # pipe -> datakanal (pipe) @@ -23,10 +27,10 @@ # msgid "" msgstr "" -"Project-Id-Version: liferea 1.8-rc1\n" +"Project-Id-Version: liferea 1.10-rc4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" -"PO-Revision-Date: 2012-04-08 20:36+0200\n" +"POT-Creation-Date: 2013-06-11 22:55+0200\n" +"PO-Revision-Date: 2013-06-15 20:36+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" @@ -35,8 +39,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:234 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -49,25 +52,16 @@ msgstr "Liferea - Nyhedslæser" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Hent og vis nyhedskilder" +msgid "Read news feeds and blogs" +msgstr "Læs nyheds- og blogkilder" #: ../xslt/feed.xml.in.h:1 -msgid "" -"This feed is discontinued. It's no longer available. Liferea won't update it " -"anymore but you can still access the cached headlines." -msgstr "" -"Denne nyhedskilde er afbrudt. Den er ikke længere tilgængelig. Liferea vil " -"ikke længere opdatere den, men du kan stadig tilgå de gemte overskrifter." +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 "Denne nyhedskilde er afbrudt. Den er ikke længere tilgængelig. Liferea vil ikke længere opdatere den, men du kan stadig tilgå de gemte overskrifter." #: ../xslt/feed.xml.in.h:2 -msgid "" -"The last update of this subscription failed!
    HTTP error code : " -msgstr "" -"Den sidste opdatering af dette abonnement mislykkedes!
    HTTP-fejlkode " -": " +msgid "The last update of this subscription failed!
    HTTP error code : " +msgstr "Den sidste opdatering af dette abonnement mislykkedes!
    HTTP-fejlkode : " #: ../xslt/feed.xml.in.h:3 msgid "There were errors while parsing this feed!" @@ -83,7 +77,7 @@ #: ../xslt/feed.xml.in.h:6 msgid "You may want to contact the author/webmaster of the feed about this!" -msgstr "" +msgstr "Du bør måske kontakte forfatteren/webmasteren for nyhedskilden om dette!" #: ../xslt/feed.xml.in.h:7 msgid "There were errors while filtering this feed!" @@ -162,38 +156,26 @@ msgstr "Forfatter" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "flag" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "bogmærke" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "bemærkninger" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Endnu ingen bemærkninger." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Bemærkninger" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." -msgstr "Opdaterer..." +msgstr "Opdaterer ..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Opdater" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Afsnit" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Afdeling" @@ -202,12 +184,8 @@ msgstr "Nyhedsbakke:" #: ../xslt/newsbin.xml.in.h:2 -msgid "" -"Add items to this news bin by selecting \"Copy to News Bin\" from the item " -"list context menu." -msgstr "" -"Tilføj punkter til denne nyhedsbakke ved at vælge »Kopier til nyhedsbakke« " -"fra kontekstmenuen til punktlisten." +msgid "Add items to this news bin by selecting \"Copy to News Bin\" from the item list context menu." +msgstr "Tilføj punkter til denne nyhedsbakke ved at vælge »Kopier til nyhedsbakke« fra kontekstmenuen til punktlisten." #: ../xslt/vfolder.xml.in.h:1 msgid "Search Folder:" @@ -217,12 +195,12 @@ msgid "Default Browser" msgstr "Standardbrowser" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Browserkommando mislykkedes: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Starter: »%s«" @@ -232,7 +210,7 @@ msgid "Authorization Error" msgstr "Godkendelsesfejl" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Kan ikke oprette mellemlagermappe »%s«!" @@ -267,113 +245,107 @@ msgid "%b %d %Y" msgstr "%d. %b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "»%s« er ikke en gyldig konfigurationsfil for pakketype!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Pakkehentning MISLYKKEDES: »%s«" +# evt. det under fanebladet +#: ../src/enclosure.c:288 +msgid "You have not configured a download tool yet! Please do so in the 'Download' tab in Tools/Preferences." +msgstr "Du har ikke konfigureret et overførselsværktøj endnu! Du kan gøre det i fanebladet »Hent« i Værktøjer/indstillinger." -#. just saving -#: ../src/enclosure.c:284 +# # evt. det under fanebladet +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Pakkehentning færdig: »%s«" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" +"Kommando mislykkedes: \n" +"\n" +"%s\n" +"\n" +" Kontroller venligst hvorvidt det konfigurerede overførselsværktøj er installeret og virker korrekt! Du kan ændre det i fanebladet »Hent« i Værktøjer/indstillinger." -#: ../src/export.c:174 +#: ../src/export.c:185 #, c-format msgid "Error renaming %s to %s\n" msgstr "Fejl under omdøbelse af %s til %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "XML-fejl under læsning af OPML-fil! Kunne ikke importere »%s«!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:422 ../src/export.c:424 #, 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-dokument »%s« må ikke være tomt under import." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:445 ../src/export.c:447 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" -msgstr "" -"»%s« er ikke et gyldigt OPML-dokument! Liferea kan ikke importere denne fil!" +msgstr "»%s« er ikke et gyldigt OPML-dokument! Liferea kan ikke importere denne fil!" # kunne være 'Importerede' -#: ../src/export.c:440 +#: ../src/export.c:466 msgid "Imported feed list" msgstr "Importeret nyhedskildeliste" -#: ../src/export.c:452 +#: ../src/export.c:478 msgid "Import Feed List" msgstr "Importer nyhedskildeliste" -#: ../src/export.c:452 +#: ../src/export.c:478 msgid "Import" msgstr "Importer" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:478 ../src/export.c:495 ../src/fl_sources/opml_source.c:394 msgid "OPML Files" msgstr "OPML-filer" -#: ../src/export.c:460 +#: ../src/export.c:486 msgid "Error while exporting feed list!" msgstr "Fejl under eksport af nyhedskildeliste!" -#: ../src/export.c:462 +#: ../src/export.c:488 msgid "Feed List exported!" msgstr "Nyhedskildeliste eksporteret!" -#: ../src/export.c:469 +#: ../src/export.c:495 msgid "Export Feed List" msgstr "Eksporter nyhedskildeliste" -#: ../src/export.c:469 +#: ../src/export.c:495 msgid "Export" msgstr "Eksporter" -#: ../src/feed.c:255 -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 "" -"

    Kunne ikke detektere denne type nyhedskilde! Tjek venligst om kilden " -"virkelig peger på en kilde tilbudt i en af de understøttede " -"syndikationformater!

    XML-fortolkeruddata:
    " +#: ../src/feed.c:254 +msgid "

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

    XML Parser Output:
    " +msgstr "

    Kunne ikke detektere denne type nyhedskilde! Tjek venligst om kilden virkelig peger på en kilde tilbudt i en af de understøttede syndikationformater!

    XML-fortolkeruddata:
    " -#: ../src/feed.c:284 +#: ../src/feed.c:283 #, c-format msgid "\"%s\" updated..." -msgstr "»%s« opdateret..." +msgstr "»%s« opdateret ..." -#: ../src/feed.c:294 +#: ../src/feed.c:293 #, c-format msgid "\"%s\" is not available" msgstr "»%s« er ikke tilgængelig" #: ../src/feed_parser.c:137 -msgid "" -"The URL you want Liferea to subscribe to points to a webpage and the auto " -"discovery found no feeds on this page. Maybe this webpage just does not " -"support feed auto discovery." -msgstr "" -"URL'en du ønsker, at Liferea skal abonnere på peger på en internetside, og " -"den automatiske registrering fandt ingen nyhedskilder på denne side. Måske " -"understøtter denne internetside ikke automatisk registrering af nyhedskilder." +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 ønsker, at Liferea skal abonnere på peger på en internetside, og den automatiske registrering fandt ingen nyhedskilder på denne side. Måske understøtter denne internetside ikke automatisk registrering af nyhedskilder." #: ../src/feed_parser.c:170 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" -msgstr "" -"XML-fejl under læsning af nyhedskilde! Nyhedskilde »%s« kunne ikke indlæses!" +msgstr "XML-fejl under læsning af nyhedskilde! Nyhedskilde »%s« kunne ikke indlæses!" #: ../src/feed_parser.c:175 msgid "Empty document!" @@ -393,114 +365,93 @@ msgstr "Kunne ikke afgøre nyhedstypen." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "Der er ingen ulæste punkter" -#: ../src/main.c:175 -msgid "" -"Start Liferea with its main window in STATE. STATE may be `shown', " -"`iconified', or `hidden'" -msgstr "" -"Start Liferea med sit hovedvindue i TILSTAND. TILSTAND kan være " -"»shown« (vist), »iconified« (som ikon) eller »hidden« (skjult)" +#: ../src/main.c:163 +msgid "Start Liferea with its main window in STATE. STATE may be `shown', `iconified', or `hidden'" +msgstr "Start Liferea med sit hovedvindue i TILSTAND. TILSTAND kan være »shown« (vist), »iconified« (som ikon) eller »hidden« (skjult)" -#: ../src/main.c:175 +#: ../src/main.c:163 msgid "STATE" msgstr "TILSTAND" -#: ../src/main.c:179 +#: ../src/main.c:164 msgid "Show version information and exit" msgstr "Vis versionsinformation og afslut" -#: ../src/main.c:180 +#: ../src/main.c:165 msgid "Add a new subscription" msgstr "Tilføj et nyt abonnement" -#: ../src/main.c:180 +#: ../src/main.c:165 msgid "uri" msgstr "uri" -#: ../src/main.c:185 +#: ../src/main.c:170 msgid "Print debugging messages of all types" msgstr "Udskriv fejlsøgningsbeskeder af alle typer" -#: ../src/main.c:186 +#: ../src/main.c:171 msgid "Print debugging messages for the cache handling" msgstr "Udskriv fejlsøgningsbeskeder for håndtering af mellemlager" -#: ../src/main.c:187 +#: ../src/main.c:172 msgid "Print debugging messages for the configuration handling" msgstr "Udskriv fejlsøgningsbeskeder for konfigurationshåndteringen" -#: ../src/main.c:188 +#: ../src/main.c:173 msgid "Print debugging messages of the database handling" msgstr "Udskriv fejlsøgningsbeskeder på databasehåndteringen" -#: ../src/main.c:189 +#: ../src/main.c:174 msgid "Print debugging messages of all GUI functions" msgstr "Udskriv fejlsøgningsbeskeder på alle GUI-funktioner" -#: ../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.8/output.xhtml" -msgstr "" -"Aktiverer HTML-optegningsfejlsøgning. Hver gang Liferea optegner HTML-uddata " -"vil Liferea også smide den oprettede HTML i ~/.liferea_1.8/output.xhtml" +#: ../src/main.c:175 +msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.cache/liferea/output.xhtml" +msgstr "Aktiverer HTML-optegningsfejlsøgning. Hver gang Liferea optegner HTML-uddata vil Liferea også skrive den oprettede HTML i ~/.cache/liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:176 msgid "Print debugging messages of all network activity" msgstr "Vis fejlsøgningsbeskeder for al netværksaktivitet" -#: ../src/main.c:192 +#: ../src/main.c:177 msgid "Print debugging messages of all parsing functions" msgstr "Vis fejlsøgningsbeskeder for alle fortolkningsfunktioner" -#: ../src/main.c:193 +#: ../src/main.c:178 msgid "Print debugging messages when a function takes too long to process" msgstr "Vis fejlsøgningsbeskeder når en funktion tager for lang tid" -#: ../src/main.c:194 +#: ../src/main.c:179 msgid "Print debugging messages when entering/leaving functions" msgstr "Vis fejlsøgningsbeskeder når funktioner startes/forlades" -#: ../src/main.c:195 +#: ../src/main.c:180 msgid "Print debugging messages of the feed update processing" msgstr "Vis fejlsøgningsbeskeder for opdateringsprocessen til nyhedskilden" -#: ../src/main.c:196 +#: ../src/main.c:181 msgid "Print debugging messages of the search folder matching" msgstr "Udskriv fejlsøgningsbeskeder for håndtering af mellemlager" -#: ../src/main.c:197 +#: ../src/main.c:182 msgid "Print verbose debugging messages" msgstr "Vis uddybende fejlsøgningsbeskeder" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:193 ../src/main.c:194 msgid "Print debugging messages for the given topic" msgstr "Vis fejlsøgningsbeskeder for det angivne emne" -#: ../src/main.c:218 +#: ../src/main.c:201 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - nyhedslæseren til Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" -"Besøg venligst http://liferea.sourceforge.net/ for yderligere information" - -#: ../src/migrate.c:340 -#, 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 "" -"Denne version af Liferea bruger et nyt mellemlagerformat og har omdannet " -"mellemlageret til dine nyhedskilder. Mellemlagerets indhold i %s blev ikke " -"automatisk slettet. Fjern venligst denne mappe manuelt når du er sikker på, " -"at omdannelsen er vellykket!" +#: ../src/main.c:202 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Besøg venligst http://lzone.de/liferea/ for yderligere information" #. Some libsoup transport errors #: ../src/net.c:320 @@ -524,10 +475,8 @@ msgstr "Kunne ikke forbinde til proxy" #: ../src/net.c:325 -msgid "" -"A network error occurred, or the other end closed the connection unexpectedly" -msgstr "" -"Der opstod en netværksfejl, eller den anden ende lukkede uventet forbindelsen" +msgid "A network error occurred, or the other end closed the connection unexpectedly" +msgstr "Der opstod en netværksfejl, eller den anden ende lukkede uventet forbindelsen" #. http 3xx redirection #: ../src/net.c:328 @@ -536,12 +485,8 @@ #. http 4xx client error #: ../src/net.c:331 -msgid "" -"You are unauthorized to download this feed. Please update your username and " -"password in the feed properties dialog box" -msgstr "" -"Du har ikke tilladelse til at hente denne nyhedskilde. Opdater venligst dit " -"brugernavn og adgangskode i dialogboksen for nyhedskildeegenskaber" +msgid "You are unauthorized to download this feed. Please update your username and password in the feed properties dialog box" +msgstr "Du har ikke tilladelse til at hente denne nyhedskilde. Opdater venligst dit brugernavn og adgangskode i dialogboksen for nyhedskildeegenskaber" #: ../src/net.c:333 msgid "Payment required" @@ -582,9 +527,7 @@ #: ../src/net.c:347 msgid "Feed not available: Server requested unsupported redirection!" -msgstr "" -"Nyhedskilde er ikke tilgængelig: Server anmodede om videresendelse, hvilket " -"ikke er understøttet!" +msgstr "Nyhedskilde er ikke tilgængelig: Server anmodede om videresendelse, hvilket ikke er understøttet!" #: ../src/net.c:349 msgid "Client Error" @@ -672,136 +615,126 @@ msgstr "er ikke angivet" #: ../src/rule.c:181 -#, fuzzy msgid "Feed title" -msgstr "Punkttitel" +msgstr "Titel for nyhedskilde" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Abonnement »%s« bliver allerede opdateret!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format -msgid "" -"The subscription \"%s\" was discontinued. Liferea won't update it anymore!" -msgstr "" -"Abonnementet »%s« blev afbrudt. Liferea vil ikke længere opdatere " -"abonnementet!" +msgid "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" +msgstr "Abonnementet »%s« blev afbrudt. Liferea vil ikke længere opdatere abonnementet!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Opdaterer favicon til »%s«" -#: ../src/subscription.c:192 -msgid "" -"There was a problem while reading this subscription. Please check the URL " -"and console output." -msgstr "" -"Der opstod et problem under læsning af dette abonnement. Tjek venligst " -"URL'en og konsoluddata." +#: ../src/subscription.c:193 +msgid "There was a problem while reading this subscription. Please check the URL and console output." +msgstr "Der opstod et problem under læsning af dette abonnement. Tjek venligst URL'en og konsoluddata." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "URL'en for »%s« har ændret sig permanent og blev opdateret" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "»%s« er afbrudt. Liferea vil ikke længere opdatere den!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "»%s« har ikke ændret sig siden sidste opdatering" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Opdaterer »%s«" -#: ../src/update.c:255 +#: ../src/update.c:258 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Fejl ved åbning af midlertidig fil %s til brug for filtrering!" -#: ../src/update.c:278 +#: ../src/update.c:281 #, c-format msgid "%s exited with status %d" msgstr "%s afsluttede med status %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:287 ../src/update.c:288 ../src/update.c:400 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Fejl: Kunne ikke åbne datakanal »%s«" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:426 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Fejl: Kunne ikke åbne fil »%s«" -#: ../src/update.c:429 +#: ../src/update.c:432 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Fejl: Der er ingen fil »%s«" -#: ../src/vfolder.c:55 +#: ../src/vfolder.c:54 msgid "New Search Folder" msgstr "Ny søgemappe" # evt. Udskriften blev -#: ../src/xml.c:451 +#: ../src/xml.c:410 msgid "[There were more errors. Output was truncated!]" msgstr "[Der var flere fejl. Udskrift blev afkortet!]" -#: ../src/xml.c:604 +#: ../src/xml.c:563 msgid "XML Parser: Could not parse document:\n" msgstr "XML-fortolker: Kunne ikke fortolke dokument:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Bilag" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d bilag" -msgstr[1] "%d bilag" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " byte" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d bilag" +msgstr[1] "%d bilag" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Vælg fil" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "Filendelse .%s" @@ -811,660 +744,673 @@ msgid "Couldn't find pixmap file: %s" msgstr "Kunne ikke finde pixmap-fil: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d ny)" msgstr[1] " (%d nye)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d ulæst%s" msgstr[1] "%d ulæste%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Hjælpeemner" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Hurtig hjælp" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "OSS" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:795 msgid "Liferea is now online" msgstr "Liferea er nu på nettet" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:797 msgid "Work Offline" msgstr "Arbejd frakoblet" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:799 msgid "Liferea is now offline" msgstr "Liferea er nu frakoblet" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:801 msgid "Work Online" msgstr "Arbejd på nettet" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:897 msgid "_Subscriptions" msgstr "_Abonnementer" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:898 msgid "Update _All" msgstr "Opdater _alle" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:898 msgid "Updates all subscriptions." msgstr "Opdaterer alle abonnementer." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:900 msgid "Mark All As _Read" msgstr "Marker alle som _læst" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:900 msgid "Marks read every item of every subscription." msgstr "Markerer alle poster på alle abonnementer som læst." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:902 msgid "_Import Feed List..." -msgstr "_Importer nyhedskildeliste..." +msgstr "_Importer nyhedskildeliste ..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:902 msgid "Imports an OPML feed list." msgstr "Importerer en OPML-nyhedskildeliste." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:903 msgid "_Export Feed List..." -msgstr "_Eksporter nyhedskildeliste..." +msgstr "_Eksporter nyhedskildeliste ..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:903 msgid "Exports the feed list as OPML." msgstr "Eksporterer nyhedskildelisten som OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:904 msgid "_Quit" msgstr "_Afslut" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:906 msgid "_Feed" msgstr "_Nyhedskilde" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:907 msgid "Remove _All Items" msgstr "Fjern _Alle punkter" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:907 msgid "Removes all items of the currently selected feed." msgstr "Fjern alle punkter på den aktuelt valgte nyhedskilde." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:910 msgid "_Item" msgstr "_Punkt" +#: ../src/ui/liferea_shell.c:911 +msgid "Previous Item" +msgstr "Forrige punkt" + +#: ../src/ui/liferea_shell.c:913 +msgid "Next Item" +msgstr "Næste punkt" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:918 msgid "_Next Unread Item" msgstr "_Næste ulæste punkt" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:921 msgid "_View" msgstr "_Vis" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:922 ../src/ui/liferea_htmlview.c:653 msgid "_Increase Text Size" msgstr "_Øg tekststørrelse" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:922 msgid "Increases the text size of the item view." msgstr "Øger tekststørrelsen af punktvisningen." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:924 ../src/ui/liferea_htmlview.c:654 msgid "_Decrease Text Size" msgstr "_Formindsk tekststørrelse" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:924 msgid "Decreases the text size of the item view." msgstr "Formindsker tekststørrelsen på punktvisningen." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:927 msgid "_Tools" msgstr "_Værktøjer" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:928 msgid "_Update Monitor" msgstr "_Opdater skærm" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:928 msgid "Show a list of all feeds currently in the update queue" msgstr "Vis en liste over alle nyhedskilder, der nu er i opdateringskøen" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:930 msgid "_Preferences" msgstr "_Indstillinger" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:930 msgid "Edit Preferences." msgstr "Rediger indstillinger." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:933 msgid "S_earch" msgstr "S_øg" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:934 msgid "Search All Feeds..." -msgstr "Søg i alle nyhedskilder..." +msgstr "Søg i alle nyhedskilder ..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:934 msgid "Show the search dialog." msgstr "Vis søgedialogen." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:936 msgid "_Help" msgstr "_Hjælp" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:937 msgid "_Contents" msgstr "_Indhold" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:937 msgid "View help for this application." msgstr "Vis hjælp for dette program." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:938 msgid "_Quick Reference" msgstr "_Hurtig hjælp" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:938 msgid "View a list of all Liferea shortcuts." msgstr "Vis en liste over alle genveje i Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:940 msgid "_FAQ" msgstr "_OSS" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:940 msgid "View the FAQ for this application." msgstr "Vis OSS'en for dette program." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:941 msgid "_About" msgstr "_Om" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:941 msgid "Shows an about dialog." msgstr "Viser en om-dialog." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:945 msgid "_Normal View" msgstr "_Normal visning" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:945 msgid "Set view mode to mail client mode." msgstr "Sæt visningstilstand til postklienttilstand." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:947 msgid "_Wide View" msgstr "_Bred visning" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:947 msgid "Set view mode to use three vertical panes." msgstr "Sæt visningstilstand til at bruge tre lodrette paneler." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:949 msgid "_Combined View" msgstr "_Kombineret visning" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:949 msgid "Set view mode to two pane mode." msgstr "Sæt visningstilstand til topaneltilstand." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:954 msgid "_Reduced Feed List" msgstr "_Reduceret nyhedskildeliste" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:954 msgid "Hide feeds with no unread items." msgstr "Skjul nyhedskilder uden ulæste punkter." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:959 msgid "_New Subscription..." -msgstr "_Nyt abonnement..." +msgstr "_Nyt abonnement ..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:959 msgid "Adds a subscription to the feed list." msgstr "Tilføjer et abonnement til nyhedskildelisten." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:961 ../src/ui/popup_menu.c:320 msgid "New _Folder..." -msgstr "Ny _mappe..." +msgstr "Ny _mappe ..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:961 msgid "Adds a folder to the feed list." msgstr "Tilføjer en mappe til kildelisten." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:962 ../src/ui/popup_menu.c:323 msgid "New S_earch Folder..." -msgstr "Ny _søgemappe..." +msgstr "Ny _søgemappe ..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:962 msgid "Adds a new search folder to the feed list." msgstr "Tilføjer en ny søgemappe til nyhedskildelisten." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:963 msgid "New _Source..." -msgstr "Ny _kilde..." +msgstr "Ny _kilde ..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:963 msgid "Adds a new feed list source." msgstr "Tilføjer en ny kilde for nyhedskildeliste." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:964 ../src/ui/popup_menu.c:325 msgid "New _News Bin..." -msgstr "Ny _nyhedsbakke..." +msgstr "Ny _nyhedsbakke ..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:964 msgid "Adds a new news bin." msgstr "Tilføjer en ny nyhedsbakke." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:968 msgid "_Mark Items Read" msgstr "_Marker punkter som læst" -#: ../src/ui/liferea_shell.c:911 -msgid "" -"Marks all items of the selected feed list node / in the item list as read." -msgstr "" -"Marker alle punkter på den valgte kildelisteknude / i punktlisten som læste." +#: ../src/ui/liferea_shell.c:968 +msgid "Marks all items of the selected feed list node / in the item list as read." +msgstr "Marker alle punkter på den valgte kildelisteknude / i punktlisten som læste." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:970 ../src/ui/popup_menu.c:300 msgid "_Update" msgstr "_Opdater" -#: ../src/ui/liferea_shell.c:913 -msgid "" -"Updates the selected subscription or all subscriptions of the selected " -"folder." -msgstr "" -"Opdaterer det valgte abonnement eller alle abonnementer på den valgte mappe." +#: ../src/ui/liferea_shell.c:970 +msgid "Updates the selected subscription or all subscriptions of the selected folder." +msgstr "Opdaterer det valgte abonnement eller alle abonnementer på den valgte mappe." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:975 msgid "_Properties" msgstr "_Egenskaber" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:975 msgid "Opens the property dialog for the selected subscription." msgstr "Åbner egenskabsdialogen for det valgte abonnement." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:976 msgid "_Remove" msgstr "_Fjern" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:976 msgid "Removes the selected subscription." msgstr "Fjerner det valgte abonnement." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:980 ../src/ui/popup_menu.c:163 msgid "Toggle _Read Status" msgstr "Skift _læsningsstatus" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:980 msgid "Toggles the read status of the selected item." msgstr "Skifter læsningsstatus på det valgte punkt." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:982 ../src/ui/popup_menu.c:164 msgid "Toggle Item _Flag" msgstr "Skift punkt_flag" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:982 msgid "Toggles the flag status of the selected item." msgstr "Skifter flagstatus på det valgte punkt." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:984 msgid "R_emove" msgstr "_Fjern" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:984 msgid "Removes the selected item." msgstr "Fjerner det valgte punkt." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" -msgstr "_Start i browser" - -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." -msgstr "Starter punktets henvisning i den konfigurerede browser." +#: ../src/ui/liferea_shell.c:986 ../src/ui/popup_menu.c:127 +msgid "Open In _Tab" +msgstr "Åbn i _faneblad" + +#: ../src/ui/liferea_shell.c:986 +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Åbner punktets adresse i et nyt browserfaneblad for Liferea." + +#: ../src/ui/liferea_shell.c:988 ../src/ui/popup_menu.c:128 +msgid "_Open In Browser" +msgstr "_Åbn i browser" + +#: ../src/ui/liferea_shell.c:988 +msgid "Launches the item's link in the Liferea item pane." +msgstr "Åbner punktets adresse i punktets panel for Liferea." + +#: ../src/ui/liferea_shell.c:990 ../src/ui/popup_menu.c:129 +msgid "Open In _External Browser" +msgstr "Åbn i _ekstern browser" + +#: ../src/ui/liferea_shell.c:990 +msgid "Launches the item's link in the configured external browser." +msgstr "Åbner punktets adresse i den konfigurerede eksterne browser." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:995 ../src/ui/popup_menu.c:193 msgid "_Work Offline" msgstr "_Arbejd frakoblet" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:995 msgid "This option allows you to disable subscription updating." -msgstr "" -"Denne indstilling giver dig mulighed for at deaktivere abonnementopdatering." +msgstr "Denne indstilling giver dig mulighed for at deaktivere abonnementopdatering." + +#: ../src/ui/liferea_shell.c:997 +msgid "_Fullscreen" +msgstr "_Fuldskærm" + +# fuldskærmsvisning +#: ../src/ui/liferea_shell.c:997 +msgid "Browse at full screen" +msgstr "Gennemse i fuld skærm" -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1328 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Nyhedslæser til Linux" -#: ../src/ui/liferea_shell.c:1246 -msgid "" -"

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

    You can add new subscriptions

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

    " -msgstr "" -"

    Velkommen til Liferea, en skrivebordsnyhedsindsamler for " -"nyhedskilder på nettet.

    Du kan tilføje nye abonnementer

    • fra " -"hovedmenuen »Abonnement« -> »Nyt abonnement«
    • Ved at føre " -"nyhedshenvisninger ind i abonnementslisten
    • Ved at højreklikke på " -"henvisninger og vælge »Abonner« i Liferea

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

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

    You can add new subscriptions

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

    " +msgstr "

    Velkommen til Liferea, en skrivebordsnyhedsindsamler for nyhedskilder på nettet.

    Du kan tilføje nye abonnementer

    • fra hovedmenuen »Abonnement« -> »Nyt abonnement«
    • Ved at føre nyhedsadresser ind i abonnementslisten
    • Ved at højreklikke på adresser og vælge »Abonner« i Liferea

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Indtast brugernavnet og adgangskoden for »%s« (%s):" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Ukendt kilde" -#: ../src/ui/ui_common.c:205 +#: ../src/ui/ui_common.c:211 msgid "All Files" msgstr "Alle filer" -#: ../src/ui/feed_list_view.c:341 +#: ../src/ui/feed_list_view.c:338 msgid "Deleting entry" msgstr "Sletter post" -#: ../src/ui/feed_list_view.c:342 +#: ../src/ui/feed_list_view.c:339 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "Er du sikker på, at du ønsker at slette »%s« og dens indhold?" -#: ../src/ui/feed_list_view.c:342 +#: ../src/ui/feed_list_view.c:339 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Er du sikker på, at du ønsker at slette »%s«?" -#: ../src/ui/feed_list_view.c:354 +#: ../src/ui/feed_list_view.c:351 msgid "Deletion Confirmation" msgstr "Sletningsbekræftelse" -#: ../src/ui/feed_list_view.c:385 +#: ../src/ui/feed_list_view.c:382 msgid "Liferea is in offline mode. No update possible." msgstr "Liferea er i frakoblet tilstand. Ingen opdatering mulig." -#: ../src/ui/liferea_htmlview.c:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Hentning MISLYKKEDES: »%s«" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "Hentning er færdig." - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" -msgstr "Start henvisning i _faneblad" - -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" -msgstr "_Start henvisning i browser" +#: ../src/ui/liferea_htmlview.c:624 +msgid "Open Link In _Tab" +msgstr "Åbn adresse i _faneblad" + +#: ../src/ui/liferea_htmlview.c:625 +msgid "_Open Link In Browser" +msgstr "_Åbn adresse i browser" + +#: ../src/ui/liferea_htmlview.c:626 +msgid "_Open Link In External Browser" +msgstr "_Åbn adresse i ekstern browser" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:629 #, c-format msgid "_Bookmark Link at %s" -msgstr "_Bogmærk henvisning på %s" +msgstr "_Bogmærk adresse på %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:633 msgid "_Copy Link Location" -msgstr "_Kopier placering på henvisning" +msgstr "_Kopier adresseplacering" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Image Location" msgstr "_Kopier billedplacering" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:638 msgid "S_ave Link As" -msgstr "_Gem henvisning som" +msgstr "_Gem adresse som" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:640 msgid "S_ave Image As" msgstr "_Gem billede som" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:643 msgid "_Subscribe..." -msgstr "_Abonner..." +msgstr "_Abonner ..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:398 msgid "*** No title ***" msgstr "*** Ingen titel ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:661 msgid "Date" msgstr "Dato" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:675 msgid "Headline" msgstr "Overskrift" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:777 ../src/ui/item_list_view.c:798 +#: ../src/ui/item_list_view.c:819 ../src/ui/item_list_view.c:883 +#: ../src/ui/item_list_view.c:968 ../src/ui/item_list_view.c:983 msgid "No item has been selected" msgstr "Intet punkt er blevet valgt" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:794 ../src/ui/item_list_view.c:815 msgid "This item has no link specified!" -msgstr "Dette punkt har ingen henvisning angivet!" +msgstr "Dette punkt har ingen adresse angivet!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:871 msgid "You must select a feed to delete its items!" msgstr "Du skal vælge en nyhedskilde for at slette dens punkter!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Kør punkt i _faneblad" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "_Start punkt i browser" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:141 msgid "Copy to News Bin" msgstr "Kopier til nyhedsbakke" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Kopier punkt-_URL til udklipsholder" +#: ../src/ui/popup_menu.c:155 +#, c-format +msgid "_Bookmark at %s" +msgstr "_Bogmærk på %s" + +#: ../src/ui/popup_menu.c:159 +msgid "Copy Item _Location" +msgstr "Kopier _punktplacering" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:165 msgid "R_emove Item" msgstr "_Fjern punkt" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:178 msgid "Open Enclosure..." -msgstr "Åbn pakke..." +msgstr "Åbn pakke ..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:179 msgid "Save As..." -msgstr "Gem som..." +msgstr "Gem som ..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:180 msgid "Copy Link Location" -msgstr "Kopier placering på henvisning" +msgstr "Kopier adresseplacering" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:194 msgid "_Update All" msgstr "_Opdater alle" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:199 msgid "_Show Liferea" msgstr "_Vis Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:302 msgid "_Update Folder" msgstr "_Opdater mappe" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:304 msgid "_Mark All As Read" msgstr "_Marker alle som læst" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:314 msgid "_New" msgstr "_Ny" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:317 msgid "New _Subscription..." -msgstr "Nyt _abonnement..." +msgstr "Nyt _abonnement ..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:324 msgid "New S_ource..." -msgstr "Ny _kilde..." +msgstr "Ny _kilde ..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:333 msgid "Sort Feeds" msgstr "Sorter nyhedskilder" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:339 msgid "_Rebuild" msgstr "_Genbyg" -#: ../src/ui/popup_menu.c:341 -#, fuzzy +#: ../src/ui/popup_menu.c:351 msgid "Convert To Local Subscriptions..." -msgstr "_Nyt abonnement..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(Tom)" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" +msgstr "Konverter til lokale abonnementer ..." -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:87 msgid "GNOME default" msgstr "GNOME-standard" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:88 msgid "Text below icons" msgstr "Tekst under ikoner" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:89 msgid "Text beside icons" msgstr "Tekst ved siden af ikoner" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:90 msgid "Icons only" msgstr "Kun ikoner" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:91 msgid "Text only" msgstr "Kun tekst" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:99 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minutter" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "timer" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "dage" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:106 msgid "Space" msgstr "Mellemrum" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:107 msgid " Space" msgstr " mellemrum" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " mellemrum" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Vælg overførselsmappe" +#: ../src/ui/preferences_dialog.c:113 +msgid "Normal View" +msgstr "Normal visning" + +#: ../src/ui/preferences_dialog.c:114 +msgid "Wide View" +msgstr "Bred visning" + +#: ../src/ui/preferences_dialog.c:115 +msgid "Combined View" +msgstr "Kombineret visning" # måske 'Manuel' (som i manuel browser) afhænger måske af type -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:500 msgid "Manual" msgstr "Manuel" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:515 msgid "Browser default" msgstr "Browserstandard" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:518 msgid "Existing window" msgstr "Eksisterende vindue" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:521 msgid "New window" msgstr "Nyt vindue" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:524 msgid "New tab" msgstr "Nyt faneblad" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:683 msgid "Integrate with the messaging menu (indicator)" msgstr "Integrer med beskedmenuen (indikator)" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:686 msgid "Terminate instead of minimizing to the messaging menu" msgstr "Afslut i stedet for at minimere til beskedmenuen" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:689 msgid "Start minimized to the messaging menu" msgstr "Start minimeret til beskedmenuen" # tast? -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:789 msgid "Type" msgstr "Type" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:792 msgid "Program" msgstr "Program" +#: ../src/ui/ui_node.c:123 +msgid "(Empty)" +msgstr "(Tom)" + +#: ../src/ui/ui_node.c:320 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" +"%s\n" +"Genbygger" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." -msgid_plural "" -"The provider of this feed suggests an update interval of %d minutes." -msgstr[0] "" -"Leverandøren af denne nyhedskilde foreslår et opdateringsinterval på %d " -"minut." -msgstr[1] "" -"Leverandøren af denne nyhedskilde foreslår et opdateringsinterval på %d " -"minutter." +msgid_plural "The provider of this feed suggests an update interval of %d minutes." +msgstr[0] "Leverandøren af denne nyhedskilde foreslår et opdateringsinterval på %d minut." +msgstr[1] "Leverandøren af denne nyhedskilde foreslår et opdateringsinterval på %d minutter." #: ../src/ui/subscription_dialog.c:434 msgid "This feed specifies no default update interval." msgstr "Denne nyhedskilde angiver ingen standard for opdateringsinterval." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:153 msgid "Untitled" msgstr "Uden titel" @@ -1516,44 +1462,33 @@ msgid "%b %d %H:%M" msgstr "%d. %b %H:%M" -#: ../src/fl_sources/default_source.c:174 -#: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 +#: ../src/fl_sources/default_source.c:145 +#: ../src/fl_sources/google_source.c:273 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" msgstr "Nyt abonnement" -#: ../src/fl_sources/google_source.c:116 +#: ../src/fl_sources/google_source.c:115 msgid "Google Reader login failed!" msgstr "Kunne ikke logge ind på Google Reader!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:394 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 -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 "" -"Integrer nyhedskildelisten på din konto i Google Reader. Liferea vil " -"præsentere dine abonnementer i Google Reader, og vil synkronisere din " -"nyhedskildeliste og læsningslister." +#: ../src/fl_sources/google_source.c:395 +msgid "Integrate the feed list of your Google Reader account. Liferea will present your Google Reader subscriptions, and will synchronize your feed list and reading lists." +msgstr "Integrer nyhedskildelisten på din konto i Google Reader. Liferea vil præsentere dine abonnementer i Google Reader, og vil synkronisere din nyhedskildeliste og læsningslister." -#: ../src/fl_sources/opml_source.c:325 +#: ../src/fl_sources/opml_source.c:326 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:326 -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 "" -"Integrer blogrolls eller Planets i din nyhedskildeliste. Liferea vil " -"automatisk tilføje og fjerne nyhedskilder i overensstemmelse med ændringerne " -"i OPML-kildedokumentet" +#: ../src/fl_sources/opml_source.c:327 +msgid "Integrate blogrolls or Planets in your feed list. Liferea will automatically add and remove feeds according to the changes of the source OPML document" +msgstr "Integrer blogrolls eller Planets i din nyhedskildeliste. Liferea vil automatisk tilføje og fjerne nyhedskilder i overensstemmelse med ændringerne i OPML-kildedokumentet" -#: ../src/fl_sources/opml_source.c:387 +#: ../src/fl_sources/opml_source.c:394 msgid "Choose OPML File" msgstr "Vælg OPML-fil" @@ -1574,23 +1509,17 @@ #: ../src/fl_sources/node_source.c:412 #, c-format msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" +msgstr "Abonnementet »%s« blev med succes konverteret til lokale nyhedskilder!" -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:360 msgid "Tiny Tiny RSS" msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 -msgid "" -"Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " -"present your tt-rss subscriptions, and will synchronize your feed list and " -"reading lists." -msgstr "" -"Integrer nyhedskildelisten for din RSS 1.5+-konto hos Tiny Tiny. Liferea vil " -"præsentere dine tt-rss abonnementer og vil synkronisere din nyhedskildeliste " -"og læsningslister." +#: ../src/fl_sources/ttrss_source.c:361 +msgid "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will present your tt-rss subscriptions, and will synchronize your feed list and reading lists." +msgstr "Integrer nyhedskildelisten for din RSS 1.5+-konto hos Tiny Tiny. Liferea vil præsentere dine tt-rss abonnementer og vil synkronisere din nyhedskildeliste og læsningslister." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:119 msgid "Could not parse JSON returned by tt-rss API!" msgstr "Kunne ikke fortolke JSON returneret af tt-rss API!" @@ -1608,26 +1537,26 @@ msgid "Visit" msgstr "Besøg" -#: ../src/notification/libnotify.c:171 ../src/notification/libnotify.c:274 +#: ../src/notification/libnotify.c:167 ../src/notification/libnotify.c:263 msgid "Open feed" msgstr "Åbn nyhedskilde" -#: ../src/notification/libnotify.c:174 ../src/notification/libnotify.c:277 +#: ../src/notification/libnotify.c:170 ../src/notification/libnotify.c:266 msgid "Mark all as read" msgstr "Marker alle som læst" -#: ../src/notification/libnotify.c:254 +#: ../src/notification/libnotify.c:247 #, c-format msgid "%s has %d update" msgid_plural "%s has %d updates" msgstr[0] "%s har %d opdatering" msgstr[1] "%s har %d opdateringer" -#: ../src/notification/libnotify.c:257 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:249 msgid "Feed Update" msgstr "Nyhedskildeopdatering" -#: ../src/notification/libnotify.c:271 +#: ../src/notification/libnotify.c:260 msgid "Show details" msgstr "Vis detaljer" @@ -1644,12 +1573,8 @@ msgstr "Bruger_navn:" #: ../glade/auth.ui.h:6 -msgid "" -"Note: The username and password will be saved to your Liferea feedlist " -"file without using encryption." -msgstr "" -"Bemærk: Brugernavn og adgangskode vil blive gemt i din kildelistefil til " -"Liferea uden brug af kryptering." +msgid "Note: The username and password will be saved to your Liferea feedlist file without using encryption." +msgstr "Bemærk: Brugernavn og adgangskode vil blive gemt i din kildelistefil til Liferea uden brug af kryptering." #: ../glade/google_source.ui.h:1 msgid "Add Google Reader Account" @@ -1659,8 +1584,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Indtast venligst din kontoopsætning for Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Adgangskode" @@ -1684,7 +1608,7 @@ msgid "combined view" msgstr "kombineret visning" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Overskrifter" @@ -1731,15 +1655,14 @@ #: ../glade/liferea.ui.h:17 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." -msgstr "" -"Denne nyhedskildeleverandør foreslår et opdateringsinterval på %d minutter." +msgstr "Denne nyhedskildeleverandør foreslår et opdateringsinterval på %d minutter." #: ../glade/liferea.ui.h:18 msgid "General" msgstr "Generelt" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Nyhedskilde" @@ -1765,33 +1688,23 @@ #: ../glade/liferea.ui.h:25 ../glade/new_subscription.ui.h:7 msgid "Select File..." -msgstr "Vælg fil..." +msgstr "Vælg fil ..." #: ../glade/liferea.ui.h:26 ../glade/new_subscription.ui.h:11 msgid "Use conversion _filter" msgstr "Brug konversions_filter" #: ../glade/liferea.ui.h:27 ../glade/new_subscription.ui.h:12 -msgid "" -"Liferea can use external filter plugins in order to access feeds and " -"directories in non-supported formats. See the documentation for more " -"information." -msgstr "" -"Liferea kan bruge eksterne filterudvidelsesmoduler for at tilgå nyhedskilder " -"og mappe i ikkeunderstøttede formater. Se dokumentationen for yderligere " -"information." +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 bruge eksterne filterudvidelsesmoduler for at tilgå nyhedskilder og mappe i ikkeunderstøttede formater. Se dokumentationen for yderligere information." #: ../glade/liferea.ui.h:28 ../glade/new_subscription.ui.h:13 msgid "Convert _using:" msgstr "Konverter med _brug af:" #: ../glade/liferea.ui.h:30 -msgid "" -"The cache setting controls if the contents of feeds are saved when Liferea " -"exits. Marked items are always saved to the cache." -msgstr "" -"Mellemlagerindstillingen kontrollerer om indholdet af nyhedskilder gemmes, " -"når Liferea afsluttes. Markerede punkter gemmes altid til mellemlageret." +msgid "The cache setting controls if the contents of feeds are saved when Liferea exits. Marked items are always saved to the cache." +msgstr "Mellemlagerindstillingen kontrollerer om indholdet af nyhedskilder gemmes, når Liferea afsluttes. Markerede punkter gemmes altid til mellemlageret." #: ../glade/liferea.ui.h:31 msgid "_Default cache settings" @@ -1831,9 +1744,7 @@ #: ../glade/liferea.ui.h:42 msgid "Auto-_load item link in configured browser when selecting articles." -msgstr "" -"_Indlæs automatisk punkthenvisning i konfigureret browser når der vælges " -"artikler." +msgstr "_Indlæs automatisk punktadresse i konfigureret browser når der vælges artikler." #: ../glade/liferea.ui.h:43 msgid "Ignore _comment feeds for this subscription." @@ -1856,499 +1767,434 @@ msgstr "Avanceret" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Indstillinger for Liferea" +msgid "New Folder" +msgstr "Ny mappe" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "Håndtering af mellemlager for nyhedskilder" +msgid "_Folder name:" +msgstr "_Mappenavn:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "_Antal punkter per nyhedskilde der som standard gemmes:" +msgid "Rename" +msgstr "Omdøb" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "Indstillinger for nyhedskildeopdatering" +msgid "_New Name:" +msgstr "_Nyt navn:" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "_Opdater alle abonnementer ved opstart." +msgid "Search Folder Properties" +msgstr "Egenskaber for søgemappe" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Standardinterval for _nyhedskildeopdatering:" +msgid "Search _Name:" +msgstr "Søge_navn:" -#. Feed update interval hint in preference dialog. +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "Find punkter som opfylder de følgende kriterier" + +# hvad er dette? +# Hvis det er ligesom i postprogrammet alpine: her angiver man regler +# for hvordan forskellige typer beskeder (el. nyheder i dette tilfælde) +# kategoriseres, f.eks. om den kommer fra dansk@dansk-gruppen.dk. Så +# kan man gøre ting med disse regler, f.eks. få alle beskeder der +# opfylder en given regel farvet blå. Man kan også bruge dem som +# søgefiltre - så her er det nok noget med en søgning, hvor man søger på +# flere regler ad gangen, og enhver af disse regler skal så matche +# (eller være 'opfyldt'). Det er i modsætning til at de allesammen skal +# være opfyldt for at en post bliver fundet. +# Så jeg foreslår: _Mindst én regel opfyldt #: ../glade/liferea.ui.h:55 -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 "" -"Bemærk: Husk venligst at angive en fornuftig opdateringsfrekvens. Normalt " -"er det spild af båndbredde at opdatere nyhedskilder oftere end hver time." +msgid "A_ny Rule Matches" +msgstr "_Mindst én regel opfyldt" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Nyhedskilder" +msgid "_All Rules Must Match" +msgstr "_Alle regler skal være opfyldt" #: ../glade/liferea.ui.h:57 -msgid "Folder Display Settings" -msgstr "Opsætning af mappevisning" +msgid "Open Enclosure" +msgstr "Åbn pakke" -# kunne også være 'når en mappe vælges' -# måske erstatte med 'for valgt mappe', hvilket er lidt mindre pænt men -# fungerer uanset hvad #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "_Vis punkterne på alle undernyhedskilder når en mappe vælges." +msgid "Open an enclosure of type:" +msgstr "Åbn pakketypen:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "_Skjul læste punkter." +msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. The enclosures URL will be supplied as an argument for this command:" +msgstr "Hvad skal Liferea gøre med denne pakke? Indtast venligst kommandoen du ønsker at køre nedenfor. Hentede pakkers adresse vil blive angivet som et argument for denne kommando:" #: ../glade/liferea.ui.h:60 -msgid "Feed Icons (Favicons)" -msgstr "Ikoner for nyhedskilde (faviconer)" +msgid "_Browse" +msgstr "_Gennemse" +# i fremtiden #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_Opdater alle faviconer nu" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "_Gør dette automatisk for pakker som dette fremadrettet." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Mapper" +msgid "Search All Feeds" +msgstr "Søg i alle nyhedskilder" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" -msgstr "Læser overskrifter" +msgid "_Search for:" +msgstr "_Søg efter:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "_Skim igennem artikler med:" +msgid "Enter a search string Liferea should find either in a items title or in its content." +msgstr "Indtast en søgestreng som Liferea skal finde enten i en punkttitel eller i dennes indhold." #: ../glade/liferea.ui.h:65 -msgid "Web Integration" -msgstr "Internetintegrering" +msgid "_Advanced..." +msgstr "_Avanceret ..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Send bogmærker til" +msgid "Starts searching for the specified text in all feeds. The search result will appear in the item list." +msgstr "Begynder søgning efter den angivne tekst i alle nyhedskilder. Søgeresultatet vil fremkomme i punktlisten." #: ../glade/liferea.ui.h:67 -msgid "Internal Browser Settings" -msgstr "Intern browseropsætning" +msgid "Update Monitor" +msgstr "Opdater skærm" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Åbn henvisninger i Lifereas _vindue." +msgid "Pending Requests" +msgstr "Afventende anmodninger" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Deaktiver Javascript." - +msgid "Downloading Now" +msgstr "Henter nu" + #: ../glade/liferea.ui.h:70 +msgid "Cancel _All" +msgstr "Afbryd _alle" + +#: ../glade/liferea.ui.h:71 +msgid "Create News Bin" +msgstr "Opret nyhedsbakke" + +#: ../glade/liferea.ui.h:72 +msgid "_News Bin Name:" +msgstr "_Nyhedsbakkenavn:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Om" + +#: ../glade/liferea.ui.h:74 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea er en nyhedsindsamler til GTK+" + +#: ../glade/liferea.ui.h:75 +msgid "Liferea Homepage" +msgstr "Lifereas hjemmeside" + +#: ../glade/liferea.ui.h:76 +msgid "Advanced Search" +msgstr "Avanceret søgning" + +# tror det skal forstås som 'søg i mappe' +#: ../glade/liferea.ui.h:77 +msgid "_Search Folder..." +msgstr "_Søg i mappe ..." + +#: ../glade/liferea.ui.h:78 +msgid "Create Search Engine Feed" +msgstr "Opret søgemotornyhedskilde" + +#: ../glade/liferea.ui.h:79 +msgid "enter any search string you want" +msgstr "indtast en ønsket søgestreng" + +#: ../glade/liferea.ui.h:80 +msgid "Maximal _Number Of Result Items:" +msgstr "Maksimalt _antal resultatpunkter:" + +#: ../glade/liferea.ui.h:81 +msgid "Note: Liferea will generate a feed subscription which is used to query the search engine results for the specified search string. You can keep this feed permanently and update it like any other subscription." +msgstr "Bemærk: Liferea vil oprette et nyhedskildeabonnement, som bruges til at forespørge søgemotorens resultater for den angivne søgestreng. Du kan beholde denne nyhedskilde permanent og opdatere den som ethvert andet abonnement." + +# Det er nok implicit at det er "indstillinger for", eller noget lignende +# ville sige: Hentning / efterbehandling +#: ../glade/new_subscription.ui.h:9 +msgid "Download / Postprocessing" +msgstr "Hentning / efterbehandling" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Kildeudvælgelse" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Vælg kildetypen du ønsker at tilføje ..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Tilføj OPML/Planet" + +#: ../glade/opml_source.ui.h:2 +msgid "Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "Angiv venligst en lokal fil eller en URL der peger på en gyldig OPML-nyhedskildeliste." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Placering" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "_Vælg fil" + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "Tilføj Tiny Tiny RSS-konto" + +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "Indtast venligst din tt-rss-kontoopsætning." + +#: ../glade/ttrss_source.ui.h:3 +msgid "_Server URL" +msgstr "_Serveradresse" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "_Brugernavn" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Avanceret ..." + +#: ../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 "Indtast en internetsideplacering til brug for automatisk opdagelse af nyhedskilde, eller hvis du kender den, den præcise placering af nyhedskilden." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Indstillinger for Liferea" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Håndtering af mellemlager for nyhedskilder" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "_Antal punkter per nyhedskilde der som standard gemmes:" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Indstillinger for nyhedskildeopdatering" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "_Opdater alle abonnementer ved opstart." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Standardinterval for _nyhedskildeopdatering:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "Note: Please remember to set a reasonable refresh time. Usually it is a waste of bandwidth to poll feeds more often than each hour." +msgstr "Bemærk: Husk venligst at angive en fornuftig opdateringsfrekvens. Normalt er det spild af båndbredde at opdatere nyhedskilder oftere end hver time." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Nyhedskilder" + +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Opsætning af mappevisning" + +# kunne også være 'når en mappe vælges' +# måske erstatte med 'for valgt mappe', hvilket er lidt mindre pænt men +# fungerer uanset hvad +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "_Vis punkterne på alle undernyhedskilder når en mappe vælges." + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "_Skjul læste punkter." + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Ikoner for nyhedskilde (faviconer)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Opdater alle faviconer nu" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Mapper" + +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Læser overskrifter" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "_Skim igennem artikler med:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "_Normal visningstilstand:" + +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Internetintegrering" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Send bogmærker til" + +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Intern browseropsætning" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Åbn adresser i Lifereas _vindue." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Deaktiver Javascript." + +#: ../glade/prefs.ui.h:25 msgid "_Enable browser plugins." msgstr "_Aktiver browserudvidelsesmoduler." -#: ../glade/liferea.ui.h:71 +#: ../glade/prefs.ui.h:26 msgid "External Browser Settings" msgstr "Ekstern browseropsætning" -#: ../glade/liferea.ui.h:72 +#: ../glade/prefs.ui.h:27 msgid "_Open link in:" -msgstr "_Åbn henvisning i:" +msgstr "_Åbn adresse i:" -#: ../glade/liferea.ui.h:74 +# måske 'Manuel' (som i manuel browser) afhænger måske af type +#: ../glade/prefs.ui.h:28 +msgid "_Manual:" +msgstr "_Manuel:" + +#: ../glade/prefs.ui.h:30 #, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" -msgstr "" -"_Manuel:\n" -"(%s for URL)" +msgid "(%s for URL)" +msgstr "(%s for adresse)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Browser:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Browser" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 msgid "Notification Settings" msgstr "Påmindelsesopsætning" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Vis et _pop op-vindue med nye overskrifter." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "Vis et status_ikon i statusfeltet." # statusfeltikon? -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Vis _antallet af nye punkter i statusikonet." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Afslut i steden for at minimere til statusikonet." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "_Start i statusikon." -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 msgid "Toolbar Settings" msgstr "Værktøjsbjælkeopsætning" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "_Skjul værktøjsbjælke." -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Etiketter for _værktøjsbjælkeknap:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "Grafisk brugergrænseflade" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "Server for HTTP-proxy" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "_Autodetekter (GNOME eller miljø)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "_Ingen proxy" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "_Manuel indstilling:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "Proxy_port:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "Proxy_vært:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Brug proxy_godkendelse" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "Proxy_adgangskode:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "Proxy_brugernavn:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 msgid "Downloading Enclosures" msgstr "Henter pakker" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Gennemse" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Gem overførsler i" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Hent med brug af" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 msgid "Opening Enclosures" msgstr "Åbner pakker" -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Pakker" -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "Synkroniseret med nærvedliggende værter" - -# yuck, den engelske er lidt grim (da L i LAN allerede er 'lokal') -# hvad med: Aktiver lokal synkronisering over LAN -# (så er det lidt mindre åbenlyst) -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_Aktiver lokal synkronisering over LAN" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "_Tjenestenavn" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Synkr" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Ny mappe" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Mappenavn:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Omdøb" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Nyt navn:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Egenskaber for søgemappe" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "Søge_navn:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "Find punkter som opfylder de følgende kriterier" - -# hvad er dette? -# Hvis det er ligesom i postprogrammet alpine: her angiver man regler -# for hvordan forskellige typer beskeder (el. nyheder i dette tilfælde) -# kategoriseres, f.eks. om den kommer fra dansk@dansk-gruppen.dk. Så -# kan man gøre ting med disse regler, f.eks. få alle beskeder der -# opfylder en given regel farvet blå. Man kan også bruge dem som -# søgefiltre - så her er det nok noget med en søgning, hvor man søger på -# flere regler ad gangen, og enhver af disse regler skal så matche -# (eller være 'opfyldt'). Det er i modsætning til at de allesammen skal -# være opfyldt for at en post bliver fundet. -# Så jeg foreslår: _Mindst én regel opfyldt -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "_Mindst én regel opfyldt" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "_Alle regler skal være opfyldt" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Henter pakke" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Henter pakketypen:" - -#: ../glade/liferea.ui.h:120 -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 "" -"Hvad skal Liferea gøre med denne pakke? Indtast venligst kommandoen du " -"ønsker at køre nedenfor. Hentede pakker vil blive angivet som et argument " -"for denne kommando:" - -# tror det er 'Forbigå URL og ...' -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "Forbigå _URL og hent ikke pakke." - -# i fremtiden -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "_Gør dette automatisk for pakker som dette fremadrettet." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Søg i alle nyhedskilder" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Søg efter:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Indtast en søgestreng som Liferea skal finde enten i en punkttitel eller i " -"dennes indhold." - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "_Avanceret..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Begynder søgning efter den angivne tekst i alle nyhedskilder. Søgeresultatet " -"vil fremkomme i punktlisten." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Opdater skærm" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "Afventende anmodninger" - -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "Henter nu" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "Afbryd _alle" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Opret nyhedsbakke" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Nyhedsbakkenavn:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Om" - -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Ophavsret 2003-2012\n" -"Holdet bag Liferea\n" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea er en nyhedsindsamler til GTK+" - -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Lifereas hjemmeside" - -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Avanceret søgning" - -# tror det skal forstås som 'søg i mappe' -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "_Søg i mappe..." - -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Opret søgemotornyhedskilde" - -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "indtast en ønsket søgestreng" - -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Maksimalt _antal resultatpunkter:" - -#: ../glade/liferea.ui.h:145 -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 "" -"Bemærk: Liferea vil oprette et nyhedskildeabonnement, som bruges til at " -"forespørge søgemotorens resultater for den angivne søgestreng. Du kan " -"beholde denne nyhedskilde permanent og opdatere den som ethvert andet " -"abonnement." - -# Det er nok implicit at det er "indstillinger for", eller noget lignende -# ville sige: Hentning / efterbehandling -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" -msgstr "Hentning / efterbehandling" - -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Kildeudvælgelse" - -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Vælg kildetypen du ønsker at tilføje..." - -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Tilføj OPML/Planet" - -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Angiv venligst en lokal fil eller en URL der peger på en gyldig OPML-" -"nyhedskildeliste." - -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Placering" - -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "_Vælg fil" - -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "Tilføj Tiny Tiny RSS-konto" - -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "Indtast venligst din tt-rss-kontoopsætning." - -#: ../glade/ttrss_source.ui.h:3 -msgid "_Server URL" -msgstr "_Serveradresse" - -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "_Brugernavn" - -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Indtast en internetsideplacering til brug for automatisk opdagelse af " -"nyhedskilde, eller hvis du kender den, den præcise placering af nyhedskilden." - -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Avanceret..." - -#~ msgid "You may want to validate the feed using" -#~ msgstr "Du kan eventuelt validere nyhedskilden med" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" +msgstr "Udvidelsesmodul" #~ msgid "" -#~ "Jumps to the next unread item. If necessary selects the next feed with " -#~ "unread items." +#~ "Copyright (c) 2003-2012\n" +#~ "The Liferea Team\n" #~ msgstr "" -#~ "Går til det næste ulæste punkt. Hvis nødvendigt vælges den næste " -#~ "nyhedskilde med ulæste punkter." - -#~ msgid "Liferea Sync %s@%s" -#~ msgstr "Liferea synkr %s@%s" +#~ "Ophavsret 2003-2012\n" +#~ "Holdet bag Liferea\n" diff -Nru liferea-1.8.15/po/de.po liferea-1.10.3/po/de.po --- liferea-1.8.15/po/de.po 2013-06-24 22:16:15.000000000 +0200 +++ liferea-1.10.3/po/de.po 2013-07-31 23:29:12.000000000 +0200 @@ -1,16 +1,16 @@ # German translation for Liferea. # Copyright (C) 2003 # This file is distributed under the same license as the Liferea package. -# Lars Linder , 2003-2009. +# Lars Windolf , 2003-2012. # Robin Stocker , 2008-2009. # Christian Dywan , 2008-2009. # msgid "" msgstr "" -"Project-Id-Version: Liferea 1.5.0\n" +"Project-Id-Version: Liferea 1.9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" -"PO-Revision-Date: 2013-01-03 16:26+0100\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" +"PO-Revision-Date: 2013-07-06 01:24+0100\n" "Last-Translator: Lars Windolf \n" "Language-Team: German\n" "Language: \n" @@ -18,9 +18,12 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Language: German\n" +"X-Poedit-Country: Germany\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 +#: ../src/main.c:235 +#: ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -33,26 +36,16 @@ msgstr "Liferea Feedreader" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Herunterladen und Anzeigen von Feeds" +msgid "Read news feeds and blogs" +msgstr "News-Feeds und Blogs lesen" #: ../xslt/feed.xml.in.h:1 -msgid "" -"This feed is discontinued. It's no longer available. Liferea won't update it " -"anymore but you can still access the cached headlines." -msgstr "" -"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:2 -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:3 msgid "There were errors while parsing this feed!" @@ -68,7 +61,7 @@ #: ../xslt/feed.xml.in.h:6 msgid "You may want to contact the author/webmaster of the feed about this!" -msgstr "Bitte kontaktieren Sie den Autor/Webmaster dieses Feeds!" +msgstr "Kontaktieren Sie den Autor/Webmaster dieses Feeds zu diesem Problem!" #: ../xslt/feed.xml.in.h:7 msgid "There were errors while filtering this feed!" @@ -82,7 +75,8 @@ msgid "Feed:" msgstr "Feed:" -#: ../xslt/feed.xml.in.h:10 ../xslt/source.xml.in.h:1 +#: ../xslt/feed.xml.in.h:10 +#: ../xslt/source.xml.in.h:1 msgid "Source:" msgstr "Quelle:" @@ -94,11 +88,13 @@ msgid "Copyright" msgstr "Copyright" -#: ../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" @@ -107,7 +103,8 @@ msgid "Folder:" msgstr "Ordner:" -#: ../xslt/item.xml.in.h:1 ../glade/liferea.ui.h:29 +#: ../xslt/item.xml.in.h:1 +#: ../glade/liferea.ui.h:29 msgid "Source" msgstr "Quelle" @@ -144,38 +141,26 @@ msgstr "Ersteller" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "Markieren" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "Lesezeichen" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "Kommentare" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Keine Kommentare bisher." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Kommentare" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Aktualisiere..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Aktualisieren" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Sektion" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Department" @@ -184,12 +169,8 @@ msgstr "Sammelordner:" #: ../xslt/newsbin.xml.in.h:2 -msgid "" -"Add items to this news bin by selecting \"Copy to News Bin\" from the item " -"list context menu." -msgstr "" -"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/vfolder.xml.in.h:1 msgid "Search Folder:" @@ -197,14 +178,15 @@ #: ../src/browser.c:32 msgid "Default Browser" -msgstr "GNOME-Standardbrowser" +msgstr "Standard-Browser" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 +#: ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Aufruf des Browsers fehlgeschlagen: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Starte: \"%s\"" @@ -214,7 +196,7 @@ msgid "Authorization Error" msgstr "Authorisierungsfehler" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Kann Cache-Verzeichnis \"%s\" nicht anlegen!" @@ -244,87 +226,90 @@ msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" -msgstr "\"%s\" ist keine gültige Enclosure-Typen-Datei!" +msgstr "\"%s\" ist keine gültige Datei mit Anhangstypen!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Download des Anhangs ging fehl: \"%s\"" +#: ../src/enclosure.c:288 +msgid "You have not configured a download tool yet! Please do so in the 'Download' tab in Tools/Preferences." +msgstr "Es ist noch kein Download-Programm konfiguriert! Dies muss im Reiter 'Download' unter Tools/Einstellungen eingetragen werden." -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Anhang fertig heruntergeladen: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" +"Kommando fehlgeschlagen: \n" +"\n" +"%s\n" +"\n" +"Bitte prüfen, ob das konfigurierte Download-Programm installiert ist und korrekt funktioniert! Im Reiter 'Download' im Menü Tools/Einstellungen kann dies kontrolliert werden." -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" -msgstr "Fehler beim Umbenennen von \"%s\" nach \"%s\"\n" +msgstr "Fehler beim Umbenennen von %s nach %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 +#: ../src/export.c:408 #, 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:396 ../src/export.c:398 +#: ../src/export.c:414 +#: ../src/export.c:416 #, 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:419 ../src/export.c:421 +#: ../src/export.c:437 +#: ../src/export.c:439 #, 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:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Importierte Abonnements" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Abonnements importieren" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Import" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 +#: ../src/export.c:487 +#: ../src/fl_sources/opml_source.c:387 msgid "OPML Files" -msgstr "OPML-Datei wählen" +msgstr "OPML-Dateien" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Fehler beim Exportieren der Abonnements!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Abonnements exportiert!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Abonnements exportieren" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Export" #: ../src/feed.c:255 -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:284 #, c-format @@ -337,20 +322,13 @@ msgstr "\"%s\" ist nicht verfügbar!" #: ../src/feed_parser.c:137 -msgid "" -"The URL you want Liferea to subscribe to points to a webpage and the auto " -"discovery found no feeds on this page. Maybe this webpage just does not " -"support feed auto discovery." -msgstr "" -"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." +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:170 #, 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:175 msgid "Empty document!" @@ -369,113 +347,94 @@ msgstr "Konnte Feed-Typ nicht bestimmen." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" -msgstr "Es gibt keine ungelesenen Schlagzeilen." +msgstr "Es gibt keine ungelesenen Schlagzeilen" -#: ../src/main.c:175 -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:164 +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:175 +#: ../src/main.c:164 msgid "STATE" msgstr "STATE" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Programmversion anzeigen und beenden" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "Add a new subscription" -msgstr "Neues Abonnement" +msgstr "Neues Abonnement hinzufügen" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" -msgstr "" +msgstr "uri" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Gibt alle Debug-Meldungen aus" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "Gibt Debug-Meldungen für die Cacheverwaltung aus" -#: ../src/main.c:187 +#: ../src/main.c:173 msgid "Print debugging messages for the configuration handling" msgstr "Gibt Debug-Meldungen für die Konfigurationsverwaltung aus" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "Gibt Debug-Meldungen für die Konfigurationsverwaltung aus" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "Gibt Debug-Meldungen aller GUI-Funktionen aus." -#: ../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.8/output.xhtml" -msgstr "" -"Aktiviert HTML-Rendering-Debugging. Bei jedem Rendern wird das HTML in ~/." -"liferea_1.8/output.xhtml gedumpt" +#: ../src/main.c:176 +msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.cache/liferea/output.xhtml" +msgstr "Aktiviert HTML-Rendering-Debugging. Bei jedem Rendern wird das HTML nach ~/.cache/liferea/output.xhtml geschrieben" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "Gibt Debug-Meldungen der Netzwerkfunktionen aus" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "Gibt Debug-Meldungen aller Parserfunktionen aus" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "Ausgabe von Meldungen über langlaufende Funktionen" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Gibt Debug-Meldungen aus, wenn Funktionen gestartet und beendet werden" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "Gibt Debug-Meldungen für die Feedaktualisierung aus" -#: ../src/main.c:196 +#: ../src/main.c:182 msgid "Print debugging messages of the search folder matching" -msgstr "Gibt Debug-Meldungen für die Suchordnerverwaltung aus" +msgstr "Gibt Debug-Meldungen für die Suchordner-Handling aus" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Gibt ausführliche Debug-Meldungen aus" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 +#: ../src/main.c:195 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:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, der Linux Feed Reader" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "Weitere Informationen auf http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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 %s migriert. Diese Verzeichnis wurde aber nicht automatisch " -"gelöscht. Bitte löschen Sie es manuell sobald sie sicher sind, daß die " -"Migration erfolgreich war!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Weitere Informationen auf http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -499,11 +458,8 @@ msgstr "Proxy ist nicht erreichbar" #: ../src/net.c:325 -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" +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:328 @@ -512,13 +468,8 @@ #. http 4xx client error #: ../src/net.c:331 -msgid "" -"You are unauthorized to download this feed. Please update your username and " -"password in the feed properties dialog box" -msgstr "" -"Sie sind nicht autorisiert, dieses Abonnement herunterzuladen. Bitte " -"aktualisieren Sie Passwort und Benutzernamen in den Eigenschaften des " -"Abonnements." +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:333 msgid "Payment required" @@ -550,8 +501,7 @@ #: ../src/net.c:340 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:345 msgid "There was an internal error in the update process" @@ -559,9 +509,7 @@ #: ../src/net.c:347 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:349 msgid "Client Error" @@ -581,11 +529,17 @@ msgid "Item" msgstr "Schlagzeile" -#: ../src/rule.c:174 ../src/rule.c:175 ../src/rule.c:176 ../src/rule.c:181 +#: ../src/rule.c:174 +#: ../src/rule.c:175 +#: ../src/rule.c:176 +#: ../src/rule.c:181 msgid "does contain" msgstr "enthält" -#: ../src/rule.c:174 ../src/rule.c:175 ../src/rule.c:176 ../src/rule.c:181 +#: ../src/rule.c:174 +#: ../src/rule.c:175 +#: ../src/rule.c:176 +#: ../src/rule.c:181 msgid "does not contain" msgstr "enthält nicht" @@ -649,75 +603,69 @@ msgid "Feed title" msgstr "Titel des Abonnements" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Das Abonnement \"%s\" wird bereits aktualisiert!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, 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:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Aktualisiere Symbol für Abonnement \"%s\"" -#: ../src/subscription.c:192 -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:193 +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 +#: ../src/subscription.c:211 #, 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 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "\"%s\" ist eingestellt. Liferea wird es nicht mehr aktualisieren." -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" hat sich seit dem letzten Update nicht verändert" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Aktualisiere \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Fehler beim Öffnen der temporären Datei %s während des Filterns!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s endete mit Status %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 +#: ../src/update.c:289 +#: ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Konnte Pipe \"%s\" nicht öffnen." #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Konnte Datei \"%s\" nicht öffnen." -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Es gibt keine Datei \"%s\"." @@ -726,55 +674,54 @@ msgid "New Search Folder" msgstr "Neuer Suchordner" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Es gab weitere Fehler. Fehlerausgabe abgeschnitten!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "XML-Parser: Konnte Dokument nicht parsen:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Anhänge" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d Anhang" -msgstr[1] "%d Anhänge" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " Bytes" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d Anhang" +msgstr[1] "%d Anhänge" + +#: ../src/ui/enclosure_list_view.c:377 +#: ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Datei wählen" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "Dateiendung .%s" @@ -784,376 +731,401 @@ msgid "Couldn't find pixmap file: %s" msgstr "Konnte Pixmap-Datei nicht finden: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d neu)" msgstr[1] " (%d neu)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d ungelesen%s" msgstr[1] "%d ungelesen%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Hilfe-Themen" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Kurzreferenz" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "FAQ" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea ist jetzt online" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Offline arbeiten" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea ist jetzt offline." -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Online arbeiten" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Abonnements" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "_Alle aktualisieren" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Aktualisieren aller Abonnements." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Alle als gelesen markieren" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Markiert alle Schlagzeilen des Abonnements als gelesen." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "Abonnements _importieren..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importiert Abonnements aus einer OPML Datei." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "Abonnements _exportieren..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Exportiert alle Abonnements als OPML Datei." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Beenden" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Abonnement" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Lösche _alle Schlagzeilen" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Löscht alle Schlagzeilen des ausgewählten Abonnements." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_Schlagzeile" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "Vorherige Schlagzeile" + +#: ../src/ui/liferea_shell.c:924 +msgid "Next Item" +msgstr "Nächste Schlagzeile" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "Nächste _Ungelesene" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Ansicht" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 +#: ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "Schriftgrad ver_größern" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Vergrößern des Schriftgrades der Schlagzeilenansicht." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 +#: ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "Schriftgrad ver_kleinern" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Verkleinern des Schriftgrades der Schlagzeilenansicht." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "_Tools" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "_Aktualisierungsstatus" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "Eine Liste aller zur Zeit laufenden Aktualisierungen anzeigen." -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Einstellungen" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Einstellungen ändern." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "_Suche" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Alle Feeds durchsuchen..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Öffnen des Suchdialogs." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Hilfe" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Inhalt" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Die Hilfe für diese Anwendung anzeigen." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Kurzreferenz" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Eine Liste aller Tastenkürzel zeigen." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_FAQ" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Häufig gestellte Fragen für diese Anwendung anzeigen." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_Info" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Anzeigen \"Über\"-Dialogs." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "_Normale Ansicht" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Ansicht wie eine Email-Anwendung verwenden." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "_Breite Ansicht" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Ansicht mit drei vertikalen Spalten verwenden." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "_Kombinierte Ansicht" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 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:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "_Reduzierte Abonnements" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Verberge Abonnements ohne ungelesene Schlagzeilen." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "_Neues Abonnement..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Neues Abonnement hinzufügen." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 +#: ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Neuer _Ordner..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Einen Ordner der Liste der Abonnements hinzufügen." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 +#: ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Neuer S_uchordner..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Einen neuen Suchordner zu den Abonnements hinzufügen." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Neue _Quelle..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Eine neue Quelle zu den Abonnements hinzufügen." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 +#: ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "Neuer Sa_mmelordner..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Einen neuen Sammelordner zu den Abonnements hinzufügen." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "Als gelesen _markieren" -#: ../src/ui/liferea_shell.c:911 -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:979 +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:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 +#: ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Aktualisieren" -#: ../src/ui/liferea_shell.c:913 -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:981 +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:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "_Eigenschaften" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Öffnet den Eigenschaften-Dialog für das ausgewählte Abonnement." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "_Löschen" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Entfernt das ausgewählte Abonnement." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 +#: ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Lesestatus ändern" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Ändert den Lesestatus der gewählten Schlagzeile." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 +#: ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "_Flagge setzen" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Ändert den Markierungsstatus der gewählten Schlagzeile." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "_Löschen" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Entfernt die ausgewählte Schlagzeile." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 +#: ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "In _Tab öffnen" + +#: ../src/ui/liferea_shell.c:997 +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Öffnet die ausgewählten Schlagzeile in einem neuen Tab in Liferea." + +#: ../src/ui/liferea_shell.c:999 +#: ../src/ui/popup_menu.c:129 +msgid "_Open In Browser" msgstr "Im _Browser öffnen" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." -msgstr "Öffnet die ausgewählten Schlagzeile im konfigurierten Browser." +#: ../src/ui/liferea_shell.c:999 +msgid "Launches the item's link in the Liferea item pane." +msgstr "Öffnet die ausgewählte Schlagzeile in Liferea." + +#: ../src/ui/liferea_shell.c:1001 +#: ../src/ui/popup_menu.c:130 +msgid "Open In _External Browser" +msgstr "Im _externen Browser öffnen" + +#: ../src/ui/liferea_shell.c:1001 +msgid "Launches the item's link in the configured external browser." +msgstr "Öffnet die ausgewählten Schlagzeile im konfigurierten externen Browser." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 +#: ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "_Offline arbeiten" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Diese Option deaktiviert das Aktualisieren von Abonnements." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "Vollbild" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "Im Vollbildmodus lesen" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Linux Feed Reader" -#: ../src/ui/liferea_shell.c:1246 -msgid "" -"

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

    You can add new subscriptions

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

    " -msgstr "" -"

    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:1341 +msgid "

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

    You can add new subscriptions

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

    " +msgstr "

    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/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 +#: ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Unbekannte Quelle" @@ -1183,265 +1155,262 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea ist offline. Keine Aktualisierungen möglich." -#: ../src/ui/liferea_htmlview.c:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Download des Anhangs schlug fehl: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "Herunterladen abgeschlossen." - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" -msgstr "Link in _Reiter öffnen" +#: ../src/ui/liferea_htmlview.c:627 +msgid "Open Link In _Tab" +msgstr "Link in _Tab öffnen" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +msgid "_Open Link In Browser" msgstr "Im _Browser öffnen" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:629 +msgid "_Open Link In External Browser" +msgstr "Im _externen Browser öffnen" + +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "_Lesezeichen mit %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Link kopieren" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 msgid "_Copy Image Location" -msgstr "_Bild-Link kopieren" +msgstr "Bild _Link kopieren" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 msgid "S_ave Link As" -msgstr "_Link Speichern unter..." +msgstr "Link Speichern _unter..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" -msgstr "Grafik Speichern _unter" +msgstr "B_ild Speichern Als" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Abonnieren..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Kein Titel ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Datum" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Schlagzeile" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 +#: ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 +#: ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 +#: ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Es wurde keine Schlagzeile ausgewählt." -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 +#: ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Diese Schlagzeile hat keinen Link!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Zum Löschen von Schlagzeilen muss ein Abonnement ausgewählt werden!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "In _Reiter öffnen" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "Im _Browser öffnen" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "In Sammelordner kopieren" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "_Link-Adresse kopieren" +#: ../src/ui/popup_menu.c:156 +#, c-format +msgid "_Bookmark at %s" +msgstr "_Lesezeichen mit %s" + +#: ../src/ui/popup_menu.c:160 +msgid "Copy Item _Location" +msgstr "_Link der Schlagzeile kopieren" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "_Lösche Schlagzeile" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Öffne Anhang..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Speichern unter..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "Link kopieren" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "_Alle aktualisieren" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "Liferea anzeigen" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "_Ordner _aktualisieren" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "Alle als gelesen _markieren" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_Neu" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "_Neues Abonnement..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "Neue _Quelle..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 msgid "Sort Feeds" msgstr "Abonnements sortieren" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" -msgstr "_Erneuern" - -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "_Neues Abonnement..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(Leer)" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" -"%s\n" -"Wird erneuert" +msgstr "_Neu Erzeugen" -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "GNOME-Standard" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Text unter Elementen" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Text neben Elementen" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Nur Symbole" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Nur Text" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 +#: ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "Minuten" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 +#: ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "Stunden" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 +#: ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "Tage" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Leertaste" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Leertaste" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Leertaste" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Auswahl eines Verzeichnisses zum Download" +#: ../src/ui/preferences_dialog.c:114 +msgid "Normal View" +msgstr "Normale Ansicht" + +#: ../src/ui/preferences_dialog.c:115 +msgid "Wide View" +msgstr "Breite Ansicht" + +#: ../src/ui/preferences_dialog.c:116 +msgid "Combined View" +msgstr "Kombinierte Ansicht" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Manuell" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Browser-Vorgabe" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Existierendes Fenster" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Neues Fenster" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" -msgstr "Neues Tab" +msgstr "Neuer Tab" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" -msgstr "Im Messaging Menü integrieren (Indicator)" +msgstr "In Messaging Menü (Indicator) integrieren" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 msgid "Terminate instead of minimizing to the messaging menu" -msgstr "B_eenden anstatt ins Benachrichtigungsfeld minimieren." +msgstr "Beenden anstatt ins Messaging Menü zu minimieren." -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" -msgstr "Minimiert im Benachrichtigungsfeld starten." +msgstr "Minimiert im Messaging Menü starten" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Typ" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Programm" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "(Leer)" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" +"%s\n" +"Erneuern" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." -msgid_plural "" -"The provider of this feed suggests an update interval of %d minutes." -msgstr[0] "" -"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/subscription_dialog.c:434 msgid "This feed specifies no default update interval." msgstr "Dieses Abonnement schlägt kein Aktualisierungsintervall vor." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "Ohne Titel" @@ -1480,7 +1449,8 @@ "%s\n" "Keine ungelesenen Schlagzeilen" -#: ../src/parsers/atom10.c:241 ../src/parsers/pie_feed.c:141 +#: ../src/parsers/atom10.c:241 +#: ../src/parsers/pie_feed.c:141 msgid "Website" msgstr "Webseite" @@ -1492,8 +1462,9 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/default_source.c:174 -#: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 +#: ../src/fl_sources/default_source.c:145 +#: ../src/fl_sources/google_source.c:274 +#: ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" msgstr "Neues Abonnement" @@ -1502,31 +1473,21 @@ msgid "Google Reader login failed!" msgstr "Google-Reader-Login fehlgeschlagen!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 -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:384 +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:325 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" #: ../src/fl_sources/opml_source.c:326 -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." +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:387 msgid "Choose OPML File" @@ -1540,35 +1501,24 @@ 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:269 msgid "Source Type" msgstr "Art der Quelle" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 -msgid "" -"Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " -"present your tt-rss subscriptions, and will synchronize your feed list and " -"reading lists." -msgstr "" -"Integrieren eines Tiny Tiny RSS 1.5+-Kontos. Liferea wird die Abonnements " -"des einbinden und den Status der Schlagzeilen synchronisieren." +#: ../src/fl_sources/ttrss_source.c:363 +msgid "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will present your tt-rss subscriptions, and will synchronize your feed list and reading lists." +msgstr "Integrieren eines Tiny Tiny RSS 1.5+ -Kontos. Liferea wird die Abonnements des Tiny Tiny RSS-Kontos als Teilbaum der Abonnements einbinden." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" -msgstr "JSON-Ausgabe der tt-rss API ist fehlerhaft!" +msgstr "Could not parse JSON returned by tt-rss API!" -#: ../src/notification/libnotify.c:61 ../src/notification/libnotify.c:83 +#: ../src/notification/libnotify.c:61 +#: ../src/notification/libnotify.c:83 #: ../src/notification/libnotify.c:152 msgid "This feed does not exist anymore!" msgstr "Das gewählte Abonnement existiert nicht mehr!" @@ -1582,11 +1532,13 @@ msgid "Visit" msgstr "Öffnen" -#: ../src/notification/libnotify.c:171 ../src/notification/libnotify.c:274 +#: ../src/notification/libnotify.c:171 +#: ../src/notification/libnotify.c:274 msgid "Open feed" msgstr "Öffnen" -#: ../src/notification/libnotify.c:174 ../src/notification/libnotify.c:277 +#: ../src/notification/libnotify.c:174 +#: ../src/notification/libnotify.c:277 msgid "Mark all as read" msgstr "Alle als gelesen markieren" @@ -1594,10 +1546,11 @@ #, c-format msgid "%s has %d update" msgid_plural "%s has %d updates" -msgstr[0] "%s hat %d Aktualisierung" -msgstr[1] "%s hat %d Aktualisierungen" +msgstr[0] "%s mit %d Aktualisierungen" +msgstr[1] "%s mit %d Aktualisierungen" -#: ../src/notification/libnotify.c:257 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:257 +#: ../src/notification/libnotify.c:259 msgid "Feed Update" msgstr "Abonnement aktualisieren" @@ -1609,21 +1562,19 @@ msgid "Authentication" msgstr "Authentifizierung" -#: ../glade/auth.ui.h:4 ../glade/liferea.ui.h:37 +#: ../glade/auth.ui.h:4 +#: ../glade/liferea.ui.h:37 msgid "_Password:" msgstr "_Passwort:" -#: ../glade/auth.ui.h:5 ../glade/liferea.ui.h:38 +#: ../glade/auth.ui.h:5 +#: ../glade/liferea.ui.h:38 msgid "User_name:" msgstr "_Benutzername:" #: ../glade/auth.ui.h:6 -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/google_source.ui.h:1 msgid "Add Google Reader Account" @@ -1633,7 +1584,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Hier sind die Google-Reader-Kontodaten anzugeben." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 +#: ../glade/google_source.ui.h:3 #: ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Passwort" @@ -1659,6 +1610,7 @@ msgstr "Kombinierte Ansicht" #: ../glade/liferea.ui.h:6 +#: ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Schlagzeilen" @@ -1672,7 +1624,7 @@ #: ../glade/liferea.ui.h:9 msgid "Feed Name" -msgstr "Abonnement-_Name:" +msgstr "Abonnement-Name" #: ../glade/liferea.ui.h:10 msgid "Feed _Name:" @@ -1701,68 +1653,66 @@ #: ../glade/liferea.ui.h:17 #, 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.ui.h:18 msgid "General" msgstr "Allgemein" -#: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/liferea.ui.h:19 +#: ../glade/new_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Abonnement-Quelle" -#: ../glade/liferea.ui.h:20 ../glade/new_subscription.ui.h:8 +#: ../glade/liferea.ui.h:20 +#: ../glade/new_subscription.ui.h:8 msgid "Source Type:" msgstr "Art der Quelle:" -#: ../glade/liferea.ui.h:21 ../glade/new_subscription.ui.h:3 +#: ../glade/liferea.ui.h:21 +#: ../glade/new_subscription.ui.h:3 msgid "_Source:" msgstr "_Quelle:" -#: ../glade/liferea.ui.h:22 ../glade/new_subscription.ui.h:4 +#: ../glade/liferea.ui.h:22 +#: ../glade/new_subscription.ui.h:4 msgid "_URL" msgstr "_Adresse" -#: ../glade/liferea.ui.h:23 ../glade/new_subscription.ui.h:5 +#: ../glade/liferea.ui.h:23 +#: ../glade/new_subscription.ui.h:5 msgid "_Command" msgstr "_Befehl" -#: ../glade/liferea.ui.h:24 ../glade/new_subscription.ui.h:6 +#: ../glade/liferea.ui.h:24 +#: ../glade/new_subscription.ui.h:6 msgid "_Local File" msgstr "Lokale _Datei" -#: ../glade/liferea.ui.h:25 ../glade/new_subscription.ui.h:7 +#: ../glade/liferea.ui.h:25 +#: ../glade/new_subscription.ui.h:7 msgid "Select File..." msgstr "Datei auswählen..." -#: ../glade/liferea.ui.h:26 ../glade/new_subscription.ui.h:11 +#: ../glade/liferea.ui.h:26 +#: ../glade/new_subscription.ui.h:11 msgid "Use conversion _filter" msgstr "_Benutze einen Filter zum Konvertieren" -#: ../glade/liferea.ui.h:27 ../glade/new_subscription.ui.h:12 -msgid "" -"Liferea can use external filter plugins in order to access feeds and " -"directories in non-supported formats. See the documentation for more " -"information." -msgstr "" -"Liferea kann externe Filter-Plugins benutzen, um Abonnements in nicht " -"unterstützten Formaten zu lesen. Die Dokumentation enthält weitere " -"Informationen." +#: ../glade/liferea.ui.h:27 +#: ../glade/new_subscription.ui.h:12 +msgid "Liferea can use external filter plugins in order to access feeds and directories in non-supported formats. See the documentation for more information." +msgstr "Liferea kann externe Filter-Plugins benutzen, um Abonnements in nicht unterstützten Formaten zu lesen. Die Dokumentation enthält weitere Informationen." -#: ../glade/liferea.ui.h:28 ../glade/new_subscription.ui.h:13 +#: ../glade/liferea.ui.h:28 +#: ../glade/new_subscription.ui.h:13 msgid "Convert _using:" msgstr "Konvertiere _mit:" #: ../glade/liferea.ui.h:30 -msgid "" -"The cache setting controls if the contents of feeds are saved when Liferea " -"exits. Marked items are always saved to the cache." -msgstr "" -"Diese Einstellung kontrolliert, ob und wieviele Schlagzeilen dieses " -"Abonnements dauerhaft gespeichert werden." +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.ui.h:31 msgid "_Default cache settings" @@ -1788,7 +1738,8 @@ msgid "Use HTTP _authentication" msgstr "HTTP-_Authentifikation benutzen" -#: ../glade/liferea.ui.h:39 ../glade/new_subscription.ui.h:10 +#: ../glade/liferea.ui.h:39 +#: ../glade/new_subscription.ui.h:10 msgid "_Don't use proxy for download" msgstr "_Proxy beim Herunterladen nicht nutzen" @@ -1825,1661 +1776,416 @@ msgstr "Erweitert" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Liferea-Einstellungen" +msgid "New Folder" +msgstr "Neuer Ordner" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "Abonnement-Cache" +msgid "_Folder name:" +msgstr "_Ordnername:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Vorgegebene _Anzahl zu sichernder Schlagzeilen:" +msgid "Rename" +msgstr "Umbenennen" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "Einstellungen zur Aktualisierung" +msgid "_New Name:" +msgstr "_Neuer Name:" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "Aktualisieren aller Abonnements beim Start." +msgid "Search Folder Properties" +msgstr "Suchordner-Eigenschaften" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Vorgegebenes Aktualisierungsintervall:" +msgid "Search _Name:" +msgstr "_Name der Suche:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "Suche Abonnements die den folgenden Kriterien entsprechen" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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." +msgid "A_ny Rule Matches" +msgstr "Ei_ne Regel trifft zu" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Abonnements" +msgid "_All Rules Must Match" +msgstr "_Alle Regeln treffen zu" #: ../glade/liferea.ui.h:57 -msgid "Folder Display Settings" -msgstr "Anzeigen von Ordnern" +msgid "Open Enclosure" +msgstr "Öffne Anhang" #: ../glade/liferea.ui.h:58 -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." +msgid "Open an enclosure of type:" +msgstr "Herunterladen eines Anhangs vom Typ:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "_Gelesene Schlagzeilen verbergen" +msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. The enclosures URL will be supplied as an argument for this command:" +msgstr "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.ui.h:60 -msgid "Feed Icons (Favicons)" -msgstr "Abonnementsymbole (Favicons)" +msgid "_Browse" +msgstr "_Durchsuchen" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "Alle Symbole _aktualisieren" +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.ui.h:62 -msgid "Folders" -msgstr "Ordner" +msgid "Search All Feeds" +msgstr "Alle Abonnements durchsuchen" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" -msgstr "Lesen von Schlagzeilen" +msgid "_Search for:" +msgstr "_Suche nach:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "Durch Artikel _blättern mit:" +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.ui.h:65 -msgid "Web Integration" -msgstr "Web Integration" +msgid "_Advanced..." +msgstr "_Erweitert..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Lesezeichen mit:" +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.ui.h:67 -msgid "Internal Browser Settings" -msgstr "Einstellungen für internen Browser" +msgid "Update Monitor" +msgstr "Aktualisierungsstatus" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Öffne Links im Liferea-_Fenster." +msgid "Pending Requests" +msgstr "Warteschlange" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "Javascript _deaktivieren." +msgid "Downloading Now" +msgstr "In Bearbeitung" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "_Aktivieren von Browser-Plugins" +msgid "Cancel _All" +msgstr "_Alle abbrechen" #: ../glade/liferea.ui.h:71 -msgid "External Browser Settings" -msgstr "Einstellungen für externen Browser" +msgid "Create News Bin" +msgstr "Neuer Sammelordner" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "_Öffne Link in:" +msgid "_News Bin Name:" +msgstr "_Name des Sammelordners" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Info" #: ../glade/liferea.ui.h:74 -#, no-c-format msgid "" -"_Manual:\n" -"(%s for URL)" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" msgstr "" -"_Manuell:\n" -"(%s für Adresse)" - -#: ../glade/liferea.ui.h:76 -msgid "_Browser:" -msgstr "_Browser:" +"Copyright (c) 2003-2012\n" +"Das Liferea Team\n" #: ../glade/liferea.ui.h:77 -msgid "Browser" -msgstr "Browser" +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea ist ein News-Aggregator für GTK+" #: ../glade/liferea.ui.h:78 -msgid "Notification Settings" -msgstr "Einstellungen für Benachrichtungen" +msgid "Liferea Homepage" +msgstr "Liferea-Webseite" #: ../glade/liferea.ui.h:79 -msgid "Show a _popup window with new headlines." -msgstr "_Popup-Fenster mit neuen Schlagzeilen anzeigen." +msgid "Advanced Search" +msgstr "Erweiterte Suche" #: ../glade/liferea.ui.h:80 -msgid "Show a status _icon in the notification area (system tray)." -msgstr "Ein _Statussymbol im Benachrichtigungsfeld anzeigen." +msgid "_Search Folder..." +msgstr "_Suchordner..." #: ../glade/liferea.ui.h:81 -msgid "Show _number of new items in the tray icon." -msgstr "A_nzahl neuer Schlagzeilen im Statussymbol anzeigen." +msgid "Create Search Engine Feed" +msgstr "Suchmaschinen-Abonnement..." #: ../glade/liferea.ui.h:82 -msgid "T_erminate instead of minimizing to tray icon." -msgstr "B_eenden anstatt ins Benachrichtigungsfeld minimieren." +msgid "enter any search string you want" +msgstr "beliebigen Suchbegriff eingeben" #: ../glade/liferea.ui.h:83 -msgid "_Start in tray icon." -msgstr "_In Benachrichtungsfeld minimiert starten." +msgid "Maximal _Number Of Result Items:" +msgstr "Maximale _Anzahl von Ergebnissen:" #: ../glade/liferea.ui.h:84 -msgid "Toolbar Settings" -msgstr "Einstellungen der Werkzeugleiste" +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.ui.h:85 -msgid "_Hide toolbar." -msgstr "_Werkzeugleiste verbergen." - -#: ../glade/liferea.ui.h:86 -msgid "Toolbar _button labels:" -msgstr "_Knopfbeschriftungen in Werkzeugleiste:" +#: ../glade/new_subscription.ui.h:9 +msgid "Download / Postprocessing" +msgstr "Download / Nachbearbeitung" -#: ../glade/liferea.ui.h:87 -msgid "GUI" -msgstr "Oberfläche" +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Auswahl der Quelle" -#: ../glade/liferea.ui.h:88 -msgid "HTTP Proxy Server" -msgstr "HTTP Proxy Server" +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Bitte den gewünschten Quellentyp auswählen..." -#: ../glade/liferea.ui.h:89 -msgid "_Auto Detect (GNOME or environment)" -msgstr "_Automatisch (GNOME oder Umgebung)" +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Neue OPML/Planet-Quelle" -#: ../glade/liferea.ui.h:90 -msgid "_No Proxy" -msgstr "Kei_n Proxy" +#: ../glade/opml_source.ui.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." -#: ../glade/liferea.ui.h:91 -msgid "_Manual Setting:" -msgstr "_Manuelle Einstellung" +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Ort" -#: ../glade/liferea.ui.h:92 -msgid "Proxy _Port:" -msgstr "Proxy-_Port:" +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "Datei au_swählen" -#: ../glade/liferea.ui.h:93 -msgid "Proxy _Host:" -msgstr "Proxy-_Host:" +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "Neuer Tiny Tiny RSS-Konto" -#: ../glade/liferea.ui.h:94 -msgid "Use Proxy Au_thentication" -msgstr "Proxy-Au_thentifikation benutzen" +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "Hier sind die TinyTinyRSS-Kontodaten anzugeben." -#: ../glade/liferea.ui.h:95 -msgid "Proxy Pass_word:" -msgstr "Proxy-_Passwort:" +#: ../glade/ttrss_source.ui.h:3 +msgid "_Server URL" +msgstr "Server-URL" -#: ../glade/liferea.ui.h:96 -msgid "Proxy _Username:" -msgstr "Proxy-_Benutzername:" +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "_Benutzername" -#: ../glade/liferea.ui.h:97 -msgid "Proxy" -msgstr "Proxy" +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Erweitert..." -#: ../glade/liferea.ui.h:98 -msgid "Downloading Enclosures" -msgstr "Herunterladen von Anhängen" +#: ../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 "Bitte die Adresse einer Webseite oder wenn bekannt die exakte Adresse eines Feeds angeben." -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Durchsuchen" +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Liferea-Einstellungen" -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Speichere Dateien in:" +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Abonnement-Cache" -#: ../glade/liferea.ui.h:101 -msgid "_Download using" -msgstr "_Herunterladen mit:" +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Vorgegebene _Anzahl zu sichernder Schlagzeilen:" -#: ../glade/liferea.ui.h:102 -msgid "Opening Enclosures" -msgstr "Öffnen von Anhängen" +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Aktualisieren von Abonnements" -#: ../glade/liferea.ui.h:103 -msgid "Enclosures" -msgstr "Anhänge" +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "Aktualisieren aller Abonnements beim Start." -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "Mit Rechner im LAN synchronisieren" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_Aktiviere Lokale LAN-Synchronisation" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "_Servicename" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Sync" +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Vorgegebenes Aktualisierungsintervall:" -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Neuer Ordner" +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "Note: Please remember to set a reasonable refresh time. Usually it is a waste of bandwidth to poll feeds more often than each hour." +msgstr "Hinweis: Es ist wichtig, ein sinnvolles Intervall anzugeben. Eine Aktualisierung öfter als einmal in der Stunde ist meist nur Bandbreitenverschwendung." -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Ordnername:" +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Abonnements" -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Umbenennen" +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Anzeigen von Ordnern" -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Neuer Name:" +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "Beim _Auswählen Schlagzeilen aller enthaltenen Abonnements zeigen." -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Suchordner-Eigenschaften" +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "_Gelesene Schlagzeilen verbergen" -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "_Name der Suche:" +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Abonnementsymbole (Favicons)" -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "Suche Abonnements die den folgenden Kriterien entsprechen" +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "Alle Symbole _aktualisieren" -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "Ei_ne Regel trifft zu" +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Ordner" -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "_Alle Regeln treffen zu" +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Lesen von Schlagzeilen" -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Herunterladen eines Anhangs" +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "Durch Artikel _blättern mit:" -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Herunterladen eines Anhangs vom Typ:" +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "_Standard Ansicht" -#: ../glade/liferea.ui.h:120 -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.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Adresse übergeben anstatt Anhang herunterzuladen" +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Web Integration" -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "_Tue dies von nun an automatisch für Dateien dieses Typs." +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Lesezeichen mit:" -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Alle Abonnements durchsuchen" +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Einstellungen für internen Browser" -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Suche nach:" +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Öffne Links im Liferea-_Fenster." -#: ../glade/liferea.ui.h:125 -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/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "Javascript _deaktivieren." -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "_Erweitert..." +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "_Browser Plugins aktivieren" -#: ../glade/liferea.ui.h:127 -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/prefs.ui.h:26 +msgid "External Browser Settings" +msgstr "Einstellungen für externen Browser" -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Aktualisierungsstatus" +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "_Öffne Link in:" -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "Warteschlange" +#: ../glade/prefs.ui.h:28 +msgid "_Manual:" +msgstr "_Manuell:" -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "Werden heruntergeladen" +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "(%s für URL)" -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "_Alle abbrechen" +#: ../glade/prefs.ui.h:31 +msgid "_Browser:" +msgstr "_Browser:" -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Neuer Sammelordner" +#: ../glade/prefs.ui.h:32 +msgid "Browser" +msgstr "Browser" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Name des Sammelordners" +#: ../glade/prefs.ui.h:33 +msgid "Notification Settings" +msgstr "Benachrichtungen" -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Info" +#: ../glade/prefs.ui.h:34 +msgid "Show a _popup window with new headlines." +msgstr "_Popup-Fenster mit neuen Schlagzeilen anzeigen." -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Copyright (c) 2003-2012\n" -"Das Liferea Team\n" +#: ../glade/prefs.ui.h:35 +msgid "Show a status _icon in the notification area (system tray)." +msgstr "Ein _Statussymbol im Benachrichtigungsfeld anzeigen." -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea ist ein News-Aggregator für GTK+" +#: ../glade/prefs.ui.h:36 +msgid "Show _number of new items in the tray icon." +msgstr "A_nzahl neuer Schlagzeilen im Statussymbol anzeigen." -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Liferea-Webseite" +#: ../glade/prefs.ui.h:37 +msgid "T_erminate instead of minimizing to tray icon." +msgstr "B_eenden anstatt ins Benachrichtigungsfeld minimieren." -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Erweiterte Suche" +#: ../glade/prefs.ui.h:38 +msgid "_Start in tray icon." +msgstr "_In Benachrichtungsfeld minimiert starten." -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "_Suchordner..." +#: ../glade/prefs.ui.h:39 +msgid "Toolbar Settings" +msgstr "Aussehen der Werkzeugleiste" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Suchmaschinen-Abonnement..." +#: ../glade/prefs.ui.h:40 +msgid "_Hide toolbar." +msgstr "_Werkzeugleiste verbergen." -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "beliebigen Suchbegriff eingeben" +#: ../glade/prefs.ui.h:41 +msgid "Toolbar _button labels:" +msgstr "_Knopfbeschriftungen in Werkzeugleiste:" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Maximale _Anzahl von Ergebnissen:" +#: ../glade/prefs.ui.h:42 +msgid "GUI" +msgstr "Oberfläche" -#: ../glade/liferea.ui.h:145 -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/prefs.ui.h:43 +msgid "HTTP Proxy Server" +msgstr "HTTP Proxy Server" -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" -msgstr "Download / Nachbearbeitung" +#: ../glade/prefs.ui.h:44 +msgid "_Auto Detect (GNOME or environment)" +msgstr "_Automatisch (GNOME oder Umgebung)" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Auswahl der Quelle" +#: ../glade/prefs.ui.h:45 +msgid "_No Proxy" +msgstr "Kei_n Proxy" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Bitte den gewünschten Quellentyp auswählen..." +#: ../glade/prefs.ui.h:46 +msgid "_Manual Setting:" +msgstr "_Manuelle Einstellung" -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Neue OPML/Planet-Quelle" +#: ../glade/prefs.ui.h:47 +msgid "Proxy _Port:" +msgstr "Proxy-_Port:" -#: ../glade/opml_source.ui.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." +#: ../glade/prefs.ui.h:48 +msgid "Proxy _Host:" +msgstr "Proxy-_Host:" -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Ort" +#: ../glade/prefs.ui.h:49 +msgid "Use Proxy Au_thentication" +msgstr "Proxy-Au_thentifikation benutzen" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "Datei au_swählen" +#: ../glade/prefs.ui.h:50 +msgid "Proxy Pass_word:" +msgstr "Proxy-_Passwort:" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "Neues Tiny Tiny RSS-Konto" +#: ../glade/prefs.ui.h:51 +msgid "Proxy _Username:" +msgstr "Proxy-_Benutzer:" -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "Hier sind die Tiny Tiny RSS-Kontodaten anzugeben." +#: ../glade/prefs.ui.h:52 +msgid "Proxy" +msgstr "Proxy" -#: ../glade/ttrss_source.ui.h:3 -msgid "_Server URL" -msgstr "_Server-URL" +#: ../glade/prefs.ui.h:53 +msgid "Downloading Enclosures" +msgstr "Herunterladen von Anhängen" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "_Benutzername" +#: ../glade/prefs.ui.h:54 +msgid "_Download using" +msgstr "_Herunterladen mit" -#: ../glade/simple_subscription.ui.h:3 -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." +#: ../glade/prefs.ui.h:55 +msgid "Opening Enclosures" +msgstr "Öffnen von Anhängen" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Erweitert..." +#: ../glade/prefs.ui.h:56 +msgid "Enclosures" +msgstr "Anhänge" -#~ msgid "You may want to validate the feed using" -#~ msgstr "Validierung des Feed-Quelltextes mit" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" +msgstr "Plugins" -#~ 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 "Liferea Sync %s@%s" -#~ msgstr "Liferea Sync %s@%s" - -#~ msgid "link cosmos" -#~ msgstr "Link-Kosmos" - -#~ msgid "Print debugging messages for the plugin loading" -#~ msgstr "Gibt Debug-Meldungen für das Laden von Plugins aus" - -#~ msgid "Liferea seems to be running already!" -#~ msgstr "Liferea scheint bereits zu laufen!" - -#~ msgid "Update status" -#~ msgstr "Aktualisierungsstatus" - -#~ msgid "was updated" -#~ msgstr "wurde aktualisiert" - -#~ msgid "was not updated" -#~ msgstr "nicht aktualisiert" - -#~ msgid "The orientation of the tray." -#~ msgstr "Die Ausrichtung des Tray." - -#~ msgid "%s" -#~ msgstr "%s" - -#~ msgid "topics_en.html" -#~ msgstr "topics_de.html" - -#~ msgid "reference_en.html" -#~ msgstr "reference_de.html" - -#~ msgid "faq_en.html" -#~ msgstr "faq_de.html" - -#~ msgid "_Script Manager" -#~ msgstr "_Skriptverwaltung" - -#~ msgid "Allows to configure and edit LUA hook scripts" -#~ msgstr "Erlaubt das Konfigurieren und Editieren von LUA-Hook-Skripten." - -#~ msgid "Search With ..." -#~ msgstr "Suche mit..." - -#~ msgid "%d Search Result for \"%s\"" -#~ msgid_plural "%d Search Results for \"%s\"" -#~ msgstr[0] "%d Suchergebnis für \"%s\"" -#~ msgstr[1] "%d Suchergebnisse für \"%s\"" - -#~ msgid "%d Search Result" -#~ msgid_plural "%d Search Results" -#~ msgstr[0] "%d Suchergebnis" -#~ msgstr[1] "%d Suchergebnisse" - -#~ 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 "Count" -#~ msgstr "Anzahl" - -#~ msgid "You have to select a feed entry" -#~ msgstr "Es muß ein Abonnement ausgewählt werden." - -#~ msgid "(empty)" -#~ msgstr "(leer)" - -#~ msgid "_Delete" -#~ msgstr "_Löschen" - -#~ msgid "_Properties..." -#~ msgstr "_Eigenschaften..." - -#~ msgid "Update out-dated feeds" -#~ msgstr "Veraltete Abonnements aktualisieren" - -#~ msgid "Force update of all feeds" -#~ msgstr "Alle Abonnements aktualisieren" - -#~ msgid "No feed update at all" -#~ msgstr "Keine Aktualisierung" - -#~ msgid "startup" -#~ msgstr "Programmstart" - -#~ msgid "feed updated" -#~ msgstr "Abonnement aktualisiert" - -#~ msgid "feed added" -#~ msgstr "Neues Abonnement" - -#~ msgid "item selected" -#~ msgstr "Schlagzeile ausgewählt" - -#~ msgid "feed selected" -#~ msgstr "Feed ausgewählt" - -#~ msgid "item unselected" -#~ msgstr "Schlagzeile abgewählt" - -#~ msgid "feed unselected" -#~ msgstr "Feed abgewählt" - -#~ msgid "shutdown" -#~ msgstr "Programmende" - -#~ msgid "Sorry, no scripting support available!" -#~ msgstr "Leider ist keine Skript-Unterstützung verfügbar!" - -#~ msgid "Script Name" -#~ msgstr "Skriptname" - -#~ msgid "No script selected!" -#~ msgstr "Es wurde kein Skript ausgewählt!" - -#~ msgid "Create a new search feed." -#~ msgstr "Neues Such-Abonnement anlegen." - -#~ msgid "Liferea is unable to display this item's content." -#~ msgstr "Liferea kann den Inhalt dieser Schlagzeile nicht anzeigen." - -#~ msgid "

    View this item's content.

    " -#~ msgstr "

    Den Inhalt dieser Schlagzeile anzeigen.

    " - -#~ msgid "Bloglines" -#~ msgstr "Bloglines" - -#~ 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." - -#~ msgid "feedlist.opml" -#~ msgstr "feedlist_de.opml" - -#~ msgid "%s has %d new / updated headline\n" -#~ msgid_plural "%s has %d new / updated headlines\n" -#~ msgstr[0] "%s hat %d neue/aktualisierte Schlagzeilen\n" -#~ msgstr[1] "%s hat %d neue/aktualisierte Schlagzeilen\n" - -#~ msgid " " -#~ msgstr " " - -#~ msgid " " -#~ msgstr " " - -#~ msgid " " -#~ msgstr " " - -#~ msgid "Feed Source" -#~ msgstr "Quelle des Abonnements" - -#~ msgid "Hook" -#~ msgstr "Hook" - -#~ msgid "Registered Scripts" -#~ msgstr "Registrierte Skripte" - -#~ msgid "Script Code" -#~ msgstr "Skriptcode" - -#~ msgid "text/plain" -#~ msgstr "text/plain" - -#~ 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 "Downloading Enclosures" -#~ msgstr "Herunterladen von Anhängen" - -#~ msgid "Feed Cache Handling" -#~ msgstr "Zwischenspeicherung" - -#~ msgid "Feed Name" -#~ msgstr "Name des Abonnements" - -#~ msgid "Feed Update Settings" -#~ msgstr "Aktualisierung von Abonnements" - -#~ msgid "HTTP Proxy Server" -#~ msgstr "HTTP-Proxy-Server" - -#~ msgid "Opening Enclosures" -#~ msgstr "Öffnen von Anhängen" - -#~ msgid "Reading Headlines" -#~ msgstr "Schlagzeilen anzeigen" - -#~ msgid "Toolbar Settings" -#~ msgstr "Menü-Einstellungen" - -#~ msgid "Update Interval" -#~ msgstr "Aktualisierungsintervall" - -#~ msgid "Web Integration" -#~ msgstr "Web-Integration" - -#~ msgid "Add Script" -#~ msgstr "Neues Skript" - -#~ msgid "At _startup:" -#~ msgstr "Beim _Start:" - -#~ msgid "Attention Profile" -#~ msgstr "Aufmerksamkeits-Übersicht" - -#~ msgid "Create new script" -#~ msgstr "Neues Skript" - -#~ msgid "Exec Command" -#~ msgstr "Befehl ausführen" - -#~ msgid "Reuse existing script" -#~ msgstr "Bestehendes Skript nutzen" - -#~ msgid "Script Manager" -#~ msgstr "Skriptverwaltung" - -#~ msgid "Search _Link Cosmos with" -#~ msgstr "Suche im _Link-Kosmos mit" - -#~ msgid "_Allow Flash in Feeds." -#~ msgstr "Flash in Feeds _erlauben" - -#, 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" - -#, fuzzy -#~ msgid "" -#~ "Copyright (c) 2003-2009\n" -#~ "Lars Lindner and \n" -#~ "Nathan J. Conrad \n" -#~ msgstr "" -#~ "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" -#~ "published by the Free Software Foundation; either version 2 of the\n" -#~ "License, or (at your option) any later version.\n" -#~ "\n" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ "GNU General Public License for more details.\n" -#~ "\n" -#~ "You should have received a copy of the GNU General Public License\n" -#~ "along with this program; if not, write to the Free Software\n" -#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, " -#~ "USA." -#~ msgstr "" -#~ "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" -#~ "published by the Free Software Foundation; either version 2 of the\n" -#~ "License, or (at your option) any later version.\n" -#~ "\n" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ "GNU General Public License for more details.\n" -#~ "\n" -#~ "You should have received a copy of the GNU General Public License\n" -#~ "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!" -#~ msgstr "" -#~ "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" -#~ "James Doherty\n" -#~ "Jeremy Messenger\n" -#~ "John McKnight\n" -#~ "Tomasz Maka\n" -#~ "Karl Soderstrom\n" -#~ "Christophe Barbe\n" -#~ "Juho Snellman\n" -#~ "Roshan Revankar\n" -#~ "Oliver Feiler\n" -#~ "Niklas Morberg\n" -#~ "Johannes Schlueter\n" -#~ "Pierre Phaneuf\n" -#~ "ahmed el-helw\n" -#~ "James Bowes\n" -#~ "Marc Deslauriers\n" -#~ "Amit D. Chaudhary\n" -#~ "Christoph Hohmann\n" -#~ "Raphael Slinckx\n" -#~ "Bjorn Monnens\n" -#~ "Thomas de Grenier de Latour\n" -#~ "Aristotle Pagaltzis\n" -#~ "Norman Jonas\n" -#~ "Sebastian Droege\n" -#~ "Daniel Gryniewicz\n" -#~ "Remi Cardona\n" -#~ "Frederic Peters\n" -#~ "Don Malcolm\n" -#~ "Ed Catmur\n" -#~ "Chris Pirillo\n" -#~ "Eric Anderson\n" -#~ "and many more...\n" -#~ "\n" -#~ "Code from other projects\n" -#~ "\n" -#~ "Anders Carlsson (tray icon support)\n" -#~ "Philippe Martin, Brion Vibber (favicon support)\n" -#~ "Jonathan Blandford (GtkTreeModelFilter)\n" -#~ "Kristian Rietveld (GtkTreeModelFilter)\n" -#~ "\n" -#~ "Included Software\n" -#~ "\n" -#~ "Liferea uses the XSPF Web Music Player to \n" -#~ "allow direct podcast playback. This player was \n" -#~ "written by Fabricio Zuardi and can be found \n" -#~ "at http://musicplayer.sourceforge.net" -#~ msgstr "" -#~ "Code, Patches, Debugging\n" -#~ "\n" -#~ "James Doherty\n" -#~ "Jeremy Messenger\n" -#~ "John McKnight\n" -#~ "Tomasz Maka\n" -#~ "Karl Soderstrom\n" -#~ "Christophe Barbe\n" -#~ "Juho Snellman\n" -#~ "Roshan Revankar\n" -#~ "Oliver Feiler\n" -#~ "Niklas Morberg\n" -#~ "Johannes Schlueter\n" -#~ "Pierre Phaneuf\n" -#~ "ahmed el-helw\n" -#~ "James Bowes\n" -#~ "Marc Deslauriers\n" -#~ "Amit D. Chaudhary\n" -#~ "Christoph Hohmann\n" -#~ "Raphael Slinckx\n" -#~ "Bjorn Monnens\n" -#~ "Thomas de Grenier de Latour\n" -#~ "Aristotle Pagaltzis\n" -#~ "Norman Jonas\n" -#~ "Sebastian Droege\n" -#~ "Daniel Gryniewicz\n" -#~ "Remi Cardona\n" -#~ "Frederic Peters\n" -#~ "Don Malcolm\n" -#~ "Ed Catmur\n" -#~ "Chris Pirillo\n" -#~ "Eric Anderson\n" -#~ "and many more...\n" -#~ "\n" -#~ "Code from other projects\n" -#~ "\n" -#~ "Anders Carlsson (tray icon support)\n" -#~ "Philippe Martin, Brion Vibber (favicon support)\n" -#~ "Jonathan Blandford (GtkTreeModelFilter)\n" -#~ "Kristian Rietveld (GtkTreeModelFilter)\n" -#~ "\n" -#~ "Included Software\n" -#~ "\n" -#~ "Liferea uses the XSPF Web Music Player to \n" -#~ "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." -#~ msgstr "" -#~ "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" -#~ "days" -#~ msgstr "" -#~ "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" -#~ "Text beside icons\n" -#~ "Icons only\n" -#~ "Text only" -#~ msgstr "" -#~ "GNOME Default\n" -#~ "Text unter Icons\n" -#~ "Text neben Icons\n" -#~ "Nur Icons\n" -#~ "Nur Text" - -#~ msgid "" -#~ "Space\n" -#~ " Space\n" -#~ " Space" -#~ msgstr "" -#~ "Space\n" -#~ " Space\n" -#~ " Space" - -#~ msgid "" -#~ "Update out-dated feeds\n" -#~ "Force update of all feeds\n" -#~ "No feed update at all" -#~ msgstr "" -#~ "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 "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 " -#~ "should not be used for production yet! If you want to use Liferea " -#~ "regularily please download the last stable version from SourceForge!
    " -#~ msgstr "" -#~ "
    Hinweis: Diese 1.1.x Version ist eine instabile " -#~ "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." -#~ msgstr "" -#~ "
    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 "" -#~ "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 "" -#~ "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 "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] "" -#~ "%s\n" -#~ "%d neue Schlagzeile" -#~ 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." -#~ msgstr "" -#~ "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" -#~ "might not work with every Mozilla version. If you have problems\n" -#~ "and Liferea does not start, try to set MOZILLA_FIVE_HOME to\n" -#~ "another Mozilla installation or delete the gconf configuration\n" -#~ "key /apps/liferea/browser-module!\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "Es wird versucht, das Mozilla-HTML Modul zu laden...\n" -#~ "Beachten Sie bitte, dass dies nicht mit jeder Mozilla-Version " -#~ "funktionieren könnte.\n" -#~ "Sollten Probleme auftreten und Liferea nicht starten, versuchen Sie die " -#~ "Umgebungsvariable MOZILLA_FIVE_HOME auf eine andere Mozilla-Installation " -#~ "verweisen zu lassen\n" -#~ "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 supported " -#~ "formats.

    " -#~ msgstr "" -#~ "

    Der Typ des Abonnements konnte nicht bestimmt werden. Bitte überprüfen " -#~ "Sie, ob das Abonnement 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 " -#~ "headlines. The right side either displays a list of the headlines of the " -#~ "selected subscription and a pane to view the selected headline or all " -#~ "headlines at once if condensed mode is selected.

    Basic Actions
    • Add Subscription - Creates a new subscription in the " -#~ "selected folder. To create a new subscription enter the feed URL or if " -#~ "you don't know it the URL of the website which provides the feed.

    • Update Subscription - This will update the subscription " -#~ "you selected. You may want to do this if you want to immediately check a " -#~ "subscription for updates. Usually it is adequate to rely on the auto " -#~ "updating according to the update interval of the subscription.

    • Update All - This will update all your subscriptions at " -#~ "once. Again usually it is adequate to rely on the auto updating.

    • Edit Subscription Properties - Sometimes you might want " -#~ "to change the update interval, title, authentication or caching " -#~ "properties of a subscription.

    To learn more about Liferea " -#~ "you should read the documentation provided in the help feed or in the FAQ available at the " -#~ "project homepage.

    " -#~ msgstr "" -#~ "

    Willkommen bei Liferea

    Im linken Fensterbereich findet sich " -#~ "die Liste der abonnierten Feeds. Auf der rechten Seite wird entweder eine " -#~ "Liste von Schlagzeilen zusammen mit der Ansicht der gerade in dieser " -#~ "Liste ausgewählten Schlagzeile oder alle Schlagzeilen auf einmal " -#~ "dargestellt.

    grundlegende Aktionen

    • Neues " -#~ "Abonnement - Erzeugt ein neues Abonnement im ausgewählten Ordner. Für " -#~ "ein neues Abonnement muss nur die URL des Feeds bekannt sein. Alternativ " -#~ "kann bei Angabe der Webseite des Feeds automatisch nach dem Feed gesucht " -#~ "werden.

    • Abonnement aktualisieren - Aktualisieren " -#~ "des ausgewählten Abonnements. Dies kann sinnvoll sein, wenn man sofort " -#~ "auf neue Schlagzeilen prüfen möchte. Ansonsten ist es ausreichend, sich " -#~ "auf das automatische Aktualisieren des Abonnements zu verlassen. Dabei " -#~ "wird gemäß des konfigurierten Update-Intervalls aktualisiert.

    • Alle aktualisieren - Es ist auch möglich, alle Feeds auf " -#~ "einmal zu aktualisieren. Normalerweise ist es allerdings ausreichend, " -#~ "sich auf das automatische Aktualisieren zu verlassen.

    Um " -#~ "mehr über Liferea zu lernen, sollte man die Dokumentation in den Hilfe-" -#~ "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" -#~ "significant memory footprint if you have a lot \n" -#~ "of feeds!" -#~ msgstr "" -#~ "_Halte alle Abonnements im Speicher. Das kann\n" -#~ "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 " -#~ "be available. Restart Liferea for changes to take effect." -#~ msgstr "" -#~ "Liferea zeigt den Inhalt eines Feeds mit Hilfe von verschiedenen HTML-" -#~ "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.8.15/po/el.po liferea-1.10.3/po/el.po --- liferea-1.8.15/po/el.po 2013-06-24 22:16:15.000000000 +0200 +++ liferea-1.10.3/po/el.po 2013-07-31 23:29:12.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: liferea\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2008-12-30 22:50+0200\n" "Last-Translator: Jennie Petoumenou \n" "Language-Team: \n" @@ -19,8 +19,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -33,8 +32,8 @@ msgstr "Ανάγνωση ροών Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Λήψη και προβολή ροών" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -145,38 +144,26 @@ msgstr "Δημιουργός" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "σημαία" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "σελιδοδείκτης" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "σχόλια" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Δεν υπάρχουν σχόλια." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Σχόλια" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Ενημέρωση..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Ανανέωση" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Τομέας" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Τμήμα" @@ -201,12 +188,12 @@ msgid "Default Browser" msgstr "Προεπιλεγμένος περιηγητής GNOME" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Απέτυχε η εντολή περιηγητή: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Εκκίνηση: \"%s\"" @@ -216,7 +203,7 @@ msgid "Authorization Error" msgstr "Σφάλμα εξουσιοδότησης" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Αδύνατη η δημιουργία του καταλόγου μνήμης \"%s\"!" @@ -246,37 +233,43 @@ msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "" "Το \"%s\" δεν είναι έγκυρο αρχείο ρυθμίσεων κάποιου τύπου συνδεδεμένων " "πολυμέσων!" -#: ../src/enclosure.c:274 -#, fuzzy, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Ολοκληρώθηκε η λήψη του συνδεδεμένου πολυμέσου: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Ολοκληρώθηκε η λήψη του συνδεδεμένου πολυμέσου: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Σφάλμα κατά τη μετονομασία του %s σε %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, fuzzy, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "" "Σφάλμα XML κατά την ανάγνωση του αρχείου της μνήμης! Αδύνατη η εισαγωγή του " "\"%s\"!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." @@ -284,43 +277,43 @@ "Κενό έγγραφο! Το αρχείο OPML \"%s\" δεν θα έπρεπε να είναι κενό για να γίνει " "η εισαγωγή." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "Το \"%s\" δεν είναι έγκυρο αρχείο OPML! Το Liferea δεν μπορεί να εισάγει " "αυτό το αρχείο!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Λίστα εισαχθέντων ροών" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Εισαγωγή λίστας ροών" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Εισαγωγή" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 #, fuzzy msgid "OPML Files" msgstr "Επιλογή αρχείου OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Σφάλμα κατά την εξαγωγή της λίστας ροών!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Εξήχθη η λίστα ροών!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Εξαγωγή λίστας ροών" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Εξαγωγή" @@ -377,12 +370,12 @@ msgstr "Αδύνατος ο καθορισμός του τύπου της ροής." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "Δεν υπάρχουν μη αναγνωσμένα άρθρα" -#: ../src/main.c:175 +#: ../src/main.c:164 #, fuzzy msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " @@ -391,124 +384,112 @@ " Η ΚΑΤΑΣΤΑΣΗ μπορεί να είναι `shown' (εμφάνιση), " "`iconified' (εικονίδιο) ή `hidden' (απόκρυψη)" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "" -#: ../src/main.c:179 +#: ../src/main.c:165 #, fuzzy msgid "Show version information and exit" msgstr " --version Εμφάνιση πληροφοριών έκδοσης και έξοδος." -#: ../src/main.c:180 +#: ../src/main.c:166 #, fuzzy msgid "Add a new subscription" msgstr "Νέα συνδρομή" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 #, fuzzy msgid "Print debugging messages of all types" msgstr "" " --debug- Εμφάνιση των μηνυμάτων της αποσφαλμάτωσης για συγκεκριμένο " "θέμα" -#: ../src/main.c:186 +#: ../src/main.c:172 #, fuzzy msgid "Print debugging messages for the cache handling" msgstr "" " --debug- Εμφάνιση των μηνυμάτων της αποσφαλμάτωσης για συγκεκριμένο " "θέμα" -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr "" " --debug- Εμφάνιση των μηνυμάτων της αποσφαλμάτωσης για συγκεκριμένο " "θέμα" -#: ../src/main.c:188 +#: ../src/main.c:174 #, fuzzy msgid "Print debugging messages of the database handling" msgstr "" " --debug- Εμφάνιση των μηνυμάτων της αποσφαλμάτωσης για συγκεκριμένο " "θέμα" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "" -#: ../src/main.c:195 +#: ../src/main.c:181 #, fuzzy msgid "Print debugging messages of the feed update processing" msgstr "" " --debug- Εμφάνιση των μηνυμάτων της αποσφαλμάτωσης για συγκεκριμένο " "θέμα" -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr "" " --debug- Εμφάνιση των μηνυμάτων της αποσφαλμάτωσης για συγκεκριμένο " "θέμα" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 #, fuzzy msgid "Print debugging messages for the given topic" msgstr "" " --debug- Εμφάνιση των μηνυμάτων της αποσφαλμάτωσης για συγκεκριμένο " "θέμα" -#: ../src/main.c:218 +#: ../src/main.c:202 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - Ανάγνωση ροών για Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" -#: ../src/migrate.c:340 -#, 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 "" -"Αυτή η έκδοση του Liferea χρησιμοποιεί μια νέα μορφή μνήμης και μετέφερε τα " -"δεδομένα της παλαιάς μνήμης ροών. Τα περιεχόμενα της μνήμης της v1.2 στον " -"κατάλογο ~/.liferea_1.2 δε διαγράφηκαν αυτόματα. Παρακαλώ, διαγράψτε τον " -"κατάλογο με το χέρι, εφόσον βεβαιωθείτε ότι η μεταφορά ήταν επιτυχής!" - #. Some libsoup transport errors #: ../src/net.c:320 msgid "The update request was cancelled" @@ -684,24 +665,24 @@ msgid "Feed title" msgstr "Τίτλος ροής" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Ήδη ενημερώνεται η συνδρομή \"%s\"!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "" "Η συνδρομή \"%s\" δε λειτουργεί πλέον. Το Liferea θα πάψει να την ενημερώνει!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Ενημέρωση του εικονιδίου της ροής \"%s\"" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -709,53 +690,53 @@ "Εμφανίστηκε πρόβλημα κατά την ανάγνωση της συνδρομής. Παρακαλώ ελέγξτε την " "τοποθεσία και τις λεπτομέρειες στην κονσόλα." -#: ../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\" δε λειτουργεί πλέον. Το Liferea θα πάψει να την ενημερώνει!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "Η ροή \"%s\" δεν έχει αλλάξει από την προηγούμενη ενημέρωση" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Ενημέρωση της ροής \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "" "Σφάλμα κατά το άνοιγμα του προσωρινού αρχείου %s που προοριζόταν για το " "φιλτράρισμα!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s: τερματίστηκε με κατάσταση %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Σφάλμα: Αδύνατο το άνοιγμα του pipe \"%s\"" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Σφάλμα: Αδύνατο το άνοιγμα του αρχείου \"%s\"" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Σφάλμα: Δεν υπάρχει το αρχείο \"%s\"" @@ -764,56 +745,54 @@ msgid "New Search Folder" msgstr "Νέος φάκελος αναζήτησης" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Εμφανίστηκαν και άλλα σφάλματα, τα οποία παραλείπονται!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "Ανάλυση XML: Αδύνατη η ανάλυση του αρχείου:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 #, fuzzy msgid "Attachments" msgstr "σχόλια" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "" -msgstr[1] "" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "" +msgstr[1] "" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Επιλογή αρχείου" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, fuzzy, c-format msgid "File Extension .%s" msgstr "Επέκταση αρχείου .%s" @@ -823,280 +802,289 @@ msgid "Couldn't find pixmap file: %s" msgstr "Δε βρέθηκε το αρχείο pixmap: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d νέο)" msgstr[1] " (%d νέα)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d μη αναγνωσμένο%s" msgstr[1] "%d μη αναγνωσμένα%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Θέματα Βοήθειας" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Σύντομος οδηγός" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "Συχνές ερωτήσεις" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Το Liferea συνδέθηκε στο δίκτυο" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Εργασία χωρίς σύνδεση" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Το Liferea αποσυνδέθηκε από το δίκτυο" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Εργασία με σύνδεση" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Συνδρομές" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "_Ενημέρωση όλων" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 #, fuzzy msgid "Updates all subscriptions." msgstr "Νέα συνδρομή" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Ση_μείωση όλων ως αναγνωσμένων" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Σημείωση ως αναγνωσμένων όλων των άρθρων σε όλες τις συνδρομές." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "Ε_ισαγωγή λίστας ροών..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Εισαγωγή λίστας ροών σε μορφή OPML." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "Εξα_γωγή λίστας ροών..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Εξαγωγή της λίστας ροών σε μορφή OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "Έ_ξοδος" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Ροή" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Αφαίρεση ό_λων των άρθρων" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Αφαίρεση όλων των άρθρων της επιλεγμένης ροής." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "Άρ_θρο" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "_Επόμενο μη αναγνωσμένο" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "_Επόμενο μη αναγνωσμένο" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Προβολή" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "_Αύξηση μεγέθους γραμματοσειράς" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Αυξάνει το μέγεθος της γραμματοσειράς των άρθρων." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_Μείωση μεγέθους γραμματοσειράς" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Μειώνει το μέγεθος της γραμματοσειράς των άρθρων." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "_Εργαλεία" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "Παρακολούθηση _ενημερώσεων" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "Εμφανίζει λίστα με τις ροές των οποίων εκκρεμεί η ενημέρωση" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Προτιμήσεις" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Επεξεργασία προτιμήσεων." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 #, fuzzy msgid "S_earch" msgstr "_Αναζήτηση" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Αναζήτηση στις ροές" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Εμφάνιση του διαλόγου αναζήτησης." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Βοήθεια" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Περιεχόμενα" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Προβολή της βοήθειας της εφαρμογής." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Σύντομος οδηγός" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Προβολή λίστας με όλες τις συντομεύσεις του Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "Συ_χνές ερωτήσεις" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Προβολή των συχνών ερωτήσεων της εφαρμογής." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "Πε_ρί" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Προβολή του διαλόγου πληροφοριών της εφαρμογής." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "_Κανονική προβολή" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "" "Προβολή στη μορφή που χρησιμοποιούν συνήθως οι εφαρμογές αλληλογραφίας." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "_Διευρυμένη προβολή" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Προβολή σε τρία κάθετα πλαίσια." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "_Συνδυασμένη προβολή" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Προβολή σε δύο πλαίσια." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 #, fuzzy msgid "Hide feeds with no unread items." msgstr "Δεν υπάρχουν μη αναγνωσμένα άρθρα" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "_Νέα συνδρομή" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Προσθήκη συνδρομής στη λίστα ροών." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Νέος _φάκελος..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Προσθήκη φακέλου στη λίστα ροών." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Νέος φάκελος ανα_ζήτησης..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Προσθήκη νέου φακέλου αναζήτησης στη λίστα ροών." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Νέα _πηγή..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Προσθήκη νέας πηγής λίστας ροής." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "Νέος φάκελος _αποκομμάτων..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Προσθήκη νέου φακέλου αποκομμάτων." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 #, fuzzy msgid "_Mark Items Read" msgstr "_Σημείωση ως αναγνωσμένου" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 #, fuzzy msgid "" "Marks all items of the selected feed list node / in the item list as read." @@ -1104,11 +1092,11 @@ "Σημειώνονται ως αναγνωσμένα όλα τα άρθρα είτε της επιλεγμένης συνδρομής είτε " "του συνόλου των συνδρομών στον επιλεγμένο φάκελο." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Ενημέρωση" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." @@ -1116,68 +1104,97 @@ "Ενημέρωση είτε της επιλεγμένης συνδρομής είτε όλων των συνδρομών στον " "επιλεγμένο φάκελο." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 #, fuzzy msgid "_Properties" msgstr "_Ιδιότητες..." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Εμφάνιση του διαλόγου ιδιοτήτων της επιλεγμένης συνδρομής." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "Α_φαίρεση" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Αφαίρεση της επιλεγμένης συνδρομής." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Ε_ναλλαγή μεταξύ αναγνωσμένου και μη" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Αν το επιλεγμένο άρθρο θεωρείται αναγνωσμένο ή όχι." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Εναλλαγή _σημαίας άρθρου" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Αν υπάρχει ή όχι σημαία στο επιλεγμένο άρθρο." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "Α_φαίρεση" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Αφαιρεί το επιλεγμένο άρθρο." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Ανοίγει το σύνδεσμο στον επιλεγμένο περιηγητή." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "Άνοιγμα στον _περιηγητή" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." msgstr "Ανοίγει το σύνδεσμο στον επιλεγμένο περιηγητή." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Ρυθμίσεις εξωτερικού περιηγητή" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." +msgstr "Ανοίγει το σύνδεσμο στον επιλεγμένο περιηγητή." + +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "Ε_ργασία χωρίς σύνδεση" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Αυτή η επιλογή απενεργοποιεί την ενημέρωση των συνδρομών." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Ανάγνωση ροών για Linux" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 #, fuzzy msgid "" "

    Welcome to Liferea, a desktop news aggregator for online news " @@ -1192,12 +1209,12 @@ "συνδρομή. Για να περιηγηθείτε στους τίτλους μιας ροής επιλέξτε τη ροή από τη " "λίστα. Οι τίτλοι θα εμφανιστούν στο δεξί πλαίσιο.

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Εισάγετε το όνομα χρήστη και το συνθηματικό για τη ροή \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Άγνωστη πηγή" @@ -1228,271 +1245,267 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Το Liferea λειτουργεί χωρίς σύνδεση. Δεν είναι δυνατή η ενημέρωση." -#: ../src/ui/liferea_htmlview.c:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Ολοκληρώθηκε η λήψη του συνδεδεμένου πολυμέσου: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 +#: ../src/ui/liferea_htmlview.c:627 #, fuzzy -msgid "Download finished." -msgstr "_Λήψη μέσω" +msgid "Open Link In _Tab" +msgstr "/Άνοιγμα συνδεσμού σε νέα _καρτέλα" -#: ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_htmlview.c:628 #, fuzzy -msgid "Launch Link In _Tab" -msgstr "/Άνοιγμα συνδεσμού σε νέα _καρτέλα" +msgid "_Open Link In Browser" +msgstr "/Ανοιγμα συνδέσμου στον _περιηγητή" -#: ../src/ui/liferea_htmlview.c:545 +#: ../src/ui/liferea_htmlview.c:629 #, fuzzy -msgid "_Launch Link In Browser" +msgid "_Open Link In External Browser" msgstr "/Ανοιγμα συνδέσμου στον _περιηγητή" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, fuzzy, c-format msgid "_Bookmark Link at %s" msgstr "/_Δημιουργία σελιδοδείκτη στο %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 #, fuzzy msgid "_Copy Link Location" msgstr "/_Αντιγραφή τοποθεσίας συνδέσμου" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 #, fuzzy msgid "_Copy Image Location" msgstr "/_Αντιγραφή τοποθεσίας συνδέσμου" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 #, fuzzy msgid "S_ave Link As" msgstr "/_Αποθήκευση ως..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 #, fuzzy msgid "_Subscribe..." msgstr "/_Συνδρομή..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 #, fuzzy msgid "*** No title ***" msgstr "*** Χωρίς τίτλο ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Ημερομηνία" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Τίτλος" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Δεν επιλέχθηκε άρθρο" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Αυτό το άρθρο δεν παραπέμπει σε σύνδεσμο!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Πρέπει πρώτα να επιλέξετε ροή για να διαγράψετε τα άρθρα της!" -#: ../src/ui/popup_menu.c:116 -#, fuzzy -msgid "Launch Item In _Tab" -msgstr "/Άνοιγμα συνδεσμού σε νέα _καρτέλα" - -#: ../src/ui/popup_menu.c:117 -#, fuzzy -msgid "_Launch Item In Browser" -msgstr "/Άνοιγμα συνδέσμου στον _περιηγητή" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 #, fuzzy msgid "Copy to News Bin" msgstr "/Αντιγραφή στο φάκελο αποκομμάτων/%s" -#: ../src/ui/popup_menu.c:147 +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "/_Δημιουργία σελιδοδείκτη στο %s" + +#: ../src/ui/popup_menu.c:160 #, fuzzy -msgid "Copy Item _URL to Clipboard" -msgstr "/_Αντιγραφή της τοποθεσίας του άρθρου στο πρόχειρο" +msgid "Copy Item _Location" +msgstr "/_Αντιγραφή τοποθεσίας συνδέσμου" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 #, fuzzy msgid "R_emove Item" msgstr "/Α_φαίρεση άρθρου" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 #, fuzzy msgid "Open Enclosure..." msgstr "/Άνοιγμα συνδεδεμένου πολυμέσου..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 #, fuzzy msgid "Save As..." msgstr "/_Αποθήκευση ως..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 #, fuzzy msgid "Copy Link Location" msgstr "/_Αντιγραφή τοποθεσίας συνδέσμου" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 #, fuzzy msgid "_Update All" msgstr "/_Ενημέρωση όλων" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 #, fuzzy msgid "_Show Liferea" msgstr "Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 #, fuzzy msgid "_Update Folder" msgstr "/_Ενημέρωση φακέλου" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 #, fuzzy msgid "_Mark All As Read" msgstr "/Ση_μείωση όλων ως αναγνωσμένων" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 #, fuzzy msgid "_New" msgstr "/_Νέο" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 #, fuzzy msgid "New _Subscription..." msgstr "_Νέα συνδρομή" -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 #, fuzzy msgid "New S_ource..." msgstr "Νέα _πηγή..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 #, fuzzy msgid "Sort Feeds" msgstr "Εισαγωγή λίστας ροών" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "_Νέα συνδρομή" - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "Προεπιλογή GNOME" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Κείμενο κάτω από τα εικονίδια" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Κείμενο δίπλα στα εικονίδια" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Μόνο εικονίδια" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Μόνο κείμενο" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "λεπτά" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "ώρες" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "ημέρες" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Διάστημα" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " + διάστημα" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " + διάστημα" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Επιλογή καταλόγου λήψης αρχείων" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "_Κανονική προβολή" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "_Διευρυμένη προβολή" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "_Συνδυασμένη προβολή" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Προσαρμοσμένος" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Προεπιλογή περιηγητή" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Υπάρχον παράθυρο" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Νέο παράθυρο" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Νέα καρτέλα" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 #, fuzzy msgid "Terminate instead of minimizing to the messaging menu" msgstr "Έ_ξοδος αντί για ελαχιστοποίηση στην περιοχή ειδοποιήσεων." -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Τύπος" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Πρόγραμμα" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1505,7 +1518,7 @@ msgid "This feed specifies no default update interval." msgstr "Αυτή η ροή δεν προτείνει συγκεκριμένη συχνότητα ενημέρωσης." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "" @@ -1556,7 +1569,7 @@ msgid "%b %d %H:%M" msgstr "%d %b %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1566,11 +1579,11 @@ msgid "Google Reader login failed!" msgstr "Απέτυχε η είσοδος στο Google Reader!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 #, fuzzy msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " @@ -1606,22 +1619,15 @@ msgid "No feed list source types found!" msgstr "Δε βρέθηκαν πηγές με λίστες ροών!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:269 msgid "Source Type" msgstr "Τύπος πηγής" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 #, fuzzy msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " @@ -1632,7 +1638,7 @@ "θα εμφανίζει στη λίστα ροών ένα υποδέντρο με τις συνδρομές του Google Reader " "(μόνο για ανάγνωση)." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1701,8 +1707,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Παρακαλώ εισάγετε τις ρυθμίσεις του λογαριασμού σας στο Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Συνθηματικό" @@ -1726,7 +1731,7 @@ msgid "combined view" msgstr "συνδυασμένη προβολή" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Τίτλοι" @@ -1778,7 +1783,7 @@ msgstr "Γενικά" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 #, fuzzy msgid "Feed Source" msgstr "Πηγή ροής" @@ -1900,500 +1905,560 @@ msgstr "Για προχωρημένους" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Προτιμήσεις Liferea" +msgid "New Folder" +msgstr "Νέος φάκελος" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "Όνομα _φακέλου:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Προεπιλεγμένος αρι_θμός άρθρων προς αποθήκευση ανά ροή:" +msgid "Rename" +msgstr "Μετονομασία" #: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "Ενημέρωση ροής" +msgid "_New Name:" +msgstr "_Νέο όνομα:" #: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Νέα συνδρομή" +msgid "Search Folder Properties" +msgstr "Αναζήτηση στις ιδιότητες του φακέλου" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Προεπιλεγμένη _συχνότητα ενημέρωσης ροών" +#, fuzzy +msgid "Search _Name:" +msgstr "Όν_ομα ροής:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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." +msgid "A_ny Rule Matches" msgstr "" -"Σημείωση: Παρακαλώ, ορίστε μια λογική τιμή για τη συχνότητα ενημέρωσης. Η " -"ενημέρωση των ροών συχνότερα από μια φορά την ώρα είναι μάλλον άσκοπη " -"σπατάλη των δυνατοτήτων της σύνδεσής σας." #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Ροές" +msgid "_All Rules Must Match" +msgstr "" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "Ρυθμίσεις εμφάνισης φακέλων" +msgid "Open Enclosure" +msgstr "/Άνοιγμα συνδεδεμένου πολυμέσου..." #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "" -"Εμ_φάνιση των άρθρων όλων των ροών ενός φακέλου, όποτε επιλέγεται ο φάκελος." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Λήψη συνδεδεμένου πολυμέσου τύπου:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "Από_κρυψη αναγνωσμένων." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"Πώς θα χειριστεί το Liferea αυτό το συνδεδεμένο πολυμέσο; Παρακαλώ, εισάγετε " +"την εντολή που επιθυμείτε να εκτελεστεί. Το ληφθέν αρχείο θα προστεθεί ως " +"παράμετρος στην εντολή:" #: ../glade/liferea.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Εικονίδια ροών (Favicons)" +msgid "_Browse" +msgstr "_Περιήγηση" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_Ενημέρωση όλων των εικονιδίων τώρα" +#, fuzzy +msgid "_Do this automatically for enclosures like this from now on." +msgstr "" +"Από εδώ και στο εξής να εφαρμόζεται αυτομάτως για αρχεία του ίδιου τύπου." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Φάκελοι" +msgid "Search All Feeds" +msgstr "Αναζήτηση στις ροές" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "μη αναγνωσμένοι τίτλοι" +msgid "_Search for:" +msgstr "_Αναζήτηση για:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "Μετά_βαση από άρθρο σε άρθρο πατώντας:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Εισάγετε φράση προς αναζήτηση. Το Liferea θα την αναζητήσει τόσο στους " +"τίτλους όσο και στο σώμα των άρθρων." #: ../glade/liferea.ui.h:65 #, fuzzy -msgid "Web Integration" -msgstr "Προσανατολισμός" +msgid "_Advanced..." +msgstr "Για προχωρημένους..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Δημοσίευση σελιδοδεικτών στο" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"Αναζήτηση της ζητούμενης φράσης σε όλες τις ροές. Τα αποτελέσματα της " +"αναζήτησης εμφανίζονται στο πλαίσιο της λίστας τίτλων." #: ../glade/liferea.ui.h:67 -#, fuzzy -msgid "Internal Browser Settings" -msgstr "Ρυθμίσεις εσωτερικού περιηγητή" +msgid "Update Monitor" +msgstr "Παρακολούθηση ενημερώσεων" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Ά_νοιγμα συνδέσμων στο παράθυρο του Liferea." +#, fuzzy +msgid "Pending Requests" +msgstr "Εκκρεμούν" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Απενεργοποίηση Javascript." +#, fuzzy +msgid "Downloading Now" +msgstr "Λαμβάνονται τώρα" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "" +msgid "Cancel _All" +msgstr "Ακύρωση ό_λων" #: ../glade/liferea.ui.h:71 -#, fuzzy -msgid "External Browser Settings" -msgstr "Ρυθμίσεις εξωτερικού περιηγητή" +msgid "Create News Bin" +msgstr "Δημιουργία φακέλου αποκομμάτων" #: ../glade/liferea.ui.h:72 +msgid "_News Bin Name:" +msgstr "Όνομα _φακέλου αποκομμάτων:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Περί" + +#: ../glade/liferea.ui.h:74 +msgid "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Το Liferea είναι μία εφαρμογή συγκέντρωσης ροών για GTK+" + +#: ../glade/liferea.ui.h:78 +#, fuzzy +msgid "Liferea Homepage" +msgstr "Ανάγνωση ροών Liferea" + +#: ../glade/liferea.ui.h:79 +#, fuzzy +msgid "Advanced Search" +msgstr "Για προχωρημένους" + +#: ../glade/liferea.ui.h:80 +#, fuzzy +msgid "_Search Folder..." +msgstr "Αναζήτηση στο φάκελο" + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Δημιουργία ροής από μηχανή αναζήτησης" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "εισάγετε μία οποιαδήποτε φράση προς αναζήτηση" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "Μέγιστος αρι_θμός αποτελεσμάτων:" + +#: ../glade/liferea.ui.h:84 +#, 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 θα δημιουργήσει μια συνδρομή που θα συγκεντρώνει " +"αποτελέσματα για τις ζητούμενες λέξεις από την επιλεγμένη μηχανή αναζήτησης. " +"Η ροή αυτή μπορεί να παραμείνει μόνιμα και να ενημερώνεται όπως και κάθε " +"άλλη συνδρομή." + +#: ../glade/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "Λήψη/Επεξεργασία" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Επιλογή πηγής" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Επιλέξτε τον τύπο πηγής που θέλετε να προσθέσετε..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Προσθήκη OPML/Planet" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"Παρακαλώ εισάγετε όνομα αρχείου ή τοποθεσία που να αντιστοιχεί σε έγκυρη " +"λίστα ροών OPML." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Τοποθεσία" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "_Επιλογή αρχείου" + +#: ../glade/ttrss_source.ui.h:1 +#, fuzzy +msgid "Add Tiny Tiny RSS Account" +msgstr "Προσθήκη λογαριασμού Bloglines" + +#: ../glade/ttrss_source.ui.h:2 +#, fuzzy +msgid "Please enter your tt-rss account settings." +msgstr "Παρακαλώ, εισάγετε τις ρυθμίσεις του λογαριασμού σας στο Bloglines." + +#: ../glade/ttrss_source.ui.h:3 +#, fuzzy +msgid "_Server URL" +msgstr "Σφάλμα εξυπηρετητή" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "Όνομα _χρήστη:" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Για προχωρημένους..." + +#: ../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 "" +"Εισάγετε τοποθεσία στο διαδίκτυο αν γνωρίζετε την ακριβή τοποθεσία της ροής, " +"ή αν επιθυμείτε να εντοπιστεί αυτόματα η ροή." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Προτιμήσεις Liferea" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Προεπιλεγμένος αρι_θμός άρθρων προς αποθήκευση ανά ροή:" + +#: ../glade/prefs.ui.h:4 +#, fuzzy +msgid "Feed Update Settings" +msgstr "Ενημέρωση ροής" + +#: ../glade/prefs.ui.h:5 +#, fuzzy +msgid "_Update all subscriptions at startup." +msgstr "Νέα συνδρομή" + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Προεπιλεγμένη _συχνότητα ενημέρωσης ροών" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"Σημείωση: Παρακαλώ, ορίστε μια λογική τιμή για τη συχνότητα ενημέρωσης. Η " +"ενημέρωση των ροών συχνότερα από μια φορά την ώρα είναι μάλλον άσκοπη " +"σπατάλη των δυνατοτήτων της σύνδεσής σας." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Ροές" + +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "Ρυθμίσεις εμφάνισης φακέλων" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "" +"Εμ_φάνιση των άρθρων όλων των ροών ενός φακέλου, όποτε επιλέγεται ο φάκελος." + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "Από_κρυψη αναγνωσμένων." + +#: ../glade/prefs.ui.h:13 +#, fuzzy +msgid "Feed Icons (Favicons)" +msgstr "Εικονίδια ροών (Favicons)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Ενημέρωση όλων των εικονιδίων τώρα" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Φάκελοι" + +#: ../glade/prefs.ui.h:16 +#, fuzzy +msgid "Reading Headlines" +msgstr "μη αναγνωσμένοι τίτλοι" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "Μετά_βαση από άρθρο σε άρθρο πατώντας:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +#, fuzzy +msgid "Web Integration" +msgstr "Προσανατολισμός" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Δημοσίευση σελιδοδεικτών στο" + +#: ../glade/prefs.ui.h:22 +#, fuzzy +msgid "Internal Browser Settings" +msgstr "Ρυθμίσεις εσωτερικού περιηγητή" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Ά_νοιγμα συνδέσμων στο παράθυρο του Liferea." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Απενεργοποίηση Javascript." + +#: ../glade/prefs.ui.h:25 +#, fuzzy +msgid "_Enable browser plugins." +msgstr "Ρυθμίσεις εξωτερικού περιηγητή" + +#: ../glade/prefs.ui.h:26 +#, fuzzy +msgid "External Browser Settings" +msgstr "Ρυθμίσεις εξωτερικού περιηγητή" + +#: ../glade/prefs.ui.h:27 msgid "_Open link in:" msgstr "Άνοι_γμα συνδέσμου στο:" -#: ../glade/liferea.ui.h:74 +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Προσαρμοσμένος" + +#: ../glade/prefs.ui.h:30 #, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" +msgid "(%s for URL)" msgstr "" -"Π_ροσαρμοσμένος:\n" -"(%s για την ιστοσελίδα)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Περιηγητής:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Περιηγητής" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 #, fuzzy msgid "Notification Settings" msgstr "Ρυθμίσεις ειδοποιήσεων" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Εμφάνιση α_ναδυόμενου παραθύρου με τους νέους τίτλους." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "Εμφάνιση ε_ικονιδίου στην περιοχή ειδοποιήσεων." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "" "Εμφάνιση του _αριθμού των νέων άρθρων πάνω στο εικονίδιο της περιοχής " "ειδοποιήσεων" -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "Έ_ξοδος αντί για ελαχιστοποίηση στην περιοχή ειδοποιήσεων." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 #, fuzzy msgid "Toolbar Settings" msgstr "Ε_τικέτες κουμπιών εργαλειοθήκης: " -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Ε_τικέτες κουμπιών εργαλειοθήκης: " -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "Γραφικό περιβάλλον" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "Αυτόματος _εντοπισμός (GNOME ή περιβάλλον)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "_Χωρίς διαμεσολαβητή" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "_Χειροκίνητη ρύθμιση:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "_Θύρα διαμεσολαβητή:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "_Διεύθυνση διαμεσολαβητή:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Χρήση πιστοποίησης _διαμεσολαβητή" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "_Συνθηματικό διαμεσολαβητή:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "Όνομα _χρήστη:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Διαμεσολαβητής" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 #, fuzzy msgid "Downloading Enclosures" msgstr "Λήψη συνδεδεμένων πολυμέσων..." -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Περιήγηση" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "Απο_θήκευση ληφθέντων αρχείων στο" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Λήψη μέσω" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 #, fuzzy msgid "Opening Enclosures" msgstr "/Άνοιγμα συνδεδεμένου πολυμέσου..." -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Συνδεδεμένα πολυμέσα" -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Όνομα ροής" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "" - -#: ../glade/liferea.ui.h:106 -#, fuzzy -msgid "_Service Name" -msgstr "Όνομα σεναρίου" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Νέος φάκελος" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "Όνομα _φακέλου:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Μετονομασία" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Νέο όνομα:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Αναζήτηση στις ιδιότητες του φακέλου" - -#: ../glade/liferea.ui.h:114 -#, fuzzy -msgid "Search _Name:" -msgstr "Όν_ομα ροής:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Λήψη συνδεδεμένων πολυμέσων..." - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Λήψη συνδεδεμένου πολυμέσου τύπου:" - -#: ../glade/liferea.ui.h:120 -#, 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:" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -"Πώς θα χειριστεί το Liferea αυτό το συνδεδεμένο πολυμέσο; Παρακαλώ, εισάγετε " -"την εντολή που επιθυμείτε να εκτελεστεί. Το ληφθέν αρχείο θα προστεθεί ως " -"παράμετρος στην εντολή:" -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "" - -#: ../glade/liferea.ui.h:122 -#, fuzzy -msgid "_Do this automatically for enclosures like this from now on." -msgstr "" -"Από εδώ και στο εξής να εφαρμόζεται αυτομάτως για αρχεία του ίδιου τύπου." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Αναζήτηση στις ροές" +#~ msgid "Download and view feeds" +#~ msgstr "Λήψη και προβολή ροών" -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Αναζήτηση για:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Εισάγετε φράση προς αναζήτηση. Το Liferea θα την αναζητήσει τόσο στους " -"τίτλους όσο και στο σώμα των άρθρων." +#~ msgid "You may want to validate the feed using" +#~ msgstr "Μπορείτε να επαληθεύσετε την εγκυρότητα της ροής μέσω" -#: ../glade/liferea.ui.h:126 #, fuzzy -msgid "_Advanced..." -msgstr "Για προχωρημένους..." +#~ msgid "Launch Item In _Tab" +#~ msgstr "/Άνοιγμα συνδεσμού σε νέα _καρτέλα" -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Αναζήτηση της ζητούμενης φράσης σε όλες τις ροές. Τα αποτελέσματα της " -"αναζήτησης εμφανίζονται στο πλαίσιο της λίστας τίτλων." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Παρακολούθηση ενημερώσεων" - -#: ../glade/liferea.ui.h:129 #, fuzzy -msgid "Pending Requests" -msgstr "Εκκρεμούν" +#~ msgid "_Launch Item In Browser" +#~ msgstr "/Άνοιγμα συνδέσμου στον _περιηγητή" -#: ../glade/liferea.ui.h:130 #, fuzzy -msgid "Downloading Now" -msgstr "Λαμβάνονται τώρα" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "/_Αντιγραφή της τοποθεσίας του άρθρου στο πρόχειρο" -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "Ακύρωση ό_λων" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Δημιουργία φακέλου αποκομμάτων" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "Όνομα _φακέλου αποκομμάτων:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Περί" +#~ msgid "flag" +#~ msgstr "σημαία" -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" +#~ msgid "bookmark" +#~ msgstr "σελιδοδείκτης" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Το Liferea είναι μία εφαρμογή συγκέντρωσης ροών για GTK+" +#~ msgid "comments" +#~ msgstr "σχόλια" -#: ../glade/liferea.ui.h:139 #, fuzzy -msgid "Liferea Homepage" -msgstr "Ανάγνωση ροών Liferea" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Ολοκληρώθηκε η λήψη του συνδεδεμένου πολυμέσου: \"%s\"" -#: ../glade/liferea.ui.h:140 -#, fuzzy -msgid "Advanced Search" -msgstr "Για προχωρημένους" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Ολοκληρώθηκε η λήψη του συνδεδεμένου πολυμέσου: \"%s\"" -#: ../glade/liferea.ui.h:141 #, fuzzy -msgid "_Search Folder..." -msgstr "Αναζήτηση στο φάκελο" - -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Δημιουργία ροής από μηχανή αναζήτησης" - -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "εισάγετε μία οποιαδήποτε φράση προς αναζήτηση" - -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Μέγιστος αρι_θμός αποτελεσμάτων:" +#~ 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 "" +#~ "Αυτή η έκδοση του Liferea χρησιμοποιεί μια νέα μορφή μνήμης και μετέφερε " +#~ "τα δεδομένα της παλαιάς μνήμης ροών. Τα περιεχόμενα της μνήμης της v1.2 " +#~ "στον κατάλογο ~/.liferea_1.2 δε διαγράφηκαν αυτόματα. Παρακαλώ, διαγράψτε " +#~ "τον κατάλογο με το χέρι, εφόσον βεβαιωθείτε ότι η μεταφορά ήταν επιτυχής!" -#: ../glade/liferea.ui.h:145 #, 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 θα δημιουργήσει μια συνδρομή που θα συγκεντρώνει " -"αποτελέσματα για τις ζητούμενες λέξεις από την επιλεγμένη μηχανή αναζήτησης. " -"Η ροή αυτή μπορεί να παραμείνει μόνιμα και να ενημερώνεται όπως και κάθε " -"άλλη συνδρομή." +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Ολοκληρώθηκε η λήψη του συνδεδεμένου πολυμέσου: \"%s\"" -#: ../glade/new_subscription.ui.h:9 #, fuzzy -msgid "Download / Postprocessing" -msgstr "Λήψη/Επεξεργασία" - -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Επιλογή πηγής" +#~ msgid "Download finished." +#~ msgstr "_Λήψη μέσω" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Επιλέξτε τον τύπο πηγής που θέλετε να προσθέσετε..." - -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Προσθήκη OPML/Planet" - -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Παρακαλώ εισάγετε όνομα αρχείου ή τοποθεσία που να αντιστοιχεί σε έγκυρη " -"λίστα ροών OPML." +#~ msgid "Choose download directory" +#~ msgstr "Επιλογή καταλόγου λήψης αρχείων" -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Τοποθεσία" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "Π_ροσαρμοσμένος:\n" +#~ "(%s για την ιστοσελίδα)" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "_Επιλογή αρχείου" +#~ msgid "_Save downloads in" +#~ msgstr "Απο_θήκευση ληφθέντων αρχείων στο" -#: ../glade/ttrss_source.ui.h:1 #, fuzzy -msgid "Add Tiny Tiny RSS Account" -msgstr "Προσθήκη λογαριασμού Bloglines" +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Όνομα ροής" -#: ../glade/ttrss_source.ui.h:2 #, fuzzy -msgid "Please enter your tt-rss account settings." -msgstr "Παρακαλώ, εισάγετε τις ρυθμίσεις του λογαριασμού σας στο Bloglines." - -#: ../glade/ttrss_source.ui.h:3 -#, fuzzy -msgid "_Server URL" -msgstr "Σφάλμα εξυπηρετητή" +#~ msgid "_Service Name" +#~ msgstr "Όνομα σεναρίου" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "Όνομα _χρήστη:" - -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Εισάγετε τοποθεσία στο διαδίκτυο αν γνωρίζετε την ακριβή τοποθεσία της ροής, " -"ή αν επιθυμείτε να εντοπιστεί αυτόματα η ροή." - -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Για προχωρημένους..." - -#~ msgid "You may want to validate the feed using" -#~ msgstr "Μπορείτε να επαληθεύσετε την εγκυρότητα της ροής μέσω" +#~ msgid "Downloading Enclosure" +#~ msgstr "Λήψη συνδεδεμένων πολυμέσων..." #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " diff -Nru liferea-1.8.15/po/es.po liferea-1.10.3/po/es.po --- liferea-1.8.15/po/es.po 2013-06-24 22:16:15.000000000 +0200 +++ liferea-1.10.3/po/es.po 2013-07-31 23:29:12.000000000 +0200 @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2010-01-21 14:40-0800\n" "Last-Translator: Rodrigo Gallardo \n" "Language-Team: Spanish \n" @@ -37,8 +37,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -51,8 +50,8 @@ msgstr "Liferea, lector de noticias" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Descarga y muestra noticias" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -160,38 +159,26 @@ msgstr "Creador" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "marcar" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "marcador" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "comentarios" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Aún no hay comentarios." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Comentarios" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Actualizando..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Actualizar" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Sección" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Departamento" @@ -216,12 +203,12 @@ msgid "Default Browser" msgstr "Navegador de GNOME" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Fallo al iniciar el navegador: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Iniciando: «%s»" @@ -231,7 +218,7 @@ msgid "Authorization Error" msgstr "Autenticación erronea" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "No se ha podido crear el directorio de almacenamiento \"%s\"!" @@ -261,74 +248,80 @@ msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "«%s» no es un archivo válido de configuración de adjuntos" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Falló la descarga del adjunto: «%s»" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Se completó la descarga del adjunto: «%s»" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Error al renombrar %s a %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "XML erroneo en el documento OPML «%s». No fue posible importarlo." -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "El documento OPML «%s», que se quería importar, está vacío." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "«%s» no es un documento OPML válido. Liferea no pudo importar el archivo." -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Lista de canales importados" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importar lista de canales" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importar" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 #, fuzzy msgid "OPML Files" msgstr "Elija el archivo OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Ocurrió un error mientras se exportaba la lista de canales." -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "La lista de canales se ha exportado con éxito." -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Exportar lista de canales" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Exportar" @@ -384,12 +377,12 @@ msgstr "No se pudo determinar el tipo de canal." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "No hay artículos sin leer " -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" @@ -398,112 +391,99 @@ "para mostrarla, «iconified» para dejarla en el área de notificación, o " "«hidden» para ocultarla" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "ESTADO" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Muestra la versión de Liferea y finaliza" -#: ../src/main.c:180 +#: ../src/main.c:166 #, fuzzy msgid "Add a new subscription" msgstr "Nuevo canal" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Mostrar todos los mensajes de depuración" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "" "Mostrar mensajes de depuración acerca del manejo del área de almacenamiento" -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr "Mostrar mensajes de depuración acerca de la configuración" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "Mostrar mensajes de depuración acerca de la base de datos" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "" "Mostrar mensajes de depuración acerca de todas las funciones de la interfaz " "gráfica" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" "Activa la depuración de la generación de HTML. Cada que Liferea genere HTML " -"lo guardará a ~/.liferea_1.8/output.xhtml" +"lo guardará a ~/.cache/liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "Mostrar mensajes de depuración acerca de los accesos a la red" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "" "Mostrar mensajes de depuración acerca de todas las funciones de procesamiento" -#: ../src/main.c:193 +#: ../src/main.c:179 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" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Mostrar mensajes de depuración al entrar y salir de funciones" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "" "Mostrar mensajes de depuración acerca del proceso de actualización de canales" -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr "" "Mostrar mensajes de depuración acerca del manejo del área de almacenamiento" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Mostrar información extra en los mensajes de depuración" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 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:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, lector de noticias para Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "Para más información, visite http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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 "" -"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." +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Para más información, visite http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -673,23 +653,23 @@ msgid "Feed title" msgstr "El título del canal" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "El canal «%s» ya se está actualizando" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "El canal «%s» ya no existe. Liferea no volverá a actualizarlo." -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Actualizando el icono de «%s»" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -697,48 +677,48 @@ "Se encontró un problema al leer el canal. Por favor, compruebe la URL y la " "salida en la consola." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "La URL de «%s» ha cambiado permanentemente y ha sido actualizada" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "«%s» fue abandonado. Liferea ya no la actualizará." -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "El contenido de «%s» no ha cambiado desde la última actualización" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Actualizando: «%s»" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Se produjo un error al abrir el archivo temporal %s para filtrar" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s terminó con estado %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "No se pudo abrir la tubería «%s»" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Error: No se pudo abrir el archivo «%s»" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Error: No existe el archivo «%s»" @@ -747,55 +727,53 @@ msgid "New Search Folder" msgstr "Nueva carpeta virtual" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Hay más errores. La salida se ha truncado]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "XML Parser: No se pudo procesar el documento:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Adjuntos" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d adjunto" -msgstr[1] "%d adjuntos" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr "bytes" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d %s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d adjunto" +msgstr[1] "%d adjuntos" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Elija un archivo" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, fuzzy, c-format msgid "File Extension .%s" msgstr "Archivo con extensión .%s" @@ -805,286 +783,295 @@ msgid "Couldn't find pixmap file: %s" msgstr "No se pudo encontrar la imagen: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d nuevo)" msgstr[1] " (%d nuevos)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d sin leer%s" msgstr[1] "%d sin leer%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Temas de ayuda" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Manual de referencia" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "Preguntas frecuentes" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea está conectado" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Trabajar sin conexión" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea está sin conexión" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Trabajar con conexión" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Suscripciones" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "_Actualizar todas" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Actualiza todas las suscripciones" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Marcar _todo como leído" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Marca como leídos todos los artículos de todas las suscripciones." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Importar lista de canales..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importa una lista de canales en formato OPML." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "E_xportar lista de canales..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Exporta la lista de canales en formato OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Salir" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Canal" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "E_liminar los artículos" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Elimina todos los artículos del canal seleccionado." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_Artículo" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "Siguiente artículo _nuevo" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "Siguiente artículo _nuevo" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Ver" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "_Aumentar el tamaño del texto" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 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:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_Reducir el tamaño del texto" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Reduce el tamaño del texto en la vista del artículo." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "_Herramientas" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "_Monitor de actualizaciones" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "Muestra la lista de todos los canales con actualizaciones pendientes" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Preferencias" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Cambiar preferencias." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "_Buscar" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Buscar en todos los canales..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Muestra la ventana de búsqueda." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "A_yuda" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Contenidos" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Muestra la ayuda del programa." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Referencia rápida" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Muestra todas las combinaciones de teclas de Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Preguntas frecuentes sobre el programa." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_Acerca de..." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Muestra información acerca del programa." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "Vista _normal" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Visualiza en modo «cliente de correo»." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "Vista a_mplia" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Visualiza usando tres paneles verticales." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "Vista _combinada" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Visualiza usando dos paneles." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "Lista de canales _reducida" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Oculta los canales sin articulos nuevos" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "_Nueva suscripción..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Añade una suscripción a la lista de canales." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Nueva _carpeta..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Añade una carpeta a la lista de canales." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Nueva carpeta de _búsqueda..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Añade una carpeta de búsqueda a la lista de canales." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Nueva _fuente..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Agrega una nueva fuente de listas de canales." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "Nueva ban_deja..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Agrega una nueva bandeja de noticias." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "_Marcar como leído" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "" "Marca como leídos todos los artículos del canal seleccionado o, en el caso " "de una carpeta, de todos sus canales." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Actualizar" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." @@ -1092,67 +1079,96 @@ "Actualiza el canal seleccionado o, en el caso de una carpeta, todos los " "canales que contenga." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "_Propiedades" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Abre el cuadro de propiedades del canal seleccionado." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "_Eliminar" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Elimina el canal seleccionado." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "_Cambiar entre leído y no leído" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Pasa el artículo actual de leído a no leído o viceversa." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Colocar o quitar _marca" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Crea o elimina una marca en el artículo seleccionado." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "_Eliminar" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Elimina el artículo seleccionado." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Abre el enlace del artículo en el navegador." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "_Abrir en el navegador" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." +msgstr "Abre el enlace del artículo en el navegador." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Opciones del navegador externo" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." msgstr "Abre el enlace del artículo en el navegador." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "Trabajar sin conexión" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Esta opción permite deshabilitar la actualización de suscripciones." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea, lector de noticias" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 #, fuzzy msgid "" "

    Welcome to Liferea, a desktop news aggregator for online news " @@ -1167,12 +1183,12 @@ "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/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Fuente desconocida" @@ -1204,251 +1220,252 @@ msgstr "" "Liferea está trabajando sin conexión. No se pueden actualizar las fuentes" -#: ../src/ui/liferea_htmlview.c:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Falló la descarga del adjunto: «%s»" - -#: ../src/ui/liferea_htmlview.c:437 +#: ../src/ui/liferea_htmlview.c:627 #, fuzzy -msgid "Download finished." -msgstr "_Descargar mediante" - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +msgid "Open Link In _Tab" msgstr "Abrir el enlace en una pes_taña nueva" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "Abrir el en_lace en el navegador" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "Abrir el en_lace en el navegador" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "Crear un marcador del enlace en %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Copiar la dirección del enlace" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 #, fuzzy msgid "_Copy Image Location" msgstr "_Copiar la dirección del enlace" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 #, fuzzy msgid "S_ave Link As" msgstr "Guardar como..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Suscribirse..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Sin título ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Fecha" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Titular" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "No se ha seleccionado ningún artículo" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Este artículo no tiene un enlace asignado" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Debe elegir un canal para eliminar sus artículos" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Abrir el artículo en una pes_taña nueva" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "Abrir el artículo en el navegador" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "Copiar a una bandeja" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Copiar la _URL del artículo al portapapeles" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "Crear un marcador del enlace en %s" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "_Copiar la dirección del enlace" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "_Eliminar artículo" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Abrir adjunto..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Guardar como..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "_Copiar la dirección del enlace" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "_Actualizar todo" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "_Mostrar Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "_Actualizar carpeta" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "_Marcar todos como leídos" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_Nueva" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "_Nueva suscripción..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "Nueva _fuente..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 #, fuzzy msgid "Sort Feeds" msgstr "Importar lista de canales" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "_Nueva suscripción..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "Navegador de GNOME" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Texto bajo los íconos" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Texto junto a los íconos" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Solo los íconos" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Sólo el texto" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minutos" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "horas" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "días" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Espacio" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Espacio" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Espacio" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Elija el directorio de descarga" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "Vista _normal" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "Vista a_mplia" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "Vista _combinada" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Manual" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Navegador predeterminado" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Ventana existente" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Nueva ventana" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Nueva pestaña" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 #, fuzzy msgid "Terminate instead of minimizing to the messaging menu" msgstr "T_erminar, en lugar de minimizar al área de notificación." -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Tipo" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Programa" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1461,7 +1478,7 @@ msgid "This feed specifies no default update interval." msgstr "Este canal no especifica un intervalo de actualización recomendado." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "Sin título" @@ -1512,7 +1529,7 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1522,11 +1539,11 @@ msgid "Google Reader login failed!" msgstr "Falló el acceso a Google Reader" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1560,22 +1577,15 @@ 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:269 msgid "Source Type" msgstr "Tipo de fuente" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 #, fuzzy msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " @@ -1586,7 +1596,7 @@ "presentará su suscripción a Google Reader como un subárbol en la lista de " "canales y la mantendrá sincronizada." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1655,8 +1665,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Por favor escriba los datos de su cuenta de Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "Contraseña" @@ -1680,7 +1689,7 @@ msgid "combined view" msgstr "vista combinada" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Titulares" @@ -1734,7 +1743,7 @@ msgstr "General" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Fuente" @@ -1852,492 +1861,548 @@ msgstr "Avanzado" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Preferencias" +msgid "New Folder" +msgstr "Nueva carpeta" #: ../glade/liferea.ui.h:49 -#, fuzzy -msgid "Feed Cache Handling" -msgstr "Caché" +msgid "_Folder name:" +msgstr "Nombre de la carpeta:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "_Número de artículos a almacenar, por canal:" +msgid "Rename" +msgstr "Renombrar" #: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "Actualización" +msgid "_New Name:" +msgstr "_Nuevo nombre:" #: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Actualiza todas las suscripciones" +msgid "Search Folder Properties" +msgstr "Propiedades de la carpeta de búsqueda" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "_Intervalo de actualización predeterminado" +msgid "Search _Name:" +msgstr "Título de la búsqueda:" + +#: ../glade/liferea.ui.h:54 +#, fuzzy +msgid "Find Items that meet the following criteria" +msgstr "Encontrar artículos con los criterios siguientes" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"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." +msgid "A_ny Rule Matches" +msgstr "Se cumple cualquier regla" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Canales" +msgid "_All Rules Must Match" +msgstr "Se cumplen todas las reglas" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "Opciones de presentación de carpetas" +msgid "Open Enclosure" +msgstr "Abrir adjunto..." #: ../glade/liferea.ui.h:58 -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." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Descargando un adjunto de tipo:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "Ocultar artículos leídos." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"¿Qué debe hacer Liferea con este adjunto? Escriba debajo la orden que desea " +"ejecutar. El nombre del archivo descargado se usará como parámetro para la " +"orden:" #: ../glade/liferea.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Íconos de los canales (Favicons)" +msgid "_Browse" +msgstr "Navegar" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "Act_ualizar todos los iconos ahora" +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.ui.h:62 -msgid "Folders" -msgstr "Carpetas" +msgid "Search All Feeds" +msgstr "Buscar en todos los canales" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "titulares no leídos" +msgid "_Search for:" +msgstr "Bu_scar:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "Avanzar por los artículos con:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Escriba un texto. Liferea lo buscará tanto en los títulos de los artículos " +"como en los contenidos." #: ../glade/liferea.ui.h:65 -#, fuzzy -msgid "Web Integration" -msgstr "Orientación" +msgid "_Advanced..." +msgstr "Avanzado..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Enviar los marcadores a" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"Busca el texto especificado en todos los canales. El resultado aparecerá en " +"la lista de artículos." #: ../glade/liferea.ui.h:67 -#, fuzzy -msgid "Internal Browser Settings" -msgstr "Opciones del navegador interno" +msgid "Update Monitor" +msgstr "Monitor de actualizaciones" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Abrir los enlaces en la ventana de Liferea." +#, fuzzy +msgid "Pending Requests" +msgstr "Transacciones pendientes" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Desactivar JavaScript." +#, fuzzy +msgid "Downloading Now" +msgstr "Descargando" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "Habilitar «plugins» del navegador." +msgid "Cancel _All" +msgstr "C_ancelar todo" #: ../glade/liferea.ui.h:71 -#, fuzzy -msgid "External Browser Settings" -msgstr "Opciones del navegador externo" +msgid "Create News Bin" +msgstr "Crear una bandeja de noticias" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "Abrir enlace en:" +msgid "_News Bin Name:" +msgstr "_Nombre de la bandeja" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Acerca de..." #: ../glade/liferea.ui.h:74 -#, no-c-format +#, fuzzy +msgid "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" +"Copyright (c) 2003-2009\n" +"El equipo de Liferea\n" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea es un lector de noticias para GTK+" + +#: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "Sitio web de Liferea" + +#: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "Búsqueda avanzada" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "Búsqueda..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Crear un canal de resultados de búsqueda" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "escriba una cadena de búsqueda" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "Cantidad máxima de resultados:" + +#: ../glade/liferea.ui.h:84 +#, 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 "" +"Nota: Liferea generará un canal que se podrá usar para consultar los " +"resultados de buscar la cadena especificada. Puede mantener este canal de " +"forma permanente y actualizarlo como cualquier otro." + +#: ../glade/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "Descarga / Postprocesamiento" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Selección de fuente" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Elija la fuente que quiere añadir..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Añadir OPML/Planeta" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"Por favor, indique un archivo local o una URL que apunte a una lista de " +"canales en formato OPML." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "Ubicación" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "Elegir archivo" + +#: ../glade/ttrss_source.ui.h:1 +#, fuzzy +msgid "Add Tiny Tiny RSS Account" +msgstr "Añadir cuenta de Bloglines" + +#: ../glade/ttrss_source.ui.h:2 +#, fuzzy +msgid "Please enter your tt-rss account settings." +msgstr "Por favor escriba los datos de su cuenta de Bloglines." + +#: ../glade/ttrss_source.ui.h:3 +#, fuzzy +msgid "_Server URL" +msgstr "Error del servidor" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "Nombre de _usuario" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Avanzado..." + +#: ../glade/simple_subscription.ui.h:4 msgid "" -"_Manual:\n" -"(%s for URL)" +"Enter a website location to use feed autodiscovery or in case you know it " +"the exact feed location." +msgstr "" +"Escriba la dirección de un sitio web para usar el autodescubrimiento o, si " +"la conoce, la dirección exacta del canal." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Preferencias" + +#: ../glade/prefs.ui.h:2 +#, fuzzy +msgid "Feed Cache Handling" +msgstr "Caché" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "_Número de artículos a almacenar, por canal:" + +#: ../glade/prefs.ui.h:4 +#, fuzzy +msgid "Feed Update Settings" +msgstr "Actualización" + +#: ../glade/prefs.ui.h:5 +#, fuzzy +msgid "_Update all subscriptions at startup." +msgstr "Actualiza todas las suscripciones" + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "_Intervalo de actualización predeterminado" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"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/prefs.ui.h:9 +msgid "Feeds" +msgstr "Canales" + +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "Opciones de presentación de carpetas" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." msgstr "" -"_Manual:\n" -"(%s para URL)" +"Mo_strar los artículos de los canales contenidos al seleccionar una carpeta." + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "Ocultar artículos leídos." + +#: ../glade/prefs.ui.h:13 +#, fuzzy +msgid "Feed Icons (Favicons)" +msgstr "Íconos de los canales (Favicons)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "Act_ualizar todos los iconos ahora" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Carpetas" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:16 +#, fuzzy +msgid "Reading Headlines" +msgstr "titulares no leídos" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "Avanzar por los artículos con:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +#, fuzzy +msgid "Web Integration" +msgstr "Orientación" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Enviar los marcadores a" + +#: ../glade/prefs.ui.h:22 +#, fuzzy +msgid "Internal Browser Settings" +msgstr "Opciones del navegador interno" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Abrir los enlaces en la ventana de Liferea." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Desactivar JavaScript." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "Habilitar «plugins» del navegador." + +#: ../glade/prefs.ui.h:26 +#, fuzzy +msgid "External Browser Settings" +msgstr "Opciones del navegador externo" + +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "Abrir enlace en:" + +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Manual" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "" + +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "Navegador:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Navegador" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 #, fuzzy msgid "Notification Settings" msgstr "Opciones de notificación" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Mostrar una ventana emergente al recibir nuevos elementos." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 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.ui.h:81 +#: ../glade/prefs.ui.h:36 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.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "T_erminar, en lugar de minimizar al área de notificación." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 #, fuzzy msgid "Toolbar Settings" msgstr "Etiquetas de la _barra de herramientas" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "Ocultar la barra de herramientas." -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Etiquetas de la _barra de herramientas" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "Interfaz gráfica" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "Detectar automáticamente (de GNOME o las variables de entorno)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "Sin «proxy»" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "Configuración manual" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "_Puerto del «proxy»:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "Servidor «proxy»:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "_Identificarse ante el «proxy»" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "Contraseña del «proxy»:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "Nombre de _usuario en el «proxy»:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 #, fuzzy msgid "Downloading Enclosures" msgstr "Descargando adjuntos" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "Navegar" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "Guardar descarga_s en" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Descargar mediante" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 #, fuzzy msgid "Opening Enclosures" msgstr "Abrir adjunto..." -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Adjuntos" -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Sincronización con equipos cercanos" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "Habilitar sincronización con la red local" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Nueva carpeta" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "Nombre de la carpeta:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Renombrar" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Nuevo nombre:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Propiedades de la carpeta de búsqueda" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "Título de la búsqueda:" - -#: ../glade/liferea.ui.h:115 -#, fuzzy -msgid "Find Items that meet the following criteria" -msgstr "Encontrar artículos con los criterios siguientes" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "Se cumple cualquier regla" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "Se cumplen todas las reglas" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Descargando adjuntos" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Descargando un adjunto de tipo:" - -#: ../glade/liferea.ui.h:120 -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 "" -"¿Qué debe hacer Liferea con este adjunto? Escriba debajo la orden que desea " -"ejecutar. El nombre del archivo descargado se usará como parámetro para la " -"orden:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "Hacer lo mismo _de forma automática para este tipo de archivos." +#~ msgid "Download and view feeds" +#~ msgstr "Descarga y muestra noticias" -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Buscar en todos los canales" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "Bu_scar:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Escriba un texto. Liferea lo buscará tanto en los títulos de los artículos " -"como en los contenidos." - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "Avanzado..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Busca el texto especificado en todos los canales. El resultado aparecerá en " -"la lista de artículos." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Monitor de actualizaciones" - -#: ../glade/liferea.ui.h:129 -#, fuzzy -msgid "Pending Requests" -msgstr "Transacciones pendientes" - -#: ../glade/liferea.ui.h:130 -#, fuzzy -msgid "Downloading Now" -msgstr "Descargando" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "C_ancelar todo" +#~ msgid "You may want to validate the feed using" +#~ msgstr "Puede verificar la validez del canal usando" -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Crear una bandeja de noticias" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Abrir el artículo en una pes_taña nueva" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Nombre de la bandeja" +#~ msgid "_Launch Item In Browser" +#~ msgstr "Abrir el artículo en el navegador" -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Acerca de..." - -#: ../glade/liferea.ui.h:135 -#, fuzzy -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Copyright (c) 2003-2009\n" -"El equipo de Liferea\n" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Copiar la _URL del artículo al portapapeles" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea es un lector de noticias para GTK+" +#~ msgid "flag" +#~ msgstr "marcar" -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Sitio web de Liferea" +#~ msgid "bookmark" +#~ msgstr "marcador" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Búsqueda avanzada" +#~ msgid "comments" +#~ msgstr "comentarios" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "Búsqueda..." +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Falló la descarga del adjunto: «%s»" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Crear un canal de resultados de búsqueda" - -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "escriba una cadena de búsqueda" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Se completó la descarga del adjunto: «%s»" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Cantidad máxima de resultados:" +#~ 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 "" +#~ "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." -#: ../glade/liferea.ui.h:145 #, 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 "" -"Nota: Liferea generará un canal que se podrá usar para consultar los " -"resultados de buscar la cadena especificada. Puede mantener este canal de " -"forma permanente y actualizarlo como cualquier otro." +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Falló la descarga del adjunto: «%s»" -#: ../glade/new_subscription.ui.h:9 #, fuzzy -msgid "Download / Postprocessing" -msgstr "Descarga / Postprocesamiento" +#~ msgid "Download finished." +#~ msgstr "_Descargar mediante" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Selección de fuente" +#~ msgid "Choose download directory" +#~ msgstr "Elija el directorio de descarga" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Elija la fuente que quiere añadir..." - -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Añadir OPML/Planeta" - -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Por favor, indique un archivo local o una URL que apunte a una lista de " -"canales en formato OPML." - -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "Ubicación" - -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "Elegir archivo" - -#: ../glade/ttrss_source.ui.h:1 -#, fuzzy -msgid "Add Tiny Tiny RSS Account" -msgstr "Añadir cuenta de Bloglines" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Manual:\n" +#~ "(%s para URL)" -#: ../glade/ttrss_source.ui.h:2 -#, fuzzy -msgid "Please enter your tt-rss account settings." -msgstr "Por favor escriba los datos de su cuenta de Bloglines." +#~ msgid "_Save downloads in" +#~ msgstr "Guardar descarga_s en" -#: ../glade/ttrss_source.ui.h:3 #, fuzzy -msgid "_Server URL" -msgstr "Error del servidor" +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Sincronización con equipos cercanos" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "Nombre de _usuario" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "Habilitar sincronización con la red local" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Escriba la dirección de un sitio web para usar el autodescubrimiento o, si " -"la conoce, la dirección exacta del canal." - -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Avanzado..." - -#~ msgid "You may want to validate the feed using" -#~ msgstr "Puede verificar la validez del canal usando" +#~ msgid "Downloading Enclosure" +#~ msgstr "Descargando adjuntos" #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " @@ -3294,12 +3359,12 @@ #~ msgid "" #~ "

    Could not determine the feed type. Please check that it is a valid type and listed in the supported " +#~ "\"http://lzone.de/liferea/supported_formats.htm\">supported " #~ "formats.

    " #~ msgstr "" #~ "

    No se pudo determinar el tipo de canal. Por favor, comprueba que sea " #~ "válida y que su formato esté soportado.

    " +#~ "\"http://lzone.de/liferea/\">esté soportado.

    " #~ msgid "Please do a search first!" #~ msgstr "Se requiere una búsqueda previa" @@ -3366,7 +3431,7 @@ #~ "to change the update interval, title, authentication or caching " #~ "properties of a subscription.

    To learn more about Liferea " #~ "you should read the documentation provided in the help feed or in the FAQ available at the " +#~ "href=\"http://lzone.de/liferea/faq.htm\">FAQ available at the " #~ "project homepage.

    " #~ msgstr "" #~ "

    Bienvenido a Liferea

    El panel de la izquierda muestra la " @@ -3386,7 +3451,7 @@ #~ "se pueden cambiar el intervalo de actualización, el título y otras " #~ "propiedades de cada elemento

    Para obtener más ayuda " #~ "puede acceder a la documentación del canal de ayuda o leer las preguntas frecuentes de " +#~ "\"http://lzone.de/liferea/es/faq.htm\">preguntas frecuentes de " #~ "la página web de Liferea.

    " #~ msgid "URL" diff -Nru liferea-1.8.15/po/eu.po liferea-1.10.3/po/eu.po --- liferea-1.8.15/po/eu.po 2013-06-24 22:16:15.000000000 +0200 +++ liferea-1.10.3/po/eu.po 2013-07-31 23:29:12.000000000 +0200 @@ -1,26 +1,26 @@ # translation of eu.po to Basque -# Copyright (C) 2011 Free Software Foundation, Inc. +# Copyright (C) 2013 Free Software Foundation, Inc. # This file is distributed under the same license as the liferea package. # # Iñaki Larrañaga Murgoitio , 2007. -# Mikel Olasagasti Uranga , 2011. +# Mikel Olasagasti Uranga , 2011, 2013. +# msgid "" msgstr "" -"Project-Id-Version: liferea-1.8-rc1\n" +"Project-Id-Version: liferea-1.10-rc4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" -"PO-Revision-Date: 2011-10-25 00:17+0100\n" +"POT-Creation-Date: 2013-06-11 22:55+0200\n" +"PO-Revision-Date: 2013-06-13 22:57+0100\n" "Last-Translator: Mikel Olasagasti Uranga \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" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Poedit 1.5.5\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:234 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -33,25 +33,16 @@ msgstr "Liferea iturri irakurlea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Deskargatu eta ikusi iturriak" +msgid "Read news feeds and blogs" +msgstr "Irakurri berri jarioak eta blogak" #: ../xslt/feed.xml.in.h:1 -msgid "" -"This feed is discontinued. It's no longer available. Liferea won't update it " -"anymore but you can still access the cached headlines." -msgstr "" -"Iturri hau etenda dago. Ez da gehiago erabilgarri egongo. Liferea-k ezingo " -"du eguneratu gehiago, hala ere cachean dauden goiburuak irakur ditzakezu." +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 "Iturri hau etenda dago. Ez da gehiago erabilgarri egongo. Liferea-k ezingo du eguneratu gehiago, hala ere cachean dauden goiburuak irakur ditzakezu." #: ../xslt/feed.xml.in.h:2 -msgid "" -"The last update of this subscription failed!
    HTTP error code : " -msgstr "" -"Harpidetza honen azken eguneraketak huts egin du!
    HTTP errorearen " -"kodea : " +msgid "The last update of this subscription failed!
    HTTP error code : " +msgstr "Harpidetza honen azken eguneraketak huts egin du!
    HTTP errorearen kodea : " #: ../xslt/feed.xml.in.h:3 msgid "There were errors while parsing this feed!" @@ -67,7 +58,7 @@ #: ../xslt/feed.xml.in.h:6 msgid "You may want to contact the author/webmaster of the feed about this!" -msgstr "" +msgstr "Agian egile edo web arduradunarekin kontaktuan jarri nahi duzu honegatik!" #: ../xslt/feed.xml.in.h:7 msgid "There were errors while filtering this feed!" @@ -143,38 +134,26 @@ msgstr "Sortzailea" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "bandera" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "laster-marka" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "iruzkinak" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Ez du iruzkinik oraingoz." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Iruzkinak" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Eguneratzen..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Freskatu" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Sekzioa" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Saila" @@ -183,12 +162,8 @@ msgstr "Albisteen erretilua:" #: ../xslt/newsbin.xml.in.h:2 -msgid "" -"Add items to this news bin by selecting \"Copy to News Bin\" from the item " -"list context menu." -msgstr "" -"Gehitu elementuak albiste honen erretiluan \"Kopiatu berrien erretiluan\" " -"hautatuz (testuinguruko menuko elementu-zerrendan)" +msgid "Add items to this news bin by selecting \"Copy to News Bin\" from the item list context menu." +msgstr "Gehitu elementuak albiste honen erretiluan \"Kopiatu berrien erretiluan\" hautatuz (testuinguruko menuko elementu-zerrendan)" #: ../xslt/vfolder.xml.in.h:1 msgid "Search Folder:" @@ -198,12 +173,12 @@ msgid "Default Browser" msgstr "Lehenetsitako arakatzailea" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Arakatzailearen komandoak huts egin du: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Exekuzioa: \"%s\"" @@ -213,7 +188,7 @@ msgid "Authorization Error" msgstr "Autentifikazio errorea" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Ezin izan da \"%s\" cache direktorioa sortu." @@ -243,108 +218,99 @@ msgid "%b %d %Y" msgstr "%Y %b %d" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "\"%s\" ez da baliozko konfigurazio-fitxategien eranskina" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Eranskina deskargatzeak huts egin du: \"%s\"" +#: ../src/enclosure.c:288 +msgid "You have not configured a download tool yet! Please do so in the 'Download' tab in Tools/Preferences." +msgstr "Oraindik ez du deskarga herramienta bat konfiguratu! Egizu hobespenetan, 'Eranskinak' fitxan." -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Amaitu da eranskina deskargatzea: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" +"Komandoak huts egin du: \n" +"\n" +"%s\n" +"\n" +" Egiaztatu deskarga tresna behar bezala instalatuta eta ongi dabilela! Hobespenetako 'Deskargak' fitxan aldatu dezakezu." -#: ../src/export.c:174 +#: ../src/export.c:185 #, c-format msgid "Error renaming %s to %s\n" msgstr "Errorea %s %s gisa izenez aldatzean\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" -msgstr "" -"XML errorea OPML fitxategia irakurtzean. Ezin izan da \"%s\" inportatu!" +msgstr "XML errorea OPML fitxategia irakurtzean. Ezin izan da \"%s\" inportatu!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:422 ../src/export.c:424 #, c-format -msgid "" -"Empty document! OPML document \"%s\" should not be empty when importing." -msgstr "" -"Dokumentu hutsa! OPML \"%s\" dokumentua ez luke hutsik egon behar " -"inprotatzean." +msgid "Empty document! OPML document \"%s\" should not be empty when importing." +msgstr "Dokumentu hutsa! OPML \"%s\" dokumentua ez luke hutsik egon behar inprotatzean." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:445 ../src/export.c:447 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" -msgstr "" -"\"%s\" ez da baliozko OPML dokumentua! Lifereak ezin du fitxategi hau " -"inportatu." +msgstr "\"%s\" ez da baliozko OPML dokumentua! Lifereak ezin du fitxategi hau inportatu." -#: ../src/export.c:440 +#: ../src/export.c:466 msgid "Imported feed list" msgstr "Inportatutako iturrien zerrenda" -#: ../src/export.c:452 +#: ../src/export.c:478 msgid "Import Feed List" msgstr "Inportatu iturrien zerrenda" -#: ../src/export.c:452 +#: ../src/export.c:478 msgid "Import" msgstr "Inportatu" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:478 ../src/export.c:495 ../src/fl_sources/opml_source.c:394 msgid "OPML Files" msgstr "OPML fitxategiak" -#: ../src/export.c:460 +#: ../src/export.c:486 msgid "Error while exporting feed list!" msgstr "Errorea iturrien zerrenda esportatzean." -#: ../src/export.c:462 +#: ../src/export.c:488 msgid "Feed List exported!" msgstr "Iturrien zerrenda esportatuta." -#: ../src/export.c:469 +#: ../src/export.c:495 msgid "Export Feed List" msgstr "Esportatu iturrien zerrenda" -#: ../src/export.c:469 +#: ../src/export.c:495 msgid "Export" msgstr "Esportatu" -#: ../src/feed.c:255 -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 "" -"

    Ezin izan da iturriaren mota zehaztu. Egiaztatu iturburuak onartutako " -"harpidetzeko formatuetako batera zuzentzen duela.

    XML analizatzailearen " -"irteera:
    " +#: ../src/feed.c:254 +msgid "

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

    XML Parser Output:
    " +msgstr "

    Ezin izan da iturriaren mota zehaztu. Egiaztatu iturburuak onartutako harpidetzeko formatuetako batera zuzentzen duela.

    XML analizatzailearen irteera:
    " -#: ../src/feed.c:284 +#: ../src/feed.c:283 #, c-format msgid "\"%s\" updated..." msgstr "\"%s\" eguneratua..." -#: ../src/feed.c:294 +#: ../src/feed.c:293 #, c-format msgid "\"%s\" is not available" msgstr "\"%s\" ez dago erabilgarri" #: ../src/feed_parser.c:137 -msgid "" -"The URL you want Liferea to subscribe to points to a webpage and the auto " -"discovery found no feeds on this page. Maybe this webpage just does not " -"support feed auto discovery." -msgstr "" -"Lifereak ez du aurkitu albisteen iturririk emandako URLan. Agian web gunea " -"honek ez du iturrien aurkikuntza automatikoak onartzen." +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 "Lifereak ez du aurkitu albisteen iturririk emandako URLan. Agian web gunea honek ez du iturrien aurkikuntza automatikoak onartzen." #: ../src/feed_parser.c:170 #, c-format @@ -368,113 +334,93 @@ msgstr "Ezin izan da iturri mota zehaztu" #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "Ez dago irakurri gabeko elementurik" -#: ../src/main.c:175 -msgid "" -"Start Liferea with its main window in STATE. STATE may be `shown', " -"`iconified', or `hidden'" -msgstr "" -"Abiarazi Liferea bere leiho nagusia EGOERA egoeran dagoela. EGOERA `shown', " -"`iconified', edo `hidden' izan daiteke" +#: ../src/main.c:163 +msgid "Start Liferea with its main window in STATE. STATE may be `shown', `iconified', or `hidden'" +msgstr "Abiarazi Liferea bere leiho nagusia EGOERA egoeran dagoela. EGOERA `shown', `iconified', edo `hidden' izan daiteke" -#: ../src/main.c:175 +#: ../src/main.c:163 msgid "STATE" msgstr "EGOERA" -#: ../src/main.c:179 +#: ../src/main.c:164 msgid "Show version information and exit" msgstr "Bistaratu bertsioaren informazioa eta irten" -#: ../src/main.c:180 +#: ../src/main.c:165 msgid "Add a new subscription" msgstr "Gehitu harpidetza berria" -#: ../src/main.c:180 +#: ../src/main.c:165 msgid "uri" msgstr "uri" -#: ../src/main.c:185 +#: ../src/main.c:170 msgid "Print debugging messages of all types" msgstr "Bistaratu mota guztitako arazketa mezuak" -#: ../src/main.c:186 +#: ../src/main.c:171 msgid "Print debugging messages for the cache handling" msgstr "Bistaratu cache kudeatzailearen arazketa mezuak" -#: ../src/main.c:187 +#: ../src/main.c:172 msgid "Print debugging messages for the configuration handling" msgstr "Bistaratu konfigurazio-kudeaketaren arazketa mezuak" -#: ../src/main.c:188 +#: ../src/main.c:173 msgid "Print debugging messages of the database handling" msgstr "Bistaratu datubase kudeatzailearen arazketa mezuak" -#: ../src/main.c:189 +#: ../src/main.c:174 msgid "Print debugging messages of all GUI functions" msgstr "Bistaratu GUI funtzio guztien arazketa mezuak" -#: ../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.8/output.xhtml" -msgstr "" -"Gaitu HTML bistaratze arazketa. Lifereak HTML bat prozesatzen duen " -"bakoitzean irteera ~/.liferea_1.8/output.xhtml fitxategian ere idatzi." +#: ../src/main.c:175 +msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.cache/liferea/output.xhtml" +msgstr "Gaitu HTML bistaratze arazketa. Lifereak HTML bat prozesatzen duen bakoitzean irteera ~/.cache/liferea/output.xhtml fitxategian ere idatzi." -#: ../src/main.c:191 +#: ../src/main.c:176 msgid "Print debugging messages of all network activity" msgstr "Bistaratu sareko sarbide guztien arazketa mezuak" -#: ../src/main.c:192 +#: ../src/main.c:177 msgid "Print debugging messages of all parsing functions" msgstr "Bistaratu funtzio analizatzaile guztien arazketa mezuak" -#: ../src/main.c:193 +#: ../src/main.c:178 msgid "Print debugging messages when a function takes too long to process" msgstr "Bistaratu arazketa mezuak funtzio batek denbora gehiegi behar duenean" -#: ../src/main.c:194 +#: ../src/main.c:179 msgid "Print debugging messages when entering/leaving functions" msgstr "Bistaratu arazketa mezuak funtzioak sartzean/kentzean" -#: ../src/main.c:195 +#: ../src/main.c:180 msgid "Print debugging messages of the feed update processing" msgstr "Bistaratu iturriaren eguneraketa prozesuaren arazketa mezuak" -#: ../src/main.c:196 +#: ../src/main.c:181 msgid "Print debugging messages of the search folder matching" msgstr "Bistaratu bilaketa direktorioaren bilatze arazketa mezuak" -#: ../src/main.c:197 +#: ../src/main.c:182 msgid "Print verbose debugging messages" msgstr "Bistaratu arazketa mezuak hitzez hitz" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:193 ../src/main.c:194 msgid "Print debugging messages for the given topic" msgstr "Bistaratu esandako gaiaren arazketa mezuak" -#: ../src/main.c:218 +#: ../src/main.c:201 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, Linux iturri irakurgailua" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "Informazio gehiagorako, bisitatu http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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 "" -"Liferea-ren bertsio honek cache formatu berria darabil eta zure cache " -"bertsio berrira migratu du. %s-(e)-n aurkitzen den cache edukia ez da " -"automatikoki ezabatu. Ezabatu direktorio hau eskuz migrazioa ongi burutu " -"dela ziurtatzean." +#: ../src/main.c:202 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Informazio gehiagorako, bisitatu http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -498,8 +444,7 @@ msgstr "Ezin izan da proxy-ra konektatu" #: ../src/net.c:325 -msgid "" -"A network error occurred, or the other end closed the connection unexpectedly" +msgid "A network error occurred, or the other end closed the connection unexpectedly" msgstr "Konexioan errore bat gertatu da edo urruneko konexioa ezustean itxi da" #. http 3xx redirection @@ -509,12 +454,8 @@ #. http 4xx client error #: ../src/net.c:331 -msgid "" -"You are unauthorized to download this feed. Please update your username and " -"password in the feed properties dialog box" -msgstr "" -"Ez zaude baimenduta iturri hau deskargatzeko. Eguneratu zure erabiltzaile-" -"izena eta pasahitza iturriaren propietateen elkarrizketa-koadroan" +msgid "You are unauthorized to download this feed. Please update your username and password in the feed properties dialog box" +msgstr "Ez zaude baimenduta iturri hau deskargatzeko. Eguneratu zure erabiltzaile-izena eta pasahitza iturriaren propietateen elkarrizketa-koadroan" #: ../src/net.c:333 msgid "Payment required" @@ -554,9 +495,7 @@ #: ../src/net.c:347 msgid "Feed not available: Server requested unsupported redirection!" -msgstr "" -"Iturria ez dago erabilgarri. Zerbitzariak onartu gabeko berbideraketa eskatu " -"du." +msgstr "Iturria ez dago erabilgarri. Zerbitzariak onartu gabeko berbideraketa eskatu du." #: ../src/net.c:349 msgid "Client Error" @@ -644,130 +583,122 @@ msgid "Feed title" msgstr "Iturriaren titulua" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "\"%s\" iturria jadanik eguneratzen ari da!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, 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 "\"%s\" iturria etenda dago. Liferea-k ezingo du eguneratu gehiago!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "\"%s\" iturriaren ikonoa eguneratzen" -#: ../src/subscription.c:192 -msgid "" -"There was a problem while reading this subscription. Please check the URL " -"and console output." -msgstr "" -"Arazoak daude harpidetza hau irakurtzean. Egiaztatu URLa eta kontsolako " -"irteera." +#: ../src/subscription.c:193 +msgid "There was a problem while reading this subscription. Please check the URL and console output." +msgstr "Arazoak daude harpidetza hau irakurtzean. Egiaztatu URLa eta kontsolako irteera." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "\"%s\"ren URLa betirako aldatu da eta eguneratu egin da" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "\"%s\" etenda dago. Lifereak ez du gehiago eguneratuko." -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" ez da aldatu azken eguneraketatik" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "\"%s\" eguneratzen" -#: ../src/update.c:255 +#: ../src/update.c:258 #, c-format msgid "Error opening temp file %s to use for filtering!" -msgstr "" -"Errorea aldi baterako %s fitxategia irakurtzean iragazteko erabiltzeko." +msgstr "Errorea aldi baterako %s fitxategia irakurtzean iragazteko erabiltzeko." -#: ../src/update.c:278 +#: ../src/update.c:281 #, c-format msgid "%s exited with status %d" msgstr "%s %d egoerarekin irten da" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:287 ../src/update.c:288 ../src/update.c:400 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Errorea: ezin izan da \"%s\" kanalizazioa ireki" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:426 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Errorea: ezin izan da \"%s\" fitxategia ireki" -#: ../src/update.c:429 +#: ../src/update.c:432 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Errorea: ez dago \"%s\" fitxategia" -#: ../src/vfolder.c:55 +#: ../src/vfolder.c:54 msgid "New Search Folder" msgstr "Bilaketaren karpeta berria" -#: ../src/xml.c:451 +#: ../src/xml.c:410 msgid "[There were more errors. Output was truncated!]" msgstr "[Errore batzuk gertatu dira. Irteera moztu egin da]" -#: ../src/xml.c:604 +#: ../src/xml.c:563 msgid "XML Parser: Could not parse document:\n" msgstr "XML analizatzailea: ezin izan da dokumentua analizatu:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Atxikiak" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "atxiki %d" -msgstr[1] "%d atxiki" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr "Byte" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "atxiki %d" +msgstr[1] "%d atxiki" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Aukeratu fitxategia" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "Fitxategiaren luzapena. %s" @@ -777,657 +708,670 @@ msgid "Couldn't find pixmap file: %s" msgstr "Ezin izan da pixmap fitxategia aurkitu: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (berri %d)" msgstr[1] " (%d berri)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "irakurri gabe %d - %s" msgstr[1] "%d irakurri gabe - %s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Laguntzaren gaiak" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Erreferentzia azkarra" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "MEG" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:795 msgid "Liferea is now online" msgstr "Liferea orain linean dago" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:797 msgid "Work Offline" msgstr "Lan egin lineaz kanpo" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:799 msgid "Liferea is now offline" msgstr "Liferea lineaz kanpo dago" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:801 msgid "Work Online" msgstr "Lan egin linean" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:897 msgid "_Subscriptions" msgstr "_Harpidetzak" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:898 msgid "Update _All" msgstr "Eguneratu _denak" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:898 msgid "Updates all subscriptions." msgstr "Eguneratu harpidetza guztiak." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:900 msgid "Mark All As _Read" msgstr "_Markatu denak irakurritako gisa" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:900 msgid "Marks read every item of every subscription." msgstr "Markatu irakurrita gisa harpidetza bakoitzeko elementu bakoitza" -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:902 msgid "_Import Feed List..." msgstr "_Inportatu iturrien zerrenda..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:902 msgid "Imports an OPML feed list." msgstr "Iturrien OPML zerrenda inportatzen du" -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:903 msgid "_Export Feed List..." msgstr "_Esportatu iturrien zerrenda" -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:903 msgid "Exports the feed list as OPML." msgstr "Esportatu iturrien zerrenda OPML gisa." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:904 msgid "_Quit" msgstr "I_rten" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:906 msgid "_Feed" msgstr "_Iturria" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:907 msgid "Remove _All Items" msgstr "Kendu elementu _denak" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:907 msgid "Removes all items of the currently selected feed." msgstr "Unean hautatutako iturritik elemen tu guztiak kentzen ditu." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:910 msgid "_Item" msgstr "_Elementua" +#: ../src/ui/liferea_shell.c:911 +msgid "Previous Item" +msgstr "Aurreko elementua" + +#: ../src/ui/liferea_shell.c:913 +msgid "Next Item" +msgstr "Hurrengo elementua" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:918 msgid "_Next Unread Item" msgstr "_Hurrengo irakurri gabeko elementua" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:921 msgid "_View" msgstr "_Ikusi" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:922 ../src/ui/liferea_htmlview.c:653 msgid "_Increase Text Size" msgstr "_Handitu testuaren tamaina" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:922 msgid "Increases the text size of the item view." msgstr "Testuaren tamaina handitzen du elementuaren ikuspegian." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:924 ../src/ui/liferea_htmlview.c:654 msgid "_Decrease Text Size" msgstr "_Gutxiagotu testu-tamaina" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:924 msgid "Decreases the text size of the item view." msgstr "Testuaren tamaina gutxiagotzen du elementuaren ikuspegian." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:927 msgid "_Tools" msgstr "_Tresnak" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:928 msgid "_Update Monitor" msgstr "_Eguneraketaren monitorea" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:928 msgid "Show a list of all feeds currently in the update queue" msgstr "Erakutsi eguneratzeko ilaran unean dauden iturri guztien zerrenda" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:930 msgid "_Preferences" msgstr "_Hobespenak" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:930 msgid "Edit Preferences." msgstr "Editatu hobespenak." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:933 msgid "S_earch" msgstr "_Bilatu" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:934 msgid "Search All Feeds..." msgstr "Bilatu iturri guztiak..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:934 msgid "Show the search dialog." msgstr "Erakutsi bilaketaren elkarrizketa-koadroa." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:936 msgid "_Help" msgstr "_Laguntza" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:937 msgid "_Contents" msgstr "_Edukia" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:937 msgid "View help for this application." msgstr "Ikusi aplikazio honen laguntza." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:938 msgid "_Quick Reference" msgstr "_Erreferentzia azkarra" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:938 msgid "View a list of all Liferea shortcuts." msgstr "Ikusi Liferearen laster-tekla guztien zerrenda." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:940 msgid "_FAQ" msgstr "_MEG" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:940 msgid "View the FAQ for this application." msgstr "Ikusi aplikazio honen Maiz Egindako Galderak (MEG)." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:941 msgid "_About" msgstr "Honi _buruz" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:941 msgid "Shows an about dialog." msgstr "Erakutsi 'honi buruz' elkarrizketa-koadroa." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:945 msgid "_Normal View" msgstr "_Ikuspegi normala" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:945 msgid "Set view mode to mail client mode." msgstr "Ezarri ikuspegi modua posta bezero moduan." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:947 msgid "_Wide View" msgstr "_Ikuspegi zabala" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:947 msgid "Set view mode to use three vertical panes." msgstr "Ezarri ikuspegi modua hiru panel bertikal erabiltzeko." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:949 msgid "_Combined View" msgstr "Ikuspegi _konbinatua" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:949 msgid "Set view mode to two pane mode." msgstr "Ezarri ikuspegi modua bi panelekin." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:954 msgid "_Reduced Feed List" msgstr "_Murriztu iturri zerrenda" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:954 msgid "Hide feeds with no unread items." msgstr "Ezkutatu irakurri gabeko elementurik ez duten jarioak." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:959 msgid "_New Subscription..." msgstr "_Harpidetza berria..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:959 msgid "Adds a subscription to the feed list." msgstr "Harpidetza bat gehitzen du iturrien zerrendara." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:961 ../src/ui/popup_menu.c:320 msgid "New _Folder..." msgstr "_Karpeta berria..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:961 msgid "Adds a folder to the feed list." msgstr "Karpeta bat gehitzen du iturrien zerrendara." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:962 ../src/ui/popup_menu.c:323 msgid "New S_earch Folder..." msgstr "_Bilaketa karpeta berria..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:962 msgid "Adds a new search folder to the feed list." msgstr "Bilaketako karpeta berri bat gehitzen du iturrien zerrendan." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:963 msgid "New _Source..." msgstr "_Iturburu berria..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:963 msgid "Adds a new feed list source." msgstr "Iturrien zerrenda berria gehitzen du." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:964 ../src/ui/popup_menu.c:325 msgid "New _News Bin..." msgstr "_Albisteen erretilu berria..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:964 msgid "Adds a new news bin." msgstr "Albisteen erretilu berria gehitzen du." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:968 msgid "_Mark Items Read" msgstr "_Markatu denak irakurritako gisa" -#: ../src/ui/liferea_shell.c:911 -msgid "" -"Marks all items of the selected feed list node / in the item list as read." -msgstr "" -"Hautatutako harpidetzaren edo karpetaren harpidetza guztien elementu guztiak " -"markatzen ditu irakurritako gisa." +#: ../src/ui/liferea_shell.c:968 +msgid "Marks all items of the selected feed list node / in the item list as read." +msgstr "Hautatutako harpidetzaren edo karpetaren harpidetza guztien elementu guztiak markatzen ditu irakurritako gisa." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:970 ../src/ui/popup_menu.c:300 msgid "_Update" msgstr "_Eguneratu" -#: ../src/ui/liferea_shell.c:913 -msgid "" -"Updates the selected subscription or all subscriptions of the selected " -"folder." -msgstr "" -"Hautatutako harpidetzak edo karpetan harpidetza guztiak eguneratzen ditu." +#: ../src/ui/liferea_shell.c:970 +msgid "Updates the selected subscription or all subscriptions of the selected folder." +msgstr "Hautatutako harpidetzak edo karpetan harpidetza guztiak eguneratzen ditu." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:975 msgid "_Properties" msgstr "_Propietateak" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:975 msgid "Opens the property dialog for the selected subscription." -msgstr "" -"Hautatutako harpidetzaren propietateen elkarrizketa-koadroa irekitzen du." +msgstr "Hautatutako harpidetzaren propietateen elkarrizketa-koadroa irekitzen du." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:976 msgid "_Remove" msgstr "_Kendu" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:976 msgid "Removes the selected subscription." msgstr "Hautatutako harpidetza ezabatzen du." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:980 ../src/ui/popup_menu.c:163 msgid "Toggle _Read Status" msgstr "Txandakatu irakurketaren egoera" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:980 msgid "Toggles the read status of the selected item." msgstr "Hautatutako elementuaren irakurketaren egoera aldatzen du." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:982 ../src/ui/popup_menu.c:164 msgid "Toggle Item _Flag" msgstr "Txandakatu elementuaren bandera" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:982 msgid "Toggles the flag status of the selected item." msgstr "Hautatutako elementuaren banderaren egoera aldatzen du." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:984 msgid "R_emove" msgstr "_Kendu" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:984 msgid "Removes the selected item." msgstr "Kandu hautatutako elementua." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:986 ../src/ui/popup_menu.c:127 +msgid "Open In _Tab" +msgstr "Ireki fitxan" + +#: ../src/ui/liferea_shell.c:986 +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Bistaratu elementuaren esteka Liferea-ren arakatzailearen fitxa berri batean." + +#: ../src/ui/liferea_shell.c:988 ../src/ui/popup_menu.c:128 +msgid "_Open In Browser" msgstr "_Abiarazi arakatzailean" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." -msgstr "Bistaratu elementuaren esteka konfiguratutako arakatzailean." +#: ../src/ui/liferea_shell.c:988 +msgid "Launches the item's link in the Liferea item pane." +msgstr "Bistaratu elementuaren esteka Liferea-ren arakatzailean." + +#: ../src/ui/liferea_shell.c:990 ../src/ui/popup_menu.c:129 +msgid "Open In _External Browser" +msgstr "Ireki _kanpoko arakatzailearen" + +#: ../src/ui/liferea_shell.c:990 +msgid "Launches the item's link in the configured external browser." +msgstr "Bistaratu elementuaren esteka konfiguratutako kanpoko arakatzailean." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:995 ../src/ui/popup_menu.c:193 msgid "_Work Offline" msgstr "_Lan egin lineaz kanpo" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:995 msgid "This option allows you to disable subscription updating." msgstr "Aukera honek harpidetzen eguneraketa desgaitzea baimentzen du." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:997 +msgid "_Fullscreen" +msgstr "_Pantaila osoa" + +#: ../src/ui/liferea_shell.c:997 +msgid "Browse at full screen" +msgstr "Arakatu pantaila osoan" + +#: ../src/ui/liferea_shell.c:1328 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Linux iturri irakurgailua" -#: ../src/ui/liferea_shell.c:1246 -msgid "" -"

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

    You can add new subscriptions

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

    " -msgstr "" -"

    Ongi etorri Lifereara, lineako albisteen iturrien mahaigaineko " -"irakurgailua.

    Harpidetza berriak gehitu ditzazkezu

    • Menu " -"nagusitik 'Harpidetzak' -> 'Harpidetza berria'
    • Jario baten " -"harpidetza esteka harpidetza zerrendara bidaltzen
    • Xaguaren eskubiko " -"botoia sakatuz eta 'Harpidetu' sakatuz Liferea barruan

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

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

    You can add new subscriptions

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

    " +msgstr "

    Ongi etorri Lifereara, lineako albisteen iturrien mahaigaineko irakurgailua.

    Harpidetza berriak gehitu ditzazkezu

    • Menu nagusitik 'Harpidetzak' -> 'Harpidetza berria'
    • Jario baten harpidetza esteka harpidetza zerrendara bidaltzen
    • Xaguaren eskubiko botoia sakatuz eta 'Harpidetu' sakatuz Liferea barruan

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Iturburu ezeaguna" -#: ../src/ui/ui_common.c:205 +#: ../src/ui/ui_common.c:211 msgid "All Files" msgstr "Fitxategi guztiak" -#: ../src/ui/feed_list_view.c:341 +#: ../src/ui/feed_list_view.c:338 msgid "Deleting entry" msgstr "Sarrera ezabatzen" -#: ../src/ui/feed_list_view.c:342 +#: ../src/ui/feed_list_view.c:339 #, 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/feed_list_view.c:342 +#: ../src/ui/feed_list_view.c:339 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Ziur zaude \"%s\" ezabatzea nahi duzula?" -#: ../src/ui/feed_list_view.c:354 +#: ../src/ui/feed_list_view.c:351 msgid "Deletion Confirmation" msgstr "Berretsi ezabatzea" -#: ../src/ui/feed_list_view.c:385 +#: ../src/ui/feed_list_view.c:382 msgid "Liferea is in offline mode. No update possible." msgstr "Liferea lineaz kanpoko moduan dago. Ezin da eguneraketarik burutua." -#: ../src/ui/liferea_htmlview.c:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Deskargak huts egin du: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "Deskarga burututa." - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +#: ../src/ui/liferea_htmlview.c:624 +msgid "Open Link In _Tab" msgstr "Ireki esteka _fitxa batean" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:625 +msgid "_Open Link In Browser" msgstr "_Ireki esteka arakatzailean" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:626 +msgid "_Open Link In External Browser" +msgstr "_Ireki esteka kanpoko arakatzailean" + +#: ../src/ui/liferea_htmlview.c:629 #, c-format msgid "_Bookmark Link at %s" msgstr "Egin estekaren _laster-marka %s gisa" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:633 msgid "_Copy Link Location" msgstr "_Kopiatu estekaren helbidea" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Image Location" msgstr "_Kopiatu irudiaren helbidea" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:638 msgid "S_ave Link As" msgstr "_Gorde esteka honela" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:640 msgid "S_ave Image As" msgstr "Gorde irudia honela" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:643 msgid "_Subscribe..." msgstr "_Harpidetu..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:398 msgid "*** No title ***" msgstr "*** Titulurik ez ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:661 msgid "Date" msgstr "Data" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:675 msgid "Headline" msgstr "Goiburua" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:777 ../src/ui/item_list_view.c:798 +#: ../src/ui/item_list_view.c:819 ../src/ui/item_list_view.c:883 +#: ../src/ui/item_list_view.c:968 ../src/ui/item_list_view.c:983 msgid "No item has been selected" msgstr "Ez da elementurik hautatu" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:794 ../src/ui/item_list_view.c:815 msgid "This item has no link specified!" msgstr "Elementu honek ez du zehaztutako estekarik." -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:871 msgid "You must select a feed to delete its items!" msgstr "Iturri bat hautatu behar duzu bere edukia ezabatzeko." -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Ireki elementua _fitxa batean" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "_Ireki elementua arakatzaile batean" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:141 msgid "Copy to News Bin" msgstr "Kopiatu albisteen erretiluan" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Kopiatu elementuaren _URLa arbelean" +#: ../src/ui/popup_menu.c:155 +#, c-format +msgid "_Bookmark at %s" +msgstr "Egin estekaren _laster-marka %s-(e)n" + +#: ../src/ui/popup_menu.c:159 +msgid "Copy Item _Location" +msgstr "_Kopiatu elementuaren helbidea" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:165 msgid "R_emove Item" msgstr "_Kendu elementua" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:178 msgid "Open Enclosure..." msgstr "Ireki eranskina..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:179 msgid "Save As..." msgstr "Gorde honela..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:180 msgid "Copy Link Location" msgstr "Kopiatu estekaren helbidea" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:194 msgid "_Update All" msgstr "_Eguneratu denak" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:199 msgid "_Show Liferea" msgstr "_Erakutsi Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:302 msgid "_Update Folder" msgstr "_Eguneratu karpeta" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:304 msgid "_Mark All As Read" msgstr "_Markatu denak irakurritako gisa" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:314 msgid "_New" msgstr "_Berria" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:317 msgid "New _Subscription..." msgstr "_Harpidetza berria..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:324 msgid "New S_ource..." msgstr "_Iturburu berria..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:333 msgid "Sort Feeds" msgstr "Ordenatu jarioak" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:339 msgid "_Rebuild" msgstr "_Berregin" -#: ../src/ui/popup_menu.c:341 -#, fuzzy +#: ../src/ui/popup_menu.c:351 msgid "Convert To Local Subscriptions..." -msgstr "_Harpidetza berria..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(Hutsik)" +msgstr "Bihurtu harpidetza lokaletara..." -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:87 msgid "GNOME default" msgstr "GNOMEko lehenetsia" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:88 msgid "Text below icons" msgstr "Testua ikonoen azpian" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:89 msgid "Text beside icons" msgstr "Testua ikonoen alboan" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:90 msgid "Icons only" msgstr "Ikonoak soilik" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:91 msgid "Text only" msgstr "Testua soilik" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:99 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minutu" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "ordu" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "egun" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:106 msgid "Space" msgstr "Espazioa" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:107 msgid " Space" msgstr " Espazioa" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Espazioa" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Aukeratu deskargatzeko direktorioa" +#: ../src/ui/preferences_dialog.c:113 +msgid "Normal View" +msgstr "Ikuspegi normala" + +#: ../src/ui/preferences_dialog.c:114 +msgid "Wide View" +msgstr "Ikuspegi zabala" + +#: ../src/ui/preferences_dialog.c:115 +msgid "Combined View" +msgstr "Ikuspegi konbinatua" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:500 msgid "Manual" msgstr "Eskuz" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:515 msgid "Browser default" msgstr "Arakatzaile lehenetsia" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:518 msgid "Existing window" msgstr "Lehendik dagoen leihoan" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:521 msgid "New window" msgstr "Leiho berrian" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:524 msgid "New tab" msgstr "Fitxa berrian" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:683 msgid "Integrate with the messaging menu (indicator)" msgstr "Integratu mezu menuarekin (indicator)" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:686 msgid "Terminate instead of minimizing to the messaging menu" msgstr "Amaitu erretiluko ikonora minimizatu ordez" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:689 msgid "Start minimized to the messaging menu" msgstr "Abiarazi erretilu ikono gisa" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:789 msgid "Type" msgstr "Mota" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:792 msgid "Program" msgstr "Programa" +#: ../src/ui/ui_node.c:123 +msgid "(Empty)" +msgstr "(Hutsik)" + +#: ../src/ui/ui_node.c:320 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" +"%s\n" +"Berreraikitzen" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." -msgid_plural "" -"The provider of this feed suggests an update interval of %d minutes." -msgstr[0] "" -"Iturriaren hornitzaileak minutu %d-eko bitartea gomendatzen du eguneratzeko." -msgstr[1] "" -"Iturriaren hornitzaileak %d minututako bitartea gomendatzen du eguneratzeko." +msgid_plural "The provider of this feed suggests an update interval of %d minutes." +msgstr[0] "Iturriaren hornitzaileak minutu %d-eko bitartea gomendatzen du eguneratzeko." +msgstr[1] "Iturriaren hornitzaileak %d minututako bitartea gomendatzen du eguneratzeko." #: ../src/ui/subscription_dialog.c:434 msgid "This feed specifies no default update interval." msgstr "Iturri honek ez du egunerstzeko bitarte lehenetsirik zehazten." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:153 msgid "Untitled" msgstr "Izengabea" @@ -1478,44 +1422,33 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/default_source.c:174 -#: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 +#: ../src/fl_sources/default_source.c:145 +#: ../src/fl_sources/google_source.c:273 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" msgstr "Harpidetza berria" -#: ../src/fl_sources/google_source.c:116 +#: ../src/fl_sources/google_source.c:115 msgid "Google Reader login failed!" msgstr "Google Reader-en saioa hasteak huts egin du!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:394 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 -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 "" -"Integratu zure Google Reader kontuko iturrien zerrenda. Liferea-k zure " -"Google Reader harpidetzak bistaratuko ditu irakur soileko azpizuhaitz gisa " -"iturrien zerrendan." +#: ../src/fl_sources/google_source.c:395 +msgid "Integrate the feed list of your Google Reader account. Liferea will present your Google Reader subscriptions, and will synchronize your feed list and reading lists." +msgstr "Integratu zure Google Reader kontuko iturrien zerrenda. Liferea-k zure Google Reader harpidetzak bistaratuko ditu irakur soileko azpizuhaitz gisa iturrien zerrendan." -#: ../src/fl_sources/opml_source.c:325 +#: ../src/fl_sources/opml_source.c:326 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:326 -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 "" -"Integratu 'blogroll' edo 'planet' iturrien zerrendara. Liferea-k " -"automatikoki iturriak gehituko eta kenduko ditu OPML dokumentuaren jatorria " -"aldatzen den heinean." +#: ../src/fl_sources/opml_source.c:327 +msgid "Integrate blogrolls or Planets in your feed list. Liferea will automatically add and remove feeds according to the changes of the source OPML document" +msgstr "Integratu 'blogroll' edo 'planet' iturrien zerrendara. Liferea-k automatikoki iturriak gehituko eta kenduko ditu OPML dokumentuaren jatorria aldatzen den heinean." -#: ../src/fl_sources/opml_source.c:387 +#: ../src/fl_sources/opml_source.c:394 msgid "Choose OPML File" msgstr "Aukeratu OPML fitxategia" @@ -1536,23 +1469,17 @@ #: ../src/fl_sources/node_source.c:412 #, c-format msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" +msgstr "'%s' harpidetza ongi bihurtu da jario lokalera!" -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:360 msgid "Tiny Tiny RSS" msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 -msgid "" -"Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " -"present your tt-rss subscriptions, and will synchronize your feed list and " -"reading lists." -msgstr "" -"Integratu zure Tiny Tiny RSS 1.5+ kontuko iturrien zerrenda. Liferea-k zure " -"tt-rss harpidetzak bistaratuko ditu irakur soileko azpizuhaitz gisa iturrien " -"zerrendan." +#: ../src/fl_sources/ttrss_source.c:361 +msgid "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will present your tt-rss subscriptions, and will synchronize your feed list and reading lists." +msgstr "Integratu zure Tiny Tiny RSS 1.5+ kontuko iturrien zerrenda. Liferea-k zure tt-rss harpidetzak bistaratuko ditu irakur soileko azpizuhaitz gisa iturrien zerrendan." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:119 msgid "Could not parse JSON returned by tt-rss API!" msgstr "Ezin izan da tt-rss-ren APIak itzulitako JSON mezua ulertu" @@ -1570,26 +1497,26 @@ msgid "Visit" msgstr "Bisitatu" -#: ../src/notification/libnotify.c:171 ../src/notification/libnotify.c:274 +#: ../src/notification/libnotify.c:167 ../src/notification/libnotify.c:263 msgid "Open feed" msgstr "Ireki iturria" -#: ../src/notification/libnotify.c:174 ../src/notification/libnotify.c:277 +#: ../src/notification/libnotify.c:170 ../src/notification/libnotify.c:266 msgid "Mark all as read" msgstr "Markatu denak irakurritako gisa" -#: ../src/notification/libnotify.c:254 +#: ../src/notification/libnotify.c:247 #, c-format msgid "%s has %d update" msgid_plural "%s has %d updates" msgstr[0] "%s jarioak eguneraketa %d du" msgstr[1] "%s jarioak %d eguneraketa ditu" -#: ../src/notification/libnotify.c:257 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:249 msgid "Feed Update" msgstr "Eguneraketa" -#: ../src/notification/libnotify.c:271 +#: ../src/notification/libnotify.c:260 msgid "Show details" msgstr "Erakutsi xehetasunak" @@ -1606,12 +1533,8 @@ msgstr "_Erabiltzaile-izena:" #: ../glade/auth.ui.h:6 -msgid "" -"Note: The username and password will be saved to your Liferea feedlist " -"file without using encryption." -msgstr "" -"Oharra: erabiltzaile-izena eta pasahitza diskoan gordeko dira zifratu " -"gabe." +msgid "Note: The username and password will be saved to your Liferea feedlist file without using encryption." +msgstr "Oharra: erabiltzaile-izena eta pasahitza diskoan gordeko dira zifratu gabe." #: ../glade/google_source.ui.h:1 msgid "Add Google Reader Account" @@ -1621,8 +1544,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Sartu zure Google Reader kontuaren ezarpenak." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Pasahitza" @@ -1646,7 +1568,7 @@ msgid "combined view" msgstr "ikuspegi konbinatua" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Goiburuak" @@ -1696,7 +1618,7 @@ msgstr "Orokorra" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Iturriaren iturburua" @@ -1729,25 +1651,16 @@ msgstr "Erabili bihurtzeko _iragazkia" #: ../glade/liferea.ui.h:27 ../glade/new_subscription.ui.h:12 -msgid "" -"Liferea can use external filter plugins in order to access feeds and " -"directories in non-supported formats. See the documentation for more " -"information." -msgstr "" -"Lifereak kanpoko iragazki-osagaia erabil dezake onartu gabe dauden formatuko " -"iturri eta direktorioak atzitzeko. Ikusi dokumentazioa xehetasun gehiagorako." +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 "Lifereak kanpoko iragazki-osagaia erabil dezake onartu gabe dauden formatuko iturri eta direktorioak atzitzeko. Ikusi dokumentazioa xehetasun gehiagorako." #: ../glade/liferea.ui.h:28 ../glade/new_subscription.ui.h:13 msgid "Convert _using:" msgstr "Bihurtu _honekin:" #: ../glade/liferea.ui.h:30 -msgid "" -"The cache setting controls if the contents of feeds are saved when Liferea " -"exits. Marked items are always saved to the cache." -msgstr "" -"Iturrien edukia gordeko diren Liferea amaitzean kontrolatzen du cachearen " -"ezarpenak. Markatutako elementuak beti gordetzen dira cachean." +msgid "The cache setting controls if the contents of feeds are saved when Liferea exits. Marked items are always saved to the cache." +msgstr "Iturrien edukia gordeko diren Liferea amaitzean kontrolatzen du cachearen ezarpenak. Markatutako elementuak beti gordetzen dira cachean." #: ../glade/liferea.ui.h:31 msgid "_Default cache settings" @@ -1787,9 +1700,7 @@ #: ../glade/liferea.ui.h:42 msgid "Auto-_load item link in configured browser when selecting articles." -msgstr "" -"_Kargatu automatikoki esteka konfiguratutako web arakatzailean artikuluak " -"hautatzean." +msgstr "_Kargatu automatikoki esteka konfiguratutako web arakatzailean artikuluak hautatzean." #: ../glade/liferea.ui.h:43 msgid "Ignore _comment feeds for this subscription." @@ -1801,8 +1712,7 @@ #: ../glade/liferea.ui.h:45 msgid "_Never do popup notification for this subscription." -msgstr "" -"_Ez erakutsi inoiz notifikazio elkarrizketa-koadrorik harpidetza honentzat." +msgstr "_Ez erakutsi inoiz notifikazio elkarrizketa-koadrorik harpidetza honentzat." #: ../glade/liferea.ui.h:46 msgid "_Mark downloaded items as read." @@ -1813,479 +1723,493 @@ msgstr "Aurreratua" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Liferea hobespenak" +msgid "New Folder" +msgstr "Karpeta berria" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "Jarioen katxe kudeatzailea" +msgid "_Folder name:" +msgstr "_Karpeta-izena:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Iturrien elementu _kopuru lehenetsia gordetzeko:" +msgid "Rename" +msgstr "Izena aldatu" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "Jarioen eguneraketa ezarpenak" +msgid "_New Name:" +msgstr "Izen berria:" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "_Eguneratu harpidetza guztiak abiaraztean." +msgid "Search Folder Properties" +msgstr "Bilaketa karpetaren propietateak" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Iturria freskatzeko _bitarte lehenetsia:" +msgid "Search _Name:" +msgstr "Bilatu _izena:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "Filatu ondorengo irizpideak betetzen dituzten elementuak" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"Oharra: gogoratu zentzuzko bitartea ezartzea freskatzeko. Normalean " -"jarioak orduro baino maizago freskatzea banda-zabalareren alferrikako " -"kontsumoa izaten da." +msgid "A_ny Rule Matches" +msgstr "Edozei_n arau betetzean" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Iturriak" +msgid "_All Rules Must Match" +msgstr "_Arau guztiak bete behar dira" #: ../glade/liferea.ui.h:57 -msgid "Folder Display Settings" -msgstr "Karpeten bistaratzearen ezarpenak" +msgid "Open Enclosure" +msgstr "Ireki eranskina" #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "_Erakutsi iturri ume guztien elementuak karpeta bat hautatzean." +msgid "Open an enclosure of type:" +msgstr "Mota honetako eranskina ireki:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "_Ezkutatu irakurritako elementuak." +msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. The enclosures URL will be supplied as an argument for this command:" +msgstr "Zer egin beharko luke Lifereak eranskin honekin? Sartu behean exekutatatzea nahi duzun komandoa. Eranskinen URLa argumentu gisa pasatuko zaio komando honi:" #: ../glade/liferea.ui.h:60 -msgid "Feed Icons (Favicons)" -msgstr "Iturrien ikonoak (Favicon)" +msgid "_Browse" +msgstr "_Arakatu" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_Eguneratu ikono guztiak orain" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "_Egin hau honelako eranskin guztientzat hemendik aurrera." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Karpetak" +msgid "Search All Feeds" +msgstr "Bilatu iturri denak" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" -msgstr "Goiburuak irakurtzen" +msgid "_Search for:" +msgstr "_Bilatu:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "_Aurreratu artikuluetan honekin:" +msgid "Enter a search string Liferea should find either in a items title or in its content." +msgstr "Sartu bilaketako testua Lifereak elementuen tituluen artean edo beraien edukien artean bilatzeko." #: ../glade/liferea.ui.h:65 -msgid "Web Integration" -msgstr "Web integrazioa" +msgid "_Advanced..." +msgstr "_Aurreratua..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Bidali laster-markak honi" +msgid "Starts searching for the specified text in all feeds. The search result will appear in the item list." +msgstr "Hasi emandako testuaren bilaketa iturri guztietan. Emaitza elementuen zerrendan agertuko da." #: ../glade/liferea.ui.h:67 -msgid "Internal Browser Settings" -msgstr "Barneko arakatzailearen ezarpenak" +msgid "Update Monitor" +msgstr "Eguneraketaren monitorea" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Ireki estekak Liferea-ren _leihoan." +msgid "Pending Requests" +msgstr "Falta diren eskaerak" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Desgaitu Javascript." +msgid "Downloading Now" +msgstr "Deskargatzen" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "_Gaitu arakatzailearen plugin-ak." +msgid "Cancel _All" +msgstr "_Utzi dena" #: ../glade/liferea.ui.h:71 -msgid "External Browser Settings" -msgstr "Kanpoko arakatzailearen ezarpenak" +msgid "Create News Bin" +msgstr "Sortu 'Albisteen erretilua'" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "_Ireki esteka:" +msgid "_News Bin Name:" +msgstr "_Albisteen erretiluaren izena:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Honi buruz" #: ../glade/liferea.ui.h:74 -#, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" -msgstr "" -"_Eskuz:\n" -"(%s - URL)" +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea albisteen biltzailea da 'GTK+'entzako" + +#: ../glade/liferea.ui.h:75 +msgid "Liferea Homepage" +msgstr "Liferea-ren orria" #: ../glade/liferea.ui.h:76 +msgid "Advanced Search" +msgstr "Bilaketa aurreratua" + +#: ../glade/liferea.ui.h:77 +msgid "_Search Folder..." +msgstr "_Bilatu karpeta..." + +#: ../glade/liferea.ui.h:78 +msgid "Create Search Engine Feed" +msgstr "Sortu bilaketaren iturri-motorra" + +#: ../glade/liferea.ui.h:79 +msgid "enter any search string you want" +msgstr "sartu edozein kate bilatzeko" + +#: ../glade/liferea.ui.h:80 +msgid "Maximal _Number Of Result Items:" +msgstr "Emaitzen kopuru _maximoa:" + +#: ../glade/liferea.ui.h:81 +msgid "Note: Liferea will generate a feed subscription which is used to query the search engine results for the specified search string. You can keep this feed permanently and update it like any other subscription." +msgstr "Oharra: Lifereak iturri bat sortuko du, bilaketako emaitzak konstultatzeko erabil daitekeena adierazitako bilaketa mezuarekin kontsultatua. Iturri hau betirako gorde eta beste edozein iturri bezala egunera dezakezu." + +#: ../glade/new_subscription.ui.h:9 +msgid "Download / Postprocessing" +msgstr "Deskarga / Ondorengo prozesatzea" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Iturburuaren hautapena" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Hautatu iturburu mota gehitzeko..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Gehitu OPML/Planet" + +#: ../glade/opml_source.ui.h:2 +msgid "Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "Baliozko OPML iturrien zerrendara zuzentzen duen fitxategi lokala edo URLa eman." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Kokalekua" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "_Hautatu fitxategia" + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "Gehitu Tiny Tiny RSS kontua" + +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "Sartu zure tt-rss kontuaren ezarpenak." + +#: ../glade/ttrss_source.ui.h:3 +msgid "_Server URL" +msgstr "_Zerbitzariaren URLa" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "_Erabiltzaile-izena" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Aurreratua..." + +#: ../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 "Sartu web gunearen helbidea iturrien aurkikuntza automatikoa erabiltzeko, edo jakinez gero iturriaren helbide zuzena erabiltzeko." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Liferea hobespenak" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Jarioen katxe kudeatzailea" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Iturrien elementu _kopuru lehenetsia gordetzeko:" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Jarioen eguneraketa ezarpenak" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "_Eguneratu harpidetza guztiak abiaraztean." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Iturria freskatzeko _bitarte lehenetsia:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "Note: Please remember to set a reasonable refresh time. Usually it is a waste of bandwidth to poll feeds more often than each hour." +msgstr "Oharra: gogoratu zentzuzko bitartea ezartzea freskatzeko. Normalean jarioak orduro baino maizago freskatzea banda-zabalareren alferrikako kontsumoa izaten da." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Iturriak" + +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Karpeten bistaratzearen ezarpenak" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "_Erakutsi iturri ume guztien elementuak karpeta bat hautatzean." + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "_Ezkutatu irakurritako elementuak." + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Iturrien ikonoak (Favicon)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Eguneratu ikono guztiak orain" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Karpetak" + +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Goiburuak irakurtzen" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "_Aurreratu artikuluetan honekin:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "Lehenetsitako ikuspegia: " + +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Web integrazioa" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Bidali laster-markak honi" + +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Barneko arakatzailearen ezarpenak" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Ireki estekak Liferea-ren _leihoan." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Desgaitu Javascript." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "_Gaitu arakatzailearen plugin-ak." + +#: ../glade/prefs.ui.h:26 +msgid "External Browser Settings" +msgstr "Kanpoko arakatzailearen ezarpenak" + +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "_Ireki esteka:" + +#: ../glade/prefs.ui.h:28 +msgid "_Manual:" +msgstr "_Eskuz:" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "(%s helbiderako)" + +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Arakatzailea:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Arakatzailea" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 msgid "Notification Settings" msgstr "Jakinarazpenen ezarpenak" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Erakutsi _laster-leihoa goiburu berriekin." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "Erakutsi egoerako _ikonoa jakinarazpen arean (sistemako erretilua)." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Erakutsi elementu berrien kopurua erretiluko ikonoan." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Amaitu, erretiluko ikonora minimizatu ordez." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "_Abiarazi erretiluko ikono bezala" -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 msgid "Toolbar Settings" msgstr "Tresna-barraren ezarpenak" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "_Ezkutatu tresna-barra." -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Tresna-barraren botoien etiketak:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "HTTP Proxy Zerbitzaria" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "_Automatikoki atzeman (GNOME edo ingurunea)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "P_roxy gabe" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "_Eskuzko ezarpena:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "Proxy-_ataka:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "Proxy-_ostalaria:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Erabili proxy au_tentifikazioa" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "Proxy _pasahitza:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "Proxy _erabiltzaile-izena:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxy-a" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 msgid "Downloading Enclosures" msgstr "Eranskina deskargatzeko" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Arakatu" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Gorde deskargak hemen:" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Deskargatu honekin" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 msgid "Opening Enclosures" msgstr "Eranskinak irekitzeko" -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Eranskinak" -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "Inguruko makinekin sinkronizatuta" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_Gaitu sare lokaleko sinkronizazioa" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "_Zerbitzu izena" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Sinkronizatu" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Karpeta berria" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Karpeta-izena:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Izena aldatu" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "Izen berria:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Bilaketa karpetaren propietateak" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "Bilatu _izena:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "Filatu ondorengo irizpideak betetzen dituzten elementuak" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "Edozei_n arau betetzean" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "_Arau guztiak bete behar dira" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Eranskina deskargatzen" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Mota honetako eranskina deskargatzen:" - -#: ../glade/liferea.ui.h:120 -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 "" -"Zer egin beharko luke Lifereak eranskin honekin? Sartu behean exekutatatzea " -"nahi duzun komandoa. Deskargatutako fitxategia argumentu gisa pasatuko zaio " -"komando honi:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Pasa URLa eta ez deskargatu eranskina." - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "_Egin hau honelako eranskin guztientzat hemendik aurrera." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Bilatu iturri denak" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Bilatu:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Sartu bilaketako testua Lifereak elementuen tituluen artean edo beraien " -"edukien artean bilatzeko." - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "_Aurreratua..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Hasi emandako testuaren bilaketa iturri guztietan. Emaitza elementuen " -"zerrendan agertuko da." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Eguneraketaren monitorea" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "Falta diren eskaerak" - -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "Deskargatzen" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "_Utzi dena" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Sortu 'Albisteen erretilua'" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Albisteen erretiluaren izena:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Honi buruz" - -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea albisteen biltzailea da 'GTK+'entzako" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" +msgstr "Pluginak" -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Liferea-ren orria" +#~ msgid "" +#~ "Copyright (c) 2003-2012\n" +#~ "The Liferea Team\n" +#~ msgstr "" +#~ "Copyright (c) 2003-2013\n" +#~ "Liferea taldea\n" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Bilaketa aurreratua" +#~ msgid "Download and view feeds" +#~ msgstr "Deskargatu eta ikusi iturriak" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "_Bilatu karpeta..." +#~ msgid "You may want to validate the feed using" +#~ msgstr "Iturria balioztatu nahi baduzu erabili" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Sortu bilaketaren iturri-motorra" +#~ msgid "bookmark" +#~ msgstr "laster-marka" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "sartu edozein kate bilatzeko" +#~ msgid "comments" +#~ msgstr "iruzkinak" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Emaitzen kopuru _maximoa:" +#~ msgid "flag" +#~ msgstr "bandera" -#: ../glade/liferea.ui.h:145 -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 "" -"Oharra: Lifereak iturri bat sortuko du, bilaketako emaitzak konstultatzeko " -"erabil daitekeena adierazitako bilaketa mezuarekin kontsultatua. Iturri hau " -"betirako gorde eta beste edozein iturri bezala egunera dezakezu." +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Eranskina deskargatzeak huts egin du: \"%s\"" -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" -msgstr "Deskarga / Ondorengo prozesatzea" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Amaitu da eranskina deskargatzea: \"%s\"" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Iturburuaren hautapena" +#~ 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 "Liferea-ren bertsio honek cache formatu berria darabil eta zure cache bertsio berrira migratu du. %s-(e)-n aurkitzen den cache edukia ez da automatikoki ezabatu. Ezabatu direktorio hau eskuz migrazioa ongi burutu dela ziurtatzean." -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Hautatu iturburu mota gehitzeko..." +#~ msgid "Jumps to the next unread item. If necessary selects the next feed with unread items." +#~ msgstr "Joan hurrengo irakurri gabeko elementua. Beharrezkoa izanez gero, irakurri gabeko elementuak dituen hurrengo iturria hautatuko du." -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Gehitu OPML/Planet" +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Deskargak huts egin du: \"%s\"" -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Baliozko OPML iturrien zerrendara zuzentzen duen fitxategi lokala edo URLa " -"eman." +#~ msgid "Download finished." +#~ msgstr "Deskarga burututa." -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Kokalekua" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Ireki elementua _fitxa batean" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "_Hautatu fitxategia" +#~ msgid "_Launch Item In Browser" +#~ msgstr "_Ireki elementua arakatzaile batean" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "Gehitu Tiny Tiny RSS kontua" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Kopiatu elementuaren _URLa arbelean" -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "Sartu zure tt-rss kontuaren ezarpenak." +#~ msgid "Choose download directory" +#~ msgstr "Aukeratu deskargatzeko direktorioa" -#: ../glade/ttrss_source.ui.h:3 -msgid "_Server URL" -msgstr "_Zerbitzariaren URLa" +#~ msgid "Liferea Sync %s@%s" +#~ msgstr "Liferea Sync %s@%s" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "_Erabiltzaile-izena" +#~ msgid "Downloading Enclosure" +#~ msgstr "Eranskina deskargatzen" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Sartu web gunearen helbidea iturrien aurkikuntza automatikoa erabiltzeko, " -"edo jakinez gero iturriaren helbide zuzena erabiltzeko." +#~ msgid "Sync" +#~ msgstr "Sinkronizatu" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Aurreratua..." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Inguruko makinekin sinkronizatuta" -#~ msgid "You may want to validate the feed using" -#~ msgstr "Iturria balioztatu nahi baduzu erabili" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "_Gaitu sare lokaleko sinkronizazioa" #~ msgid "" -#~ "Jumps to the next unread item. If necessary selects the next feed with " -#~ "unread items." +#~ "_Manual:\n" +#~ "(%s for URL)" #~ msgstr "" -#~ "Joan hurrengo irakurri gabeko elementua. Beharrezkoa izanez gero, " -#~ "irakurri gabeko elementuak dituen hurrengo iturria hautatuko du." +#~ "_Eskuz:\n" +#~ "(%s - URL)" -#~ msgid "Liferea Sync %s@%s" -#~ msgstr "Liferea Sync %s@%s" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "_Pasa URLa eta ez deskargatu eranskina." + +#~ msgid "_Save downloads in" +#~ msgstr "_Gorde deskargak hemen:" + +#~ msgid "_Service Name" +#~ msgstr "_Zerbitzu izena" #, fuzzy #~ msgid "Print debugging messages for the plugin loading" @@ -2337,16 +2261,8 @@ #~ msgstr[0] "\"%2$s\" bilaketaren emaitzak: %1$d" #~ msgstr[1] "\"%2$s\" bilaketaren emaitzak: %1$d" -#~ 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 "" -#~ "Elementuen zerrendak bilaketako ereduarekin bat datozen elementu guztiak " -#~ "ditu. Bilaketaren emaitza gordetzea nahi izanez gero egin klik " -#~ "bilaketaren elkarrizketa-koadroko \"Bilaketaren karpeta\" botoian eta " -#~ "Liferea-k bilaketaren karpeta bat gehituko dio iturrien zerrendari." +#~ 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 "Elementuen zerrendak bilaketako ereduarekin bat datozen elementu guztiak ditu. Bilaketaren emaitza gordetzea nahi izanez gero egin klik bilaketaren elkarrizketa-koadroko \"Bilaketaren karpeta\" botoian eta Liferea-k bilaketaren karpeta bat gehituko dio iturrien zerrendari." #, fuzzy #~ msgid "Count" @@ -2428,13 +2344,8 @@ #~ msgid "Bloglines" #~ msgstr "Bloglines" -#~ 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 "" -#~ "Integratu zure Bloglines kontuko iturrien zerrenda. Liferea-k zure " -#~ "Bloglines harpidetzak bistaratuko ditu irakur soileko azpizuhaitz gisa " -#~ "iturrien zerrendan." +#~ 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 "Integratu zure Bloglines kontuko iturrien zerrenda. Liferea-k zure Bloglines harpidetzak bistaratuko ditu irakur soileko azpizuhaitz gisa iturrien zerrendan." #~ msgid "feedlist.opml" #~ msgstr "feedlist_eu.opml" @@ -2467,12 +2378,8 @@ #~ msgid "text/plain" #~ msgstr "testua/laua" -#~ msgid "" -#~ "This option can cause significant delays when loading folders " -#~ "containing many feeds." -#~ msgstr "" -#~ "Aukera honek atzerapena sor dezake hainbat iturri dituzten karpetak " -#~ "kargatzean." +#~ msgid "This option can cause significant delays when loading folders containing many feeds." +#~ msgstr "Aukera honek atzerapena sor dezake hainbat iturri dituzten karpetak kargatzean." #~ msgid "Downloading Enclosures" #~ msgstr "Eranskinen deskarga" @@ -2596,8 +2503,7 @@ #~ msgstr " --mainwindow-state=EGOERA" #~ msgid " Start Liferea with its main window in STATE." -#~ msgstr "" -#~ " Abiatu Liferea bere leiho nagusia EGOERAn dagoela." +#~ msgstr " Abiatu Liferea bere leiho nagusia EGOERAn dagoela." #~ msgid "The --mainwindow-state argument must be given a parameter.\n" #~ msgstr "--mainwindow-state argumentuak parametro bat eman behar du.\n" @@ -2618,9 +2524,7 @@ #~ msgstr "elementu." #~ msgid "Feed link auto discovery failed! No feed links found!" -#~ msgstr "" -#~ "Iturrien esteken aurkikuntza automatikoak huts egin du. Ez da iturrien " -#~ "estekarik aurkitu." +#~ msgstr "Iturrien esteken aurkikuntza automatikoak huts egin du. Ez da iturrien estekarik aurkitu." #~ msgid "Could not download \"%s\". Will retry in %d seconds." #~ msgstr "Ezin izan da \"%s\" deskargatu. Saiatu berriro %d segundo barru." @@ -2637,19 +2541,11 @@ #~ msgid "Show _Toolbar Only" #~ msgstr "Erakutsi _tresna-barra soilik" -#~ msgid "" -#~ "Unexpected end of character sequence or corrupt UTF-8 encoding! Some " -#~ "characters were dropped!" -#~ msgstr "" -#~ "Ustegabeko karaktere sekuentziaren amaiera, edo hondatutako UTF-8 " -#~ "kodeketa. Karaktere batzuk jaregin egin dira" +#~ msgid "Unexpected end of character sequence or corrupt UTF-8 encoding! Some characters were dropped!" +#~ msgstr "Ustegabeko karaktere sekuentziaren amaiera, edo hondatutako UTF-8 kodeketa. Karaktere batzuk jaregin egin dira" -#~ msgid "" -#~ "Sorry, I was not able to load any installed browser plugin! Try the --" -#~ "debug-plugins option to get debug information!" -#~ msgstr "" -#~ "Ezin izan da instalatutako arakatzaileen plugin-ik kargatu. Saiatu --" -#~ "debug-plugins aukerarekin arazketari buruzko informazioa lortzeko." +#~ msgid "Sorry, I was not able to load any installed browser plugin! Try the --debug-plugins option to get debug information!" +#~ msgstr "Ezin izan da instalatutako arakatzaileen plugin-ik kargatu. Saiatu --debug-plugins aukerarekin arazketari buruzko informazioa lortzeko." #~ msgid "This item does not have a link assigned!" #~ msgstr "Elementuak ez du estekarik esleituta." @@ -2669,10 +2565,8 @@ #~ msgid "/_Show|Hide Window" #~ msgstr "/_Erakutsi|Ezkutatu leihoa" -#~ msgid "" -#~ "Saves this search as a search folder, which will appear in the feed list." -#~ msgstr "" -#~ "Gorde bilaketa hau bilaketaren karpetan, iturrien zerrendan agertuko da." +#~ msgid "Saves this search as a search folder, which will appear in the feed list." +#~ msgstr "Gorde bilaketa hau bilaketaren karpetan, iturrien zerrendan agertuko da." #~ msgid "search" #~ msgstr "bilatu" @@ -2684,16 +2578,13 @@ #~ msgstr "ez dator bat" #~ msgid "Updates all subscriptions. This does not update OCS directories." -#~ msgstr "" -#~ "Harpidetza guztiak eguneratzen ditu. Honek ez ditu OCS direktorioak " -#~ "eguneratzen." +#~ msgstr "Harpidetza guztiak eguneratzen ditu. Honek ez ditu OCS direktorioak eguneratzen." #~ msgid "Rule" #~ msgstr "Araua" #~ msgid "Liferea Homepage" -#~ msgstr "" -#~ " Liferea-ren gune nagusia" +#~ msgstr " Liferea-ren gune nagusia" #~ msgid "" #~ "Code, Patches, Debugging\n" @@ -2798,9 +2689,7 @@ #~ 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." -#~ msgstr "" -#~ "Oharra: elementuak bilaketako karpetan gehituko dira arau batekin bat " -#~ "etorriz gero. Kendu egingo dira bat datorren araua ezabatzean." +#~ msgstr "Oharra: elementuak bilaketako karpetan gehituko dira arau batekin bat etorriz gero. Kendu egingo dira bat datorren araua ezabatzean." #~ msgid "Translation" #~ msgstr "Itzultpena" @@ -2830,8 +2719,7 @@ #~ msgstr "Urruneko ostalaria baliogabeko erantzuna bidali du" #~ msgid "Webserver's authentication method incompatible with Liferea" -#~ msgstr "" -#~ "Web zerbitzariaren autentifikazio metodoa ez dator bat Liferea-rekin" +#~ msgstr "Web zerbitzariaren autentifikazio metodoa ez dator bat Liferea-rekin" #~ msgid "_Program" #~ msgstr "_Programa" @@ -2845,23 +2733,14 @@ #~ msgid "_Delete Selected" #~ msgstr "_Ezabatu hautatutakoa" -#~ msgid "" -#~ "Error while reading cache file \"%s\" ! Cache file could not be loaded!" -#~ msgstr "" -#~ "Errorea cacheko \"%s\" fitxategia irakurtzean! Cacheko fitxategia ezin " -#~ "izan da kargatu." +#~ msgid "Error while reading cache file \"%s\" ! Cache file could not be loaded!" +#~ msgstr "Errorea cacheko \"%s\" fitxategia irakurtzean! Cacheko fitxategia ezin izan da kargatu." -#~ msgid "" -#~ "

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

    " -#~ msgstr "" -#~ "

    XML errorea cacheko fitxategia analizatzean! Cacheko \"%s\" iturri-" -#~ "fitxategia ezin izan da kargatu.

    " +#~ msgid "

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

    " +#~ msgstr "

    XML errorea cacheko fitxategia analizatzean! Cacheko \"%s\" iturri-fitxategia ezin izan da kargatu.

    " #~ msgid "

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

    " -#~ msgstr "" -#~ "

    \"%s\" ez da baliozko cache fitxategia! Ezin da cacheko fitxategia " -#~ "irakurri.

    " +#~ msgstr "

    \"%s\" ez da baliozko cache fitxategia! Ezin da cacheko fitxategia irakurri.

    " #~ msgid "There were errors while parsing cache file \"%s\"" #~ msgstr "Erroreak gertatu dira cacheko \"%s\" fitxategia analizatzean" @@ -2881,23 +2760,14 @@ #~ msgid "Please restart Liferea for changes to take effect." #~ msgstr "Berrabiarazi Liferea aldaketak eragina izateko. " -#~ msgid "" -#~ "Liferea reuses the GNOME proxy settings. If you use GNOME you can " -#~ "change these settings in the GNOME Control Center." -#~ msgstr "" -#~ "Lifereak GNOMEren proxy ezarpenak berrerabiltzen ditu. GNOME " -#~ "erabiltzen baduzu, ezarpen hauek alda ditzakezu GNOMEren kontrol-zentroan." -#~ "" +#~ msgid "Liferea reuses the GNOME proxy settings. If you use GNOME you can change these settings in the GNOME Control Center." +#~ msgstr "Lifereak GNOMEren proxy ezarpenak berrerabiltzen ditu. GNOME erabiltzen baduzu, ezarpen hauek alda ditzakezu GNOMEren kontrol-zentroan." #~ msgid "_Enable Proxy" #~ msgstr "_Gaitu proxy-a" -#~ msgid "" -#~ " --debug-html Enable HTML debugging (saving to ~/.liferea_1.2/output." -#~ "xhtml)" -#~ msgstr "" -#~ " --debug-html Gaitu HTML arazketa ( ~/.liferea_1.2/output.xhtml " -#~ "fitxategian gorde)" +#~ msgid " --debug-html Enable HTML debugging (saving to ~/.liferea_1.2/output.xhtml)" +#~ msgstr " --debug-html Gaitu HTML arazketa ( ~/.liferea_1.2/output.xhtml fitxategian gorde)" #~ msgid " --debug-plugins Print debugging messages when loading plugins" #~ msgstr " --debug-plugins Bistaratu arazketa mezuak plugin-ak kargatzean" diff -Nru liferea-1.8.15/po/fi.po liferea-1.10.3/po/fi.po --- liferea-1.8.15/po/fi.po 2013-06-24 22:16:15.000000000 +0200 +++ liferea-1.10.3/po/fi.po 2013-07-31 23:29:12.000000000 +0200 @@ -1,5 +1,5 @@ # Finnish messages for liferea. -# Copyright © 2010 Free Software Foundation, Inc. +# Copyright © 2010, 2013 Free Software Foundation, Inc. # This file is distributed under the same license as the liferea package. # # Note: we set @@ -9,14 +9,14 @@ # enclosure = liitetiedosto # # Pauli Virtanen , 2004-2005. -# Jorma Karvonen , 2010, 2012. +# Jorma Karvonen , 2010, 2012-2013. # msgid "" msgstr "" -"Project-Id-Version: liferea 1.8-rc1\n" +"Project-Id-Version: liferea 1.10-rc3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" -"PO-Revision-Date: 2012-09-03 01:47+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" +"PO-Revision-Date: 2013-06-10 17:44+0200\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -24,10 +24,9 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Poedit 1.5.4\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -40,24 +39,16 @@ msgstr "Liferea syötteenlukija" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Lataa ja katso syötteitä" +msgid "Read news feeds and blogs" +msgstr "Lue uutissyötteitä ja blogeja" #: ../xslt/feed.xml.in.h:1 -msgid "" -"This feed is discontinued. It's no longer available. Liferea won't update it " -"anymore but you can still access the cached headlines." -msgstr "" -"Tämä syöte on lakkautettu, ja ei enää saatavilla. Liferea ei enää päivitä " -"sitä, mutta voit yhä lukea välimuistissa olevia otsikoita." +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 "Tämä syöte on lakkautettu, ja ei enää saatavilla. Liferea ei enää päivitä sitä, mutta voit yhä lukea välimuistissa olevia otsikoita." #: ../xslt/feed.xml.in.h:2 -msgid "" -"The last update of this subscription failed!
    HTTP error code : " -msgstr "" -"Tämän julkaisun viimeinen päivitys epäonnistui!
    HTTP-virhekoodi : " +msgid "The last update of this subscription failed!
    HTTP error code : " +msgstr "Tämän julkaisun viimeinen päivitys epäonnistui!
    HTTP-virhekoodi : " #: ../xslt/feed.xml.in.h:3 msgid "There were errors while parsing this feed!" @@ -73,7 +64,7 @@ #: ../xslt/feed.xml.in.h:6 msgid "You may want to contact the author/webmaster of the feed about this!" -msgstr "" +msgstr "Haluat ehkä ottaa yhteyttä uutissyötteen kirjoittajaan/webbiylläpitäjään tästä asiasta!" #: ../xslt/feed.xml.in.h:7 msgid "There were errors while filtering this feed!" @@ -149,38 +140,26 @@ msgstr "Kirjoittaja" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "lippu" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "kirjanmerkki" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "kommentit" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Ei vielä kommentteja." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Kommentit" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Päivitetään..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Verestä" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Lohko" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Osasto" @@ -189,12 +168,8 @@ msgstr "Uusi kori:" #: ../xslt/newsbin.xml.in.h:2 -msgid "" -"Add items to this news bin by selecting \"Copy to News Bin\" from the item " -"list context menu." -msgstr "" -"Lisää kohteita tähän uutiskoriin valitsemalla ”Kopioi uutiskoriin” " -"asiayhteysvalikon luetteloriviltä." +msgid "Add items to this news bin by selecting \"Copy to News Bin\" from the item list context menu." +msgstr "Lisää kohteita tähän uutiskoriin valitsemalla ”Kopioi uutiskoriin” asiayhteysvalikon luetteloriviltä." #: ../xslt/vfolder.xml.in.h:1 msgid "Search Folder:" @@ -204,12 +179,12 @@ msgid "Default Browser" msgstr "Oletusselain" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Selainkomento epäonnistui: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Käynnistetään: ”%s”" @@ -219,7 +194,7 @@ msgid "Authorization Error" msgstr "Käyttövaltuutusvirhe" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Ei voida luoda välimuistihakemistoa ”%s”!" @@ -249,87 +224,85 @@ msgid "%b %d %Y" msgstr "%d. %b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "”%s” ei ole kelvollinen liitetyyppinen asetustiedosto!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Liitteen lataaminen EPÄONNISTUI: ”%s”" +#: ../src/enclosure.c:288 +msgid "You have not configured a download tool yet! Please do so in the 'Download' tab in Tools/Preferences." +msgstr "Et ole vielä asettanut lataustyökalua! Tee niin Työkalut/Asetukset-valikon ’Lataus’-välilehdessä." -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Liitteen lataaminen päättyi: ”%s”" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check wether the configured download tool is installed and working correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" +"Komento epäonnistui: \n" +"\n" +"%s\n" +"\n" +" Tarkista, että onko asetuksissa määritelty lataustyökalu asennettu ja toimiiko se oikein! Voit vaihtaa sen Työkalut/Asetukset-valikon ’Lataus’-välilehdessä." -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Tiedoston ”%s” nimen vaihtaminen tiedostoksi ”%s” ei onnistunut.\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "XML-virhe luetaessa OPML-tiedostoa!. Ei voitu tuoda kohdetta ”%s”!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format -msgid "" -"Empty document! OPML document \"%s\" should not be empty when importing." -msgstr "" -"Tyhjä asiakirja. OPML-asiakirjan ”%s” ei tulisi olla tyhjä, kun se tuodaan." +msgid "Empty document! OPML document \"%s\" should not be empty when importing." +msgstr "Tyhjä asiakirja. OPML-asiakirjan ”%s” ei tulisi olla tyhjä, kun se tuodaan." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" -msgstr "" -"”%s” ei ole kelvollinen OPML-asiakirja. Liferea ei voi käsitellä tätä " -"tiedostoa." +msgstr "”%s” ei ole kelvollinen OPML-asiakirja. Liferea ei voi käsitellä tätä tiedostoa." -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Tuotu syöteluettelo" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Tuo syöteluettelo" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Tuo" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 msgid "OPML Files" msgstr "OPML-tiedostot" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Virhe syöteluettelon viemisessä!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Syöteluettelo viety!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Vie syöteluettelo" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Vie" #: ../src/feed.c:255 -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 "" -"

    Ei voitu tunnistaa tämän syötteen tyyppiä! Tarkista, että lähde todella " -"osoittaa resurssiin, joka tarjotaan yhdessä tuetuista syndikaattimuodoissa!XML-jäsennintuloste:

    " +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 "

    Ei voitu tunnistaa tämän syötteen tyyppiä! Tarkista, että lähde todella osoittaa resurssiin, joka tarjotaan yhdessä tuetuista syndikaattimuodoissa!

    XML-jäsennintuloste:
    " #: ../src/feed.c:284 #, c-format @@ -342,14 +315,8 @@ msgstr "”%s” ei ole käytettävissä" #: ../src/feed_parser.c:137 -msgid "" -"The URL you want Liferea to subscribe to points to a webpage and the auto " -"discovery found no feeds on this page. Maybe this webpage just does not " -"support feed auto discovery." -msgstr "" -"Verkko-osoite, jota haluat Liferea-ohjelman tilaavan, osoittaa webbisivuun " -"ja automaattitunnistus ei löytänyt tältä sivulta syötettä. Ehkä tämä sivu ei " -"vain tue syötteen automaattista havaitsemista." +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 "Verkko-osoite, jota haluat Liferea-ohjelman tilaavan, osoittaa webbisivuun ja automaattitunnistus ei löytänyt tältä sivulta syötettä. Ehkä tämä sivu ei vain tue syötteen automaattista havaitsemista." #: ../src/feed_parser.c:170 #, c-format @@ -373,116 +340,93 @@ msgstr "Ei voitu määritellä syötetyyppiä." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "Lukemattomia otsikkoja ei ole" -#: ../src/main.c:175 -msgid "" -"Start Liferea with its main window in STATE. STATE may be `shown', " -"`iconified', or `hidden'" -msgstr "" -"Käynnistä Liferea pääikkunassaan TILAssa. TILA voi olla ”shown”, " -"”iconified”, tai ”hidden”" +#: ../src/main.c:164 +msgid "Start Liferea with its main window in STATE. STATE may be `shown', `iconified', or `hidden'" +msgstr "Käynnistä Liferea pääikkunassaan TILAssa. TILA voi olla ”shown”, ”iconified”, tai ”hidden”" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "TILA" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Näytä versiotiedot ja poistu" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "Add a new subscription" msgstr "Lisää uusi syöte" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "internet-resurssin tunnus" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Tulosta kaikentyyppisiä vianjäljitysviestejä" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "Tulosta vianjäljitusviestit välimuistikäsittelylle" -#: ../src/main.c:187 +#: ../src/main.c:173 msgid "Print debugging messages for the configuration handling" msgstr "Tulosta asetuskäsittelyn vianjäljitysviestit" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "Tulosta tietokantakäsittelyn vianjäljitysviestit" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "Tulosta graafisten käyttöliittymäfunktioiden vianjäljitusviestit" -#: ../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.8/output.xhtml" -msgstr "" -"Ota käyttöön HTML-renderoinnin vianjäljityksen. Joka kerta kun Liferea " -"renderoi HTML-tulosteen, se vedostaa myös tuotetun HTML-koodin tiedostoon ~/." -"liferea_1.8/output.xhtml" +#: ../src/main.c:176 +msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.cache/liferea/output.xhtml" +msgstr "Ottaa käyttöön HTML-renderoinnin vianjäljityksen. Joka kerta kun Liferea renderoi HTML-tulosteen, se vedostaa myös tuotetun HTML-koodin tiedostoon ~/.cache/liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "Tulosta kaikki verkkotoimintojen vianjäljitysviestit" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "Tulosta jäsennysfunktioiden vianjäljitysviestit" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" -msgstr "" -"Tulosta vianjäljitysviestit, kun funktion prosessointi kestää liian pitkään" +msgstr "Tulosta vianjäljitysviestit, kun funktion prosessointi kestää liian pitkään" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Tulosta vianjäljitysviestejä funktioiden alussa ja lopussa" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "Tulosta vianjäljitysviestejä syötepäivitysten käsittelystä" -#: ../src/main.c:196 +#: ../src/main.c:182 msgid "Print debugging messages of the search folder matching" msgstr "Tulosta hakukansiotäsmäyksen vianjäljitusviestit" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Tulosta laajoja vianjäljitysviestejä" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "Tulosta vianjäljitysviestejä tietystä aiheesta" -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, Linux-syötelukija" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" -"Vieraile lisätietoja varten osoitteessa http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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 "" -"Tämä Liferea-versio käyttää uutta välimuistimuotoa ja on tuonut sinun " -"syötevälimuistisi. Välimuistisisältö kohteessa %s poistettiin " -"automaattisesti. Poista tämä hakemisto manuaalisesti sen jälkeen kun olet " -"varma, että tuonti onnistui!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Vieraile lisätietoja varten osoitteessa http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -506,8 +450,7 @@ msgstr "Yhteyden muodostaminen välityspalvelimeen epäonnistui" #: ../src/net.c:325 -msgid "" -"A network error occurred, or the other end closed the connection unexpectedly" +msgid "A network error occurred, or the other end closed the connection unexpectedly" msgstr "Tapahtui verkkovirhe, tai etäpää sulki yhteyden odottamatta" #. http 3xx redirection @@ -517,12 +460,8 @@ #. http 4xx client error #: ../src/net.c:331 -msgid "" -"You are unauthorized to download this feed. Please update your username and " -"password in the feed properties dialog box" -msgstr "" -"Tämän syötteen lukemiseen ei ole lupaa. Kirjoita oikea käyttäjätunnus ja " -"salasana syötteen ominaisuusikkunaan." +msgid "You are unauthorized to download this feed. Please update your username and password in the feed properties dialog box" +msgstr "Tämän syötteen lukemiseen ei ole lupaa. Kirjoita oikea käyttäjätunnus ja salasana syötteen ominaisuusikkunaan." #: ../src/net.c:333 msgid "Payment required" @@ -562,8 +501,7 @@ #: ../src/net.c:347 msgid "Feed not available: Server requested unsupported redirection!" -msgstr "" -"Syöte ei ole käytettävissä: palvelin vaati ei-tuettua uudelleenohjausta!" +msgstr "Syöte ei ole käytettävissä: palvelin vaati ei-tuettua uudelleenohjausta!" #: ../src/net.c:349 msgid "Client Error" @@ -651,72 +589,67 @@ msgid "Feed title" msgstr "Syötteen nimi" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Syöte ”%s” on jo päivitetty." -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, 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 "Syöte ”%s” on lakkautettu. Liferea ei päivitä sitä enää!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Päivitetään favicon-kuvake kohteelle ”%s”" -#: ../src/subscription.c:192 -msgid "" -"There was a problem while reading this subscription. Please check the URL " -"and console output." -msgstr "" -"Syötteen lukemisessa tapahtui virhe. Tarkista verkko-osoite ja " -"pääteikkunassa näkyvä tuloste." +#: ../src/subscription.c:193 +msgid "There was a problem while reading this subscription. Please check the URL and console output." +msgstr "Syötteen lukemisessa tapahtui virhe. Tarkista verkko-osoite ja pääteikkunassa näkyvä tuloste." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "Syötteen ”%s” verkko-osoite on muuttunut pysyvästi ja päivitetty" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "”%s” on lakkautettu. Liferea ei enää päivitä sitä!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "”%s” ei ole muuttunut viime kerrasta" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "”%s” päivittyy" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Virhe avattaessa tilapäistä tiedostoa %s suodatusta varten!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s sulkeutui, lopetuskoodi oli %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Virhe: putken ”%s” avaaminen ei onnistunut" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Virhe: tiedoston ”%s” avaaminen ei onnistunut" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Virhe: Tiedosto ”%s” ei ole olemassa" @@ -725,55 +658,53 @@ msgid "New Search Folder" msgstr "Uusi etsintäkansio" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Virheitä oli lisää. Tuloste typistettiin!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "XML-jäsenin: Asiakirjan jäsentäminen epäonnistui:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Liitteet" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d liite" -msgstr[1] "%d liitettä" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " tavua" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kilotavua" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "megatavua" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "gigatavua" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d liite" +msgstr[1] "%d liitettä" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Valitse tiedosto" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "Tiedostotarkennin .%s" @@ -783,372 +714,388 @@ msgid "Couldn't find pixmap file: %s" msgstr "Pixmap-kuvatiedostoa ei löytynyt: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d uusi)" msgstr[1] " (%d uutta)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d lukematon%s" msgstr[1] "%d lukematonta%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Opasteaiheet" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Pika-asetukset" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "UKK" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea on nyt yhteydessä verkkoon." -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Toimi yhteydettä" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea ei ole yhteydessä verkkoon." -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Toimi verkossa" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "Uu_det syötteet" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "_Päivitä kaikki" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Päivittää kaikki syötteet." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "_Merkitse kaikki luetuiksi" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Merkitsee kaikkien syötteiden kaikki uutiset luetuiksi." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Tuo syöteluettelo..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Tuo OPML-muotoisen syöteluettelon." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Vie syöteluettelo..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Vie OPML-muotoisen syöteluettelon." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Lopeta" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Syöte" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Poist_a kaikki otsikot" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Poistaa kaikki otsikot valitusta syötteestä." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_Otsikko" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "Edellinen otsikko" + +#: ../src/ui/liferea_shell.c:924 +msgid "Next Item" +msgstr "Seuraava otsikko" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "_Seuraava lukematon otsikko" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Näytä" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "_Kasvata tekstin kokoa" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Kasvattaa tekstin kokoa otsikkonäkymässä." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_Pienennä tekstin kokoa" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Pienentää tekstin kokoa otsikkonäkymässä." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "_Työkalut" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "_Päivitä valvonta" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "Näytä nykyisen päivitysjonon kaikkien syötteiden luettelo" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "As_etukset" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Muokkaa asetuksia." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "_Etsi" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Etsi kaikista syötteistä..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Näyttää tai piilottaa etsintälaatikon." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Ohje" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "Sisäl_tö" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Katso tämän sovelluksen opastetta." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Pikaviite" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Katso Liferea-pikanäppäinten luetteloa." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_UKK" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Katso tämän sovelluksen Usein Kysyttyjä Kysymyksiä." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "Lifereasta" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Näyttää tietoja Lifereasta." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "_Normaalinäkymä" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Aseta näkymätilaksi sähköpostiasiakastila." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "Le_veä näkymä" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Aseta näkymä käyttämään kolmea pystysuoraa paneelia." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "Näytä yh_distettynä" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Aseta näkymätilaksi kahden paneelin tila." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "P_iennenetty syöteluettelo" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Jos valittu, vain lukemattomia otsikoita sisältävät syötteet näkyvät." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "_Uusi syöte..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Lisää uuden syötteen syöteluetteloon." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Uu_si kansio..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Lisää kansion syöteluetteloon." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Uusi _etsintäkansio..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Lisää uuden etsintäkansion syöteluetteloon." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Uusi _lähde..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Lisää uuden syöteluettelolähteen." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "Uusi uutis_kori..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Lisää uuden uutiskorin." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "_Merkitse luetuksi" -#: ../src/ui/liferea_shell.c:911 -msgid "" -"Marks all items of the selected feed list node / in the item list as read." -msgstr "" -"Merkitse valittujen syötteiden tai valitun kansion sisältämien syötteiden " -"otsikot luetuiksi." +#: ../src/ui/liferea_shell.c:979 +msgid "Marks all items of the selected feed list node / in the item list as read." +msgstr "Merkitse valittujen syötteiden tai valitun kansion sisältämien syötteiden otsikot luetuiksi." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Päivitä" -#: ../src/ui/liferea_shell.c:913 -msgid "" -"Updates the selected subscription or all subscriptions of the selected " -"folder." -msgstr "" -"Päivittää kaikki valitut syötteet, tai valitun kansion kaikki syötteet." +#: ../src/ui/liferea_shell.c:981 +msgid "Updates the selected subscription or all subscriptions of the selected folder." +msgstr "Päivittää kaikki valitut syötteet, tai valitun kansion kaikki syötteet." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "_Ominaisuudet" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Avaa valitun syötteen ominaisuusikkunan." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "Po_ista" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Poistaa valitut syötteet." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Merkitse _luetuksi tai lukemattomaksi" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Merkitse otsikko lukemattomaksi tai luetuksi." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "_Merkitse otsikko" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Merkitse otsikko lukemattomaksi tai luetuksi." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "Poist_a" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Poistaa valitun otsikon." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "Avaa välileh_dessä" + +#: ../src/ui/liferea_shell.c:997 +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Avaa otsikon linkin uudessa Liferea-selainvälilehdessä." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +msgid "_Open In Browser" msgstr "_Avaa selaimessa" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." -msgstr "Avaa otsikon linkin asetusten mukaisessa selaimessa." +#: ../src/ui/liferea_shell.c:999 +msgid "Launches the item's link in the Liferea item pane." +msgstr "Avaa otsikon linkin Liferea-otsikkopaneelissa." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +msgid "Open In _External Browser" +msgstr "Avaa ulkoisessa selaimessa" + +#: ../src/ui/liferea_shell.c:1001 +msgid "Launches the item's link in the configured external browser." +msgstr "Avaa otsikon linkin asetusten mukaisessa ulkoisessa selaimessa." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "T_oimi yhteydettä" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Tämä valitsin sallii sinun ottaa syötteen päivityksen pois käytöstä." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "K_okoruutunäyttö" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "Selaa kokoruutunäytöllä" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Linux-uutislukija" -#: ../src/ui/liferea_shell.c:1246 -msgid "" -"

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

    You can add new subscriptions

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

    " -msgstr "" -"

    Tervetuloa Lifereaan, työpöytäuutiskerääjään verkkouutisyötteitä " -"varten.

    Voit lisätä uuden syötteen

    • Päävalikosta 'Uudet syötteet " -"> Uusi syöte...'
    • Pudottamalla syötelinkin syöteluetteloon
    • Napsauttamalla hiiren kakkospainikkeella ja valitsemalla 'Uusi > " -"Uusi syöte...' Liferea-ohjelman sisällä

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

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

    You can add new subscriptions

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

    " +msgstr "

    Tervetuloa Lifereaan, työpöytäuutiskerääjään verkkouutisyötteitä varten.

    Voit lisätä uuden syötteen

    • Päävalikosta 'Uudet syötteet > Uusi syöte...'
    • Pudottamalla syötelinkin syöteluetteloon
    • Napsauttamalla hiiren kakkospainikkeella ja valitsemalla 'Uusi > Uusi syöte...' Liferea-ohjelman sisällä

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Tuntematon lähde" @@ -1176,264 +1123,257 @@ #: ../src/ui/feed_list_view.c:385 msgid "Liferea is in offline mode. No update possible." -msgstr "" -"Liferea ei ole yhteydessä verkkoon, joten päivittäminen ei ole mahdollista." - -#: ../src/ui/liferea_htmlview.c:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Lataaminen EPÄONNISTUI: ”%s”" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "Lataus valmis." +msgstr "Liferea ei ole yhteydessä verkkoon, joten päivittäminen ei ole mahdollista." -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +#: ../src/ui/liferea_htmlview.c:627 +msgid "Open Link In _Tab" msgstr "Avaa linkki _välilehdessä" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +msgid "_Open Link In Browser" +msgstr "_Avaa linkki selaimessa" + +#: ../src/ui/liferea_htmlview.c:629 +msgid "_Open Link In External Browser" msgstr "_Avaa linkki selaimessa" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "Kirja_nmerkintälinkki osoitteessa %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Kopioi linkkisijainti" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 msgid "_Copy Image Location" msgstr "_Kopioi kuvasijainti" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 msgid "S_ave Link As" msgstr "T_allenna linkki nimellä" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "T_allenna kuva nimellä" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Uusi syöte..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Otsikoton ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Päivämäärä" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Otsikko" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Otsikkoja ei ole valittu." -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Tällä otsikolla ei ole linkkiä!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Syöte, jonka otsikot poistetaan, täytyy valita!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Avaa otsikko _välilehdessä" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "_Avaa otsikko selaimessa" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "Kopioi uutiskoriin" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Kopioi otsikkon verkko-osoite leikepöydälle" +#: ../src/ui/popup_menu.c:156 +#, c-format +msgid "_Bookmark at %s" +msgstr "Kirja_nmerkintä osoitteessa %s" + +#: ../src/ui/popup_menu.c:160 +msgid "Copy Item _Location" +msgstr "_Kopioi otsikkosijainti" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "P_oista otsikko" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Avaa liitetiedosto..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Tallenna nimellä..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "_Kopioi linkki" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "_Päivitä kaikki" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "Näy_tä Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "_Päivitä kansio" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "_Merkitse kaikki luetuiksi" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_Uusi" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "_Uusi syöte..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "Uusi läh_de..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 msgid "Sort Feeds" msgstr "Lajittele syötteet" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "_Rakenna uudelleen" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "_Uusi syöte..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(Tyhjä)" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "GNOME-oletus" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Teksti kuvakkeiden alla" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Teksti kuvakkeiden rinnalla" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Vain kuvakkeet" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Vain teksti" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minuuttia" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "tuntia" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "päivää" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Välilyönti" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " välilyönti" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " välilyönti" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Valitse tallennuskansio" +#: ../src/ui/preferences_dialog.c:114 +msgid "Normal View" +msgstr "Normaalinäkymä" + +#: ../src/ui/preferences_dialog.c:115 +msgid "Wide View" +msgstr "Leveä näkymä" + +#: ../src/ui/preferences_dialog.c:116 +msgid "Combined View" +msgstr "Näytä yhdistettynä" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Käyttöohje" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Selaimen oletus" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Olemassa oleva ikkuna" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Uusi ikkuna" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Uusi välilehti" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "Integroi viestintävalikon kanssa (inidikaattori)" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 msgid "Terminate instead of minimizing to the messaging menu" msgstr "Sulje sovellus, älä minimoi viestivalikkoon" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "Käynnistä minimoituna viestivalikkoon" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Tyyppi" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Ohjelma" +#: ../src/ui/ui_node.c:124 +msgid "(Empty)" +msgstr "(Tyhjä)" + +#: ../src/ui/ui_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" +"%s\n" +"Rakennetaan uudelleen" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." -msgid_plural "" -"The provider of this feed suggests an update interval of %d minutes." -msgstr[0] "" -"Tämän syötteen tarjoaja suosittelee päivitystaajuudeksi %d minuuttia." -msgstr[1] "" -"Tämän syötteen tarjoaja suosittelee päivitystaajuudeksi %d minuuttia." +msgid_plural "The provider of this feed suggests an update interval of %d minutes." +msgstr[0] "Tämän syötteen tarjoaja suosittelee päivitystaajuudeksi %d minuuttia." +msgstr[1] "Tämän syötteen tarjoaja suosittelee päivitystaajuudeksi %d minuuttia." #: ../src/ui/subscription_dialog.c:434 msgid "This feed specifies no default update interval." msgstr "Tällä syötteellä ei ole suositeltua päivitystaajuutta." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "Nimetön" @@ -1484,7 +1424,7 @@ msgid "%b %d %H:%M" msgstr "%d. %b %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1494,30 +1434,21 @@ msgid "Google Reader login failed!" msgstr "Google-lukija-kirjautuminen epäonnistui!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google-lukija" -#: ../src/fl_sources/google_source.c:392 -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 "" -"Integroi Google-lukijatilisi syöteluettelo. Liferea esittää Google-" -"lukijasyötteesi, ja synkronoi syöteluettelosi ja lukijaluettelosi." +#: ../src/fl_sources/google_source.c:384 +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 "Integroi Google-lukijatilisi syöteluettelo. Liferea esittää Google-lukijasyötteesi, ja synkronoi syöteluettelosi ja lukijaluettelosi." #: ../src/fl_sources/opml_source.c:325 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" #: ../src/fl_sources/opml_source.c:326 -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 "" -"Integroi Blogrolls tai Planets syöteluetteloosi. Liferea lisää ja poistaa " -"syötteet automaattisesti OPML-lähdeasiakirjan muutosten mukaan." +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 "Integroi Blogrolls tai Planets syöteluetteloosi. Liferea lisää ja poistaa syötteet automaattisesti OPML-lähdeasiakirjan muutosten mukaan." #: ../src/fl_sources/opml_source.c:387 msgid "Choose OPML File" @@ -1531,34 +1462,21 @@ msgid "No feed list source types found!" msgstr "Ei löytynyt syöteluettelotyyppejä!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:269 msgid "Source Type" msgstr "Lähteen tyyppi" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 -msgid "" -"Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " -"present your tt-rss subscriptions, and will synchronize your feed list and " -"reading lists." -msgstr "" -"Integroi Tiny Tiny RSS 1.5+ -tilisi syöteluettelo. Liferea esittää tt-rss-" -"syötteesi, ja synkronoi syöteluettelosi ja lukuluettelosi." +#: ../src/fl_sources/ttrss_source.c:363 +msgid "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will present your tt-rss subscriptions, and will synchronize your feed list and reading lists." +msgstr "Integroi Tiny Tiny RSS 1.5+ -tilisi syöteluettelo. Liferea esittää tt-rss-syötteesi, ja synkronoi syöteluettelosi ja lukuluettelosi." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" -msgstr "" -"Ei kyetty jäsentämään tt-rss API-rajapinnan palauttamaa JSON-rakennetta" +msgstr "Ei kyetty jäsentämään tt-rss API-rajapinnan palauttamaa JSON-rakennetta" #: ../src/notification/libnotify.c:61 ../src/notification/libnotify.c:83 #: ../src/notification/libnotify.c:152 @@ -1610,12 +1528,8 @@ msgstr "Käyttäjä_tunnus:" #: ../glade/auth.ui.h:6 -msgid "" -"Note: The username and password will be saved to your Liferea feedlist " -"file without using encryption." -msgstr "" -"Huomaa: Käyttäjätunnus ja salasana tallentuvat salaamattomina Liferean " -"syöteluetteloon." +msgid "Note: The username and password will be saved to your Liferea feedlist file without using encryption." +msgstr "Huomaa: Käyttäjätunnus ja salasana tallentuvat salaamattomina Liferean syöteluetteloon." #: ../glade/google_source.ui.h:1 msgid "Add Google Reader Account" @@ -1625,8 +1539,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Kirjoita Google-lukijatiliasetuksesi." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Salasana" @@ -1650,7 +1563,7 @@ msgid "combined view" msgstr "yhdistelmänäkymä" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Otsikot" @@ -1700,7 +1613,7 @@ msgstr "Yleistä" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Syötteen lähde" @@ -1733,25 +1646,16 @@ msgstr "Käytä _muunnossuodatinta" #: ../glade/liferea.ui.h:27 ../glade/new_subscription.ui.h:12 -msgid "" -"Liferea can use external filter plugins in order to access feeds and " -"directories in non-supported formats. See the documentation for more " -"information." -msgstr "" -"Liferea voi lukea ei-tuettuja syötteitä ja hakemistoja käyttämällä ulkoisia " -"suodatinliitännäisiä. Lisätietoja on Liferean käyttöohjeessa." +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 voi lukea ei-tuettuja syötteitä ja hakemistoja käyttämällä ulkoisia suodatinliitännäisiä. Lisätietoja on Liferean käyttöohjeessa." #: ../glade/liferea.ui.h:28 ../glade/new_subscription.ui.h:13 msgid "Convert _using:" msgstr "M_uunna käyttäen:" #: ../glade/liferea.ui.h:30 -msgid "" -"The cache setting controls if the contents of feeds are saved when Liferea " -"exits. Marked items are always saved to the cache." -msgstr "" -"Välimuistin asetukset vaikuttavat siihen miten syötteiden sisältö tallentuu " -"kun Liferea suljetaan. Merkityt otsikot tallentuvat aina." +msgid "The cache setting controls if the contents of feeds are saved when Liferea exits. Marked items are always saved to the cache." +msgstr "Välimuistin asetukset vaikuttavat siihen miten syötteiden sisältö tallentuu kun Liferea suljetaan. Merkityt otsikot tallentuvat aina." #: ../glade/liferea.ui.h:31 msgid "_Default cache settings" @@ -1791,9 +1695,7 @@ #: ../glade/liferea.ui.h:42 msgid "Auto-_load item link in configured browser when selecting articles." -msgstr "" -"_Lataa uutislinkit automaattisesti asetetussa selaimessa kun valitaan " -"artikkeleita." +msgstr "_Lataa uutislinkit automaattisesti asetetussa selaimessa kun valitaan artikkeleita." #: ../glade/liferea.ui.h:43 msgid "Ignore _comment feeds for this subscription." @@ -1816,478 +1718,494 @@ msgstr "Edistyneet ominaisuudet" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Liferean asetukset" +msgid "New Folder" +msgstr "Uusi kansio" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "Syötevälimuistin käsittely" +msgid "_Folder name:" +msgstr "Kan_sion nimi:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Oletusa_rvoisesti tallennettava otsikkojen määrä per syöte:" +msgid "Rename" +msgstr "Nimeä uudelleen" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "Syötepäivitysasetukset" +msgid "_New Name:" +msgstr "Uusi _nimi:" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "_Päivitä kaikki syötteet käynnistettäessä." +msgid "Search Folder Properties" +msgstr "Etsintäkansion ominaisuudet" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Oletusarvoinen syötteen _päivitystaajuus:" +msgid "Search _Name:" +msgstr "Haku_nimi:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "Löydä kohteita, jotka täyttävät seuraavat kriteerit" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"Huomaa: Määrittele taajuus järkevästi. On tavallisesti kaistanleveyden " -"tuhlausta kiertokysellä syötteitä useammin kuin kerran tunnissa." +msgid "A_ny Rule Matches" +msgstr "Mikä taha_nsa sääntö täsmää" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Syötteet" +msgid "_All Rules Must Match" +msgstr "K_aikkien sääntöjen on täsmättävä" #: ../glade/liferea.ui.h:57 -msgid "Folder Display Settings" -msgstr "Kansion näyttöasetukset" +msgid "Open Enclosure" +msgstr "Avaa liitetiedosto" #: ../glade/liferea.ui.h:58 -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." +msgid "Open an enclosure of type:" +msgstr "Avaa liitetiedostotyyppi:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "P_iilota luetut otsikot." +msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. The enclosures URL will be supplied as an argument for this command:" +msgstr "Mitä Liferean tulisi tehdä tälle liitetiedostolle? Kirjoita alle suoritettava komento. Liitetiedostojen verkko-osoite tarjotaan tämän komennon argumenttina:" #: ../glade/liferea.ui.h:60 -msgid "Feed Icons (Favicons)" -msgstr "Syötekuvakkeet (Favicon-kuvakkeet)" +msgid "_Browse" +msgstr "_Selaa" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_Päivitä kaikki favicon-kuvakkeet nyt" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "_Tee näin aina jatkossa tämäntyyppisille liitetiedostoille." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Kansiot" +msgid "Search All Feeds" +msgstr "Etsi kaikista syötteistä" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" -msgstr "Luetaan otsikkorivit" +msgid "_Search for:" +msgstr "_Etsi:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "_Selaa otsikoita läpi näppäilemällä: " +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.ui.h:65 -msgid "Web Integration" -msgstr "Webbi-integraatio" +msgid "_Advanced..." +msgstr "_Lisäsäännöt..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "Läh_etä kirjanmerkit kohteeseen" +msgid "Starts searching for the specified text in all feeds. The search result will appear in the item list." +msgstr "Etsii annettua tekstiä kaikista syötteistä. Etsinnän tulokset näkyvät otsikkoluettelossa." #: ../glade/liferea.ui.h:67 -msgid "Internal Browser Settings" -msgstr "Sisäisen selaimen asetukset" +msgid "Update Monitor" +msgstr "Päivitä valvonta" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Avaa linkit Liferean _ikkunassa." +msgid "Pending Requests" +msgstr "Odottavat pyynnöt" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "Poista _Javascript käytöstä." +msgid "Downloading Now" +msgstr "Ladataan nyt" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "Ota käyttöön s_elainliitännäiset." +msgid "Cancel _All" +msgstr "Peru _kaikki" #: ../glade/liferea.ui.h:71 -msgid "External Browser Settings" -msgstr "Ulkoisen selaimen asetukset" +msgid "Create News Bin" +msgstr "Luo uutiskori" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "_Linkkien avaus:" +msgid "_News Bin Name:" +msgstr "_Uutiskorin nimi:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Lifereasta" #: ../glade/liferea.ui.h:74 -#, no-c-format msgid "" -"_Manual:\n" -"(%s for URL)" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" msgstr "" -"_Manuaalinen:\n" -"(%s verkko-osoitteelle)" - -#: ../glade/liferea.ui.h:76 -msgid "_Browser:" -msgstr "_Selain:" +"Copyright © 2003-2012\n" +"Liferea-ryhmä\n" #: ../glade/liferea.ui.h:77 -msgid "Browser" -msgstr "Selain" +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea on GTK+-pohjainen uutissyötteiden lukuohjelma" #: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "Liferea-kotisivu" + +#: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "Monimutkaisempi haku" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "E_tsintäkansio..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Luo hakukonesyöte" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "Kirjoita sanat joita haluat etsiä" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "Tulosten e_nimmäismäärä:" + +#: ../glade/liferea.ui.h:84 +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 "Huomaa: Liferea tuottaa syötteen, jota käytetään kyselemään tietyn hakumerkkijonon hakukone-etsinnän tuloksia. Voit pitää tämän syötteen pysyvänä ja päivittää sitä kuten mitä tahansa syötettä." + +#: ../glade/new_subscription.ui.h:9 +msgid "Download / Postprocessing" +msgstr "Ladataan / jälkikäsitellään" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Lähdevalinta" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Lisää lähdetyyppi, jonka haluat lisätä..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Lisää OPML/PLanet" + +#: ../glade/opml_source.ui.h:2 +msgid "Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "Määritä paikallinen tiedosto tai verkko-osoite, joka osoitttaa kelvolliseen OPML-syöteluetteloon." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Sijainti" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "_Valitse tiedosto" + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "Lisää Tiny Tiny RSS -tili" + +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "Kirjoita tt-rss-tiliasetuksesi." + +#: ../glade/ttrss_source.ui.h:3 +msgid "_Server URL" +msgstr "_Palvelinverkko-osoite" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "Käyttäjä_tunnus" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Lisätoiminnot..." + +#: ../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 "Kirjoita webbisivusijainti käytettäväksi syötteen automaattitunnistuksessa tai siinä tapauksessa, että tiedät sen tarkan syötesijainnin." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Liferean asetukset" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Syötevälimuistin käsittely" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Oletusa_rvoisesti tallennettava otsikkojen määrä per syöte:" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Syötepäivitysasetukset" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "_Päivitä kaikki syötteet käynnistettäessä." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Oletusarvoinen syötteen _päivitystaajuus:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "Note: Please remember to set a reasonable refresh time. Usually it is a waste of bandwidth to poll feeds more often than each hour." +msgstr "Huomaa: Määrittele taajuus järkevästi. On tavallisesti kaistanleveyden tuhlausta kiertokysellä syötteitä useammin kuin kerran tunnissa." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Syötteet" + +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Kansion näyttöasetukset" + +#: ../glade/prefs.ui.h:11 +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/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "P_iilota luetut otsikot." + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Syötekuvakkeet (Favicon-kuvakkeet)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Päivitä kaikki favicon-kuvakkeet nyt" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Kansiot" + +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Luetaan otsikkorivit" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "_Selaa otsikoita läpi näppäilemällä:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "_Oletusnäkymätila:" + +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Webbi-integraatio" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "Läh_etä kirjanmerkit kohteeseen" + +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Sisäisen selaimen asetukset" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Avaa linkit Liferean _ikkunassa." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "Poista _Javascript käytöstä." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "Ota käyttöön s_elainliitännäiset." + +#: ../glade/prefs.ui.h:26 +msgid "External Browser Settings" +msgstr "Ulkoisen selaimen asetukset" + +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "_Linkkien avaus:" + +#: ../glade/prefs.ui.h:28 +msgid "_Manual:" +msgstr "_Käyttöohje" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "(%s verkko-osoitteelle)" + +#: ../glade/prefs.ui.h:31 +msgid "_Browser:" +msgstr "_Selain:" + +#: ../glade/prefs.ui.h:32 +msgid "Browser" +msgstr "Selain" + +#: ../glade/prefs.ui.h:33 msgid "Notification Settings" msgstr "Ilmoitusasetukset" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Näytä uudet otsikot sisältävä _ponnahdusikkuna." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "Näytä t_ilakuvake paneelin ilmoitusalueessa (järjestelmäpalkki)." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "_Näytä kuvakkeiden määrä järjestelmäpalkissa." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "Sulj_e sovellus, älä minimoi järjestelmäkuvakkeeseen." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "Käynni_stä järjestelmäkuvakkeessa." -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 msgid "Toolbar Settings" msgstr "Työkalupalkkiasetukset" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "Piil_ota työkalupalkki." -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Työk_alupalkkipainikkeen nimiöt:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "Käyttöliittymä" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "HTTP-välityspalvelin" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "Tunnista _automaattisesti (GNOME tai ympäristö)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "_Ei välityspalvelinta" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "_Manuaaliasetus:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "Välityspalvelimen _portti:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "Välityspalvelimen _konenimi:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Käytä välityspalvelin-_todennusta" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "_Välityspalvelimen salasana:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "Välityspalvelimen k_äyttäjätunnus:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Välityspalvelin" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 msgid "Downloading Enclosures" msgstr "Ladataan liitetiedostoja" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Selaa" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "T_allenna lataukset kansioon" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "La_taa käyttäen" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 msgid "Opening Enclosures" msgstr "Avaa liitetiedosto" -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Liitetiedostot" -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "Synkroinoitu läheisiin verkkokoneisiin" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "Ota käyttöön paikallin_en LAN-synkronointi" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "_Palvelunimi" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Synkronoi" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Uusi kansio" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" +msgstr "Lisäosat" -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "Kan_sion nimi:" +#~ msgid "Download and view feeds" +#~ msgstr "Lataa ja katso syötteitä" -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Nimeä uudelleen" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "Uusi _nimi:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Etsintäkansion ominaisuudet" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "Haku_nimi:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "Löydä kohteita, jotka täyttävät seuraavat kriteerit" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "Mikä taha_nsa sääntö täsmää" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "K_aikkien sääntöjen on täsmättävä" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Ladataan liitetiedostoja" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Tallennetaan liitetiedostoa. Tyyppi:" - -#: ../glade/liferea.ui.h:120 -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ä Liferean tulisi tehdä tälle liitetiedostolle? Kirjoita alle " -"suoritettava komento, jonka parametriksi tallentuneen tiedoston nimi " -"annetaan:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Välitä verkko-osoite ja älä lataa liitettä." - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "_Tee näin aina jatkossa tämäntyyppisille liitetiedostoille." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Etsi kaikista syötteistä" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Etsi:" - -#: ../glade/liferea.ui.h:125 -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.ui.h:126 -msgid "_Advanced..." -msgstr "_Lisäsäännöt..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Etsii annettua tekstiä kaikista syötteistä. Etsinnän tulokset näkyvät " -"otsikkoluettelossa." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Päivitä valvonta" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "Odottavat pyynnöt" - -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "Ladataan nyt" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "Peru _kaikki" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Luo uutiskori" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Uutiskorin nimi:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Lifereasta" - -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Copyright © 2003-2012\n" -"Liferea-ryhmä\n" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea on GTK+-pohjainen uutissyötteiden lukuohjelma" - -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Liferea-kotisivu" - -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Monimutkaisempi haku" - -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "E_tsintäkansio..." +#~ msgid "You may want to validate the feed using" +#~ msgstr "Saatat ehkä haluta tarkastaa syötteen oikeellisuuden käyttäen" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Luo hakukonesyöte" +#~ msgid "bookmark" +#~ msgstr "kirjanmerkki" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "Kirjoita sanat joita haluat etsiä" +#~ msgid "comments" +#~ msgstr "kommentit" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Tulosten e_nimmäismäärä:" +#~ msgid "flag" +#~ msgstr "lippu" -#: ../glade/liferea.ui.h:145 -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 "" -"Huomaa: Liferea tuottaa syötteen, jota käytetään kyselemään tietyn " -"hakumerkkijonon hakukone-etsinnän tuloksia. Voit pitää tämän syötteen " -"pysyvänä ja päivittää sitä kuten mitä tahansa syötettä." +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Liitteen lataaminen EPÄONNISTUI: ”%s”" -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" -msgstr "Ladataan / jälkikäsitellään" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Liitteen lataaminen päättyi: ”%s”" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Lähdevalinta" +#~ 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 "Tämä Liferea-versio käyttää uutta välimuistimuotoa ja on tuonut sinun syötevälimuistisi. Välimuistisisältö kohteessa %s poistettiin automaattisesti. Poista tämä hakemisto manuaalisesti sen jälkeen kun olet varma, että tuonti onnistui!" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Lisää lähdetyyppi, jonka haluat lisätä..." +#~ msgid "Jumps to the next unread item. If necessary selects the next feed with unread items." +#~ msgstr "Siirtyy seuraavaan lukemattomaan otsikkoon, mahdollisesti seuraavassa syötteessä." -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Lisää OPML/PLanet" +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Lataaminen EPÄONNISTUI: ”%s”" -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Määritä paikallinen tiedosto tai verkko-osoite, joka osoitttaa kelvolliseen " -"OPML-syöteluetteloon." +#~ msgid "Download finished." +#~ msgstr "Lataus valmis." -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Sijainti" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Avaa otsikko _välilehdessä" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "_Valitse tiedosto" +#~ msgid "_Launch Item In Browser" +#~ msgstr "_Avaa otsikko selaimessa" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "Lisää Tiny Tiny RSS -tili" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Kopioi otsikkon verkko-osoite leikepöydälle" -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "Kirjoita tt-rss-tiliasetuksesi." +#~ msgid "Choose download directory" +#~ msgstr "Valitse tallennuskansio" -#: ../glade/ttrss_source.ui.h:3 -msgid "_Server URL" -msgstr "_Palvelinverkko-osoite" +#~ msgid "Liferea Sync %s@%s" +#~ msgstr "Liferea Sync %s@%s" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "Käyttäjä_tunnus" +#~ msgid "Downloading Enclosure" +#~ msgstr "Ladataan liitetiedostoja" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Kirjoita webbisivusijainti käytettäväksi syötteen automaattitunnistuksessa " -"tai siinä tapauksessa, että tiedät sen tarkan syötesijainnin." +#~ msgid "Sync" +#~ msgstr "Synkronoi" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Lisätoiminnot..." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Synkroinoitu läheisiin verkkokoneisiin" -#~ msgid "You may want to validate the feed using" -#~ msgstr "Saatat ehkä haluta tarkastaa syötteen oikeellisuuden käyttäen" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "Ota käyttöön paikallin_en LAN-synkronointi" #~ msgid "" -#~ "Jumps to the next unread item. If necessary selects the next feed with " -#~ "unread items." +#~ "_Manual:\n" +#~ "(%s for URL)" #~ msgstr "" -#~ "Siirtyy seuraavaan lukemattomaan otsikkoon, mahdollisesti seuraavassa " -#~ "syötteessä." +#~ "_Manuaalinen:\n" +#~ "(%s verkko-osoitteelle)" -#~ msgid "Liferea Sync %s@%s" -#~ msgstr "Liferea Sync %s@%s" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "_Välitä verkko-osoite ja älä lataa liitettä." + +#~ msgid "_Save downloads in" +#~ msgstr "T_allenna lataukset kansioon" + +#~ msgid "_Service Name" +#~ msgstr "_Palvelunimi" #~ msgid "link cosmos" #~ msgstr "linkki cosmos" @@ -2338,16 +2256,8 @@ #~ msgstr[0] "%d etsintätulos" #~ msgstr[1] "%d etsintätulosta" -#~ 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 "" -#~ "Otsikkoluettelo sisältää nyt kaikki otsikot, jotka täsmäävät määriteltyyn " -#~ "hakumalliin. Jos haluat tallentaa tämän etsintätuloksen pysyvästi, voit " -#~ "napsauttaa ”Hakukansio”-painiketta etsintäikkunassa ja Liferea lisää " -#~ "etsintäkansion syöteluetteloosi." +#~ 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 "Otsikkoluettelo sisältää nyt kaikki otsikot, jotka täsmäävät määriteltyyn hakumalliin. Jos haluat tallentaa tämän etsintätuloksen pysyvästi, voit napsauttaa ”Hakukansio”-painiketta etsintäikkunassa ja Liferea lisää etsintäkansion syöteluetteloosi." #~ msgid "You have to select a feed entry" #~ msgstr "Syötteen otsikko on valittava" @@ -2415,12 +2325,8 @@ #~ msgid "Bloglines" #~ msgstr "Bloglines" -#~ 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 "" -#~ "Integroi Bloglines-tilisi syöteluettelo. Liferea esittää Bloglines-" -#~ "syötteesi syöteluettelossa kirjoitussuojattuna alipuuna." +#~ 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 "Integroi Bloglines-tilisi syöteluettelo. Liferea esittää Bloglines-syötteesi syöteluettelossa kirjoitussuojattuna alipuuna." #~ msgid "feedlist.opml" #~ msgstr "feedlist.opml" @@ -2454,12 +2360,8 @@ #~ msgid "text/plain" #~ msgstr "text/plain" -#~ msgid "" -#~ "This option can cause significant delays when loading folders " -#~ "containing many feeds." -#~ msgstr "" -#~ "Jos kansiossa on paljon syötteitä, sen näyttäminen voi kestää kauan " -#~ "kun tämä valitsin on käytössä." +#~ msgid "This option can cause significant delays when loading folders containing many feeds." +#~ msgstr "Jos kansiossa on paljon syötteitä, sen näyttäminen voi kestää kauan kun tämä valitsin on käytössä." #~ msgid "Downloading Enclosures" #~ msgstr "Ladataan liitetiedostoja" @@ -2525,43 +2427,22 @@ #~ msgstr "Sisäinen virhe: aikatietojen muunnosvirhe, mktime() ei toiminut.\n" #~ msgid "Invalid ISO8601 date format! Ignoring information!\n" -#~ msgstr "" -#~ "Virheellinen ISO8601-aikamuoto: -kentän tiedot jäävät " -#~ "huomiotta.\n" +#~ msgstr "Virheellinen ISO8601-aikamuoto: -kentän tiedot jäävät huomiotta.\n" -#~ msgid "" -#~ "Unexpected end of character sequence or corrupt UTF-8 encoding! Some " -#~ "characters were dropped!" -#~ msgstr "" -#~ "Odottamaton merkkisarjan loppu tai vioittunutta UTF-8 merkkikoodausta. " -#~ "Osa merkeistä jää pois." +#~ msgid "Unexpected end of character sequence or corrupt UTF-8 encoding! Some characters were dropped!" +#~ msgstr "Odottamaton merkkisarjan loppu tai vioittunutta UTF-8 merkkikoodausta. Osa merkeistä jää pois." -#~ msgid "" -#~ "

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

    " -#~ msgstr "" -#~ "

    Syötteen tyypin määrittäminen ei onnistunut. Tarkista, että syöte on " -#~ "kelvollinen ja tuettua muotoa.

    " +#~ msgid "

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

    " +#~ msgstr "

    Syötteen tyypin määrittäminen ei onnistunut. Tarkista, että syöte on kelvollinen ja tuettua muotoa.

    " -#~ msgid "" -#~ "Error while reading cache file \"%s\" ! Cache file could not be loaded!" -#~ msgstr "" -#~ "Virhe välivarastotiedoston \"%s\" lukemisessa. Välivarastotiedoston " -#~ "lataaminen ei onnistunut." +#~ msgid "Error while reading cache file \"%s\" ! Cache file could not be loaded!" +#~ msgstr "Virhe välivarastotiedoston \"%s\" lukemisessa. Välivarastotiedoston lataaminen ei onnistunut." -#~ msgid "" -#~ "

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

    " -#~ msgstr "" -#~ "

    XML-virhe välivarastotiedoston lukemisessa! Välivarastoitua " -#~ "syötetiedostoa \"%s\" ei voitu ladata.

    " +#~ msgid "

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

    " +#~ msgstr "

    XML-virhe välivarastotiedoston lukemisessa! Välivarastoitua syötetiedostoa \"%s\" ei voitu ladata.

    " #~ msgid "

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

    " -#~ msgstr "" -#~ "

    \"%s\" ei ole kelvollinen välivarastotiedosto. Sen lukeminen ei " -#~ "onnistu.

    " +#~ msgstr "

    \"%s\" ei ole kelvollinen välivarastotiedosto. Sen lukeminen ei onnistu.

    " #~ msgid "There were errors while parsing cache file \"%s\"" #~ msgstr "Välivarastotiedoston \"%s\" jäsentämisessä oli ongelmia" @@ -2593,20 +2474,14 @@ #~ msgid "Webserver's authentication method incompatible with Liferea" #~ msgstr "WWW-palvelimen todennustapa ei ole yhteensopiva Liferean kanssa" -#~ msgid "" -#~ "
    You may want to validate the feed using Voit tarkistaa syötteen oikeellisuuden You may want to validate the feed using Voit tarkistaa syötteen oikeellisuuden FeedValidator." #~ msgstr "\">FeedValidator-palvelun avulla." #~ msgid "Feed link auto discovery failed! No feed links found!" -#~ msgstr "" -#~ "Syötelinkin automaattinen tunnistaminen ei onnistunut. Syötelinkkejä ei " -#~ "löydy." +#~ msgstr "Syötelinkin automaattinen tunnistaminen ei onnistunut. Syötelinkkejä ei löydy." #~ msgid "_Program" #~ msgstr "_Ohjelma" @@ -2614,12 +2489,8 @@ #~ msgid "Updates all subscriptions. This does not update OCS directories." #~ msgstr "Päivittää kaikki syötteet, lukuun ottamatta OCS-kansioita." -#~ msgid "" -#~ "Marks all items of the current selected subscription or all of " -#~ "subscriptions of the selected folder as read." -#~ msgstr "" -#~ "Merkitse kaikki valitun syötteen tai kaikkien valitun kansion syötteiden " -#~ "otsikot luetuiksi." +#~ msgid "Marks all items of the current selected subscription or all of subscriptions of the selected folder as read." +#~ msgstr "Merkitse kaikki valitun syötteen tai kaikkien valitun kansion syötteiden otsikot luetuiksi." #~ msgid "New _VFolder..." #~ msgstr "Uusi _v-kansio..." @@ -2669,16 +2540,11 @@ #~ msgid "User defined format:" #~ msgstr "Muu muoto:" -#~ msgid "" -#~ "for expert users: specify a time format string, consult the strftime() " -#~ "manpage for the format codes" -#~ msgstr "" -#~ "Osaavat käyttäjät: ajan muotoilumerkkijono voi sisältää strftime()-" -#~ "muotoilukoodeja, katso lisätietoja strftime:n manuaalisivuilta" +#~ msgid "for expert users: specify a time format string, consult the strftime() manpage for the format codes" +#~ msgstr "Osaavat käyttäjät: ajan muotoilumerkkijono voi sisältää strftime()-muotoilukoodeja, katso lisätietoja strftime:n manuaalisivuilta" #~ msgid "Please restart Liferea for changes to take effect." -#~ msgstr "" -#~ "Muutokset tulevat voimaan, kun Liferea käynnistetään uudelleen." +#~ msgstr "Muutokset tulevat voimaan, kun Liferea käynnistetään uudelleen." #~ msgid " " #~ msgstr " " @@ -2707,12 +2573,8 @@ #~ msgid "Show _Toolbar Only" #~ msgstr "Näytä vain _työkalupalkki" -#~ msgid "" -#~ "Liferea reuses the GNOME proxy settings. If you use GNOME you can " -#~ "change these settings in the GNOME Control Center." -#~ msgstr "" -#~ "Liferea seuraa Gnomen välityspalvelinasetuksia. Jos käytät Gnomea " -#~ "näitä asetuksia voi muuttaa hallintakeskuksesta." +#~ msgid "Liferea reuses the GNOME proxy settings. If you use GNOME you can change these settings in the GNOME Control Center." +#~ msgstr "Liferea seuraa Gnomen välityspalvelinasetuksia. Jos käytät Gnomea näitä asetuksia voi muuttaa hallintakeskuksesta." #~ msgid "_Enable Proxy" #~ msgstr "Käytä _välityspalvelinta" @@ -2834,13 +2696,8 @@ #~ msgid "Liferea encountered an unknown argument: %s\n" #~ msgstr "Liferealle annettiin tuntematon parametri: %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 "" -#~ "Toinen kopio Lifereasta on jo käynnissä, käytä mieluiten sitä. Jos näin " -#~ "kuitenkaan ei ole, poista lukitustiedosto \"~/.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 "Toinen kopio Lifereasta on jo käynnissä, käytä mieluiten sitä. Jos näin kuitenkaan ei ole, poista lukitustiedosto \"~/.liferea/lock\"." #~ msgid "feed generator" #~ msgstr "syötteen tuottaja" @@ -2915,8 +2772,7 @@ #~ msgstr "ei täsmää" #~ msgid "Note: Using the subscriptions filter disables drag & drop" -#~ msgstr "" -#~ "Huomaa: syötteiden suodattaminen estää hiirellä vetämisen ja pudottamisen" +#~ msgstr "Huomaa: syötteiden suodattaminen estää hiirellä vetämisen ja pudottamisen" #~ msgid "You must select a feed entry" #~ msgstr "Jokin syöte täytyy valita" @@ -2927,11 +2783,8 @@ #~ msgid "A folder must be selected." #~ msgstr "Jokin kansio täytyy valita." -#~ msgid "" -#~ "internal error! unknown entry type! cannot display appropriate icon!\n" -#~ msgstr "" -#~ "Sisäinen virhe: tuntematon otsikon tyyppi, sopivaa kuvaketta ei voi " -#~ "näyttää.\n" +#~ msgid "internal error! unknown entry type! cannot display appropriate icon!\n" +#~ msgstr "Sisäinen virhe: tuntematon otsikon tyyppi, sopivaa kuvaketta ei voi näyttää.\n" #~ msgid "" #~ "\n" @@ -2954,8 +2807,7 @@ #~ "Failed to open HTML widget module (%s) specified in configuration!\n" #~ "%s\n" #~ msgstr "" -#~ "Asetuksissa määritellyn HTML-komponentin moduulin (%s) lataaminen ei " -#~ "onnistunut.\n" +#~ "Asetuksissa määritellyn HTML-komponentin moduulin (%s) lataaminen ei onnistunut.\n" #~ "%s\n" #~ msgid "Htmlview API mismatch!" @@ -2979,12 +2831,8 @@ #~ msgid "trying to load browser module %s (%s)\n" #~ msgstr "selainmoduuli %s (%s) latautuu\n" -#~ msgid "" -#~ "Sorry, I was not able to load any installed browser modules! Try the --" -#~ "debug-all option to get debug information!" -#~ msgstr "" -#~ "Mikään asennetuista selainmoduuleista ei latautunut. Etsi vikaa " -#~ "käyttämällä --debug-valitsimia." +#~ msgid "Sorry, I was not able to load any installed browser modules! Try the --debug-all option to get debug information!" +#~ msgstr "Mikään asennetuista selainmoduuleista ei latautunut. Etsi vikaa käyttämällä --debug-valitsimia." #~ msgid "New Feed" #~ msgstr "Uusi syöte" @@ -3080,26 +2928,14 @@ #~ msgid "There were errors while parsing a feed" #~ msgstr "Syötteen lukemisessa tapahtui virheitä" -#~ msgid "" -#~ "There were errors while parsing this feed. The following error occurred:" -#~ "
    %s" -#~ msgstr "" -#~ "Tämän syötteen jäsentämisessä oli virheitä. Seuraavat virheet ilmenivät:" -#~ "
    %s" +#~ msgid "There were errors while parsing this feed. The following error occurred:
    %s" +#~ msgstr "Tämän syötteen jäsentämisessä oli virheitä. Seuraavat virheet ilmenivät:
    %s" -#~ msgid "" -#~ "There were errors while filtering this feed. The following error occurred:" -#~ "
    %s
    " -#~ msgstr "" -#~ "Tämän syötteen jäsentämisessä oli virheitä. Seuraavat virheet ilmenivät:" -#~ "
    %s
    " +#~ msgid "There were errors while filtering this feed. The following error occurred:
    %s
    " +#~ msgstr "Tämän syötteen jäsentämisessä oli virheitä. Seuraavat virheet ilmenivät:
    %s
    " -#~ msgid "" -#~ "Starts a search for all items that do match the given search string " -#~ "either in title or content." -#~ msgstr "" -#~ "Etsii kaikki otsikot, joiden nimi tai sisältö täsmää annettuihin " -#~ "hakusanoihin." +#~ msgid "Starts a search for all items that do match the given search string either in title or content." +#~ msgstr "Etsii kaikki otsikot, joiden nimi tai sisältö täsmää annettuihin hakusanoihin." #~ msgid "Close search" #~ msgstr "Sulje etsintä" @@ -3121,15 +2957,8 @@ #~ "(etenkin etsintää) mutta saattaa viedä paljon\n" #~ " muistia jos syötteitä on paljon." -#~ msgid "" -#~ "Liferea displays feeds' content using various HTML renderers. Depending " -#~ "on which renderers are installed on your computer, different options will " -#~ "be available. Restart Liferea for changes to take effect." -#~ msgstr "" -#~ "Liferea näyttää syötteiden sisällön jollakin HTML-piirtimellä. " -#~ "Käytettävissä olevat piirtimet riippuvat siitä, mitä tietokoneelle on " -#~ "asennettu. Liferea täytyy käynnistää uudelleen jotta nämä asetukset " -#~ "tulevat voimaan." +#~ msgid "Liferea displays feeds' content using various HTML renderers. Depending on which renderers are installed on your computer, different options will be available. Restart Liferea for changes to take effect." +#~ msgstr "Liferea näyttää syötteiden sisällön jollakin HTML-piirtimellä. Käytettävissä olevat piirtimet riippuvat siitä, mitä tietokoneelle on asennettu. Liferea täytyy käynnistää uudelleen jotta nämä asetukset tulevat voimaan." #~ msgid "/Open" #~ msgstr "/Avaa" @@ -3147,5 +2976,4 @@ #~ msgstr "Otsikoiden näyttö" #~ msgid "URL points to permanent redirect, updating with new location..." -#~ msgstr "" -#~ "URL osoittaa pysyvään uudelleenohjaukseen, päivitetään uusi sijainti..." +#~ msgstr "URL osoittaa pysyvään uudelleenohjaukseen, päivitetään uusi sijainti..." diff -Nru liferea-1.8.15/po/fr.po liferea-1.10.3/po/fr.po --- liferea-1.8.15/po/fr.po 2013-06-24 22:16:15.000000000 +0200 +++ liferea-1.10.3/po/fr.po 2013-07-31 23:29:12.000000000 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Liferea 1.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2011-11-22 01:39+0100\n" "Last-Translator: Vincent Lefevre \n" "Language-Team: French\n" @@ -21,8 +21,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n < 2 ? 0 : 1;\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -35,8 +34,8 @@ msgstr "Lecteur de flux Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Télécharger et voir des flux" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -146,38 +145,26 @@ msgstr "Créateur" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "marqueur" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "marque-page" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "commentaires" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Pas encore de commentaires." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Commentaires" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Mise à jour..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Rafraîchir" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Section" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Département" @@ -202,12 +189,12 @@ msgid "Default Browser" msgstr "Navigateur par défaut" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "La commande du navigateur a échoué : %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Exécution de : \"%s\"" @@ -217,7 +204,7 @@ msgid "Authorization Error" msgstr "Erreur d'autorisation" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Impossible de créer le répertoire cache \"%s\" !" @@ -247,35 +234,41 @@ msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, 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:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Le téléchargement de l'annexe a ÉCHOUÉ : \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Le téléchargement de l'annexe s'est terminé : \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Erreur lors du renommage de %s en %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, 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:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." @@ -283,42 +276,42 @@ "Document vide ! Le document OPML \"%s\" ne devrait pas être vide lors de " "l'importation." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, 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:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Liste des flux importée" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importer une liste de flux" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importer" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 msgid "OPML Files" msgstr "Fichiers OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Erreur lors de l'exportation de la liste des flux !" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Liste des flux exportée !" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Exporter la liste des flux" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Exporter" @@ -376,11 +369,11 @@ msgstr "Impossible de déterminer le type de flux." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "Il n'y a aucun élément non lu" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" @@ -389,105 +382,93 @@ "« shown » (fenêtre visible), « iconified » (fenêtre iconisée) ou " "« hidden » (fenêtre cachée)" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "ÉTAT" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Affiche des informations sur la version et quitte" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "Add a new subscription" msgstr "Ajoute un nouvel abonnement" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "uri" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Affiche des messages de débuggage de tout type" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "Affiche des messages de débuggage pour la gestion du cache" -#: ../src/main.c:187 +#: ../src/main.c:173 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:174 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:175 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:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" "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.8/output.xhtml" +"il copiera aussi le HTML généré dans ~/.cache/liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:177 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:178 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:179 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 +#: ../src/main.c:180 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:195 +#: ../src/main.c:181 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:196 +#: ../src/main.c:182 msgid "Print debugging messages of the search folder matching" msgstr "Affiche des messages de débuggage pour le dossier de recherche" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Affiche des messages de débuggage verbeux" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 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:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, le lecteur de flux pour Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" -"Pour plus d'information, veuillez visiter http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" -"Cette version de Liferea utilise un nouveau format de cache et a converti " -"votre cache de flux. Le contenu du cache dans %s n'a pas été effacé " -"automatiquement. Veuillez supprimer ce répertoire à la main une fois que " -"vous êtes sûr que la conversion s'est correctement effectuée !" +"Pour plus d'information, veuillez visiter http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -660,24 +641,24 @@ msgid "Feed title" msgstr "Le titre de l'élément" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Une mise à jour de l'abonnement \"%s\" est déjà en cours !" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "" "L'abonnement \"%s\" avait cessé d'exister. Liferea ne le mettra plus à jour !" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Mise à jour de la favicon pour \"%s\"" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -685,48 +666,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:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "L'URL de \"%s\" a changé définitivement et a été mise à jour" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "\"%s\" a cessé d'exister. Liferea ne le mettra plus à jour !" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" n'a pas changé depuis la dernière mise à jour" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Mise à jour de \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:259 #, 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:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s s'est terminé avec le code de retour %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, 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:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Erreur : impossible d'ouvrir le fichier \"%s\"" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Erreur : il n'y a pas de fichier \"%s\"" @@ -735,55 +716,53 @@ msgid "New Search Folder" msgstr "Nouveau dossier de recherche" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Il y avait d'autres erreurs. La sortie a été tronquée !]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "Analyseur syntaxique XML : impossible d'analyser le document :\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Attachements" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d attachement" -msgstr[1] "%d attachements" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " octets" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "Ko" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "Mo" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "Go" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d attachement" +msgstr[1] "%d attachements" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Choisir un fichier" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "Extension de fichier .%s" @@ -793,287 +772,296 @@ msgid "Couldn't find pixmap file: %s" msgstr "Fichier pixmap %s introuvable." -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d nouveau)" msgstr[1] " (%d nouveaux)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, 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:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Sommaire de l'aide" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Référence rapide" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "FAQ" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea est maintenant connecté" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Travailler déconnecté" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea est maintenant déconnecté" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Travailler connecté" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "A_bonnements" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "Tout mettre à _jour" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Met à jour tous les abonnements." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Marquer le tout comme _lu" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Marque comme lu chaque élément de chaque abonnement." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Importer une liste de flux..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importe une liste de flux OPML." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Exporter la liste des flux..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Exporte la liste des flux en OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Quitter" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Flux" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Supprimer _tous les éléments" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Supprime tous les éléments du flux sélectionné." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_Élément" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "Élément _non lu suivant" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "Élément _non lu suivant" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Vue" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "_Augmenter la taille du texte" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 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:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_Réduire la taille du texte" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 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:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "_Outils" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "_Moniteur de mise à jour" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 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:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Préférences" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Éditer les préférences." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "_Recherche" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Chercher dans tous les flux..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Affiche la boîte de recherche." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Aide" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Sommaire" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Voir l'aide concernant cette application." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Référence rapide" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Voir une liste de tous les raccourcis clavier de Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_FAQ" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Voir la FAQ de cette application." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "À _propos" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Affiche une fenêtre \"À propos\"." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "Vue _normale" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Mettre la vue comme celle d'un client mail." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "Vue _large" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Mettre une vue utilisant trois cadres verticaux." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "Vue _combinée" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Mettre une vue utilisant deux cadres." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "Liste de flux ré_duite" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Cacher les flux sans éléments non lus." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "Nouvel _abonnement..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Ajoute un abonnement à la liste des flux." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Nouveau _dossier..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Ajoute un dossier à la liste des flux." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Nouveau dossier de _recherche..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 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:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Nouvelle _source..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Ajoute une nouvelle source de liste de flux." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "Nouvelle _boîte à nouvelles..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Ajoute une nouvelle boîte à nouvelles." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "Marquer les éléments comme _lus" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 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:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "Mettre à _jour" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." @@ -1081,67 +1069,96 @@ "Met à jour l'abonnement sélectionné ou tous les abonnements du dossier " "sélectionné." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "_Propriétés" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 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:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "_Supprimer" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Supprime l'abonnement sélectionné." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Changer le statut _lu" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 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:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Changer le _marqueur de l'élément" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 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:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "_Supprimer" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Supprime l'élément sélectionné." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Ouvre le lien de l'élément dans le navigateur configuré." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "_Ouvrir dans le navigateur" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." msgstr "Ouvre le lien de l'élément dans le navigateur configuré." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Réglages du navigateur externe" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." +msgstr "Ouvre le lien de l'élément dans le navigateur configuré." + +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "_Travailler déconnecté" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 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:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Lecteur de flux" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 msgid "" "

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

    You can add new subscriptions

    • From main menu " @@ -1156,12 +1173,12 @@ "d'abonnements
    • en cliquant sur des liens avec le bouton droit et en " "choisissant « S'abonner » dans Liferea

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Entrer le nom d'utilisateur et le mot de passe pour \"%s\" (%s) :" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Source inconnue" @@ -1193,246 +1210,248 @@ "Liferea est en mode déconnecté. Il n'est pas possible de faire de mise à " "jour." -#: ../src/ui/liferea_htmlview.c:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Le téléchargement a ÉCHOUÉ : \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "Le téléchargement s'est terminé." - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +#: ../src/ui/liferea_htmlview.c:627 +#, fuzzy +msgid "Open Link In _Tab" msgstr "Ouvrir le lien dans un onglet (_tab)" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "_Ouvrir le lien dans le navigateur" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "_Ouvrir le lien dans le navigateur" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "_Publier le lien sur %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Copier l'adresse du lien" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 msgid "_Copy Image Location" msgstr "_Copier l'adresse de l'image" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 msgid "S_ave Link As" msgstr "S_auver le lien sous" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "S_auver l'image sous" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "S'_abonner..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Pas de titre ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Date" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Titre" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Aucun élément n'a été sélectionné" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Cet élément n'a pas de lien spécifié !" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Vous devez sélectionner un flux pour effacer ses éléments !" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Ouvrir l'élément dans un onglet (_tab)" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "_Ouvrir l'élément dans le navigateur" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "Copier dans la boîte à nouvelles" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Copier l'_URL de l'élément dans le presse-papiers" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "_Publier le lien sur %s" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "_Copier l'adresse de l'image" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "_Supprimer l'élément" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Ouvrir l'annexe..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Sauver sous..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "Copier l'adresse du lien" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "Mettre à _jour le tout" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "_Montrer Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "_Mettre à jour le dossier" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "_Marquer le tout comme lu" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_Nouveau" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "Nouvel _abonnement..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "Nouvelle _source..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 msgid "Sort Feeds" msgstr "Trier les flux" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "_Reconstruire" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "Nouvel _abonnement..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(Vide)" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "Défaut GNOME" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Texte sous les icônes" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Texte à côté des icônes" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Icônes uniquement" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Texte uniquement" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minutes" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "heures" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "jours" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Espace" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Espace" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Espace" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Choisissez un répertoire de téléchargement" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "Vue _normale" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "Vue _large" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "Vue _combinée" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Manuel" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Choix par défaut du navigateur" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Fenêtre existante" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Nouvel onglet" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "Intégrer avec le menu de messagerie (indicateur)" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 msgid "Terminate instead of minimizing to the messaging menu" msgstr "Terminer au lieu de minimiser dans le menu de messagerie" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "Commencer minimisé dans le menu de messagerie" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Type" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Programme" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "(Vide)" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1447,7 +1466,7 @@ msgid "This feed specifies no default update interval." msgstr "Ce flux ne spécifie aucun intervalle de mise à jour." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "Sans titre" @@ -1498,7 +1517,7 @@ msgid "%b %d %H:%M" msgstr "%d %b %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1508,11 +1527,11 @@ msgid "Google Reader login failed!" msgstr "La connexion (login) à Google Reader a échoué !" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1547,22 +1566,15 @@ 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:269 msgid "Source Type" msgstr "Type de source" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " "present your tt-rss subscriptions, and will synchronize your feed list and " @@ -1572,7 +1584,7 @@ "présentera vos abonnements tt-rss et synchronisera votre liste de flux et " "listes de lecture." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "Impossible d'analyser le JSON retourné par l'API tt-rss !" @@ -1641,8 +1653,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Veuillez entrer les paramètres de votre compte Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Mot de passe" @@ -1666,7 +1677,7 @@ msgid "combined view" msgstr "vue combinée" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Titres" @@ -1718,7 +1729,7 @@ msgstr "Général" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Source du flux" @@ -1837,476 +1848,539 @@ msgstr "Avancé" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Préférences de Liferea" +msgid "New Folder" +msgstr "Nouveau dossier" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "Gestion du cache des flux" +msgid "_Folder name:" +msgstr "Nom du _dossier :" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "_Nombre d'éléments de flux par défaut à sauvegarder :" +msgid "Rename" +msgstr "Renommer" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "Réglages de la mise à jour du flux" +msgid "_New Name:" +msgstr "_Nouveau nom :" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "_Mettre à jour tous les abonnements au démarrage." +msgid "Search Folder Properties" +msgstr "Propriétés du dossier de recherche" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "_Intervalle de rafraîchissement des flux par défaut :" +msgid "Search _Name:" +msgstr "Nom de la _recherche :" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "Trouver les éléments satisfaisant les critères suivants" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -msgid "" -"Note: Please remember to set a reasonable refresh time. Usually it is a " -"waste of bandwidth to poll feeds more often than each hour." -msgstr "" -"Note : Veuillez vous souvenir de régler un délai de rafraîchissement " -"raisonnable. Un délai inférieur à une heure n'est généralement qu'un " -"gaspillage de bande passante." +msgid "A_ny Rule Matches" +msgstr "N'_importe quelle règle s'applique" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Flux" +msgid "_All Rules Must Match" +msgstr "_Toutes les règles doivent s'appliquer" #: ../glade/liferea.ui.h:57 -msgid "Folder Display Settings" -msgstr "Réglages d'affichage des dossiers" +#, fuzzy +msgid "Open Enclosure" +msgstr "Ouvrir l'annexe..." #: ../glade/liferea.ui.h:58 -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é." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Téléchargement d'une annexe de type :" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "_Cacher les éléments lus." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"Que doit faire Liferea avec cette annexe ? Veuillez entrer ci-dessous la " +"commande que vous voulez exécuter. Les fichiers téléchargés seront passés en " +"argument de cette commande :" #: ../glade/liferea.ui.h:60 -msgid "Feed Icons (Favicons)" -msgstr "Icônes des flux (favicons)" +msgid "_Browse" +msgstr "_Parcourir" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "Mettre à _jour toutes les favicons maintenant" +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.ui.h:62 -msgid "Folders" -msgstr "Dossiers" +msgid "Search All Feeds" +msgstr "Chercher dans tous les flux" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" -msgstr "Lecture des titres" +msgid "_Search for:" +msgstr "_Chercher :" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "_Survoler les articles avec :" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Entrez une chaîne à rechercher que Liferea doit trouver soit dans le titre, " +"soit dans le contenu d'un élément." #: ../glade/liferea.ui.h:65 -msgid "Web Integration" -msgstr "Intégration web" +msgid "_Advanced..." +msgstr "_Avancé..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Poster les marque-pages sur" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"Débute une recherche du texte spécifié dans tous les flux. Le résultat de la " +"recherche apparaîtra dans la liste des éléments." #: ../glade/liferea.ui.h:67 -msgid "Internal Browser Settings" -msgstr "Réglages du navigateur interne" +msgid "Update Monitor" +msgstr "Moniteur de mise à jour" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Ouvrir les liens dans la fenêtre de _Liferea." +msgid "Pending Requests" +msgstr "Demandes en attente" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "Désactiver _Javascript." +msgid "Downloading Now" +msgstr "En cours de téléchargement" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "Activer les _greffons (plugins) du navigateur." +msgid "Cancel _All" +msgstr "_Annuler le tout" #: ../glade/liferea.ui.h:71 -msgid "External Browser Settings" -msgstr "Réglages du navigateur externe" +msgid "Create News Bin" +msgstr "Créer une boîte à nouvelles" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "_Ouvrir le lien dans :" +msgid "_News Bin Name:" +msgstr "Nom de _boîte à nouvelles :" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "À propos" #: ../glade/liferea.ui.h:74 -#, no-c-format +#, fuzzy +msgid "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" +"Copyright (c) 2003-2011\n" +"L'équipe Liferea\n" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea est un agrégateur de nouvelles pour GTK+" + +#: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "Page d'accueil de Liferea" + +#: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "Recherche avancée" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "_Dossier de recherche..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Créer un flux de moteur de recherche" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "entrer n'importe quelle chaîne voulue" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "Nombre _maximal de résultats :" + +#: ../glade/liferea.ui.h:84 +msgid "" +"Note: Liferea will generate a feed subscription which is used to query the " +"search engine results for the specified search string. You can keep this " +"feed permanently and update it like any other subscription." +msgstr "" +"Note : Liferea va générer un abonnement à un flux, utilisé pour récupérer " +"les résultats du moteur de recherche pour la chaîne de recherche spécifiée. " +"Vous pouvez garder ce flux définitivement et le mettre à jour comme " +"n'importe quel autre abonnement." + +#: ../glade/new_subscription.ui.h:9 +msgid "Download / Postprocessing" +msgstr "Téléchargement / post-traitement" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Sélection de la source" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Sélectionnez le type de source que vous voulez ajouter..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Ajouter OPML/Planet" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"Veuillez spécifier un fichier local ou une URL pointant sur une liste de " +"flux OPML valide." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Adresse" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "Sélectionner un _fichier" + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "Ajouter un compte Tiny Tiny RSS" + +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "Veuillez entrer les paramètres de votre compte tt-rss." + +#: ../glade/ttrss_source.ui.h:3 +msgid "_Server URL" +msgstr "URL du _serveur" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "Nom d'_utilisateur" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Avancé..." + +#: ../glade/simple_subscription.ui.h:4 msgid "" -"_Manual:\n" -"(%s for URL)" +"Enter a website location to use feed autodiscovery or in case you know it " +"the exact feed location." +msgstr "" +"Entrez une adresse de site web à utiliser pour la découverte automatique ou, " +"si vous la connaissez, l'adresse exacte du flux." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Préférences de Liferea" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Gestion du cache des flux" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "_Nombre d'éléments de flux par défaut à sauvegarder :" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Réglages de la mise à jour du flux" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "_Mettre à jour tous les abonnements au démarrage." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "_Intervalle de rafraîchissement des flux par défaut :" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"Note : Veuillez vous souvenir de régler un délai de rafraîchissement " +"raisonnable. Un délai inférieur à une heure n'est généralement qu'un " +"gaspillage de bande passante." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Flux" + +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Réglages d'affichage des dossiers" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "" +"_Montrer les éléments de tous les flux enfants lorsqu'un dossier est " +"sélectionné." + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "_Cacher les éléments lus." + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Icônes des flux (favicons)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "Mettre à _jour toutes les favicons maintenant" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Dossiers" + +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Lecture des titres" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "_Survoler les articles avec :" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" msgstr "" -"_Manuel :\n" -"(%s pour l'URL)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Intégration web" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Poster les marque-pages sur" + +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Réglages du navigateur interne" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Ouvrir les liens dans la fenêtre de _Liferea." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "Désactiver _Javascript." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "Activer les _greffons (plugins) du navigateur." + +#: ../glade/prefs.ui.h:26 +msgid "External Browser Settings" +msgstr "Réglages du navigateur externe" + +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "_Ouvrir le lien dans :" + +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Manuel" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "" + +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Navigateur :" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Navigateur" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 msgid "Notification Settings" msgstr "Réglages de notification" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Afficher un _popup avec les nouveaux titres." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 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.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "_Montrer le nombre de nouveaux éléments dans l'icône." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Terminer au lieu de minimiser dans l'icône." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "_Démarrer dans l'icône de la barre des tâches." -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 msgid "Toolbar Settings" msgstr "Réglages de la barre d'outils" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "_Cacher la barre d'outils." -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "_Boutons de la barre d'outils :" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "Interface" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "Serveur proxy HTTP" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "_Détection automatique (GNOME ou environnement)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "Pa_s de proxy" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "_Réglage manuel :" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "_Port du proxy :" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "_Hôte du proxy :" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Utiliser l'_authentification pour le proxy" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "_Mot de passe pour le proxy :" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "_Nom d'utilisateur pour le proxy :" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 msgid "Downloading Enclosures" msgstr "Téléchargement d'annexes" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Parcourir" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "Sauver les téléchargements _dans" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Télécharger en utilisant" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 msgid "Opening Enclosures" msgstr "Ouverture des annexes" -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Annexes" -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "Synchronisé avec les machines voisines" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_Activer la synchronisation avec le réseau local" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "_Nom de service" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Synchro" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Nouveau dossier" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "Nom du _dossier :" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Renommer" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Nouveau nom :" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Propriétés du dossier de recherche" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "Nom de la _recherche :" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "Trouver les éléments satisfaisant les critères suivants" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "N'_importe quelle règle s'applique" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "_Toutes les règles doivent s'appliquer" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Téléchargement d'une annexe" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Téléchargement d'une annexe de type :" - -#: ../glade/liferea.ui.h:120 -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 "" -"Que doit faire Liferea avec cette annexe ? Veuillez entrer ci-dessous la " -"commande que vous voulez exécuter. Les fichiers téléchargés seront passés en " -"argument de cette commande :" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Passer l'URL et ne pas télécharger l'annexe." - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -"_Faire ceci automatiquement pour les annexes comme celle-ci à partir de " -"maintenant." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Chercher dans tous les flux" -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Chercher :" +#~ msgid "Download and view feeds" +#~ msgstr "Télécharger et voir des flux" -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Entrez une chaîne à rechercher que Liferea doit trouver soit dans le titre, " -"soit dans le contenu d'un élément." - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "_Avancé..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Débute une recherche du texte spécifié dans tous les flux. Le résultat de la " -"recherche apparaîtra dans la liste des éléments." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Moniteur de mise à jour" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "Demandes en attente" - -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "En cours de téléchargement" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "_Annuler le tout" +#~ msgid "You may want to validate the feed using" +#~ msgstr "Vous pouvez valider le flux avec" -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Créer une boîte à nouvelles" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Ouvrir l'élément dans un onglet (_tab)" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "Nom de _boîte à nouvelles :" +#~ msgid "_Launch Item In Browser" +#~ msgstr "_Ouvrir l'élément dans le navigateur" -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "À propos" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Copier l'_URL de l'élément dans le presse-papiers" -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Copyright (c) 2003-2012\n" -"L'équipe Liferea\n" +#~ msgid "flag" +#~ msgstr "marqueur" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea est un agrégateur de nouvelles pour GTK+" +#~ msgid "bookmark" +#~ msgstr "marque-page" -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Page d'accueil de Liferea" +#~ msgid "comments" +#~ msgstr "commentaires" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Recherche avancée" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Le téléchargement de l'annexe a ÉCHOUÉ : \"%s\"" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "_Dossier de recherche..." +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Le téléchargement de l'annexe s'est terminé : \"%s\"" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Créer un flux de moteur de recherche" - -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "entrer n'importe quelle chaîne voulue" - -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Nombre _maximal de résultats :" - -#: ../glade/liferea.ui.h:145 -msgid "" -"Note: Liferea will generate a feed subscription which is used to query the " -"search engine results for the specified search string. You can keep this " -"feed permanently and update it like any other subscription." -msgstr "" -"Note : Liferea va générer un abonnement à un flux, utilisé pour récupérer " -"les résultats du moteur de recherche pour la chaîne de recherche spécifiée. " -"Vous pouvez garder ce flux définitivement et le mettre à jour comme " -"n'importe quel autre abonnement." - -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" -msgstr "Téléchargement / post-traitement" - -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Sélection de la source" +#~ msgid "" +#~ "This version of Liferea uses a new cache format and has migrated your " +#~ "feed cache. The cache content in %s was not deleted automatically. Please " +#~ "remove this directory manually once you are sure migration was successful!" +#~ msgstr "" +#~ "Cette version de Liferea utilise un nouveau format de cache et a converti " +#~ "votre cache de flux. Le contenu du cache dans %s n'a pas été effacé " +#~ "automatiquement. Veuillez supprimer ce répertoire à la main une fois que " +#~ "vous êtes sûr que la conversion s'est correctement effectuée !" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Sélectionnez le type de source que vous voulez ajouter..." +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Le téléchargement a ÉCHOUÉ : \"%s\"" -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Ajouter OPML/Planet" +#~ msgid "Download finished." +#~ msgstr "Le téléchargement s'est terminé." -#: ../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.ui.h:3 -msgid "_Location" -msgstr "_Adresse" +#~ msgid "Choose download directory" +#~ msgstr "Choisissez un répertoire de téléchargement" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "Sélectionner un _fichier" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Manuel :\n" +#~ "(%s pour l'URL)" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "Ajouter un compte Tiny Tiny RSS" +#~ msgid "_Save downloads in" +#~ msgstr "Sauver les téléchargements _dans" -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "Veuillez entrer les paramètres de votre compte tt-rss." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Synchronisé avec les machines voisines" -#: ../glade/ttrss_source.ui.h:3 -msgid "_Server URL" -msgstr "URL du _serveur" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "_Activer la synchronisation avec le réseau local" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "Nom d'_utilisateur" +#~ msgid "_Service Name" +#~ msgstr "_Nom de service" -#: ../glade/simple_subscription.ui.h:3 -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 "Sync" +#~ msgstr "Synchro" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Avancé..." +#~ msgid "Downloading Enclosure" +#~ msgstr "Téléchargement d'une annexe" -#~ msgid "You may want to validate the feed using" -#~ msgstr "Vous pouvez valider le flux avec" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "_Passer l'URL et ne pas télécharger l'annexe." #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " diff -Nru liferea-1.8.15/po/gl.po liferea-1.10.3/po/gl.po --- liferea-1.8.15/po/gl.po 2013-06-24 22:16:15.000000000 +0200 +++ liferea-1.10.3/po/gl.po 2013-07-31 23:29:12.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: liferea 1.7.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2010-08-19 16:32+0100\n" "Last-Translator: Anxo Outeiral \n" "Language-Team: Galician \n" @@ -17,8 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -31,8 +30,8 @@ msgstr "Lector de fontes Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Descarga e amosa fontes" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -141,38 +140,26 @@ msgstr "Creador" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "marcar" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "marcador" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "comentarios" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Aínda sen comentarios." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Comentarios" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Actualizando..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Actualizar" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Sección" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Departamento" @@ -197,12 +184,12 @@ msgid "Default Browser" msgstr "Navegador predeterminado de GNOME" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Erro ao iniciar o navegador: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "A iniciar: «%s»" @@ -212,7 +199,7 @@ msgid "Authorization Error" msgstr "Erro de autenticación" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Non foi posíbel crear o directorio da caché «%s»!" @@ -242,33 +229,39 @@ msgid "%b %d %Y" msgstr "%b %d %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "«%s» non é un ficheiro válido de configuración de contidos asociados!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Fallou a descarga do contido asociado: «%s»" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Rematou a descarga do contido asociado: «%s»" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Erro ao renomear %s a %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "Erro do XML ao ler o ficheiro OPML! Non foi posíbel importar «%s»!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." @@ -276,42 +269,42 @@ "Documento baleiro! O documento OPML «%s» que se desexaba importar, está " "baleiro." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "«%s» non é un documento OPML válido! Liferea non pode importar este ficheiro!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Lista de fontes importadas" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importar lista de fontes" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importar" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 #, fuzzy msgid "OPML Files" msgstr "Escolla o ficheiro OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Erro ao exportar a lista de fontes!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Lista de fontes exportada!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Exportar lista de fontes" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Exportar" @@ -367,12 +360,12 @@ msgstr "Non foi posíbel determinar o tipo de fonte." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "Non hai artigos non lidos" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" @@ -381,105 +374,93 @@ "mostrala, «iconified» para deixala na área de notificación, ou «hidden» " "para ocultala" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "ESTADO" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Amosa información da versión e finaliza" -#: ../src/main.c:180 +#: ../src/main.c:166 #, fuzzy msgid "Add a new subscription" msgstr "Nova subscrición" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Amosa todas as mensaxes de depuración" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "Amosa mensaxes de depuración para a xestión da caché" -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr "Amosa mensaxes de depuración da xestión de configuración" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "Amosa mensaxes de depuración da xestión de bases de datos" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "Amosa mensaxes de depuración de todas as funcións da interface gráfica" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" "Activa a depuración de renderización HTML. Cada vez que Liferea produza HTML " -"de saída gardará ese contido no arquivo ~/.liferea_1.8/output.xhtml" +"de saída gardará ese contido no arquivo ~/.cache/liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "Amosa mensaxes de depuración de toda a actividade de rede" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "Amosa mensaxes de depuración de todas as funcións de procesamento" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "Amosa mensaxes de depuración cando unha función demórase moito tempo" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Amosa mensaxes de depuración na entrada e saída de funcións" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "Amosa mensaxes de depuración do proceso de actualización de fontes" -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr "Amosa mensaxes de depuración para a xestión da caché" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Amosa máis información nas mensaxes de depuración" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "Amosa mensaxes de depuración para asunto especificado" -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, lector de fontes para Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" -"Para máis información, por favor visite http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" -"Esta versión do Liferea utiliza un novo formato de caché polo que as antigas " -"fontes foron trasladadas. O contido da caché en %s non se eliminou " -"automaticamente. Por favor, elimine este cartafol manualmente cando teña a " -"certeza de que a actualización rematou correctamente!" +"Para máis información, por favor visite http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -648,23 +629,23 @@ msgid "Feed title" msgstr "Título da fonte" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "A subscrición «%s» estase a actualizar!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "A subscrición «%s» foi suspendida. Liferea non a actualizará!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Actualizando a icona da páxina de «%s»" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -672,48 +653,48 @@ "Atopouse un problema ao ler esta subscrición. Por favor comprobe o URL e a " "saída da consola." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "O URL de «%s» cambiou permanentemente e foi actualizada" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "«%s» foi suspendido. Liferea non a actualizará!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "«%s» non cambiou dende a última actualización" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "A actualizar «%s»" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Erro ao abrir o ficheiro temporal %s para usar na filtraxe!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s saíu con estado %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Erro: Non puido abrir a canalización «%s»" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Erro: Non puido abrir o ficheiro «%s»" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Erro: O ficheiro «%s» non existe" @@ -722,55 +703,53 @@ msgid "New Search Folder" msgstr "Novo cartafol de busca" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Hai máis erros. A saída foi truncada!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "Analizador XML: Non puido analizar o documento:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Anexos" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d anexo" -msgstr[1] "%d anexos" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " Bytes" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d anexo" +msgstr[1] "%d anexos" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Escolla un ficheiro" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, fuzzy, c-format msgid "File Extension .%s" msgstr "Extensión do ficheiro .%s" @@ -780,284 +759,293 @@ msgid "Couldn't find pixmap file: %s" msgstr "Non foi posíbel localizar o ficheiro de mapa de píxeles: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d novo)" msgstr[1] " (%d novos)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d non lido%s" msgstr[1] "%d non lidos%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Temas de axuda" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Referencia rápida" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "Preguntas máis frecuentes" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea está conectado" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Traballar sen conexión" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea está desconectado" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Traballar con conexión" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Subscricións" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "Actualizar _todas" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Actualizar todas as subscricións." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Marcar todo coma _lido" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Marcar coma lidos todos os artigos de cada subscrición." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Importar lista de fontes..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importar unha lista de fontes co formato OPML." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Exportar lista de fontes..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Exportar a lista de fontes co formato OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Saír" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Fonte" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Eliminar _todos os artigos" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Eliminar todos os artigos da fonte seleccionada." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_Artigo" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "_Seguinte artigo non lido" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "_Seguinte artigo non lido" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Ver" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "_Aumentar o tamaño do texto" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Aumenta o tamaño do texto na vista do artigo." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_Diminuír o tamaño do texto" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Diminúe o tamaño do texto na vista do artigo." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "_Ferramentas" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "_Monitor de actualizacións" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "Amosa unha lista de todas as fontes na cola de actualizacións" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Preferencias" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Editar preferencias." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "_Procurar" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Procurar en todas as fontes..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Amosa a caixa de diálogo de busca." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Axuda" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Contidos" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Ver a axuda para esta aplicación." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Referencia rápida" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Ver a lista de todos os atallos do Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_Preguntas máis frecuentes" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Ver as preguntas máis frecuentes para esta aplicación." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_Acerca de" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Amosa información do programa." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "Visualización _normal" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Define o modo de visualización en modo cliente de correo." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "Visualización _ampla" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Define o modo de visualización usando tres paneis verticais." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "Visualización _combinada" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Define o modo de visualización usando dous paneis." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "Lista de fontes _reducida" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Agocha as fontes sen artigos non lidos" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "_Nova subscrición..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Engade unha subscrición á lista de fontes." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Novo _cartafol..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Engade un cartafol á lista de fontes." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Novo cartafol de _busca..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Engade un novo cartafol de busca á lista de fontes." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Nova _fonte..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Engadir unha nova orixe de listas de fontes." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "Nova bandexa de _novas..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Engade unha nova bandexa de novas." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "_Marcar artigos coma lidos" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "Marca coma lidos todos os artigos da lista de fontes seleccionada." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Actualizar" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." @@ -1065,67 +1053,96 @@ "Actualiza a subscrición seleccionada ou todas as subscricións do cartafol " "seleccionado." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "_Propiedades" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Abre a caixa de diálogo para a subscrición seleccionada." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "_Eliminar" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Elimina a subscrición seleccionada." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Alternar estado de _lectura" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Alterna o estado de lectura do artigo seleccionado." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Alternar _marcador do artigo" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Alterna o estado do marcador do artigo seleccionado." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "_Eliminar" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Elimina o artigo seleccionado." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Inicia a ligazón do artigo no navegador configurado." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "_Iniciar no navegador" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." msgstr "Inicia a ligazón do artigo no navegador configurado." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Preferencias do navegador externo" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." +msgstr "Inicia a ligazón do artigo no navegador configurado." + +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "_Traballar sen conexión" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Esta opción permite desactivar a actualización de subscricións." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Lector de fontes para Linux" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 #, fuzzy msgid "" "

    Welcome to Liferea, a desktop news aggregator for online news " @@ -1140,12 +1157,12 @@ "navegar polos titulares dunha fonte, selecciónea na lista e os titulares " "cargaranse no panel dereito.

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Introduza o nome de usuario e contrasinal para «%s» (%s):" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Fonte descoñecida" @@ -1176,251 +1193,252 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea está en modo sen conexión. Non é posíbel actualizar." -#: ../src/ui/liferea_htmlview.c:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Fallou a descarga do contido asociado: «%s»" - -#: ../src/ui/liferea_htmlview.c:437 +#: ../src/ui/liferea_htmlview.c:627 #, fuzzy -msgid "Download finished." -msgstr "_Descargar empregando" - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +msgid "Open Link In _Tab" msgstr "Iniciar a ligazón nun _separador" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "_Inicia a ligazón no navegador" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "_Inicia a ligazón no navegador" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "_Marcar ligazón en %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Copiar localización da ligazón" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 #, fuzzy msgid "_Copy Image Location" msgstr "_Copiar localización da ligazón" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 #, fuzzy msgid "S_ave Link As" msgstr "Gardar como..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Subscribirse..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Sen título ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Data" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Encabezamento" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Non se escolleu ningún artigo" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Este artigo non ten ligazón especificada!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Seleccione unha fonte para eliminar os seus artigos!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Iniciar o artigo nun novo _separador" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "_Iniciar o artigo no navegador" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "Copiar á bandexa de novas " -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Copiar o _URL do artigo ao portapapeis" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "_Marcar ligazón en %s" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "_Copiar localización da ligazón" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "_Eliminar artigo" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Abrir contido asociado..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Gardar como..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "Copiar localización da ligazón" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "_Actualizar todo" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "_Amosar Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "_Actualizar cartafol" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "_Marcar todo coma lido" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_Nova" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "_Nova subscrición..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "Nova _fonte..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 #, fuzzy msgid "Sort Feeds" msgstr "Importar lista de fontes" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "_Nova subscrición..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "Predeterminado GNOME" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Texto abaixo das iconas" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Texto ao lado das iconas" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Só iconas" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Só texto" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minutos" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "horas" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "días" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Espazo" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Espazo" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Expazo" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Escolla o cartafol de descarga" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "Visualización _normal" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "Visualización _ampla" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "Visualización _combinada" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Manual" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Navegador predeterminado" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Xanela existente" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Nova xanela" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Novo separador" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 #, fuzzy msgid "Terminate instead of minimizing to the messaging menu" msgstr "_Finalizar en vez de minimizar á icona da bandexa." -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Tipo" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Programa" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1436,7 +1454,7 @@ msgstr "" "Esta fonte non especifica un intervalo de actualización predeterminado." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "" @@ -1487,7 +1505,7 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1497,11 +1515,11 @@ msgid "Google Reader login failed!" msgstr "Fallou ao iniciar a sesión do Google Reader!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1536,22 +1554,15 @@ msgid "No feed list source types found!" msgstr "Non se atopou ningún tipo de lista de fontes!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:269 msgid "Source Type" msgstr "Tipo de fonte" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 #, fuzzy msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " @@ -1562,7 +1573,7 @@ "súa subscrición do Google Reader, e sincronizará a súa lista de fontes e de " "lectura." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1631,8 +1642,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Por favor introduza os datos da súa conta de Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Contrasinal" @@ -1656,7 +1666,7 @@ msgid "combined view" msgstr "vista combinada" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Titulares" @@ -1709,7 +1719,7 @@ msgstr "Xeral" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 #, fuzzy msgid "Feed Source" msgstr "Orixe da fonte" @@ -1828,496 +1838,561 @@ msgstr "Avanzado" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Preferencias do Liferea" +msgid "New Folder" +msgstr "Novo cartafol" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "Nome do _cartafol:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "_Número de artigos predeterminados a gardar por fonte:" +msgid "Rename" +msgstr "Renomear" #: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "Actualizar fonte" +msgid "_New Name:" +msgstr "_Novo nome:" #: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Actualizar todas as subscricións." +msgid "Search Folder Properties" +msgstr "Preferencias do cartafol de busca" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "_Intervalo de actualización predeterminado:" +msgid "Search _Name:" +msgstr "_Nome da procura:" + +#: ../glade/liferea.ui.h:54 +#, fuzzy +msgid "Find Items that meet the following criteria" +msgstr "Atopar artigos que reúnan os seguintes criterios" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"Nota: Por favor, recorde establecer un tempo de actualización razonábel. " -"Normalmente é un desperdicio de largura de banda obter fontes máis dunha vez " -"cada hora." +msgid "A_ny Rule Matches" +msgstr "_Calquera regra coincide" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Fontes" +msgid "_All Rules Must Match" +msgstr "_Todas as regras deben coincidir" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "" -"Preferencias de visualización dos cartafoles" +msgid "Open Enclosure" +msgstr "Abrir contido asociado..." #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "" -"_Amosar os artigos de todas as fontes fillas ao seleccionar un cartafol." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Descargando un contido asociado de tipo:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "_Ocultar artigos lidos." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"Que debería facer Liferea con este contido asociado? Por favor introduza " +"abaixo o comando que desexa executar. Os contidos asociados descargados " +"serán empregados como argumentos para esta orde: " #: ../glade/liferea.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Iconas das fontes (Iconas das páxinas)" +msgid "_Browse" +msgstr "_Navegar" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_Actualizar todas as iconas das páxinas agora" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "" +"_Facer isto automaticamente para contidos asociados coma este de agora en " +"adiante." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Cartafoles" +msgid "Search All Feeds" +msgstr "Procurar en todas as fontes" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "titulares non lidos" +msgid "_Search for:" +msgstr "_Procurar por:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "_Avanzar polos artigos con:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Introduza unha cadea de busca que o Liferea debe procurar nos títulos dos " +"artigos ou nos seus contidos." #: ../glade/liferea.ui.h:65 -#, fuzzy -msgid "Web Integration" -msgstr "Orientación" +msgid "_Advanced..." +msgstr "_Avanzado..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Publicar os marcadores en" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"Inicia unha procura do texto especificado en todas as fontes. O resultado da " +"procura aparecerá na lista de artigos." #: ../glade/liferea.ui.h:67 -#, fuzzy -msgid "Internal Browser Settings" -msgstr "Preferencias do navegador interno" +msgid "Update Monitor" +msgstr "Monitor de actualizacións" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Abrir as ligazóns na _xanela do Liferea." +#, fuzzy +msgid "Pending Requests" +msgstr "Solicitudes pendentes" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Desactivar Javascript." +#, fuzzy +msgid "Downloading Now" +msgstr "Descargando" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "" - +msgid "Cancel _All" +msgstr "Cancelar _todo" + #: ../glade/liferea.ui.h:71 +msgid "Create News Bin" +msgstr "Crear unha bandexa de novas" + +#: ../glade/liferea.ui.h:72 +msgid "_News Bin Name:" +msgstr "Nome da bandexa de _novas:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Acerca de" + +#: ../glade/liferea.ui.h:74 +#, fuzzy +msgid "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" +"Dereitos de autor (c) 2003-2009\n" +"Os desenvolvedores do Liferea\n" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea é un agregador de novas para GTK+" + +#: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "Páxina principal do Liferea" + +#: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "Procura avanzada" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "Cartafol de _busca..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Crear unha fonte de motor de busca" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "introduza unha cadea para procurar" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "_Cantidade máxima de artigos da busca:" + +#: ../glade/liferea.ui.h:84 +#, 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 "" +"Nota: Liferea xerará unha fonte de subscrición que poderá ser usada para " +"consultar os resultados dos motores de busca da cadea especificada. Pode " +"manter esta fonte permanentemente e actualizala como calquera outra " +"subscrición." + +#: ../glade/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "Descarga / Postprocesado" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Selección da fonte" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Selección do tipo de fonte que desexa engadir..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Engadir OPML/Planeta" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"Por favor especifique un ficheiro local ou un URL que apunte a unha lista de " +"fontes en formato OPML." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Localización" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "_Seleccionar ficheiro" + +#: ../glade/ttrss_source.ui.h:1 +#, fuzzy +msgid "Add Tiny Tiny RSS Account" +msgstr "Engadir conta de Bloglines" + +#: ../glade/ttrss_source.ui.h:2 +#, fuzzy +msgid "Please enter your tt-rss account settings." +msgstr "Por favor introduza os datos da súa conta de Bloglines." + +#: ../glade/ttrss_source.ui.h:3 +#, fuzzy +msgid "_Server URL" +msgstr "Erro do servidor" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "Nome de _usuario" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Avanzado..." + +#: ../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 "" +"Introduza o enderezo dun sitio web para empregar o descubrimento automático " +"da fonte, ou no caso de que a coñeza, a súa localización exacta." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Preferencias do Liferea" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "_Número de artigos predeterminados a gardar por fonte:" + +#: ../glade/prefs.ui.h:4 +#, fuzzy +msgid "Feed Update Settings" +msgstr "Actualizar fonte" + +#: ../glade/prefs.ui.h:5 +#, fuzzy +msgid "_Update all subscriptions at startup." +msgstr "Actualizar todas as subscricións." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "_Intervalo de actualización predeterminado:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"Nota: Por favor, recorde establecer un tempo de actualización razonábel. " +"Normalmente é un desperdicio de largura de banda obter fontes máis dunha vez " +"cada hora." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Fontes" + +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "" +"Preferencias de visualización dos cartafoles" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "" +"_Amosar os artigos de todas as fontes fillas ao seleccionar un cartafol." + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "_Ocultar artigos lidos." + +#: ../glade/prefs.ui.h:13 +#, fuzzy +msgid "Feed Icons (Favicons)" +msgstr "Iconas das fontes (Iconas das páxinas)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Actualizar todas as iconas das páxinas agora" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Cartafoles" + +#: ../glade/prefs.ui.h:16 +#, fuzzy +msgid "Reading Headlines" +msgstr "titulares non lidos" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "_Avanzar polos artigos con:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +#, fuzzy +msgid "Web Integration" +msgstr "Orientación" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Publicar os marcadores en" + +#: ../glade/prefs.ui.h:22 +#, fuzzy +msgid "Internal Browser Settings" +msgstr "Preferencias do navegador interno" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Abrir as ligazóns na _xanela do Liferea." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Desactivar Javascript." + +#: ../glade/prefs.ui.h:25 +#, fuzzy +msgid "_Enable browser plugins." +msgstr "Preferencias do navegador externo" + +#: ../glade/prefs.ui.h:26 #, fuzzy msgid "External Browser Settings" msgstr "Preferencias do navegador externo" -#: ../glade/liferea.ui.h:72 +#: ../glade/prefs.ui.h:27 msgid "_Open link in:" msgstr "_Abrir ligazón en:" -#: ../glade/liferea.ui.h:74 +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Manual" + +#: ../glade/prefs.ui.h:30 #, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" +msgid "(%s for URL)" msgstr "" -"_Manual:\n" -"(%s para URL)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Navegador:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Navegador" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 #, fuzzy msgid "Notification Settings" msgstr "Preferencias de notificación" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Amosa unha xanela _emerxente ao recibir novos titulares." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "Amosa unha _icona na área de notificación (bandexa do sistema)." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Amosa a _cantidade de novos artigos na icona da bandexa." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Finalizar en vez de minimizar á icona da bandexa." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "_Iniciar a icona na bandexa" -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 #, fuzzy msgid "Toolbar Settings" msgstr "Etiquetas dos _botóns da barra de ferramentas:" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "_Ocultar a barra de ferramentas." -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Etiquetas dos _botóns da barra de ferramentas:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "Interface gráfica de usuario" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "Detectar _automaticamente (do GNOME ou do ambiente)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "_Sen proxy" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "Configuración _manual:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "_Porto do proxy:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "_Servidor proxy:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Utilizar _autenticación proxy" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "_Contrasinal do proxy:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "Nome de _usuario do proxy:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 #, fuzzy msgid "Downloading Enclosures" msgstr "Descargando contido asociado" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Navegar" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Gardar descargas en" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Descargar empregando" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 #, fuzzy msgid "Opening Enclosures" msgstr "Abrir contido asociado..." -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Contido asociado" -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Sincronización con servidores próximos" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_Activar a sincronización na rede local" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "Nome do _servizo" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Sincronizar" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Novo cartafol" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "Nome do _cartafol:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Renomear" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Novo nome:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Preferencias do cartafol de busca" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "_Nome da procura:" - -#: ../glade/liferea.ui.h:115 -#, fuzzy -msgid "Find Items that meet the following criteria" -msgstr "Atopar artigos que reúnan os seguintes criterios" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "_Calquera regra coincide" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "_Todas as regras deben coincidir" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Descargando contido asociado" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Descargando un contido asociado de tipo:" - -#: ../glade/liferea.ui.h:120 -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 "" -"Que debería facer Liferea con este contido asociado? Por favor introduza " -"abaixo o comando que desexa executar. Os contidos asociados descargados " -"serán empregados como argumentos para esta orde: " - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Pasar o URL e non descargar o contido asociado." - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -"_Facer isto automaticamente para contidos asociados coma este de agora en " -"adiante." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Procurar en todas as fontes" -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Procurar por:" +#~ msgid "Download and view feeds" +#~ msgstr "Descarga e amosa fontes" -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Introduza unha cadea de busca que o Liferea debe procurar nos títulos dos " -"artigos ou nos seus contidos." - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "_Avanzado..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Inicia unha procura do texto especificado en todas as fontes. O resultado da " -"procura aparecerá na lista de artigos." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Monitor de actualizacións" - -#: ../glade/liferea.ui.h:129 -#, fuzzy -msgid "Pending Requests" -msgstr "Solicitudes pendentes" - -#: ../glade/liferea.ui.h:130 -#, fuzzy -msgid "Downloading Now" -msgstr "Descargando" +#~ msgid "You may want to validate the feed using" +#~ msgstr "Pode validar a fonte utilizando" -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "Cancelar _todo" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Iniciar o artigo nun novo _separador" -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Crear unha bandexa de novas" +#~ msgid "_Launch Item In Browser" +#~ msgstr "_Iniciar o artigo no navegador" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "Nome da bandexa de _novas:" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Copiar o _URL do artigo ao portapapeis" -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Acerca de" +#~ msgid "flag" +#~ msgstr "marcar" -#: ../glade/liferea.ui.h:135 -#, fuzzy -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Dereitos de autor (c) 2003-2009\n" -"Os desenvolvedores do Liferea\n" +#~ msgid "bookmark" +#~ msgstr "marcador" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea é un agregador de novas para GTK+" +#~ msgid "comments" +#~ msgstr "comentarios" -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Páxina principal do Liferea" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Fallou a descarga do contido asociado: «%s»" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Procura avanzada" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Rematou a descarga do contido asociado: «%s»" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "Cartafol de _busca..." - -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Crear unha fonte de motor de busca" - -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "introduza unha cadea para procurar" - -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "_Cantidade máxima de artigos da busca:" +#~ 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 "" +#~ "Esta versión do Liferea utiliza un novo formato de caché polo que as " +#~ "antigas fontes foron trasladadas. O contido da caché en %s non se " +#~ "eliminou automaticamente. Por favor, elimine este cartafol manualmente " +#~ "cando teña a certeza de que a actualización rematou correctamente!" -#: ../glade/liferea.ui.h:145 #, 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 "" -"Nota: Liferea xerará unha fonte de subscrición que poderá ser usada para " -"consultar os resultados dos motores de busca da cadea especificada. Pode " -"manter esta fonte permanentemente e actualizala como calquera outra " -"subscrición." +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Fallou a descarga do contido asociado: «%s»" -#: ../glade/new_subscription.ui.h:9 #, fuzzy -msgid "Download / Postprocessing" -msgstr "Descarga / Postprocesado" +#~ msgid "Download finished." +#~ msgstr "_Descargar empregando" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Selección da fonte" +#~ msgid "Choose download directory" +#~ msgstr "Escolla o cartafol de descarga" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Selección do tipo de fonte que desexa engadir..." - -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Engadir OPML/Planeta" - -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Por favor especifique un ficheiro local ou un URL que apunte a unha lista de " -"fontes en formato OPML." - -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Localización" - -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "_Seleccionar ficheiro" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Manual:\n" +#~ "(%s para URL)" -#: ../glade/ttrss_source.ui.h:1 -#, fuzzy -msgid "Add Tiny Tiny RSS Account" -msgstr "Engadir conta de Bloglines" +#~ msgid "_Save downloads in" +#~ msgstr "_Gardar descargas en" -#: ../glade/ttrss_source.ui.h:2 #, fuzzy -msgid "Please enter your tt-rss account settings." -msgstr "Por favor introduza os datos da súa conta de Bloglines." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Sincronización con servidores próximos" -#: ../glade/ttrss_source.ui.h:3 -#, fuzzy -msgid "_Server URL" -msgstr "Erro do servidor" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "_Activar a sincronización na rede local" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "Nome de _usuario" +#~ msgid "_Service Name" +#~ msgstr "Nome do _servizo" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Introduza o enderezo dun sitio web para empregar o descubrimento automático " -"da fonte, ou no caso de que a coñeza, a súa localización exacta." +#~ msgid "Sync" +#~ msgstr "Sincronizar" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Avanzado..." +#~ msgid "Downloading Enclosure" +#~ msgstr "Descargando contido asociado" -#~ msgid "You may want to validate the feed using" -#~ msgstr "Pode validar a fonte utilizando" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "_Pasar o URL e non descargar o contido asociado." #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " diff -Nru liferea-1.8.15/po/he.po liferea-1.10.3/po/he.po --- liferea-1.8.15/po/he.po 2013-06-24 22:16:15.000000000 +0200 +++ liferea-1.10.3/po/he.po 2013-07-31 23:29:12.000000000 +0200 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: liferea 1.8.11\n" +"Project-Id-Version: liferea 1.8.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" -"PO-Revision-Date: 2013-01-13 11:51+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" +"PO-Revision-Date: 2012-12-23 18:24+0200\n" "Last-Translator: Isratine Citizen \n" "Language-Team: Hebrew \n" "Language: he\n" @@ -18,8 +18,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.5.4\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "‫Liferea" @@ -32,16 +31,16 @@ msgstr "קורא הערוצים Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "טען וצפה בערוצים" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" "This feed is discontinued. It's no longer available. Liferea won't update it " "anymore but you can still access the cached headlines." msgstr "" -"ערוץ זה הופסק, ואיננו זמין יותר. Liferea לא יעדכן אותו בעתיד, אולם עדיין " -"ביכולתך לגשת אל הכותרות המוטמנות." +"ערוץ זה הופסק, ואינו זמין יותר. Liferea לא יעדכן את ערוץ זה בעתיד, אולם " +"עדיין ניתן לגשת לכותרות המוטמנות." #: ../xslt/feed.xml.in.h:2 msgid "" @@ -68,7 +67,7 @@ #: ../xslt/feed.xml.in.h:6 msgid "You may want to contact the author/webmaster of the feed about this!" -msgstr "ייתכן שברצונך ליצור קשר עם מחבר/מנהל אתר הערוץ בנוגע לעניין זה!" +msgstr "" #: ../xslt/feed.xml.in.h:7 msgid "There were errors while filtering this feed!" @@ -155,50 +154,37 @@ # בנוסף פורסם אצל #: ../xslt/item.xml.in.h:8 msgid "Also posted in" -msgstr "בנוסף פורסם אצל:" +msgstr "פורסם גם בערוץ:" #: ../xslt/item.xml.in.h:9 msgid "Creator" msgstr "יוצר" -# דגלון -#: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "דגל" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "סימנייה" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "תגובות" - # RLO workaround until RTL problem will be solved #

    אין עדיין תגובות.

    -#: ../xslt/item.xml.in.h:13 +#: ../xslt/item.xml.in.h:10 msgid "No comments yet." msgstr "אין עדיין תגובות.‮" # RLO workaround until RTL problem will be solved #

    תגובות

    -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "תגובות‮" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "מעדכן כעת…" -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "רענן" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "סעיף" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "מחלקה" @@ -223,25 +209,25 @@ msgid "Default Browser" msgstr "דפדפן ברירת מחדל" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "פקודת דפדפן נכשלה: ‭%s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" -msgstr "מפעיל כעת: \"%s\"" +msgstr "מפעיל כעת את: \"%s\"" #. unauthorized #: ../src/comments.c:120 msgid "Authorization Error" msgstr "שגיאת הרשאה" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" -msgstr "לא ניתן ליצור ספריית מטמון \"%s\"!" +msgstr "לא ניתן ליצור מדור מטמון עבור \"%s\"!" #. translation hint: date format for today, reorder format codes as necessary #: ../src/date.c:80 @@ -268,73 +254,79 @@ msgid "%b %d %Y" msgstr "%d ב%b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "‏\"%s\" אינו קובץ תצורה תקין של טיפוס צירופים!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "הורדת צירוף נכשלה: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "הורדת צירוף הסתיימה: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" # בשינוי השם של -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "שגיאה בשינוי השם %s אל %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" -msgstr "שגיאת XML במהלך קריאת קובץ OPML! לא היה ניתן לייבא את \"%s\"!" +msgstr "שגיאת XML במהלך קריאת קובץ OPML! לא ניתן לייבא את \"%s\"!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." -msgstr "מסמך ריק! מסמך OPML ‏\"%s\" לא אמור להיות ריק כאשר הוא מיובא." +msgstr "מסמך ריק! מסמך OPML ‏\"%s\" לא אמור להיות ריק במהלך ייבוא." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "‏\"%s\" אינו מסמך OPML תקין. Liferea לא מסוגל לייבא קובץ זה." -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "רשימת ערוצים מיובאים" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "ייבוא רשימת ערוצים" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "ייבוא" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 msgid "OPML Files" msgstr "קבצי OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "שגיאה במהלך ייצוא רשימת ערוצים!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "ייצוא רשימת ערוצים הסתיים!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "ייצוא רשימת ערוצים" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "ייצוא" @@ -344,8 +336,8 @@ "points to a resource provided in one of the supported syndication formats!XML Parser Output:
    " msgstr "" -"

    לא היה ניתן לזהות את טיפוס ערוץ זה! אנא בדוק שהכתובת אכן מצביעה לאחד " -"הפורמטים הנתמכים.

    תוצאת פענוח ה-XML:
    " +"

    לא ניתן לזהות את טיפוס הערוץ! נא לבדוק שהכתובת אכן מצביעה לאחד הפורמטים " +"הנתמכים.

    תוצאת פענוח ה-XML:
    " # <שם_הזנה> עודכנה... #: ../src/feed.c:284 @@ -371,7 +363,7 @@ #: ../src/feed_parser.c:170 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" -msgstr "שגיאת XML במהלך קריאת ערוץ! לא היה ניתן לטעון את הערוץ \"%s\"!" +msgstr "שגיאת XML במהלך קריאת ערוץ! לא ניתן לטעון את הערוץ \"%s\"!" #: ../src/feed_parser.c:175 msgid "Empty document!" @@ -388,135 +380,124 @@ #: ../src/feed_parser.c:230 msgid "Could not determine the feed type." -msgstr "לא היה ניתן לקבוע את טיפוס הערוץ." +msgstr "לא ניתן לקבוע את טיפוס הערוץ." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "אין פריטים שלא נקראו" # cli -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" msgstr "" # cli -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "" # cli -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "" # cli # הוספת מינוי חדש -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "Add a new subscription" msgstr "" # cli -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" # cli -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "" # cli -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "" # cli -#: ../src/main.c:187 +#: ../src/main.c:173 msgid "Print debugging messages for the configuration handling" msgstr "" # cli -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "" # cli -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "" # cli -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" # cli -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "" # cli -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "" # cli -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" # cli -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "" # cli -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "" # cli -#: ../src/main.c:196 +#: ../src/main.c:182 msgid "Print debugging messages of the search folder matching" msgstr "" # cli -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "" # cli -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "" # cli # ‏Liferea‏, קורא הערוצים של לינוקס -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "" -# למידע נוסף, אנא בקר בכתובת http://liferea.sourceforge.net/‎ -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" +# למידע נוסף, אנא בקר בכתובת http://lzone.de/liferea/‎ +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" -#: ../src/migrate.c:340 -#, 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 "" -"גרסא זאת של Liferea עושה שימוש בפורמט מטמון חדש, ומטמון הערוצים הקיים הוסב " -"לפורמט החדש. תוכן המטמון במדור %s הוסב אך לא נמחק אוטומטית. אנא הסר את המדור " -"ידנית כאשר הינך סמוך שתהליך ההסבה הסתיים בהצלחה!" - #. Some libsoup transport errors #: ../src/net.c:320 msgid "The update request was cancelled" @@ -541,22 +522,22 @@ #: ../src/net.c:325 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" -msgstr "ארעה שגיאת תקשורת, או שהקצה המרוחק ניתק את הקשר במפתיע" +msgstr "ארעה שגיאת תקשורת, או שהקצה המרוחק ניתק את הקשר באופן בלתי צפוי" # באופן קבוע #. http 3xx redirection #: ../src/net.c:328 msgid "The resource moved permanently to a new location" -msgstr "המשאב נעבר אל מיקום חדש לצמיתות" +msgstr "המשאב הועבר לצמיתות אל מיקום חדש" -# לטעון את ערוץ זה. אנא עדכן +# לטעון את ערוץ זה. נא לעדכן #. http 4xx client error #: ../src/net.c:331 msgid "" "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" msgstr "" -"אין לך הרשאה לטעון את תוכן הערוץ. אנא עדכן את שם המשתמש והסיסמה שלך בדו שיח " +"אין לך הרשאה לטעון את תוכן הערוץ. נא לעדכן את שם המשתמש והסיסמה שלך בדו שיח " "מאפייני הערוץ" #: ../src/net.c:333 @@ -583,16 +564,16 @@ #: ../src/net.c:338 msgid "Proxy authentication required" -msgstr "נדרשת התאמתות אל מול פרוקסי" +msgstr "נדרשת הזדהות אל מול פרוקסי" #: ../src/net.c:339 msgid "Request timed out" -msgstr "תם הזמן המוקצב לבקשה" +msgstr "תם הזמן שהוקצב לבקשה" # אבד, נעלם #: ../src/net.c:340 msgid "Gone. Resource doesn't exist. Please unsubscribe!" -msgstr "הערוץ לא קיים. אנא בטל את המינוי." +msgstr "הערוץ לא קיים. נא לבטל את המינוי." #: ../src/net.c:345 msgid "There was an internal error in the update process" @@ -679,138 +660,136 @@ #: ../src/rule.c:180 msgid "is set" -msgstr "שנקבעה כ" +msgstr "שמוגדרת כ" #: ../src/rule.c:180 msgid "is not set" -msgstr "שלא נקבעה כ" +msgstr "שלא מוגדרת כ" #: ../src/rule.c:181 msgid "Feed title" -msgstr "כותרת ערוץ" +msgstr "כותר ערוץ" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "המינוי \"%s\" כבר מתעדכן כעת!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "המינוי \"%s\" הופסק. Liferea לא יעדכן אותו יותר!" # הצלמית עבור \"%s\" מתעדכנת כעת -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" -msgstr "מעדכן כעת צלמית עבור \"%s\"" +msgstr "מעדכן כעת סמל עבור \"%s\"" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." -msgstr "ארעה בעיה במהלך קריאת מינוי זה. אנא בדוק כתובת URL ופלט מסוף." +msgstr "ארעה בעיה במהלך קריאת מינוי זה. נא לבדוק כתובת URL ופלט מסוף." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" -msgstr "הכתובת של \"%s\" הוחלפה לצמיתות ועודכנה" +msgstr "כתובת URL של \"%s\" הוחלפה לצמיתות ועודכנה" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "‏\"%s\" הופסק. Liferea לא יעדכן אותו יותר." -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "‏\"%s\" לא השתנה מאז העדכון האחרון." -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "מעדכן כעת את \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "שגיאה בפתיחת הקובץ הזמני %s לשימוש בסינון!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "‏%s סיימה עם סטטוס %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" -msgstr "שגיאה: לא היה ניתן לפתוח צינור \"%s\"" +msgstr "שגיאה: לא ניתן לפתוח צינור \"%s\"" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" -msgstr "שגיאה: לא היה ניתן לפתוח קובץ \"%s\"" +msgstr "שגיאה: לא ניתן לפתוח את הקובץ \"%s\"" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" -msgstr "שגיאה: אין קובץ \"%s\"" +msgstr "שגיאה: הקובץ \"%s\" לא קיים" #: ../src/vfolder.c:55 msgid "New Search Folder" msgstr "תיקיית חיפוש חדשה" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[היו שגיאות נוספות. הפלט קוצץ!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" -msgstr "מפענח XML: לא היה ניתן לפענח מסמך:\n" +msgstr "מפענח XML: לא ניתן לפענח את המסמך:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "קבצים מצורפים" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "‏%d קובץ מצורף" -msgstr[1] "‏%d קבצים מצורפים" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " בתים" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "ק״ב" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "מ״ב" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "ג״ב" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "‏%d קובץ מצורף" +msgstr[1] "‏%d קבצים מצורפים" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" -msgstr "בחירת קובץ" +msgstr "בחר קובץ" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "סיומת קובץ .%s" @@ -820,360 +799,398 @@ msgid "Couldn't find pixmap file: %s" msgstr "לא היה ניתן למצוא קובץ מפת סיביות: ‏%s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] "(%d חדש) " msgstr[1] "(%d חדשים) " -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d לא נקרא%s " msgstr[1] "%d לא נקראו%s " -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "נושאי עזרה" # הפנייה מהירה -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "תיעוד מהיר" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "שו״ת" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "‏Liferea מקוון כעת" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" -msgstr "עבוד לא־מקוון" +msgstr "עבוד במצב לא־מקוון" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "‏Liferea לא־מקוון כעת" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" -msgstr "עבוד מקוון" +msgstr "עבוד במצב מקוון" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_מינויים" # עדכון כל המינויים -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "_עדכן הכל" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "עדכן את כל המינויים." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" -msgstr "סמן את כולם כ־_נקראו" +msgstr "סמן כל הפריטים כ־_נקראו" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "סימון כל פריט בכל מינוי כ־נקרא." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "יי_בוא רשימת ערוצים..." # מייבא רשימת הזנות מסוג OPML. # מייבא רשימת הזנות OPML. -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "ייבוא רשימת ערוצים בתסדיר OPML." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "ייצו_א רשימת ערוצים..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "ייצוא רשימת הערוצים בפורמט OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "י_ציאה" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "ע_רוץ" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "הסר את _כל הפריטים" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "הסר את כל הפריטים בערוץ שנבחר כעת." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_פריט" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "הפריט ה_בא שלא נקרא" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "הפריט ה_בא שלא נקרא" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_תצוגה" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "ה_גדל גודל טקסט" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "הגדל את הטקסט בתצוגת הפריטים." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "ה_קטן גודל טקסט" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "הקטן את הטקסט בתצוגת הפריטים." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "_כלים" # פעילות נוכחית -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" -msgstr "_נטר אחר עדכונים" +msgstr "_ניטור אחר עדכונים" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "הצג רשימה של כל הערוצים שמצויים כעת בתור העדכון" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "ה_עדפות" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." -msgstr "ערוך העדפות." +msgstr "ערוך ההעדפות." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "_חיפוש" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." -msgstr "חפש בכל הערוצים..." +msgstr "חיפוש בכל הערוצים..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "הצג דו שיח חיפוש." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_עזרה" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_תכנים" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "עיון במסכי עזרה עבור יישום זה." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "עזרה _מהירה" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." -msgstr "צפייה ברשימת הקיצורים של Liferea." +msgstr "צפייה בכל רשימת הקיצורים של Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_שו״ת" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "צפייה בשאלות הנפוצות עבור יישום זה." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_אודות" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "הצג דו שיח אודות." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "תצוגה _רגילה" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "הגדר צורת תצוגה בדומה ליישום דוא״ל." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "תצוגה ר_חבה" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "הגדר צורת תצוגה לשלושה לוחות אנכיים." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "תצוגה מ_שולבת" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "הגדר צורת תצוגה לשני לוחות." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "רשימת ערוצים מ_צומצמת" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." -msgstr "הסתר ערוצים שאין בהם פריטים שלא נקראו." +msgstr "הסתר ערוצים שבהם אין פריטים שלא נקראו." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "מינוי _חדש..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "הוספת מינוי לרשימת הערוצים." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "_תיקייה חדשה..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "הוספת תיקייה לרשימת הערוצים." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "תיקיית _חיפוש חדשה" -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "הוספת תיקיית חיפוש חדשה לרשימת הערוצים." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "_מקור חדש..." # הוספת מקור רשימת הזנות חדש. -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "הוספת מקור חדש לרשימת הערוצים." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "_סל איסוף חדש" # סל איסוף חדשות -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "הוספת סל איסוף חדש" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "_סמן פריטים כ־נקראו" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "סימון כל הפריטים שנבחרו או את כל הערוצים בתיקייה שנבחרה כ־נקראו." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_עדכן" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." -msgstr "עדכון המינוי הנבחר או את כל המינויים של התיקייה הנבחרת." +msgstr "עדכון המינוי הנבחר או את כל המינויים של התיקייה שנבחרה." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "מ_אפיינים" # תכונות -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "פתיחת דו שיח המאפיינים עבור המינוי שנבחר." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "הס_ר" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "הסרת המינוי הנבחר." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "החלף מצב _נקרא" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "קביעה או ביטול סימון הפריט שנבחר כ־נקרא." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "החלף מצב _דגל" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "קביעה או ביטול סימון הפריט שנבחר בדגל." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "הס_ר" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "הסרת הפריט שנבחר." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "שיגור הקישור של הפריט בדפדפן שהוגדר." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "_פתח בדפדפן" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." -msgstr "פתיחת הקישור של הפריט בדפדפן שהוגדר." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." +msgstr "שיגור הקישור של הפריט בדפדפן שהוגדר." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "הגדרות דפדפן חיצוני" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." +msgstr "שיגור הקישור של הפריט בדפדפן שהוגדר." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "עבוד במצב _לא־מקוון" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." -msgstr "אפשרות זו מתירה לך לנטרל עדכון אוטומטי של ערוצים." +msgstr "אפשרות זו מאפשרת לך לנטרל עדכון מינויים." + +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" # The HTML bidi context seems to be incorrect, had to add markup -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "

    ‫Liferea‏ -‏ מאגד הערוצים של Linux

    " # הלוח הימני מכיל את רשימת המינויים שעשית. על מנת להוסיף מינוי, בחר בתפריט ערוצים ובתוכו מינוי חדש. כדי לצפות בכותרות הערוץ, בחר אותו ברשימת הערוצים והכותרות ייטענו לתוך הלוח השמאלי -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 msgid "" "

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

    You can add new subscriptions

    • From main menu " @@ -1187,13 +1204,13 @@ "המינויים
    • על ידי לחיצה ימנית על קישורים ובחירת תפריט 'הרשמה' בתוך " "Liferea

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "מקור לא ידוע" @@ -1218,257 +1235,255 @@ #: ../src/ui/feed_list_view.c:354 msgid "Deletion Confirmation" -msgstr "אישור מחיקה" +msgstr "אימות מחיקה" #: ../src/ui/feed_list_view.c:385 msgid "Liferea is in offline mode. No update possible." msgstr "‏Liferea מצוי כעת במצב לא־מקוון. אין אפשרות לעדכן ערוצים." -#: ../src/ui/liferea_htmlview.c:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "טעינה נכשלה: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "טעינה הושלמה." - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +#: ../src/ui/liferea_htmlview.c:627 +#, fuzzy +msgid "Open Link In _Tab" msgstr "פתח קישור ב_לשונית" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "פתח קישור ב_דפדפן" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "פתח קישור ב_דפדפן" -# פרסם -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" -msgstr "_סמן קישור באתר %s" +msgstr "_סימון קישור באתר %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_העתק מיקום קישור" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 msgid "_Copy Image Location" msgstr "_העתק מיקום תמונה" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 msgid "S_ave Link As" msgstr "_שמור קישור בשם" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "שמור _תמונה בשם" # יצירת _מינוי... -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "ה_רשמה..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** אין כותרת ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "תאריך" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" -msgstr "כותרת ראשית" +msgstr "כותרת" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "לא נבחר אף פריט" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "לפריט זה לא צוין קישור!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "עליך לבחור ערוץ כדי למחוק את הפריטים שלו!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "פתח פריט ב_לשונית" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "פתח פריט בד_פדפן" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "העתק אל סל איסוף" -# העתק _כתובת URL -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "העתק _כתובת פריט אל לוח גזירה" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "_סימון קישור באתר %s" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "_העתק מיקום תמונה" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "_הסר פריט" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "פתח צירוף..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." -msgstr "שמור בשם..." +msgstr "שמירה בשם..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "העתק כתובת קישור" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "עדכן ה_כל" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "_הצג את Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "עדכן _תיקייה" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" -msgstr "_סמן את כולם כ־נקראו" +msgstr "_סמן פריטים כ־נקראו" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_חדש" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "_מינוי חדש..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "מ_קור חדש..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 msgid "Sort Feeds" msgstr "מיון ערוצים" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "הר_כב מחדש" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "מינוי _חדש..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(ריק)" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" -"%s\n" -"מרכיב מחדש כעת" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "ברירת מחדל של GNOME" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" -msgstr "טקסט מתחת לצלמיות" +msgstr "טקסט מתחת לסמלים" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" -msgstr "טקסט לצד צלמיות" +msgstr "טקסט לצד סמלים" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" -msgstr "צלמיות בלבד" +msgstr "סמלים בלבד" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "טקסט בלבד" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "דקות" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "שעות" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "ימים" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "רווח" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr "Ctrl + רווח" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr "Alt + רווח" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "בחירת מדור הורדה" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "תצוגה _רגילה" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "תצוגה ר_חבה" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "תצוגה מ_שולבת" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "בחירה ידנית" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "לפי ברירת מחדל של דפדפן נתון" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "בחלון קיים" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "בחלון חדש" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "בלשונית חדשה" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "שלב עם תפריט ההודעות (מחוון)" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 msgid "Terminate instead of minimizing to the messaging menu" -msgstr "סיים במקום לצמצם אל תפריט ההודעות" +msgstr "סיים במקום למזער אל תפריט ההודעות" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "התחל ממוזער אל תפריט ההודעות" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "טיפוס" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "תוכנית" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "(ריק)" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1481,7 +1496,7 @@ msgid "This feed specifies no default update interval." msgstr "לערוץ זה לא הוגדרה תדירות עדכון." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "ללא כותרת" @@ -1532,7 +1547,7 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1542,11 +1557,11 @@ msgid "Google Reader login failed!" msgstr "ההתחברות אל Google Reader נכשלה!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "‏Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1581,22 +1596,15 @@ msgid "No feed list source types found!" msgstr "לא נמצאו טיפוסים של מקור רשימת ערוץ!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:269 msgid "Source Type" msgstr "טיפוס מקור" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "‏Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " "present your tt-rss subscriptions, and will synchronize your feed list and " @@ -1606,8 +1614,8 @@ "המינויים מתוך tt-rss, ויסנכרן את רשימות הערוצים וסימוני הפריטים שנקראו." # This string should not be translated. -# לא היה ניתן לפענח את מסד המידע JSON שהוחזר על־ידי ה־API של tt-rss! -#: ../src/fl_sources/ttrss_source_feed.c:112 +# לא ניתן לפענח את מסד המידע JSON שהוחזר על־ידי ה־API של tt-rss! +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1631,7 +1639,7 @@ #: ../src/notification/libnotify.c:174 ../src/notification/libnotify.c:277 msgid "Mark all as read" -msgstr "סמן את כולם כ־נקראו" +msgstr "סמן כל הפריטים כ־נקראו" #: ../src/notification/libnotify.c:254 #, fuzzy, c-format @@ -1666,7 +1674,7 @@ "file without using encryption." msgstr "" "לתשומת לבך: שם המשתמש והסיסמה יישמרו בקובץ רשימת ערוצים של Liferea ללא " -"הצפנה." +"שימוש בהצפנה." #: ../glade/google_source.ui.h:1 msgid "Add Google Reader Account" @@ -1674,10 +1682,9 @@ #: ../glade/google_source.ui.h:2 msgid "Please enter your Google Reader account settings." -msgstr "אנא הזן הגדרות חשבון Google Reader." +msgstr "נא להזין את הגדרות חשבון Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_סיסמה" @@ -1701,13 +1708,13 @@ msgid "combined view" msgstr "תצוגה משולבת" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "כותרות" #: ../glade/liferea.ui.h:7 msgid "Online/Offline Button" -msgstr "לחצן מצב מקוון\\לא־מקוון" +msgstr "מתג מקוון\\לא־מקוון" #: ../glade/liferea.ui.h:8 msgid "Subscription Properties" @@ -1736,7 +1743,7 @@ #: ../glade/liferea.ui.h:14 msgid "_Don't update this feed automatically." -msgstr "א_ל תעדכן את ערוץ זה אוטומטית." +msgstr "_אל תעדכן את ערוץ זה אוטומטית." #: ../glade/liferea.ui.h:15 msgid " " @@ -1752,7 +1759,7 @@ msgstr "כללי" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "מקור ערוץ" @@ -1791,11 +1798,11 @@ "information." msgstr "" "‏Liferea מסוגל לעבוד עם תוספות מסננות חיצוניות על מנת לגשת לערוצים ולתיקיות " -"בפורמטים לא נתמכים. ניתן למצוא מידע נוסף בתיעוד." +"בסוגי פורמט שלא נתמכים. ניתן למצוא מידע נוסף בתיעוד." #: ../glade/liferea.ui.h:28 ../glade/new_subscription.ui.h:13 msgid "Convert _using:" -msgstr "המר באמ_צעות:" +msgstr "המר ב_אמצעות:" #: ../glade/liferea.ui.h:30 msgid "" @@ -1828,11 +1835,11 @@ #: ../glade/liferea.ui.h:36 msgid "Use HTTP _authentication" -msgstr "השתמש _באימות HTTP" +msgstr "השתמש ב_זיהוי HTTP" #: ../glade/liferea.ui.h:39 ../glade/new_subscription.ui.h:10 msgid "_Don't use proxy for download" -msgstr "אל תשתמש ב_פרוקסי לטעינה" +msgstr "_אל תעשה שימוש בפרוקסי" # טעינת פריטים #: ../glade/liferea.ui.h:40 @@ -1857,7 +1864,7 @@ #: ../glade/liferea.ui.h:45 msgid "_Never do popup notification for this subscription." -msgstr "א_ל תציג התראה קופצת עבור מינוי זה." +msgstr "_אל תציג התראה קופצת עבור מינוי זה." #: ../glade/liferea.ui.h:46 msgid "_Mark downloaded items as read." @@ -1868,485 +1875,550 @@ msgstr "מתקדם" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "העדפות Liferea" +msgid "New Folder" +msgstr "תיקייה חדשה" -# לנהל, לטפל -# *ניהול הטמנת הזנות -# טיפול בהזנת מטמון -# ניהול הזנת מטמון #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "ניהול הטמנת ערוצים" +msgid "_Folder name:" +msgstr "שם _תיקייה:" -# _מספר משתמט של פריטים שיישמרו מכל ערוץ: #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "ברירת מחדל ל_מספר הפריטים שיישמרו מכל ערוץ:" +msgid "Rename" +msgstr "שנה שם" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "הגדרות עדכון ערוץ" +msgid "_New Name:" +msgstr "_שם חדש:" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "_עדכן את כל המינויים בעת הפעלה." +msgid "Search Folder Properties" +msgstr "מאפייני תיקיית חיפוש" -# תדירות משתמטת ל_רענון ערוץ: #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "ברירת מחדל לתדירות _רענון ערוץ:" +msgid "Search _Name:" +msgstr "_שם חיפוש:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "מצא פריטים שעומדים בקריטריונים הבאים" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"לתשומת לבך: רצוי לקבוע זמן רענון הגיוני. בדרך כלל תשאול של ערוצים כל שעה " -"או פחות מהווה בזבוז של רוחב פס." +msgid "A_ny Rule Matches" +msgstr "_מספיק כלל אחד מתאים" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "ערוצים" +msgid "_All Rules Must Match" +msgstr "על _כל הכללים להתאים" #: ../glade/liferea.ui.h:57 -msgid "Folder Display Settings" -msgstr "הגדרות תצוגת תיקיות" +#, fuzzy +msgid "Open Enclosure" +msgstr "פתח צירוף..." -# תת־הערוצים > ערוצי־המשנה -# האם עומדת לרשותך מילה מוצלחת יותר מ־צאצא? -# הזנת צאצא child feeds -# תהליך צאצא child process -# תהליך הורה parent process -# _הצג את כל הפריטים של כל ההזנות המשניות כאשר תיקייה נבחרת. #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "ה_צג את כל הפריטים של כל ערוצי המשנה כאשר תיקייה נבחרת." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "הורדת צירוף מן טיפוס:" +# ינופקו +# שם הקובץ שלתוכו מורד הצירוף יועבר כפרמטר אל פקודה זו #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "ה_סתר פריטים שנקראו." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"מה על Liferea לעשות עם צירוף זה? נא להזין למטה את הפקודה שברצונך להריץ. " +"צירופים מורדים יסופקו כארגומנט עבור פקודה זו:" #: ../glade/liferea.ui.h:60 -msgid "Feed Icons (Favicons)" -msgstr "צלמיות ערוץ (Favicons)" +msgid "_Browse" +msgstr "_עיון" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_עדכן עכשיו את כל הצלמיות" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "_ביצוע פעולה זו אוטומטית עבור כל הצירופים שכמו צירוף זה מעתה והלאה." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "תיקיות" +msgid "Search All Feeds" +msgstr "חיפוש בכל הערוצים" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" -msgstr "קריאת כותרות" +msgid "_Search for:" +msgstr "_חפש:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "קרא מאמרים ב_רפרוף עם:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "הזן מחרוזת תווים שאותה יחפש Liferea בכותרות הפריטים או בתוכנם." #: ../glade/liferea.ui.h:65 -msgid "Web Integration" -msgstr "מיזוג רשת" +msgid "_Advanced..." +msgstr "_מתקדם..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "פרסם _סימניות אצל" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "חיפוש הטקסט שצוין בכל הערוצים. תוצאות החיפוש יופיעו ברשימת הפריטים." +# מנטר העדכונים #: ../glade/liferea.ui.h:67 -msgid "Internal Browser Settings" -msgstr "הגדרות דפדפן פנימי" +msgid "Update Monitor" +msgstr "ניטור אחר עדכונים" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "פתח קישורים ב_חלון של Liferea." +msgid "Pending Requests" +msgstr "בקשות ממתינות" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_נטרל Javascript." +msgid "Downloading Now" +msgstr "ערוצים שנטענים כעת" +# ביטול הכל +# עצירה +# ביטול מוחלט #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "אפשר _תוספות דפדפן." +msgid "Cancel _All" +msgstr "_בטל הכל" #: ../glade/liferea.ui.h:71 -msgid "External Browser Settings" -msgstr "הגדרות דפדפן חיצוני" +msgid "Create News Bin" +msgstr "צור סל איסוף" #: ../glade/liferea.ui.h:72 +msgid "_News Bin Name:" +msgstr "שם _סל איסוף:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "אודות" + +#: ../glade/liferea.ui.h:74 +msgid "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "‏Liferea הינו מאגד חדשות עבור ‎GTK+‎." + +#: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "דף הבית של Liferea" + +# מתקדם +#: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "חיפוש מורחב" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "_תיקיית חיפוש..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "צור ערוץ של מנוע חיפוש" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "הזן מחרוזת חיפוש כלשהי" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "מספר מ_קסימלי של פריטי תוצאה:" + +# שפורטו +#: ../glade/liferea.ui.h:84 +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 יחולל מינוי, המשמש לתשאל את תוצאות מנוע החיפוש עבור " +"מחרוזת החיפוש שצוינו. ביכולתך לשמור את ערוץ זה באופן קבוע ולעדכן אותו כמו כל " +"מינוי אחר." + +#: ../glade/new_subscription.ui.h:9 +msgid "Download / Postprocessing" +msgstr "טעינה \\ עיבוד־מאוחר" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "בחירת מקור" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "בחר את טיפוס המקור שברצונך להוסיף..." + +# Would not it be better: Add OPML/Planet source +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "הוספת מקור ‫OPML/Planet" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "נא לציין שם קובץ מקומי או כתובת URL של רשימת ערוצים תקינה בפורמט OPML." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_מיקום" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "בחר _קובץ" + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "הוסף חשבון ‫Tiny Tiny RSS" + +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "נא להזין את הגדרות חשבון tt-rss." + +#: ../glade/ttrss_source.ui.h:3 +msgid "_Server URL" +msgstr "כתובת _שרת" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "_שם משתמש" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "מתקדם..." + +#: ../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 "" +"בכדי לעשות שימוש בגילוי ערוצים אוטומטי יש להזין כתובת URL של אתר אינטרנט, או " +"כתובת מדויקת של הערוץ במידה והכתובת המדויקת ידועה לך." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "העדפות" + +# לנהל, לטפל +# *ניהול הטמנת הזנות +# טיפול בהזנת מטמון +# ניהול הזנת מטמון +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "ניהול הטמנת ערוצים" + +# _מספר משתמט של פריטים שיישמרו מכל ערוץ: +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "ברירת מחדל ל_מספר הפריטים שיישמרו מכל ערוץ:" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "הגדרות עדכון ערוץ" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "_עדכן את כל המינויים בעת הפעלה." + +# תדירות משתמטת ל_רענון ערוץ: +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "ברירת מחדל לזמן _רענון ערוץ:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"לתשומת לבך: רצוי לקבוע זמן רענון הגיוני. בדרך כלל תשאול של ערוצים כל שעה " +"או פחות מהווה בזבוז של רוחב פס." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "ערוצים" + +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "הגדרות תצוגת תיקיות" + +# תת־הערוצים > ערוצי־המשנה +# האם עומדת לרשותך מילה מוצלחת יותר מ־צאצא? +# הזנת צאצא child feeds +# תהליך צאצא child process +# תהליך הורה parent process +# _הצג את כל הפריטים של כל ההזנות המשניות כאשר תיקייה נבחרת. +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "ה_צג את כל הפריטים של כל ערוצי המשנה כאשר תיקייה נבחרת." + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "ה_סתר פריטים שנקראו." + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "סמלי ערוץ (Favicons)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_עדכן את כל הסמלים כעת" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "תיקיות" + +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "קריאת כותרות" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "קרא מאמרים ב_רפרוף עם:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "מיזוג רשת" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "פרסם _סימניות אצל" + +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "הגדרות דפדפן פנימי" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "פתח קישורים ב_חלון של Liferea." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_נטרל Javascript." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "אפשר _תוספות דפדפן." + +#: ../glade/prefs.ui.h:26 +msgid "External Browser Settings" +msgstr "הגדרות דפדפן חיצוני" + +#: ../glade/prefs.ui.h:27 msgid "_Open link in:" msgstr "_פתח קישור בתוך:" -#: ../glade/liferea.ui.h:74 +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "בחירה ידנית" + +#: ../glade/prefs.ui.h:30 #, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" +msgid "(%s for URL)" msgstr "" -"_בחר ידנית:\n" -"‏(‭%s‬ עבור כתובת URL)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_דפדפן:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "דפדפן" # הגדרות התראה -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 msgid "Notification Settings" msgstr "הגדרת התראות" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "הצג _חלון קופץ עם כותרות חדשות." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "הצג _צלמית מצב באזור ההתראות (מגש מערכת)." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." -msgstr "הצג _מספר של פריטים חדשים בצלמית מגש." +msgstr "הצג _מספר של פריטים חדשים בסמל מגש." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." -msgstr "_סיים במקום למזער אל צלמית מגש." +msgstr "_סיים במקום למזער אל סמל מגש." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." -msgstr "ה_תחל בצלמית מגש." +msgstr "ה_תחל בסמל מגש." -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 msgid "Toolbar Settings" msgstr "הגדרות סרגל כלים" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "_הסתר סרגל כלים." # סיווג -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "תוויות _כפתורים בסרגל כלים:" # מ.מ.ג. -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "ממשק משתמש גרפי" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "שרת פרוקסי HTTP" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" -msgstr "אתר או_טומטית (לפי GNOME או סביבת העבודה)" +msgstr "אתר _אוטומטית (לפי GNOME או סביבת העבודה)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "אין _פרוקסי" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "הגדרה י_דנית:" # פתחה -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "י_ציאת פרוקסי:" # מארח -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "מארח פ_רוקסי:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" -msgstr "השתמש ב_אימות פרוקסי" +msgstr "השתמש ב_זיהוי פרוקסי" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "_סיסמת פרוקסי:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "_שם משתמש פרוקסי:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "פרוקסי" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 msgid "Downloading Enclosures" msgstr "הורדת צירופים" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_עיון" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_שמור הורדות במדור" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "הו_רד באמצעות" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 msgid "Opening Enclosures" msgstr "פתיחת צירופים" -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "צירופים" -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "מסונכרן עם מחשבים סמוכים" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "אפשר _סנכרון ברשת עבודה מקומית (LAN)" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "שם _שירות:" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "סינכרון" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "תיקייה חדשה" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "שם _תיקייה:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "שנה שם" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_שם חדש:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "מאפייני תיקיית חיפוש" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "_שם חיפוש:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "מצא פריטים שעומדים בקריטריונים הבאים" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "_מספיק כלל אחד מתאים" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "על _כל הכללים להתאים" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "הורדת צירוף" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "מוריד כעת צירוף מן טיפוס:" - -# ינופקו -# שם הקובץ שלתוכו מורד הצירוף יועבר כפרמטר אל פקודה זו -#: ../glade/liferea.ui.h:120 -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:" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -"מה על Liferea לעשות עם צירוף זה? אנא הזן למטה את הפקודה שברצונך להריץ. " -"צירופים מורדים יסופקו כארגומנט עבור פקודה זו:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_העבר כתובת במקום להוריד צירוף." - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "_בצע את פעולה זו אוטומטית עבור צירופים כמו זה מעתה והלאה." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "חיפוש בכל הערוצים" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_חפש:" -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "הזן מחרוזת תווים שאותה יחפש Liferea בכותרות הפריטים או בתוכנם." - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "_מתקדם..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "חיפוש הטקסט שצוין בכל הערוצים. תוצאות החיפוש יופיעו ברשימת הפריטים." +#~ msgid "Download and view feeds" +#~ msgstr "טעינה וצפיה בערוצים" -# מנטר העדכונים -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "מנטר עדכונים" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "בקשות ממתינות" - -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "טוען עכשיו" - -# ביטול הכל -# עצירה -# ביטול מוחלט -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "_בטל הכל" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "צור סל איסוף" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "שם _סל איסוף:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "אודות" - -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "‏Liferea הינו מאגד חדשות עבור ‎GTK+‎." - -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "דף הבית של Liferea" - -# מתקדם -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "חיפוש מורחב" +#~ msgid "You may want to validate the feed using" +#~ msgstr "ייתכן שברצונך לאמת את הערוץ באמצעות" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "_תיקיית חיפוש..." +# דגלון +#~ msgid "flag" +#~ msgstr "דגל" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "צור ערוץ של מנוע חיפוש" +#~ msgid "bookmark" +#~ msgstr "סימנייה" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "הזן מחרוזת חיפוש כלשהי" +#~ msgid "comments" +#~ msgstr "תגובות" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "מספר מ_קסימלי של פריטי תוצאה:" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "הורדת צירוף נכשלה: \"%s\"" -# שפורטו -#: ../glade/liferea.ui.h:145 -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 יחולל מינוי, המשמש לתשאל את תוצאות מנוע החיפוש עבור " -"מחרוזת החיפוש שצוינו. ביכולתך לשמור את ערוץ זה באופן קבוע ולעדכן אותו כמו כל " -"מינוי אחר." +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "הורדת צירוף הסתיימה: \"%s\"" -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" -msgstr "טעינה \\ עיבוד־מאוחר" +#~ 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 "" +#~ "גרסא זו של Liferea עושה שימוש בפורמט מטמון חדש, ומטמון הערוצים הקיים הוסב " +#~ "לפורמט החדש. תוכן המטמון במדור %s הוסב אך לא נמחק אוטומטית. נא להסיר את " +#~ "המדור ידנית כאשר אתם בטוחים שתהליך ההסבה סוים בהצלחה!" + +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "טעינה נכשלה: \"%s\"" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "בחירת מקור" +#~ msgid "Download finished." +#~ msgstr "טעינה הושלמה." -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "בחר את טיפוס המקור שברצונך להוסיף..." +#~ msgid "Launch Item In _Tab" +#~ msgstr "פתח פריט ב_לשונית" -# Would not it be better: Add OPML/Planet source -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "הוספת מקור ‫OPML/Planet" +#~ msgid "_Launch Item In Browser" +#~ msgstr "פתח פריט בד_פדפן" -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "אנא ציין שם קובץ מקומי או כתובת URL של רשימת ערוצים תקינה בפורמט OPML." +# העתק _כתובת URL +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "העתק _כתובת URL של פריט אל לוח גזירה" -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_מיקום" +#~ msgid "Choose download directory" +#~ msgstr "בחירת מדור הורדה" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "בחר _קובץ" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_בחר ידנית:\n" +#~ "‏(‭%s‬ עבור כתובת URL)" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "הוסף חשבון ‫Tiny Tiny RSS" +#~ msgid "_Save downloads in" +#~ msgstr "_שמור הורדות במדור" -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "אנא הזן הגדרות חשבון tt-rss." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "מסונכרן עם מחשבים סמוכים" -#: ../glade/ttrss_source.ui.h:3 -msgid "_Server URL" -msgstr "כתובת _שרת" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "אפשר _סנכרון ברשת עבודה מקומית (LAN)" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "_שם משתמש" +#~ msgid "_Service Name" +#~ msgstr "שם _שירות:" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"בכדי לעשות שימוש בגילוי ערוצים אוטומטי ניתן להזין כתובת URL של אתר אינטרנט, " -"ולחלופין אפשר להזין כתובת מדויקת של הערוץ במידה וזו ידועה לך." +#~ msgid "Sync" +#~ msgstr "סנכרון" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "מורחב..." +#~ msgid "Downloading Enclosure" +#~ msgstr "הורדת צירוף" -#~ msgid "You may want to validate the feed using" -#~ msgstr "ייתכן שברצונך לאמת את הערוץ באמצעות" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "_העברת כתובת URL במקום להוריד צירוף." #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " diff -Nru liferea-1.8.15/po/hu.po liferea-1.10.3/po/hu.po --- liferea-1.8.15/po/hu.po 2013-06-24 22:16:16.000000000 +0200 +++ liferea-1.10.3/po/hu.po 2013-07-31 23:29:12.000000000 +0200 @@ -1,14 +1,14 @@ # Hungarian translation for liferea -# Copyright (c) 2007, 2009, 2011 Free Software Foundation, Inc. +# Copyright (c) 2007, 2009, 2011, 2013 Free Software Foundation, Inc. # This file is distributed under the same license as the liferea package. # -# Gabor Kelemen , 2009, 2011. +# Gabor Kelemen , 2009, 2011, 2013. msgid "" msgstr "" -"Project-Id-Version: liferea 1.8-rc1\n" +"Project-Id-Version: liferea 1.10-rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" -"PO-Revision-Date: 2011-11-19 16:02+0100\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" +"PO-Revision-Date: 2013-04-23 12:14+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -16,10 +16,9 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.4\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -32,24 +31,16 @@ msgstr "Liferea hírforrásolvasó" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Hírforrások letöltése és megjelenítése" +msgid "Read news feeds and blogs" +msgstr "Hírforrások és blogok olvasása" #: ../xslt/feed.xml.in.h:1 -msgid "" -"This feed is discontinued. It's no longer available. Liferea won't update it " -"anymore but you can still access the cached headlines." -msgstr "" -"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:2 -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:3 msgid "There were errors while parsing this feed!" @@ -65,7 +56,7 @@ #: ../xslt/feed.xml.in.h:6 msgid "You may want to contact the author/webmaster of the feed about this!" -msgstr "" +msgstr "Ezzel kapcsolatban keresse meg a hírforrás szerzőjét/webmesterét!" #: ../xslt/feed.xml.in.h:7 msgid "There were errors while filtering this feed!" @@ -141,38 +132,26 @@ msgstr "Létrehozó" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "megjelölés" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "könyvjelző" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "hozzászólás" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Még nincs hozzászólás." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Hozzászólások" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Frissítés…" -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Frissítés" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Szakasz" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Részleg" @@ -181,11 +160,8 @@ msgstr "Hírgyűjtő:" #: ../xslt/newsbin.xml.in.h:2 -msgid "" -"Add items to this news bin by selecting \"Copy to News Bin\" from the item " -"list context menu." -msgstr "" -"Adjon elemeket a hírgyűjtőhöz a helyi menü „Másolás hírgyűjtőbe” pontjával." +msgid "Add items to this news bin by selecting \"Copy to News Bin\" from the item list context menu." +msgstr "Adjon elemeket a hírgyűjtőhöz a helyi menü „Másolás hírgyűjtőbe” pontjával." #: ../xslt/vfolder.xml.in.h:1 msgid "Search Folder:" @@ -195,12 +171,12 @@ msgid "Default Browser" msgstr "Alapértelmezett böngésző" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Hibás böngészőparancs: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "%s indítása" @@ -210,7 +186,7 @@ msgid "Authorization Error" msgstr "Hitelesítési hiba" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Nem hozható létre a %s ideiglenes könyvtár." @@ -240,87 +216,85 @@ msgid "%b %d %Y" msgstr "%Y. %b. %e." -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "„%s” nem érvényes melléklettípus-konfigurációs fájl." -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Melléklet letöltése MEGHIÚSULT: „%s”" +#: ../src/enclosure.c:288 +msgid "You have not configured a download tool yet! Please do so in the 'Download' tab in Tools/Preferences." +msgstr "Még nem állított be letöltőeszközt. Ezt az Eszközök -> Beállítások ablak Letöltés lapján teheti meg." -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Melléklet letöltése befejeződött: „%s”" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" +"A parancs futtatása meghiúsult:\n" +"\n" +"%s\n" +"\n" +"Ellenőrizze, hogy a beállított letöltőeszköz telepítve van-e és helyesen működik-e. Az Eszközök/Beállítások ablak „Letöltés” lapján megváltoztathatja." -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Hiba %s átnevezésekor %s névre\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, 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:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, 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:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, 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:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Importált hírforrások" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Hírforráslista importálása" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importálás" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 msgid "OPML Files" msgstr "OPML-fájlok" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Hiba történt a hírforráslista exportálása közben." -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Hírforráslista exportálva!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Hírforráslista exportálása" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Exportálás" #: ../src/feed.c:255 -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:284 #, c-format @@ -333,14 +307,8 @@ msgstr "„%s” nem érhető el" #: ../src/feed_parser.c:137 -msgid "" -"The URL you want Liferea to subscribe to points to a webpage and the auto " -"discovery found no feeds on this page. Maybe this webpage just does not " -"support feed auto discovery." -msgstr "" -"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." +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:170 #, c-format @@ -364,115 +332,93 @@ msgstr "Nem állapítható meg a hírforrás típusa." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "Nincsenek olvasatlan elemek" -#: ../src/main.c:175 -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:164 +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:175 +#: ../src/main.c:164 msgid "STATE" msgstr "ÁLLAPOT" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Verzióinformáció megjelenítése, majd kilépés" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "Add a new subscription" msgstr "Új feliratkozás hozzáadása" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "URI" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Minden típusú hibakeresési üzenet kiírása" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "A gyorsítótár-kezelési hibakeresési üzenetek kiírása" -#: ../src/main.c:187 +#: ../src/main.c:173 msgid "Print debugging messages for the configuration handling" msgstr "A beállításkezelés hibakeresési üzeneteinek kiírása" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "Az adatbázis-kezelés hibakeresési üzeneteinek kiírása" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" 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.8/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.8/output." -"xhtml fájlba." +#: ../src/main.c:176 +msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.cache/liferea/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 ~/.cache/liferea/output.xhtml fájlba." -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "Minden hálózati tevékenység hibakeresési üzeneteinek kiírása" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "Minden feldolgozási függvény hibakeresési üzeneteinek kiírása" -#: ../src/main.c:193 +#: ../src/main.c:179 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 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Hibakeresési üzenetek kiírása függvényekbe belépéskor/kilépéskor" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "A hírforrásfrissítés-feldolgozás hibakeresési üzeneteinek kiírása" -#: ../src/main.c:196 +#: ../src/main.c:182 msgid "Print debugging messages of the search folder matching" msgstr "A keresőmappa-illesztés hibakeresési üzeneteinek kiírása" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Részletes hibakeresési üzenetek kiírása" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 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:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea – A linuxos hírforrásolvasó" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "További információkért lásd: http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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." +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "További információkért lásd: http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -496,10 +442,8 @@ msgstr "Nem lehet csatlakozni a proxyhoz" #: ../src/net.c:325 -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" +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:328 @@ -508,12 +452,8 @@ #. http 4xx client error #: ../src/net.c:331 -msgid "" -"You are unauthorized to download this feed. Please update your username and " -"password in the feed properties dialog box" -msgstr "" -"Ö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" +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:333 msgid "Payment required" @@ -641,74 +581,67 @@ msgid "Feed title" msgstr "Hírforrás címe" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "„%s” feliratkozás már frissítve lett!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, 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:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "„%s” hírforrásikonjának frissítése" -#: ../src/subscription.c:192 -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:193 +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 +#: ../src/subscription.c:211 #, 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 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "„%s” meg lett szüntetve. A Liferea nem fogja már frissíteni." -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "Az utolsó frissítés óta %s nem változott." -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "%s frissítése" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Hiba %s ideiglenes fájl szűrésre történő megnyitásakor." -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s kilépett %d állapotkóddal" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Hiba: %s adatcsatorna nem nyitható meg" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Hiba: nem nyitható meg „%s” nevű fájl" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Hiba: nem létezik „%s” nevű fájl" @@ -717,55 +650,53 @@ msgid "New Search Folder" msgstr "Új keresőmappa" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Több hiba is történt. A kimenet csonkítva lett!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "XML-értelmező: A következő dokumentumot nem lehet elemezni:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Mellékletek" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d melléklet" -msgstr[1] "%d melléklet" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " bájt" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d melléklet" +msgstr[1] "%d melléklet" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Fájl választása" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr ".%s fájlkiterjesztés" @@ -775,373 +706,388 @@ msgid "Couldn't find pixmap file: %s" msgstr "A képfájl nem található: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d új)" msgstr[1] " (%d új)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d olvasatlan%s" msgstr[1] "%d olvasatlan%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Súgótémák" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Rövid leírás" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "GYIK" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "A Liferea kapcsolódik az internethez" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Kapcsolat nélküli munka" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "A Liferea már nincs kapcsolódva az internethez" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Munka kapcsolódva" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Feliratkozások" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "Öss_zes frissítése" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Minden feliratkozás frissítése." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Összes _olvasottnak jelölése" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Minden feliratkozás minden elemét olvasottnak jelöli" -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "Hírforráslista i_mportálása…" -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Egy OPML hírforráslistát importál." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "Hírforráslista _exportálása…" -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "A hírcsoportlistát exportálja OPML formátumban." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Kilépés" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "F_orrás" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Minden elem _törlése" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Eltávolít minden elemet a jelenlegi hírforrásból." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "Ele_m" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "Előző elem" + +#: ../src/ui/liferea_shell.c:924 +msgid "Next Item" +msgstr "Következő elem" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "_Következő olvasatlan elem" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Nézet" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "Szövegméret _növelése" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 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:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "Szövegméret _csökkentése" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Csökkenti az elemnézetben használt betűk méretét." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "_Eszközök" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "_Frissítésfigyelő" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "A jelenleg frissítés alatt álló források felsorolása" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Beállítások" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Beállítások szerkesztése." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "_Keresés" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Keresés az összes forrásban…" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Megjeleníti a keresés párbeszédpanelt." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Súgó" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Tartalom" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Súgó megjelenítése az alkalmazáshoz." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "Rövid _leírás" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Egy felsorolás megtekintése a Liferea gyorsbillentyűiről." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_GYIK" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Az alkalmazással kapcsolatos gyakran ismételt kérdések megjelenítése." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_Névjegy" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Megjeleníti a névjegy ablakot." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "N_ormál nézet" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Levelezőkhöz hasonló megjelenési mód." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "_Széles nézet" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Három függőleges ablaktábla megjelenítése." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "_Kombinált nézet" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Két ablaktáblás nézet." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "Csökkentett _hírforráslista" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Az új elemeket nem tartalmazó hírforrások elrejtése." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "Új _feliratkozás…" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Új feliratkozást ad a forráslistához." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Új _mappa…" -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Mappát ad a forráslistához." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Új ke_resőmappa…" -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Új keresőmappát ad a forráslistához." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Új f_orrás…" -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Új forráslista-forrást ad hozzá." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "Új _hírgyűjtő…" -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Új hírgyűjtő felvétele." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "_Olvasottnak jelölés" -#: ../src/ui/liferea_shell.c:911 -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:979 +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:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Frissítés" -#: ../src/ui/liferea_shell.c:913 -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:981 +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:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "T_ulajdonságok" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Megnyitja a tulajdonságok ablakot a kiválasztott feliratkozáshoz." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "_Eltávolítás" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Eltávolítja a kiválasztott feliratkozást." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Olvasottság átka_pcsolása" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Átkapcsolja az olvasottsági állapotát a kiválasztott elemnek." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Megjelöl_tség átkapcsolása" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Az elem megjelöltségét ki/bekapcsolja." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "_Eltávolítás" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Eltávolítja a kiválasztott elemet." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "Megnyitás l_apon" + +#: ../src/ui/liferea_shell.c:997 +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Megnyitja az elem hivatkozását egy új Liferea böngészőlapon." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +msgid "_Open In Browser" msgstr "_Megnyitás böngészőben" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." -msgstr "Megnyitja az elemhivatkozást a beállított böngészőben." +#: ../src/ui/liferea_shell.c:999 +msgid "Launches the item's link in the Liferea item pane." +msgstr "Megnyitja az elem hivatkozását a Liferea elemsávján." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +msgid "Open In _External Browser" +msgstr "Megnyitás _külső böngészőben" + +#: ../src/ui/liferea_shell.c:1001 +msgid "Launches the item's link in the configured external browser." +msgstr "Megnyitja az elemhivatkozást a beállított külső böngészőben." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "K_apcsolat nélküli munka" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Ez a lehetőség lehetővé teszi a frissítések szüneteltetését." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "_Teljes képernyő" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "Teljes képernyős üzemmód" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea – Linuxos hírforrásolvasó" -#: ../src/ui/liferea_shell.c:1246 -msgid "" -"

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

    You can add new subscriptions

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

    " -msgstr "" -"

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

    Új " -"feliratkozásokat vehet fel

    • A főmenü „Feliratkozás -> Új " -"feliratkozás” menüpontjának kiválasztásával
    • Hírforrás-hivatkozások " -"feliratkozáslistába húzásával
    • Hivatkozások helyi menüjének " -"„Feliratkozás” pontjának kiválasztásával a Lifereaban.

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

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

    You can add new subscriptions

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

    " +msgstr "

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

    Új feliratkozásokat vehet fel

    • A főmenü „Feliratkozás -> Új feliratkozás” menüpontjának kiválasztásával
    • Hírforrás-hivatkozások feliratkozáslistába húzásával
    • Hivatkozások helyi menüjének „Feliratkozás” pontjának kiválasztásával a Lifereaban.

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Ismeretlen forrás" @@ -1171,251 +1117,247 @@ 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:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "A letöltés MEGHIÚSULT: „%s”" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "A letöltés befejeződött." - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" -msgstr "Hivatkozás megnyitása új l_apon" - -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" -msgstr "Hivatkozás megnyitása _böngészőben" +#: ../src/ui/liferea_htmlview.c:627 +msgid "Open Link In _Tab" +msgstr "Hivatkozás megnyitása l_apon" + +#: ../src/ui/liferea_htmlview.c:628 +msgid "_Open Link In Browser" +msgstr "Hivatkozás _megnyitása böngészőben" + +#: ../src/ui/liferea_htmlview.c:629 +msgid "_Open Link In External Browser" +msgstr "Hivatkozás megnyitása _külső böngészőben" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "Hivatkozást _könyvjelzőbe: %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "Hivatkozás _címének másolása" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 msgid "_Copy Image Location" msgstr "Ké_p helyének másolása" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 msgid "S_ave Link As" msgstr "_Hivatkozás mentése másként" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "_Kép mentése másként" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Feliratkozás…" -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Nincs cím ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Dátum" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Cím" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Nincs kiválasztott elem" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Nincs hivatkozás megadva ehhez az elemhez." -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Válasszon ki egy hírforrást az elemeinek törléséhez." -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Megnyitás új l_apon" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "Megnyitás _böngészőben" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "Másolás hírgyűjtőbe" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "_URL másolása vágólapra" +#: ../src/ui/popup_menu.c:156 +#, c-format +msgid "_Bookmark at %s" +msgstr "Hivatkozás i_de: %s" + +#: ../src/ui/popup_menu.c:160 +msgid "Copy Item _Location" +msgstr "_Elem helyének másolása" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "Elem el_távolítása" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Melléklet megnyitása…" -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Mentés másként…" -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "Hivatkozás megnyitása" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "Összes _frissítése" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "Liferea _megjelenítése" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "Mappa f_rissítése" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "Összes megjelölése _olvasottnak" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "Ú_j" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "Új _feliratkozás…" -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "Új _forrás…" -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 msgid "Sort Feeds" msgstr "Hírforrások rendezése" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "Újjáé_pítés" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "Új _feliratkozás…" - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(Üres)" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "GNOME alapértelmezett" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Szöveg az ikonok alatt" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Szöveg az ikonok mellett" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Csak ikonok" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Csak szöveg" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "perc" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "óra" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "nap" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Szóköz" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr "Ctrl + szóköz" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr "Alt + szóköz" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Letöltési könyvtár kiválasztása" +#: ../src/ui/preferences_dialog.c:114 +msgid "Normal View" +msgstr "Normál nézet" + +#: ../src/ui/preferences_dialog.c:115 +msgid "Wide View" +msgstr "Széles elrendezés" + +#: ../src/ui/preferences_dialog.c:116 +msgid "Combined View" +msgstr "Kombinált elrendezés" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Egyéb…" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Alapértelmezett böngésző" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Létező ablak" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Új ablak" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Új lap" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "Integráció az üzenetkezelési menüvel (indikátorral)" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 msgid "Terminate instead of minimizing to the messaging menu" msgstr "Kilépés az üzenetkezelési menüre való minimalizálás helyett" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "Indítás az üzenetkezelési menüre minimalizálva" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Típus" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Program" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "(Üres)" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" +"%s\n" +"Újraépítés" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." -msgid_plural "" -"The provider of this feed suggests an update interval of %d minutes." +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." @@ -1423,7 +1365,7 @@ msgid "This feed specifies no default update interval." msgstr "Ez a hírforrás nem ad meg javasolt frissítési időközt." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "Névtelen" @@ -1474,7 +1416,7 @@ msgid "%b %d %H:%M" msgstr "%b. %e. %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1484,32 +1426,21 @@ msgid "Google Reader login failed!" msgstr "Google Reader bejelentkezés hibával zárult." -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 -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:384 +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:325 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" #: ../src/fl_sources/opml_source.c:326 -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." +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:387 msgid "Choose OPML File" @@ -1523,32 +1454,19 @@ 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:269 msgid "Source Type" msgstr "Forrás típusa" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 -msgid "" -"Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " -"present your tt-rss subscriptions, and will synchronize your feed list and " -"reading lists." -msgstr "" -"A Tiny Tiny RSS 1.5+ fiók hírforráslistájának integrálása. A Liferea " -"megjeleníti a Tiny Tiny RSS 1.5+ feliratkozásokat, valamint szinkronizálja a " -"hírforráslistát és az olvasott elemek listáját." +#: ../src/fl_sources/ttrss_source.c:363 +msgid "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will present your tt-rss subscriptions, and will synchronize your feed list and reading lists." +msgstr "A Tiny Tiny RSS 1.5+ fiók hírforráslistájának integrálása. A Liferea megjeleníti a Tiny Tiny RSS 1.5+ feliratkozásokat, valamint szinkronizálja a hírforráslistát és az olvasott elemek listáját." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "A tt-rss API által visszaadott JSON nem dolgozható fel!" @@ -1602,12 +1520,8 @@ msgstr "_Felhasználónév:" #: ../glade/auth.ui.h:6 -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/google_source.ui.h:1 msgid "Add Google Reader Account" @@ -1617,8 +1531,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Adja meg a Google Readeres felhasználói beállításait" -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "Jel_szó" @@ -1642,7 +1555,7 @@ msgid "combined view" msgstr "kombinált elrendezés" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Címek" @@ -1692,7 +1605,7 @@ msgstr "Általános" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Hírforrás címe" @@ -1725,27 +1638,16 @@ msgstr "Átalakítási _szűrő használata" #: ../glade/liferea.ui.h:27 ../glade/new_subscription.ui.h:12 -msgid "" -"Liferea can use external filter plugins in order to access feeds and " -"directories in non-supported formats. See the documentation for more " -"information." -msgstr "" -"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ó." +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.ui.h:28 ../glade/new_subscription.ui.h:13 msgid "Convert _using:" msgstr "_Konvertáló:" #: ../glade/liferea.ui.h:30 -msgid "" -"The cache setting controls if the contents of feeds are saved when Liferea " -"exits. Marked items are always saved to the cache." -msgstr "" -"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." +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.ui.h:31 msgid "_Default cache settings" @@ -1785,9 +1687,7 @@ #: ../glade/liferea.ui.h:42 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." +msgstr "A cikk kiválasztásakor az elem hivatkozásának _automatikus megnyitása a beállított böngészőben." #: ../glade/liferea.ui.h:43 msgid "Ignore _comment feeds for this subscription." @@ -1810,481 +1710,494 @@ msgstr "Haladó" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Liferea beállításai" +msgid "New Folder" +msgstr "Új mappa" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "Hírforrás gyorsítótárának kezelése" +msgid "_Folder name:" +msgstr "_Mappa neve:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Elmentett _hírek alapértelmezés szerinti száma hírforrásonként:" +msgid "Rename" +msgstr "Átnevezés" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "Hírforrás frissítésének beállításai" +msgid "_New Name:" +msgstr "_Új név:" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "Min_den feliratkozás frissítése induláskor." +msgid "Search Folder Properties" +msgstr "Keresőmappa tulajdonságai" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Alapértelmezett _frissítési időköz:" +msgid "Search _Name:" +msgstr "_Keresés neve:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "A következő feltételeknek megfelelő elemek keresése" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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." +msgid "A_ny Rule Matches" +msgstr "Bá_rmely szabály illeszkedik" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Hírforrás" +msgid "_All Rules Must Match" +msgstr "Min_den szabály illeszkedik" #: ../glade/liferea.ui.h:57 -msgid "Folder Display Settings" -msgstr "Mappamegjelenítési beállítások" +msgid "Open Enclosure" +msgstr "Melléklet megnyitása" #: ../glade/liferea.ui.h:58 -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." +msgid "Open an enclosure of type:" +msgstr "A következő típusú melléklet megnyitása:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "Olvasott hírek _elrejtése." +msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. The enclosures URL will be supplied as an argument for this command:" +msgstr "Mit tegyen a Liferea ezzel a melléklettel? Adja meg alább a végrehajtandó parancsot. A mellékletek URL címe a következő parancs argumentumai lesznek:" #: ../glade/liferea.ui.h:60 -msgid "Feed Icons (Favicons)" -msgstr "Hírforrásikonok" +msgid "_Browse" +msgstr "_Tallózás" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "Hírforrásikonok frissítése _most" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "_Tegye ezt mostantól minden ehhez hasonló melléklettel." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Mappák" +msgid "Search All Feeds" +msgstr "Keresés az összes hírforrásban" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" -msgstr "Fejlécek olvasása" +msgid "_Search for:" +msgstr "_Keresés:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "Cikkek át_futása:" +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.ui.h:65 -msgid "Web Integration" -msgstr "Webes integráció" +msgid "_Advanced..." +msgstr "_Speciális…" #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Könyvjelzők küldése:" +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.ui.h:67 -msgid "Internal Browser Settings" -msgstr "Belső böngésző beállításai" +msgid "Update Monitor" +msgstr "Frissítésfigyelő" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Hivatkozások megnyitása a Liferea _ablakában." +msgid "Pending Requests" +msgstr "Függőben lévő kérések" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_JavaScript tiltása." +msgid "Downloading Now" +msgstr "Letöltés most" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "Bö_ngészőbővítmények engedélyezése." +msgid "Cancel _All" +msgstr "Összes _megszakítása" #: ../glade/liferea.ui.h:71 -msgid "External Browser Settings" -msgstr "Külsőböngésző-beállítások" +msgid "Create News Bin" +msgstr "Hírgyűjtő készítése" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "Hivatk_ozás megnyitása:" +msgid "_News Bin Name:" +msgstr "_Hírgyűjtő neve:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Névjegy" #: ../glade/liferea.ui.h:74 -#, no-c-format msgid "" -"_Manual:\n" -"(%s for URL)" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" msgstr "" -"_Kézi:\n" -"(%s az URL-hez)" - -#: ../glade/liferea.ui.h:76 -msgid "_Browser:" -msgstr "Böngés_ző:" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" #: ../glade/liferea.ui.h:77 -msgid "Browser" -msgstr "Böngésző" +msgid "Liferea is a news aggregator for GTK+" +msgstr "A Liferea egy hírolvasó program GTK+ grafikus felülettel." #: ../glade/liferea.ui.h:78 -msgid "Notification Settings" -msgstr "Értesítések beállításai" +msgid "Liferea Homepage" +msgstr "A Liferea honlapja" #: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "Speciális keresés" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "Keresés ma_ppában…" + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Keresőmotor-hírforrás készítése" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "írja be a keresendő szöveget" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "Találatok ma_ximális száma:" + +#: ../glade/liferea.ui.h:84 +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/new_subscription.ui.h:9 +msgid "Download / Postprocessing" +msgstr "Letöltés / Utófeldolgozás" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Forrásválasztás" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Válassza ki a hozzáadandó forrástípust…" + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "OPML/Planet hozzáadása" + +#: ../glade/opml_source.ui.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." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Hely" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "Fájl _kiválasztása" + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "Tiny Tiny RSS fiók hozzáadása" + +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "Írja be a tt-rss felhasználói beállításait." + +#: ../glade/ttrss_source.ui.h:3 +msgid "_Server URL" +msgstr "_Kiszolgáló URL-címe" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "Felhasználó_név" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Speciális…" + +#: ../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 "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." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Liferea beállításai" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Hírforrás gyorsítótárának kezelése" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Elmentett _hírek alapértelmezés szerinti száma hírforrásonként:" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Hírforrás frissítésének beállításai" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "Min_den feliratkozás frissítése induláskor." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Alapértelmezett _frissítési időköz:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "Note: Please remember to set a reasonable refresh time. Usually it is a waste of bandwidth to poll feeds more often than each hour." +msgstr "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/prefs.ui.h:9 +msgid "Feeds" +msgstr "Hírforrás" + +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Mappamegjelenítési beállítások" + +#: ../glade/prefs.ui.h:11 +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." + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "Olvasott hírek _elrejtése." + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Hírforrásikonok" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "Hírforrásikonok frissítése _most" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Mappák" + +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Fejlécek olvasása" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "Cikkek át_futása:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "Alapértelmezett _nézetmód:" + +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Webes integráció" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Könyvjelzők küldése:" + +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Belső böngésző beállításai" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Hivatkozások megnyitása a Liferea _ablakában." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_JavaScript tiltása." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "Bö_ngészőbővítmények engedélyezése." + +#: ../glade/prefs.ui.h:26 +msgid "External Browser Settings" +msgstr "Külsőböngésző-beállítások" + +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "Hivatk_ozás megnyitása:" + +#: ../glade/prefs.ui.h:28 +msgid "_Manual:" +msgstr "_Kézi:" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "(%s az URL-hez)" + +#: ../glade/prefs.ui.h:31 +msgid "_Browser:" +msgstr "Böngés_ző:" + +#: ../glade/prefs.ui.h:32 +msgid "Browser" +msgstr "Böngésző" + +#: ../glade/prefs.ui.h:33 +msgid "Notification Settings" +msgstr "Értesítések beállításai" + +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "_Felugró ablak megjelenítése az új hírekről." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 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.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Új elemek s_zámának mutatása az állapotikonon." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 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.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "_Indítás tálcaikonként." -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 msgid "Toolbar Settings" msgstr "Eszköztár beállításai" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "_Eszköztár elrejtése." -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Esz_köztárgombok címkéi:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "Kezelőfelület" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "HTTP proxy kiszolgáló" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "_Automatikus felismerés (GNOME vagy környezet)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "_Proxy nélkül" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "_Kézi beállítás" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "Proxy _port:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "Proxy _gépnév:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Proxy hi_telesítés használata" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "Proxy jel_szó:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "Proxy _felhasználónév:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 msgid "Downloading Enclosures" msgstr "Mellékletek letöltése" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Tallózás" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "Letöltés _helye" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Letöltés módja:" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 msgid "Opening Enclosures" msgstr "Mellékletek megnyitása" -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Mellékletek" -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "Szinkronizálva közeli gépekkel" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "Helyi háló_zati szinkronizálás engedélyezése" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "S_zolgáltatás neve" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Szinkronizálás" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Új mappa" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Mappa neve:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Átnevezés" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Új név:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Keresőmappa tulajdonságai" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "_Keresés neve:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "A következő feltételeknek megfelelő elemek keresése" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "Bá_rmely szabály illeszkedik" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "Min_den szabály illeszkedik" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Melléklet letöltése" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "A következő típusú melléklet letöltése:" - -#: ../glade/liferea.ui.h:120 -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.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "U_RL átadása, melléklet letöltése nélkül." - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "_Tegye ezt mostantól minden ehhez hasonló melléklettel." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Keresés az összes hírforrásban" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Keresés:" - -#: ../glade/liferea.ui.h:125 -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.ui.h:126 -msgid "_Advanced..." -msgstr "_Speciális…" - -#: ../glade/liferea.ui.h:127 -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.ui.h:128 -msgid "Update Monitor" -msgstr "Frissítésfigyelő" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "Függőben lévő kérések" - -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "Letöltés most" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "Összes _megszakítása" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Hírgyűjtő készítése" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Hírgyűjtő neve:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Névjegy" - -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "A Liferea egy hírolvasó program GTK+ grafikus felülettel." +#: ../glade/prefs.ui.h:57 +msgid "Plugins" +msgstr "Bővítmények" -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "A Liferea honlapja" +#~ msgid "Download and view feeds" +#~ msgstr "Hírforrások letöltése és megjelenítése" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Speciális keresés" +#~ msgid "You may want to validate the feed using" +#~ msgstr "A hírforrás ellenőrizhető a következővel:" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "Keresés ma_ppában…" +#~ msgid "bookmark" +#~ msgstr "könyvjelző" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Keresőmotor-hírforrás készítése" +#~ msgid "comments" +#~ msgstr "hozzászólás" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "írja be a keresendő szöveget" +#~ msgid "flag" +#~ msgstr "megjelölés" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Találatok ma_ximális száma:" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Melléklet letöltése MEGHIÚSULT: „%s”" -#: ../glade/liferea.ui.h:145 -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 "Enclosure download finished: \"%s\"" +#~ msgstr "Melléklet letöltése befejeződött: „%s”" -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" -msgstr "Letöltés / Utófeldolgozás" +#~ msgid "This version of Liferea uses a new cache format and has migrated your feed cache. The cache content in %s was not deleted automatically. Please remove this directory manually once you are sure migration was successful!" +#~ msgstr "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." -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Forrásválasztás" +#~ 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." -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Válassza ki a hozzáadandó forrástípust…" +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "A letöltés MEGHIÚSULT: „%s”" -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "OPML/Planet hozzáadása" - -#: ../glade/opml_source.ui.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 "Download finished." +#~ msgstr "A letöltés befejeződött." -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Hely" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Megnyitás új l_apon" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "Fájl _kiválasztása" +#~ msgid "_Launch Item In Browser" +#~ msgstr "Megnyitás _böngészőben" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "Tiny Tiny RSS fiók hozzáadása" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "_URL másolása vágólapra" -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "Írja be a tt-rss felhasználói beállításait." +#~ msgid "Choose download directory" +#~ msgstr "Letöltési könyvtár kiválasztása" -#: ../glade/ttrss_source.ui.h:3 -msgid "_Server URL" -msgstr "_Kiszolgáló URL-címe" +#~ msgid "Liferea Sync %s@%s" +#~ msgstr "Liferea szinkronizálás %s@%s" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "Felhasználó_név" +#~ msgid "Downloading Enclosure" +#~ msgstr "Melléklet letöltése" -#: ../glade/simple_subscription.ui.h:3 -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 "Sync" +#~ msgstr "Szinkronizálás" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Speciális…" +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Szinkronizálva közeli gépekkel" -#~ msgid "You may want to validate the feed using" -#~ msgstr "A hírforrás ellenőrizhető a következővel:" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "Helyi háló_zati szinkronizálás engedélyezése" #~ msgid "" -#~ "Jumps to the next unread item. If necessary selects the next feed with " -#~ "unread items." +#~ "_Manual:\n" +#~ "(%s for URL)" #~ msgstr "" -#~ "A következő olvasatlan elemre ugrik. Ha szükséges, kiválasztja a " -#~ "következő forrást az olvasatlan elemeivel." +#~ "_Kézi:\n" +#~ "(%s az URL-hez)" -#~ msgid "Liferea Sync %s@%s" -#~ msgstr "Liferea szinkronizálás %s@%s" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "U_RL átadása, melléklet letöltése nélkül." + +#~ msgid "_Save downloads in" +#~ msgstr "Letöltés _helye" + +#~ msgid "_Service Name" +#~ msgstr "S_zolgáltatás neve" #~ msgid "link cosmos" #~ msgstr "hivatkozáskozmoz" @@ -2335,16 +2248,8 @@ #~ msgstr[0] "%d találat" #~ msgstr[1] "%d találat" -#~ 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." #~ msgid "You have to select a feed entry" #~ msgstr "Válasszon ki egy hírforrást" @@ -2412,13 +2317,8 @@ #~ msgid "Bloglines" #~ msgstr "Bloglines" -#~ 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." +#~ 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." #~ msgid "feedlist.opml" #~ msgstr "feedlist.opml" @@ -2449,12 +2349,8 @@ #~ msgid "text/plain" #~ msgstr "text/plain" -#~ 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." #~ msgid "Downloading Enclosures" #~ msgstr "Mellékletek letöltése" diff -Nru liferea-1.8.15/po/it.po liferea-1.10.3/po/it.po --- liferea-1.8.15/po/it.po 2013-06-24 22:16:16.000000000 +0200 +++ liferea-1.10.3/po/it.po 2013-09-27 10:57:29.000000000 +0200 @@ -1,26 +1,24 @@ # 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, 2010, 2013. # msgid "" msgstr "" "Project-Id-Version: liferea 1.7.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" -"PO-Revision-Date: 2010-03-19 11:14+0100\n" -"Last-Translator: Gianvito Cavasoli \n" -"Language-Team: Italiana \n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" +"PO-Revision-Date: 2013-09-27 10:56+0200\n" +"Last-Translator: Gianvito Cavasoli \n" +"Language-Team: Italiano \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.6\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -33,8 +31,8 @@ msgstr "Lettore notiziari Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Scarica e visualizza notiziari" +msgid "Read news feeds and blogs" +msgstr "Leggi notizie e blog" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -67,7 +65,7 @@ #: ../xslt/feed.xml.in.h:6 msgid "You may want to contact the author/webmaster of the feed about this!" -msgstr "" +msgstr "Contattare l'autore/webmaster di questo notiziario." #: ../xslt/feed.xml.in.h:7 msgid "There were errors while filtering this feed!" @@ -143,38 +141,26 @@ msgstr "Creatore" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "contrassegno" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "segnalibro" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "commenti" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Ancora nessun commento." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Commenti" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Aggiornamento..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Ricarica" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Sezione" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Reparto" @@ -195,16 +181,15 @@ msgstr "Cartella ricerca:" #: ../src/browser.c:32 -#, fuzzy msgid "Default Browser" -msgstr "Browser predefinito di GNOME" +msgstr "Browser predefinito" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Comando browser non riuscito: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Avvio: «%s»" @@ -214,7 +199,7 @@ msgid "Authorization Error" msgstr "Errore di autorizzazione" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Impossibile creare la directory di cache «%s»." @@ -244,34 +229,49 @@ msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "Il file «%s» non è una configurazione di tipo allegato valida." -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Scaricamento dell'allegato non riuscito: «%s»" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" +"Non è stato ancora configurato uno strumento di scaricamento. Configurarlo " +"nella scheda «Scaricamento» in Strumenti/Preferenze." -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Scaricamento dell'allegato terminato: «%s»" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" +"Comando non riuscito:\n" +"\n" +"%s\n" +"\n" +"Verificare che lo strumento di scaricamento configurato sia installato e " +"funzioni correttamente. Si può cambiarlo nella scheda «Scaricamento» in " +"Strumenti/Preferenze." -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Errore nel rinominare %s in %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "" "Errore XML durante la lettura del file OPML. Impossibile importare «%s»." -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." @@ -279,42 +279,41 @@ "Documento vuoto. Il documento OPML «%s» non deve essere vuoto durante " "l'importazione." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, 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." -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Elenco notiziari importati" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importa elenco notiziari" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importa" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 -#, fuzzy +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 msgid "OPML Files" -msgstr "Scegliere file OPML" +msgstr "File OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Errore durante l'esportazione dell'elenco notiziari." -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Elenco notiziari esportato." -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Esporta elenco notiziari" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Esporta" @@ -372,12 +371,11 @@ msgstr "Impossibile determinare il tipo di notiziario." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 -#, fuzzy +#: ../src/itemlist.c:404 msgid "There are no unread items" -msgstr "Non ci sono articoli non letti." +msgstr "Non ci sono articoli non letti" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" @@ -385,108 +383,93 @@ "Avvia la finestra principale di Liferea con lo STATO. STATO può essere " "«shown»(mostra), «iconified»(ridotta a icona) o «hidden»(nascosta)" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "STATO" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Mostra informazioni di versione ed esce" -#: ../src/main.c:180 -#, fuzzy +#: ../src/main.c:166 msgid "Add a new subscription" -msgstr "Nuovo abbonamento" +msgstr "Aggiunge un nuovo abbonamento" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" -msgstr "" +msgstr "uri" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Stampa messaggi di debug di tutti i tipi" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "Stampa messaggi di debug del gestore di cache" -#: ../src/main.c:187 -#, fuzzy +#: ../src/main.c:173 msgid "Print debugging messages for the configuration handling" msgstr "Stampa messaggi di debug del gestore di configurazione" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "Stampa messaggi di debug del gestore del database" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "Stampa messaggi di debug di tutte le funzioni dell'interfaccia grafica" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" "Abilita il debug del rendering HTML. Ogni volta che ci sarà il render di " -"output HTML sarà riversato l'HTML generato anche in «~/.liferea_1.8/output." +"output HTML sarà riversato l'HTML generato anche in «~/.cache/liferea/output." "xhtml»" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "Stampa messaggi di debug di tutte le attività di rete" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "Stampa messaggi di debug di tutte le funzioni di analisi" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" "Stampa messaggi di debug quando una funzione richiede troppo tempo per " "elaborare" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Stampa messaggi di debug quando entra/lascia le funzioni" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "" "Stampa messaggi di debug dell'elaborazione di aggiornamento del notiziario" -#: ../src/main.c:196 -#, fuzzy +#: ../src/main.c:182 msgid "Print debugging messages of the search folder matching" -msgstr "Stampa messaggi di debug del gestore di cache" +msgstr "Stampa messaggi di debug della cartella dei risultati corrispondenti" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Stampa messaggi di debug dettagliati" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "Stampa messaggi di debug dell'argomento scelto" -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, il lettore notiziari in Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "Per maggiori informazioni, visitare http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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 "" -"Questa versione dell'applicazione usa un nuovo formato di cache e ha " -"convertito la cache dei notiziari. Il contenuto della cache in «%s» non è " -"stato eliminato automaticamente. Rimuovere manualmente questa directory " -"quando si è certi che la conversione è stata effettuata con successo." +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Per maggiori informazioni, visitare http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -658,23 +641,23 @@ msgid "Feed title" msgstr "Titolo del notiziario" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "L'abbonamento di «%s» è già in aggiornamento." -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, 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." -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Aggiornamento favicon per «%s»" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -682,49 +665,49 @@ "Si è verificato un problema durante la lettura di questo abbonamento. " "Controllare l'URL e l'output della console." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "L'URL di «%s» è cambiato permanentemente ed è stato aggiornato" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "«%s» è abbandonato. Non verrà più aggiornato." -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "«%s» non è cambiato dall'ultimo aggiornamento" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Aggiornamento di «%s»" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "" "Errore durante l'apertura del file temporaneo %s da usare per il filtraggio." -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s è uscito con lo stato %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Errore: impossibile aprire la pipe «%s»" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Errore: impossibile aprire il file «%s»" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Errore: non c'è il file «%s»" @@ -733,347 +716,353 @@ msgid "New Search Folder" msgstr "Nuova cartella di ricerca" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Si sono verificati più errori. L'output è stato troncato.]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "Analizzatore XML: impossibile analizzare il documento:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Allegati" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d allegato" -msgstr[1] "%d allegati" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " byte" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MiB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GiB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d allegato" +msgstr[1] "%d allegati" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Scegliere file" -#: ../src/ui/enclosure_list_view.c:404 -#, fuzzy, c-format +#: ../src/ui/enclosure_list_view.c:438 +#, c-format msgid "File Extension .%s" -msgstr "Estensione file .%s" +msgstr "Estensione file .%s" #: ../src/ui/icons.c:54 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Impossibile trovare il file pixmap: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d nuovo)" msgstr[1] " (%d nuovi)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d non letto%s" msgstr[1] "%d non letti%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Guida argomenti" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Riferimenti veloci" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "Domande frequenti" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "In rete" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Lavora fuori rete" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Fuori rete" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Lavora in rete" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Abbonamenti" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "Aggiorna _tutto" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Aggiorna tutti gli abbonamenti." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Segna tutto come _letto" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Segna come letto tutti gli articoli e tutti gli abbonamenti." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "Im_porta elenco notiziari..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importa un elenco notiziari OPML." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "Espo_rta elenco notiziari..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Esporta l'elenco notiziari come OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Esci" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Notiziario" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Rimuovi _tutti gli articoli" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Rimuove tutti gli articoli del notiziario attualmente selezionato." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "Arti_colo" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "Articolo precedente" + +#: ../src/ui/liferea_shell.c:924 +msgid "Next Item" +msgstr "Articolo successivo" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "Articolo s_uccessivo non letto" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Visualizza" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "Au_menta dimensione testo" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Aumenta la dimensione del testo nella visualizzazione dell'articolo" -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_Diminuisci dimensione testo" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "" "Diminuisce la dimensione del testo nella visualizzazione dell'articolo." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "_Strumenti" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "Controllo _aggiornamenti" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "" "Mostra un elenco di tutti gli attuali notiziari nella coda d'aggiornamento" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "Preferen_ze" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Modifica le preferenze." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "_Cerca" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Cerca in tutti i notiziari..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Mostra il dialogo di ricerca." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "A_iuto" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "Som_mario" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Visualizza la guida per questa applicazione." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "Riferimenti velo_ci" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Visualizza un elenco di tutte le scorciatoie da tastiera." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "Domande _frequenti" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Visualizza le domande frequenti per questa applicazione." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "I_nformazioni" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Mostra un dialogo di informazioni." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "Visualizzazione norma_le" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Imposta la modalità di visualizzazione come un client di posta." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "Visualizzazione ampi_a" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "" -"Imposta la modalità di visualizzazione per usare tre pannelli verticali." +"Imposta la modalità di visualizzazione per usare tre riquadri verticali." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "Visualizzazione com_binata" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." -msgstr "Imposta la modalità di visualizzazione in due pannelli." +msgstr "Imposta la modalità di visualizzazione in due riquadri." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "Elenco notiziari ri_dotto" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Nasconde i notiziari con nessun articolo non letto." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "Nu_ovo abbonamento..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Aggiunge un abbonamento all'elenco dei notiziari." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Nuova _cartella..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Aggiunge una cartella all'elenco dei notiziari." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Nuova cartella ric_erca..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Aggiunge una nuova cartella di ricerca all'elenco dei notiziari." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Nuova fo_nte..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Aggiunge una nuova fonte dell'elenco dei notiziari." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "Nuovo archivio no_tizie..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Aggiunge un nuovo archivio delle notizie." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "Se_gna articoli come letti" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "" "Segna tutti gli articoli selezionati nell'elenco dei notiziari alla voce «/» " "come letti." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Aggiorna" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." @@ -1081,69 +1070,93 @@ "Aggiorna gli abbonamenti selezionati o tutti gli abbonamenti di una cartella " "selezionata." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "Pr_oprietà" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Apre il dialogo della proprietà dell'abbonamento selezionato." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "Rimuo_vi" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Rimuove l'abbonamento selezionato." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Commuta stato l_etto" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Commuta lo stato di letto dell'articolo selezionato." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Commuta contrass_egno articolo" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Commuta lo stato del contrassegno dell'articolo selezionato." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "Rimuov_i" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Rimuove l'articolo selezionato." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" -msgstr "La_ncia nel browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "Apri nella _scheda" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." -msgstr "Lancia il collegamento dell'articolo nel browser configurato." +#: ../src/ui/liferea_shell.c:997 +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "" +"Lancia i collegamenti degli articoli in una nuova scheda del browser interno." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +msgid "_Open In Browser" +msgstr "_Apri nel browser" + +#: ../src/ui/liferea_shell.c:999 +msgid "Launches the item's link in the Liferea item pane." +msgstr "Lancia i collegamenti degli articoli nel riquadro degli articoli" -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +msgid "Open In _External Browser" +msgstr "Apri nel browser _esterno" + +#: ../src/ui/liferea_shell.c:1001 +msgid "Launches the item's link in the configured external browser." +msgstr "Lancia i collegamenti degli articoli nel browser esterno configurato." + +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "_Lavora fuori rete" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "" "Questa opzione consente di disabilitare l'aggiornamento degli abbonamenti." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "_Schermo intero" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "Esplora a schermo intero" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Linux Feed Reader" -#: ../src/ui/liferea_shell.c:1246 -#, fuzzy +#: ../src/ui/liferea_shell.c:1341 msgid "" "

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

    You can add new subscriptions

    • From main menu " @@ -1152,25 +1165,24 @@ "'Subscribe' within Liferea

    " 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.

    È possibile aggiungere nuovi abbonamenti

    • Dal menù " +"principale «Abbonamenti» -> «Nuovo abbonamento»
    • Rilasciando i " +"collegamenti dei notiziari nell'elenco degli abbonamenti
    • Facendo " +"clic con il tasto destro sui collegamenti e scegliendo «Abbonati» " +"all'interno dell'applicazione

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Fonte sconosciuta" #: ../src/ui/ui_common.c:205 -#, fuzzy msgid "All Files" -msgstr "File loca_le" +msgstr "Tutti i file" #: ../src/ui/feed_list_view.c:341 msgid "Deleting entry" @@ -1194,251 +1206,243 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Modalità non in rete. Nessun aggiornamento è possibile." -#: ../src/ui/liferea_htmlview.c:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Scaricamento dell'allegato non riuscito: «%s»" - -#: ../src/ui/liferea_htmlview.c:437 -#, fuzzy -msgid "Download finished." -msgstr "Scari_care usando" - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" -msgstr "Lancia collegamento nella sc_heda" - -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" -msgstr "_Lancia collegamento nel browser" +#: ../src/ui/liferea_htmlview.c:627 +msgid "Open Link In _Tab" +msgstr "Apri collegamento nella _scheda" + +#: ../src/ui/liferea_htmlview.c:628 +msgid "_Open Link In Browser" +msgstr "_Apri collegamento nel browser" + +#: ../src/ui/liferea_htmlview.c:629 +msgid "_Open Link In External Browser" +msgstr "_Apri collegamento nel browser esterno" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" -msgstr "Collegamento come _segnalibro in %s" +msgstr "Collegamento come _segnalibro su %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Copia posizione collegamento" -#: ../src/ui/liferea_htmlview.c:555 -#, fuzzy +#: ../src/ui/liferea_htmlview.c:639 msgid "_Copy Image Location" -msgstr "_Copia posizione collegamento" +msgstr "_Copia posizione immagine" -#: ../src/ui/liferea_htmlview.c:557 -#, fuzzy +#: ../src/ui/liferea_htmlview.c:641 msgid "S_ave Link As" -msgstr "Salva come..." +msgstr "S_alva collegamento come" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" -msgstr "" +msgstr "S_alva immagine come" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Abbonati..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Nessun titolo ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Data" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Testata" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Nessun articolo è stato selezionato" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Questo articolo non ha un collegamento specificato." -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Si deve selezionare un notiziario per eliminare i suoi articoli." -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Lancia collegamento nella sc_heda" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "_Lancia articolo nel browser" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "Copia in archivio notizie" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Copia _URL dell'articolo negli appunti" +#: ../src/ui/popup_menu.c:156 +#, c-format +msgid "_Bookmark at %s" +msgstr "_Segnalibro su %s" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:160 +msgid "Copy Item _Location" +msgstr "Copia _posizione articolo" + +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "Rimuo_vi articolo" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Apri allegato..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Salva come..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "Copia posizione collegamento" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "Ag_giorna tutto" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "Mo_stra finestra" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "A_ggiorna cartella" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "Se_gna tutto come letto" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_Nuovo" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "Nuovo _abbonamento..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "Nuova fo_nte..." -#: ../src/ui/popup_menu.c:323 -#, fuzzy +#: ../src/ui/popup_menu.c:329 msgid "Sort Feeds" -msgstr "Importa elenco notiziari" +msgstr "Ordina notiziari" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" -msgstr "" +msgstr "_Ricostruisci" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "Nu_ovo abbonamento..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "Predefinito di GNOME" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Testo accanto alle icone" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Testo sotto le icone" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Solo icone" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Solo testo" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minuti" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "ore" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "giorni" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Spazio" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Spazio" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Spazio" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Scegliere directory scaricamenti" +#: ../src/ui/preferences_dialog.c:114 +msgid "Normal View" +msgstr "Visualizzazione normale" + +#: ../src/ui/preferences_dialog.c:115 +msgid "Wide View" +msgstr "Visualizzazione ampia" + +#: ../src/ui/preferences_dialog.c:116 +msgid "Combined View" +msgstr "Visualizzazione combinata" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" -msgstr "Comando manuale" +msgstr "Manuale" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Predefinito del browser" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Finestra esistente" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Nuova finestra" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Nuova scheda" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" -msgstr "" +msgstr "Integrazione con il menù di messaggistica (indicatore)" -#: ../src/ui/ui_prefs.c:684 -#, fuzzy +#: ../src/ui/preferences_dialog.c:685 msgid "Terminate instead of minimizing to the messaging menu" -msgstr "Termina_re invece di minimizzare nell'area di notifica." +msgstr "Terminare invece di minimizzare nel menù di messaggistica" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" -msgstr "" +msgstr "Avviare minimizzato nel menù di messaggistica" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Tipo" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Programma" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "(Vuoto)" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" +"%s\n" +"Ricostruzione" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1456,9 +1460,9 @@ msgstr "" "Questo notiziario non specifica un intervallo di aggiornamento predefinito." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" -msgstr "" +msgstr "Senza titolo" #: ../src/ui/ui_tray.c:221 #, c-format @@ -1497,7 +1501,7 @@ #: ../src/parsers/atom10.c:241 ../src/parsers/pie_feed.c:141 msgid "Website" -msgstr "" +msgstr "Sito web" #: ../src/parsers/atom10.c:251 msgid "Invalid Atom feed: unknown author" @@ -1507,7 +1511,7 @@ msgid "%b %d %H:%M" msgstr "%d %b %H.%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1517,11 +1521,11 @@ msgid "Google Reader login failed!" msgstr "Accesso a Google Reader non riuscito." -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1556,35 +1560,27 @@ 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:269 msgid "Source Type" msgstr "Tipo di fonte" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" -msgstr "" +msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 -#, fuzzy +#: ../src/fl_sources/ttrss_source.c:363 msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " "present your tt-rss subscriptions, and will synchronize your feed list and " "reading lists." msgstr "" -"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." +"Integrare l'elenco notiziari dell'account di Tiny Tiny RSS 1.5+. Verranno " +"presentati gli abbonamenti di tt-rss e saranno sincronizzati l'elenco dei " +"notiziari e le liste di lettura." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" -msgstr "" +msgstr "Impossibile analizzare JSON restituito dalle API di tt-rss." #: ../src/notification/libnotify.c:61 ../src/notification/libnotify.c:83 #: ../src/notification/libnotify.c:152 @@ -1612,8 +1608,8 @@ #, c-format msgid "%s has %d update" msgid_plural "%s has %d updates" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s ha %d aggiornamento" +msgstr[1] "%s ha %d aggiornamenti" #: ../src/notification/libnotify.c:257 ../src/notification/libnotify.c:259 msgid "Feed Update" @@ -1633,7 +1629,7 @@ #: ../glade/auth.ui.h:5 ../glade/liferea.ui.h:38 msgid "User_name:" -msgstr "Nom_e utente:" +msgstr "_Nome utente:" #: ../glade/auth.ui.h:6 msgid "" @@ -1651,14 +1647,13 @@ msgid "Please enter your Google Reader account settings." msgstr "Inserire le impostazioni dell'account Google Reader" -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "Pass_word" #: ../glade/google_source.ui.h:4 msgid "_Username (Email)" -msgstr "Nom_e utente (email)" +msgstr "_Nome utente (email)" #: ../glade/liferea.ui.h:2 msgid "normal view" @@ -1676,7 +1671,7 @@ msgid "combined view" msgstr "visualizzazione combinata" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Testate" @@ -1689,18 +1684,16 @@ msgstr "Proprietà dell'abbonamento" #: ../glade/liferea.ui.h:9 -#, fuzzy msgid "Feed Name" -msgstr "_Nome notiziario:" +msgstr "Nome notiziario" #: ../glade/liferea.ui.h:10 msgid "Feed _Name:" msgstr "_Nome notiziario:" #: ../glade/liferea.ui.h:11 -#, fuzzy msgid "Update Interval" -msgstr "Controllo aggiornamenti" +msgstr "Intervallo di aggiornamento" #: ../glade/liferea.ui.h:12 msgid "_Use global default update interval." @@ -1730,10 +1723,9 @@ msgstr "Generale" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 -#, fuzzy +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" -msgstr "Fonte notiziario" +msgstr "Fonte notiziario" #: ../glade/liferea.ui.h:20 ../glade/new_subscription.ui.h:8 msgid "Source Type:" @@ -1848,333 +1840,78 @@ msgstr "Avanzato" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Preferenze di Liferea" - -#: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" - -#: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "_Numero predefinito di articoli per notiziario da salvare:" - -#: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "Aggiornamento notiziario" - -#: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Aggiorna tutti gli abbonamenti." - -#: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "_Intervallo predefinito di aggiornamento del notiziario:" - -#. Feed update interval hint in preference dialog. -#: ../glade/liferea.ui.h:55 -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: ricordarsi di impostare un tempo ragionevole di aggiornamento. " -"Solitamente non è consigliabile far uso di banda per controllare i notiziari " -"più di una volta l'ora." - -#: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Notiziari" - -#: ../glade/liferea.ui.h:57 -#, fuzzy -msgid "Folder Display Settings" -msgstr "" -"Impostazioni visualizzazione delle cartelle" - -#: ../glade/liferea.ui.h:58 -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." - -#: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "Nas_condere gli articoli letti." - -#: ../glade/liferea.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Icone dei notiziari (favicon)" - -#: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "Ag_giorna tutte le favicon ora" - -#: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Cartelle" - -#: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "testate non lette" - -#: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "Scor_rere gli articoli con:" - -#: ../glade/liferea.ui.h:65 -#, fuzzy -msgid "Web Integration" -msgstr "Orientamento" - -#: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Inserire segnalibri in" - -#: ../glade/liferea.ui.h:67 -#, fuzzy -msgid "Internal Browser Settings" -msgstr "Impostazioni del browser interno" - -#: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Aprire collegamenti nella _finestra." - -#: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "Disa_bilitare Javascript." - -#: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "" - -#: ../glade/liferea.ui.h:71 -#, fuzzy -msgid "External Browser Settings" -msgstr "Impostazioni del browser esterno" - -#: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "A_prire collegamenti in:" - -#: ../glade/liferea.ui.h:74 -#, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" -msgstr "" -"Manual_e:\n" -"(%s per l'URL)" - -#: ../glade/liferea.ui.h:76 -msgid "_Browser:" -msgstr "_Browser web:" - -#: ../glade/liferea.ui.h:77 -msgid "Browser" -msgstr "Browser" - -#: ../glade/liferea.ui.h:78 -#, fuzzy -msgid "Notification Settings" -msgstr "Impostazioni delle notifiche" - -#: ../glade/liferea.ui.h:79 -msgid "Show a _popup window with new headlines." -msgstr "Mostrare una finestra di _notifica con le nuove testate." - -#: ../glade/liferea.ui.h:80 -msgid "Show a status _icon in the notification area (system tray)." -msgstr "Mostrare un'i_cona di stato nell'area di notifica." - -#: ../glade/liferea.ui.h:81 -msgid "Show _number of new items in the tray icon." -msgstr "Mostrare il num_ero di nuovi articoli nell'area di notifica." - -#: ../glade/liferea.ui.h:82 -msgid "T_erminate instead of minimizing to tray icon." -msgstr "Termina_re invece di minimizzare nell'area di notifica." - -#: ../glade/liferea.ui.h:83 -msgid "_Start in tray icon." -msgstr "A_vviare nell'area di notifica." - -#: ../glade/liferea.ui.h:84 -#, fuzzy -msgid "Toolbar Settings" -msgstr "Etichette _pulsanti della barra degli strumenti:" - -#: ../glade/liferea.ui.h:85 -msgid "_Hide toolbar." -msgstr "Nascon_dere la barra degli strumenti." - -#: ../glade/liferea.ui.h:86 -msgid "Toolbar _button labels:" -msgstr "Etichette _pulsanti della barra degli strumenti:" - -#: ../glade/liferea.ui.h:87 -msgid "GUI" -msgstr "Interfaccia" - -#: ../glade/liferea.ui.h:88 -msgid "HTTP Proxy Server" -msgstr "" - -#: ../glade/liferea.ui.h:89 -msgid "_Auto Detect (GNOME or environment)" -msgstr "Rile_vare automaticamente (GNOME o ambiente)" - -#: ../glade/liferea.ui.h:90 -msgid "_No Proxy" -msgstr "Nessu_n proxy" - -#: ../glade/liferea.ui.h:91 -msgid "_Manual Setting:" -msgstr "Impostazione man_uale:" - -#: ../glade/liferea.ui.h:92 -msgid "Proxy _Port:" -msgstr "Por_ta del proxy:" - -#: ../glade/liferea.ui.h:93 -msgid "Proxy _Host:" -msgstr "_Host del proxy:" - -#: ../glade/liferea.ui.h:94 -msgid "Use Proxy Au_thentication" -msgstr "Usare auten_ticazione proxy" - -#: ../glade/liferea.ui.h:95 -msgid "Proxy Pass_word:" -msgstr "Pass_word del proxy:" - -#: ../glade/liferea.ui.h:96 -msgid "Proxy _Username:" -msgstr "Nome _utente del proxy:" - -#: ../glade/liferea.ui.h:97 -msgid "Proxy" -msgstr "Proxy" - -#: ../glade/liferea.ui.h:98 -#, fuzzy -msgid "Downloading Enclosures" -msgstr "Scaricamento allegato" - -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "Sce_gli" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "Sal_vare scaricamenti in" - -#: ../glade/liferea.ui.h:101 -msgid "_Download using" -msgstr "Scari_care usando" - -#: ../glade/liferea.ui.h:102 -#, fuzzy -msgid "Opening Enclosures" -msgstr "Apri allegato..." - -#: ../glade/liferea.ui.h:103 -msgid "Enclosures" -msgstr "Allegati" - -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Sincronizzato con host vicini" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "A_bilitare sincronizzazione della LAN locale" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "Nome del servi_zio" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Sincronizza" - -#: ../glade/liferea.ui.h:109 msgid "New Folder" msgstr "Nuova cartella" -#: ../glade/liferea.ui.h:110 +#: ../glade/liferea.ui.h:49 msgid "_Folder name:" msgstr "Nome cartel_la:" -#: ../glade/liferea.ui.h:111 +#: ../glade/liferea.ui.h:50 msgid "Rename" msgstr "Rinomina" -#: ../glade/liferea.ui.h:112 +#: ../glade/liferea.ui.h:51 msgid "_New Name:" msgstr "Nuo_vo nome:" -#: ../glade/liferea.ui.h:113 +#: ../glade/liferea.ui.h:52 msgid "Search Folder Properties" msgstr "Proprietà cartella di ricerca" -#: ../glade/liferea.ui.h:114 +#: ../glade/liferea.ui.h:53 msgid "Search _Name:" msgstr "_Nome della ricerca:" -#: ../glade/liferea.ui.h:115 -#, fuzzy +#: ../glade/liferea.ui.h:54 msgid "Find Items that meet the following criteria" -msgstr "Trova gli articoli che soddisfano i seguenti criteri" +msgstr "Trova gli articoli che soddisfano i seguenti criteri" -#: ../glade/liferea.ui.h:116 +#: ../glade/liferea.ui.h:55 msgid "A_ny Rule Matches" -msgstr "_Qualsiasi regola con risultati" +msgstr "_Qualsiasi regola corrispondente" -#: ../glade/liferea.ui.h:117 +#: ../glade/liferea.ui.h:56 msgid "_All Rules Must Match" msgstr "_Tutte le regole devono corrispondere" -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Scaricamento allegato" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Scaricamento allegato di tipo:" +#: ../glade/liferea.ui.h:57 +msgid "Open Enclosure" +msgstr "Apri allegato" -#: ../glade/liferea.ui.h:120 +#: ../glade/liferea.ui.h:58 +msgid "Open an enclosure of type:" +msgstr "Aprire un allegato di tipo:" + +#: ../glade/liferea.ui.h:59 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 " +"want to be executed below. The enclosures URL will be supplied as an " "argument for this command:" msgstr "" "Cosa fare con questo allegato? Immettere qui sotto il comando che si vuole " -"eseguire. Gli allegati scaricati saranno utilizzati come argomento per " -"questo comando:" +"eseguire. Gli URL degli allegati saranno forniti come argomento per questo " +"comando:" -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "Pass_are l'URL e non scaricare l'allegato." +#: ../glade/liferea.ui.h:60 +msgid "_Browse" +msgstr "_Esplora" -#: ../glade/liferea.ui.h:122 +#: ../glade/liferea.ui.h:61 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.ui.h:123 +#: ../glade/liferea.ui.h:62 msgid "Search All Feeds" msgstr "Cerca in tutti i notiziari" -#: ../glade/liferea.ui.h:124 +#: ../glade/liferea.ui.h:63 msgid "_Search for:" -msgstr "Cer_ca:" +msgstr "Cer_ca per:" -#: ../glade/liferea.ui.h:125 +#: ../glade/liferea.ui.h:64 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." @@ -2182,11 +1919,11 @@ "Immettere la stringa di ricerca che si vuol cercare nei titoli o nel " "contenuto degli articoli." -#: ../glade/liferea.ui.h:126 +#: ../glade/liferea.ui.h:65 msgid "_Advanced..." msgstr "Avan_zato..." -#: ../glade/liferea.ui.h:127 +#: ../glade/liferea.ui.h:66 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2194,75 +1931,71 @@ "Avvia la ricerca del testo specificato in tutti i notiziari. Il risultato " "della ricerca apparirà nell'elenco degli articoli." -#: ../glade/liferea.ui.h:128 +#: ../glade/liferea.ui.h:67 msgid "Update Monitor" msgstr "Controllo aggiornamenti" -#: ../glade/liferea.ui.h:129 -#, fuzzy +#: ../glade/liferea.ui.h:68 msgid "Pending Requests" -msgstr "Richieste in attesa" +msgstr "Richieste in attesa" -#: ../glade/liferea.ui.h:130 -#, fuzzy +#: ../glade/liferea.ui.h:69 msgid "Downloading Now" -msgstr "Scaricamento in corso" +msgstr "Scaricamento in corso" -#: ../glade/liferea.ui.h:131 +#: ../glade/liferea.ui.h:70 msgid "Cancel _All" msgstr "Annulla tu_tto" -#: ../glade/liferea.ui.h:132 +#: ../glade/liferea.ui.h:71 msgid "Create News Bin" msgstr "Crea archivio notizie" -#: ../glade/liferea.ui.h:133 +#: ../glade/liferea.ui.h:72 msgid "_News Bin Name:" msgstr "Nome archivio no_tizie:" -#: ../glade/liferea.ui.h:134 +#: ../glade/liferea.ui.h:73 msgid "About" msgstr "Informazioni" -#: ../glade/liferea.ui.h:135 -#, fuzzy +#: ../glade/liferea.ui.h:74 msgid "" "Copyright (c) 2003-2012\n" "The Liferea Team\n" msgstr "" -"Copyright (c) 2003-2009\n" +"Copyright (c) 2003-2013\n" "Sviluppatori di Liferea\n" -#: ../glade/liferea.ui.h:138 +#: ../glade/liferea.ui.h:77 msgid "Liferea is a news aggregator for GTK+" msgstr "Un aggregatore di notizie per GTK+" -#: ../glade/liferea.ui.h:139 +#: ../glade/liferea.ui.h:78 msgid "Liferea Homepage" msgstr "Pagina web di Liferea" -#: ../glade/liferea.ui.h:140 +#: ../glade/liferea.ui.h:79 msgid "Advanced Search" msgstr "Ricerca avanzata" -#: ../glade/liferea.ui.h:141 +#: ../glade/liferea.ui.h:80 msgid "_Search Folder..." msgstr "Cartella ri_cerca..." -#: ../glade/liferea.ui.h:142 +#: ../glade/liferea.ui.h:81 msgid "Create Search Engine Feed" msgstr "Crea motore di ricerca notiziari" -#: ../glade/liferea.ui.h:143 +#: ../glade/liferea.ui.h:82 msgid "enter any search string you want" msgstr "immettere qualsiasi stringa di ricerca si desidera" -#: ../glade/liferea.ui.h:144 +#: ../glade/liferea.ui.h:83 msgid "Maximal _Number Of Result Items:" msgstr "N_umero massimo di risultati per articoli:" -#: ../glade/liferea.ui.h:145 -#, fuzzy +#: ../glade/liferea.ui.h:84 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 " @@ -2271,12 +2004,11 @@ "Nota: l'applicazione genererà un abbonamento di notiziario che verrà " "utilizzato 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 un qualunque abbonamento." #: ../glade/new_subscription.ui.h:9 -#, fuzzy msgid "Download / Postprocessing" -msgstr "Scaricamento / Elaborazione" +msgstr "Scaricamento / Elaborazione" #: ../glade/node_source.ui.h:1 msgid "Source Selection" @@ -2306,281 +2038,253 @@ msgstr "_Seleziona file" #: ../glade/ttrss_source.ui.h:1 -#, fuzzy msgid "Add Tiny Tiny RSS Account" -msgstr "Aggiungi account Bloglines" +msgstr "Aggiungi account Tiny Tiny RSS" #: ../glade/ttrss_source.ui.h:2 -#, fuzzy msgid "Please enter your tt-rss account settings." -msgstr "Inserire le impostazioni dell'account Bloglines." +msgstr "Inserire le impostazioni dell'account tt-rss." #: ../glade/ttrss_source.ui.h:3 -#, fuzzy msgid "_Server URL" -msgstr "Errore del server" +msgstr "URL del _server" #: ../glade/ttrss_source.ui.h:5 msgid "_Username" msgstr "Nom_e utente" -#: ../glade/simple_subscription.ui.h:3 +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Avanzato..." + +#: ../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 "" "Inserire l'indirizzo di un sito web per usare il rilevamento automatico del " -"notiziario, oppure, se si è a conoscenza, l'indirizzo esatto del notiziario." - -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Avanzato..." - -#~ msgid "You may want to validate the feed using" -#~ msgstr "È possibile convalidare il notiziario usando" - -#~ msgid "" -#~ "Jumps to the next unread item. If necessary selects the next feed with " -#~ "unread items." -#~ msgstr "" -#~ "Passa all'articolo successivo non letto. Se necessario seleziona il " -#~ "successivo notiziario con articoli non letti." - -#~ msgid "Liferea Sync %s@%s" -#~ msgstr "Sincronizzazione %s@%s" - -#~ msgid "link cosmos" -#~ msgstr "collegamento cosmos" - -#~ msgid "Print debugging messages for the plugin loading" -#~ msgstr "Stampa messaggi di debug del caricamento del plugin" - -#~ msgid "Liferea seems to be running already!" -#~ msgstr "L'applicazione sembra già in esecuzione." - -#~ msgid "Update status" -#~ msgstr "Stato dell'aggiornamento" +"notiziario oppure se si è a conoscenza l'indirizzo esatto del notiziario." -#~ msgid "was updated" -#~ msgstr "è stato aggiornato" - -#~ msgid "was not updated" -#~ msgstr "non è stato aggiornato" - -#~ msgid "The orientation of the tray." -#~ msgstr "L'orientamento nell'area di notifica." - -#~ msgid "%s" -#~ msgstr "%s" - -#~ msgid "topics_en.html" -#~ msgstr "topics_en.html" - -#~ msgid "reference_en.html" -#~ msgstr "reference_en.html" - -#~ msgid "faq_en.html" -#~ msgstr "faq_en.html" - -#~ msgid "_Script Manager" -#~ msgstr "Gestore scri_pt" - -#~ msgid "Allows to configure and edit LUA hook scripts" -#~ msgstr "Consente di configurare e modificare script di aggancio di LUA" - -#~ msgid "Search With ..." -#~ msgstr "Cerca con..." - -#~ msgid "%d Search Result for \"%s\"" -#~ msgid_plural "%d Search Results for \"%s\"" -#~ msgstr[0] "%d risultato di ricerca per «%s»" -#~ msgstr[1] "%d risultati di ricerca per «%s»" - -#~ msgid "%d Search Result" -#~ msgid_plural "%d Search Results" -#~ msgstr[0] "%d risultato di ricerca" -#~ msgstr[1] "%d risultati di ricerca" - -#~ 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 "" -#~ "L'elenco degli articoli adesso contiene tutti gli articoli corrispondenti " -#~ "al criterio di ricerca specificato. Per salvare il risultato della " -#~ "ricerca permanentemente, è possibile fare clic sul pulsante «Cartella " -#~ "ricerca» nel dialogo di ricerca e verrà aggiunta una cartella di ricerca " -#~ "nell'elenco dei notiziari." +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Preferenze di Liferea" -#~ msgid "Count" -#~ msgstr "Contatore" +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Gestione cache del notiziario" -#~ msgid "You have to select a feed entry" -#~ msgstr "Selezionare una voce di notiziario" +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "_Numero predefinito di articoli per notiziario da salvare:" -#~ msgid "(empty)" -#~ msgstr "(vuoto)" +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Impostazioni aggiornamento del notiziario" -#~ msgid "_Delete" -#~ msgstr "Eli_mina" +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "_Aggiornare tutti gli abbonamenti all'avvio." -#~ msgid "_Properties..." -#~ msgstr "Pr_oprietà..." +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "_Intervallo predefinito di aggiornamento del notiziario:" -#~ msgid "Update out-dated feeds" -#~ msgstr "Aggiornare i notiziari scaduti" +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"Note: ricordarsi di impostare un tempo ragionevole di aggiornamento. " +"Solitamente non è consigliabile far uso di banda per controllare i notiziari " +"più di una volta l'ora." -#~ msgid "Force update of all feeds" -#~ msgstr "Forzare l'aggiornamento di tutti i notiziari" +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Notiziari" -#~ msgid "No feed update at all" -#~ msgstr "Non aggiornare i notiziari" +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Impostazioni visualizzazione delle cartelle" -#~ msgid "startup" -#~ msgstr "avvio" +#: ../glade/prefs.ui.h:11 +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." -#~ msgid "feed updated" -#~ msgstr "notiziario aggiornato" +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "Nas_condere gli articoli letti." -#~ msgid "feed added" -#~ msgstr "notiziario aggiunto" +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Icone dei notiziari (favicon)" -#~ msgid "item selected" -#~ msgstr "articolo selezionato" +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "Ag_giorna tutte le favicon ora" -#~ msgid "feed selected" -#~ msgstr "notiziario selezionato" +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Cartelle" -#~ msgid "item unselected" -#~ msgstr "articolo deselezionato" +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Lettura testate" -#~ msgid "feed unselected" -#~ msgstr "notiziario deselezionato" +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "Scor_rere gli articoli con:" -#~ msgid "shutdown" -#~ msgstr "arresto" +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "Modalità _predefinita di visualizzazione:" -#~ msgid "Sorry, no scripting support available!" -#~ msgstr "Non è disponibile il supporto allo scripting." +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Integrazione web" -#~ msgid "Script Name" -#~ msgstr "Nome script" +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Inserire segnalibri in" -#~ msgid "No script selected!" -#~ msgstr "Nessuno script selezionato." +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Impostazioni del browser interno" -#~ msgid "Create a new search feed." -#~ msgstr "Crea un nuovo notiziario di ricerca." +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Aprire collegamenti nella _finestra." -#~ msgid "Liferea is unable to display this item's content." -#~ msgstr "Impossibile visualizzare il contenuto dell'articolo." +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "Disa_bilitare Javascript." -#~ msgid "

    View this item's content.

    " -#~ msgstr "" -#~ "

    Visualizza il contenuto di questo articolo.

    " +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "_Abilitare plugin del broser." -#~ msgid "Bloglines" -#~ msgstr "Bloglines" +#: ../glade/prefs.ui.h:26 +msgid "External Browser Settings" +msgstr "Impostazioni del browser esterno" -#~ 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 " -#~ "nell'elenco dei notiziari." +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "A_prire collegamenti in:" -#~ msgid "feedlist.opml" -#~ msgstr "feedlist_it.opml" +#: ../glade/prefs.ui.h:28 +msgid "_Manual:" +msgstr "_Manuale:" -#~ msgid "%s has %d new / updated headline\n" -#~ msgid_plural "%s has %d new / updated headlines\n" -#~ msgstr[0] "%s ha %d nuova testata aggiornata\n" -#~ msgstr[1] "%s ha %d nuove testate aggiornate\n" +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "(%s per l'URL)" -#~ msgid " " -#~ msgstr " " +#: ../glade/prefs.ui.h:31 +msgid "_Browser:" +msgstr "_Browser:" -#~ msgid " " -#~ msgstr " " +#: ../glade/prefs.ui.h:32 +msgid "Browser" +msgstr "Browser" -#~ msgid " " -#~ msgstr " " +#: ../glade/prefs.ui.h:33 +msgid "Notification Settings" +msgstr "Impostazioni notifiche" -#~ msgid "Hook" -#~ msgstr "Aggancio" +#: ../glade/prefs.ui.h:34 +msgid "Show a _popup window with new headlines." +msgstr "Mostrare una finestra di _notifica con le nuove testate." -#~ msgid "Registered Scripts" -#~ msgstr "Script registrati" +#: ../glade/prefs.ui.h:35 +msgid "Show a status _icon in the notification area (system tray)." +msgstr "Mostrare un'i_cona di stato nell'area di notifica." -#~ msgid "Script Code" -#~ msgstr "Codice script" +#: ../glade/prefs.ui.h:36 +msgid "Show _number of new items in the tray icon." +msgstr "Mostrare il num_ero di nuovi articoli nell'area di notifica." -#~ msgid "text/plain" -#~ msgstr "testo semplice" +#: ../glade/prefs.ui.h:37 +msgid "T_erminate instead of minimizing to tray icon." +msgstr "Termina_re invece di minimizzare nell'area di notifica." -#~ msgid "" -#~ "This option can cause significant delays when loading folders " -#~ "containing many feeds." -#~ msgstr "" -#~ "Questa opzione può causare significanti ritardi durante il caricamento " -#~ "di cartelle che contengono molti notiziari." +#: ../glade/prefs.ui.h:38 +msgid "_Start in tray icon." +msgstr "A_vviare nell'area di notifica." -#~ msgid "Downloading Enclosures" -#~ msgstr "Scaricamento allegati" +#: ../glade/prefs.ui.h:39 +msgid "Toolbar Settings" +msgstr "Impostazioni barra degli strumenti" -#~ msgid "Feed Cache Handling" -#~ msgstr "Gestione cache dei notiziari" +#: ../glade/prefs.ui.h:40 +msgid "_Hide toolbar." +msgstr "Nascon_dere la barra degli strumenti." -#~ msgid "Feed Name" -#~ msgstr "Nome del notiziario" +#: ../glade/prefs.ui.h:41 +msgid "Toolbar _button labels:" +msgstr "Etichette _pulsanti della barra degli strumenti:" -#~ msgid "Feed Update Settings" -#~ msgstr "" -#~ "Impostazioni aggiornamento dei notiziari" +#: ../glade/prefs.ui.h:42 +msgid "GUI" +msgstr "Interfaccia grafica" -#~ msgid "HTTP Proxy Server" -#~ msgstr "Server proxy HTTP" +#: ../glade/prefs.ui.h:43 +msgid "HTTP Proxy Server" +msgstr "Server proxy HTTP" -#~ msgid "Opening Enclosures" -#~ msgstr "Apertura degli allegati" +#: ../glade/prefs.ui.h:44 +msgid "_Auto Detect (GNOME or environment)" +msgstr "Rile_vare automaticamente (GNOME o ambiente)" -#~ msgid "Reading Headlines" -#~ msgstr "Lettura delle testate" +#: ../glade/prefs.ui.h:45 +msgid "_No Proxy" +msgstr "Nessu_n proxy" -#~ msgid "Toolbar Settings" -#~ msgstr "Impostazioni barra degli strumenti" +#: ../glade/prefs.ui.h:46 +msgid "_Manual Setting:" +msgstr "Impostazione man_uale:" -#~ msgid "Update Interval" -#~ msgstr "Intervallo di aggiornamento" +#: ../glade/prefs.ui.h:47 +msgid "Proxy _Port:" +msgstr "Por_ta del proxy:" -#~ msgid "Web Integration" -#~ msgstr "Integrazione web" +#: ../glade/prefs.ui.h:48 +msgid "Proxy _Host:" +msgstr "_Host del proxy:" -#~ msgid "Add Script" -#~ msgstr "Aggiungi script" +#: ../glade/prefs.ui.h:49 +msgid "Use Proxy Au_thentication" +msgstr "Usare auten_ticazione proxy" -#~ msgid "At _startup:" -#~ msgstr "All'av_vio:" +#: ../glade/prefs.ui.h:50 +msgid "Proxy Pass_word:" +msgstr "Pass_word del proxy:" -#~ msgid "Attention Profile" -#~ msgstr "Profilo attenzione" +#: ../glade/prefs.ui.h:51 +msgid "Proxy _Username:" +msgstr "Nome _utente del proxy:" -#~ msgid "Create new script" -#~ msgstr "Crea nuovo script" +#: ../glade/prefs.ui.h:52 +msgid "Proxy" +msgstr "Proxy" -#~ msgid "Exec Command" -#~ msgstr "Esegui comando" +#: ../glade/prefs.ui.h:53 +msgid "Downloading Enclosures" +msgstr "Scaricamento allegati" -#~ msgid "Reuse existing script" -#~ msgstr "Riutilizza script esistente" +#: ../glade/prefs.ui.h:54 +msgid "_Download using" +msgstr "Scari_care usando" -#~ msgid "Script Manager" -#~ msgstr "Gestore script" +#: ../glade/prefs.ui.h:55 +msgid "Opening Enclosures" +msgstr "Apertura allegati" -#~ msgid "Search _Link Cosmos with" -#~ msgstr "Cercare col_legamenti Cosmos con" +#: ../glade/prefs.ui.h:56 +msgid "Enclosures" +msgstr "Allegati" -#~ msgid "_Allow Flash in Feeds." -#~ msgstr "Con_sentire il Flash nei notiziari." +#: ../glade/prefs.ui.h:57 +msgid "Plugins" +msgstr "Plugin" diff -Nru liferea-1.8.15/po/ja.po liferea-1.10.3/po/ja.po --- liferea-1.8.15/po/ja.po 2013-06-24 22:16:16.000000000 +0200 +++ liferea-1.10.3/po/ja.po 2013-07-31 23:29:12.000000000 +0200 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: liferea-1.8-rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-04-27 14:08+0300\n" "PO-Revision-Date: 2012-10-26 23:32+0900\n" "Last-Translator: Takeshi Hamasaki \n" "Language-Team: Japanese \n" @@ -22,8 +22,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -36,8 +35,8 @@ msgstr "Liferea フィード・リーダ" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "配信元をダウンロードして表示します" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -145,38 +144,26 @@ msgstr "作者" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "フラグ" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "ブックマーク" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "コメント" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "コメントなし" -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "コメント" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "更新中..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "更新" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "セクション" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "部門" @@ -200,12 +187,12 @@ msgid "Default Browser" msgstr "デフォルト・ブラウザ" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "ブラウザの起動に失敗しました: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "起動中: \"%s\"" @@ -215,7 +202,7 @@ msgid "Authorization Error" msgstr "認証エラー" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "キャッシュ・フォルダ \"%s\" を生成できません!" @@ -245,36 +232,42 @@ msgid "%b %d %Y" msgstr "%Y年%B%e日" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "" "\"%s\" は正しいエンクロージャの種類を定義する設定ファイルではありません!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "エンクロージャのダウンロードに失敗しました: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "エンクロージャのダウンロードが完了しました: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "%s から %s へ名前を変更する際にエラー\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "" "OPML ファイルを解析する際に XML エラーが発生しました! (\"%s\" をインポートで" "きませんでした)" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." @@ -282,42 +275,42 @@ "ドキュメントが空です! (インポートする際にOPML ドキュメント \"%s\" は空にしな" "いで下さい...)" -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "\"%s\" は正しい OPML ドキュメントではありません! (このファイルをインポートで" "きません)" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "配信元一覧を取り込みました" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "配信元一覧のインポート" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "インポート" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 msgid "OPML Files" msgstr "OPML ファイル" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "配信元一覧のエキスポート時にエラーが発生しました!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "配信元一覧をエキスポートしました!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "配信元一覧のエキスポート" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "エキスポート" @@ -375,11 +368,11 @@ msgstr "配信元の種類を特定できませんでした。" #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "未読のトピックはありません" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" @@ -387,101 +380,89 @@ "指定した状態でメイン・ウィンドウを表示する (STATE: 'shown', " "'iconified','hidden')" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "STATE" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "バージョン情報を表示して終了する" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "Add a new subscription" msgstr "新しい配信元を追加する" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "uri" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "全ての種類のデバッグ情報を出力する" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "キャッシュの操作に関するデバッグ情報を出力する" -#: ../src/main.c:187 +#: ../src/main.c:173 msgid "Print debugging messages for the configuration handling" msgstr "設定の処理に関するデバッグ情報を出力する" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "データベースの操作に関するデバッグ情報を出力する" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "GUI を扱う関数のデバッグ情報を出力する" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" -"HTML 描画機能のデバッグを有効にする (HTML 出力を行う度にその内容を ~/." -"liferea_1.8/output.xhtml にも書き込む)" +"HTML 描画機能のデバッグを有効にする (HTML 出力を行う度にその内容を ~/.cache/" +"liferea/output.xhtml にも書き込む)" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "ネットワーク機能に関するデバッグ情報を出力する" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "全ての解析機能に関するデバッグ情報を出力する" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "任意の機能に時間がかかった時のデバッグ情報を出力する" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "関数の出入りに関するデバッグ情報を出力する" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "配信元の更新処理に関するデバッグ情報を出力する" -#: ../src/main.c:196 +#: ../src/main.c:182 msgid "Print debugging messages of the search folder matching" msgstr "検索フォルダの処理に関するデバッグ情報を出力する" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "詳細なデバッグ情報を出力する" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "指定したトピックに関するデバッグ情報を出力する" -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - Linux 向けのフィード・リーダです" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "詳細は http://liferea.sourceforge.net/ を訪問してみて下さい" - -#: ../src/migrate.c:340 -#, 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 "" -"このバージョンの Liferea からキャッシュの形式が新しくなったので、お使いの古い" -"キャッシュを変換しておきました。但し、%s にある古いキャッシュは自動的には削除" -"されません。新しいキャッシュに変換できたことを確認した上で、この古いキャッ" -"シュを格納したフォルダを手動で削除しておいて下さい!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "詳細は http://lzone.de/liferea/ を訪問してみて下さい" #. Some libsoup transport errors #: ../src/net.c:320 @@ -652,12 +633,12 @@ msgid "Feed title" msgstr "配信元のタイトル" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "この配信元 \"%s\" は既に更新済みです!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" @@ -665,12 +646,12 @@ "その配信元 \"%s\" は更新を停止しています (今後 Liferea で更新されることはあり" "ません!)" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "\"%s\" の favicon の更新中" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -678,49 +659,49 @@ "この購読を読み込む際に問題が発生しました。URL と端末に出力されているメッセー" "ジを確認して下さい。" -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "\"%s\" の URL が更新されていました" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "" "\"%s\" の更新は停止しています (今後 Liferea が更新することはありません!)" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" は最後の更新から変更はありません" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "\"%s\" の更新中" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "フィルタに使用する作業ファイル \"%s\" を開く際にエラーが発生しました!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "ステータス %2$d のトピック %1$s" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "エラー: パイプ \"%s\" を開けませんでした" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "エラー: ファイル \"%s\" を開けませんでした" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "エラー: ファイル \"%s\" がありません" @@ -729,54 +710,52 @@ msgid "New Search Folder" msgstr "新しい検索フォルダ" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[大量のエラーが発生したのでパーサのエラー出力を短くしました]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "XML パーサ: ドキュメントを解析できませんでした:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "添付ファイル" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "添付ファイル: %d個" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " バイト" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "KB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "添付ファイル: %d個" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "ファイルの選択" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "拡張子 .%s" @@ -786,349 +765,387 @@ msgid "Couldn't find pixmap file: %s" msgstr "Pixmap ファイルが見つかりませんでした: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] "(新着%d個)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "未読%d個%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "ヘルプのトピックス" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "クィック・リファレンス" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "FAQ" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea はオンラインです" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "オフラインで動作" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea はオフラインです" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "オンラインで動作" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "購読(_S)" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "全て更新(_A)" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "全ての購読先を更新します" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "全て既読にする(_R)" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "全ての購読の全てのトピックに既読マークを付与します" -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "配信元一覧のインポート(_I)..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "OPML 配信元一覧をインポートします" -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "配信元一覧のエキスポート(_E)..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "OPML の配信元一覧としてエキスポートします" -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "終了(_Q)" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "配信元(_F)" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "全て削除(_A)" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "現在選択している全てのトピックを削除します" -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "トピック(_I)" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "次の未読のトピック(_N)" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "次の未読のトピック(_N)" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "表示(_V)" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "文字を大きくする(_I)" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "エントリの表示サイズを大きくします" -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "文字を小さくする(_D)" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "エントリの表示サイズを小さくします" -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "ツール(_T)" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "更新モニタ(_U)" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "更新キューの中にある全ての配信元の一覧を表示します" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "設定(_P)" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "設定を編集します" -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "検索(_E)" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "全ての配信元から検索..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "検索ダイアログを表示します" -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "目次(_C)" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "このアプリケーションのヘルプを表示します" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "クイック・リファレンス(_Q)" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "ショートカット・キーの一覧を表示します" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "FAQ(_F)" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "このアプリケーションの FAQ を表示します" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "このアプリケーションについて(_A)" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "情報ダイアログを表示します" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "通常の表示(_N)" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "メーラー・モードで表示します" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "ワイド表示(_W)" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "ニュースやトピック、その内容を縦型に表示します" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "サマリ表示(_C)" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "トピックを要約して表示します" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "既読の配信一覧を隠す(_R)" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "トピックが全て既読の配信元を非表示にします" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "新しい購読(_N)..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "新しい購読を配信元一覧に追加します" -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "新しいフォルダ(_F)..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "新しいフォルダを配信元一覧に追加します" -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "新しい検索フォルダ(_E)..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "新しい検索フォルダを配信元一覧に追加します" -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "新しい場所(_S)..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "新しい配信元一覧の場所を追加します" -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "新しい NewsBin(_N)..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "新しい NewsBin を追加します" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "全て既読にする(_M)" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "" "現在選択している配信元一覧や購読の一覧にある全てのトピックを既読にします" -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "更新(_U)" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "選択した購読または選択したフォルダにある全ての購読を更新します" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "プロパティ(_P)" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "選択した購読のプロパティ・ダイアログを開きます" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "削除(_R)" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "選択した購読を削除します" -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "既読ステータスの切り替え(_R)" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "選択したトピックの既読ステータスを切り替えます" -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "トピック・フラグの切り替え(_F)" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "選択したトピックの既読ステータスを切り替えます" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "トピックの削除(_E)" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "現在選択しているトピックを削除します" -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "設定したブラウザでトピックのリンクを開きます" + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "ブラウザで開く(_L)" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." msgstr "設定したブラウザでトピックのリンクを開きます" -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "外部ブラウザの設定" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." +msgstr "設定したブラウザでトピックのリンクを開きます" + +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "オフラインで動作(_W)" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "このオプションで購読の更新を無効にできます" -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Linux ニュース・アグリゲータ" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 msgid "" "

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

    You can add new subscriptions

    • From main menu " @@ -1143,12 +1160,12 @@ "ンで右クリックして表示されるコンテキストメニューの [新規] を開く
    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "\"%s\" (%s) のユーザ名とパスワードを入力して下さい:" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "配信元ソースが不明です" @@ -1178,246 +1195,248 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea はオフライン・モードです (更新はできません)" -#: ../src/ui/liferea_htmlview.c:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "ダウンロード失敗: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "ダウンロード完了です" - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +#: ../src/ui/liferea_htmlview.c:627 +#, fuzzy +msgid "Open Link In _Tab" msgstr "タブの中に開く(_T)" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "ブラウザで開く(_L)" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "ブラウザで開く(_L)" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "%s のブックマークに追加(_B)" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "リンク先のコピー(_C)" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 msgid "_Copy Image Location" msgstr "画像のリンク先のコピー(_C)" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 msgid "S_ave Link As" msgstr "リンクを別名で保存(_A)" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "画像を別名で保存(_A)" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "購読する(_S)..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** タイトルなし ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "日付" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "ヘッドライン" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "トピックが選択されていません" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "このトピックにはリンクが割り当てられていません!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "トピックを削除する配信元を選択して下さい!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "タブの中に開く(_T)" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "ブラウザで開く(_L)" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "NewsBin にコピーする" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "URL をクリップボードへコピーする(_U)" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "%s のブックマークに追加(_B)" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "画像のリンク先のコピー(_C)" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "トピックの削除(_E)" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "エンクロージャを開く..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "別名で保存..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "リンク先のアドレスのコピー" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "全て更新(_U)" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "表示する(_S)" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "フォルダの更新(_U)" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "全て既読にする(_M)" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "新規(_N)" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "新しい購読(_S)..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "新しい場所(_O)..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 msgid "Sort Feeds" msgstr "配信元の並べ替え" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "再構築(_R)" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "新しい購読(_N)..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(空)" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "GNOME のデフォルト" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "アイコンの下にラベル" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "アイコンの横にラベル" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "アイコンのみ" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "ラベルのみ" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "分ごと" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "時間ごと" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "日ごと" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Space" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr "Ctrl+Space" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr "Alt+Space" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "ダウンロード・フォルダの選択" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "通常の表示(_N)" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "ワイド表示(_W)" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "サマリ表示(_C)" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:505 msgid "Manual" msgstr "手動" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:520 msgid "Browser default" msgstr "デフォルト" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:523 msgid "Existing window" msgstr "既存のウィンドウ" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:526 msgid "New window" msgstr "新しいウィンドウ" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:529 msgid "New tab" msgstr "新しいタブ" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:688 msgid "Integrate with the messaging menu (indicator)" msgstr "メッセージ・メニューと統合する (インジケータ)" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:691 msgid "Terminate instead of minimizing to the messaging menu" msgstr "メッセージメニューをクリックしたら最小化しないで終了する" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:694 msgid "Start minimized to the messaging menu" msgstr "起動時にメッセージ・メニューにアイコン化する" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:794 msgid "Type" msgstr "種類" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:797 msgid "Program" msgstr "プログラム" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "(空)" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1429,7 +1448,7 @@ msgid "This feed specifies no default update interval." msgstr "この配信元ではデフォルトの更新間隔を設定してません。" -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "タイトルなし" @@ -1476,7 +1495,7 @@ msgid "%b %d %H:%M" msgstr "%B%e日 %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1486,11 +1505,11 @@ msgid "Google Reader login failed!" msgstr "Google リーダへのログインに失敗しました!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google リーダ" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1524,22 +1543,15 @@ msgid "No feed list source types found!" msgstr "配信元一覧のソースの種類が見つかりませんでした!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:269 msgid "Source Type" msgstr "ソースの種類" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:367 msgid "Tiny Tiny RSS" msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:368 msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " "present your tt-rss subscriptions, and will synchronize your feed list and " @@ -1548,7 +1560,7 @@ "Tiny Tiny RSS 1.5 以上のアカウントで購読している配信元を統合します。Liferea " "では tt-rss の購読を提供し配信元の一覧を同期して一覧に表示します。" -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:111 msgid "Could not parse JSON returned by tt-rss API!" msgstr "tt-rss API が返した JSON を解析できませんでした!" @@ -1616,8 +1628,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Google リーダのアカウント情報を入力して下さい:" -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "パスワード(_P)" @@ -1641,7 +1652,7 @@ msgid "combined view" msgstr "サマリ表示" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "ヘッドライン" @@ -1691,7 +1702,7 @@ msgstr "全般" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "配信元の場所" @@ -1808,470 +1819,532 @@ msgstr "拡張" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Liferea の設定" +msgid "New Folder" +msgstr "新しいフォルダ" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "キャッシュの扱い" +msgid "_Folder name:" +msgstr "フォルダ名(_F):" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "配信元毎に保存するトピックの数(_U):" +msgid "Rename" +msgstr "フォルダ名の変更" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "更新の設定" +msgid "_New Name:" +msgstr "新しい名前(_N):" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "起動時に全ての配信先を更新する(_U)" +msgid "Search Folder Properties" +msgstr "検索フォルダのプロパティ" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "配信元を更新する間隔(_I):" +msgid "Search _Name:" +msgstr "検索する内容(_N):" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "次の条件を満足するトピックを検索します:" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"注記: 妥当な更新時間をセットするようにして下さい。但し、単位時間内の更新回" -"数を多くしても使用するネットワーク (帯域) の無駄遣いです。" +msgid "A_ny Rule Matches" +msgstr "幾つかを満足するもの(_N)" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "配信元" +msgid "_All Rules Must Match" +msgstr "全てを満足するもの(_A)" #: ../glade/liferea.ui.h:57 -msgid "Folder Display Settings" -msgstr "表示の設定" +#, fuzzy +msgid "Open Enclosure" +msgstr "エンクロージャを開く..." #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "フォルダが選択されたらその配下にある配信元も全て表示する(_S)" +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "ダウンロードするエンクロージャの種類:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "既読のトピックを隠す(_H)" +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"このエンクロージャに対して Liferea に何をさせるか?です。実行したいコマンドを" +"入力して下さい。ダウンロードするエンクロージャはコマンドの引数として自動的に" +"付与されます:" #: ../glade/liferea.ui.h:60 -msgid "Feed Icons (Favicons)" -msgstr "アイコン (Favicons)" +msgid "_Browse" +msgstr "参照(_B)" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "今すぐ全ての favicon を更新する(_U)" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "これ以降は類似したエンクロージャに対しても自動的に実行する(_D)" #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "フォルダ" +msgid "Search All Feeds" +msgstr "全ての配信元から検索" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" -msgstr "ヘッドラインの読み込み" +msgid "_Search for:" +msgstr "検索する文字列(_S):" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "エントリの斜め読みに使用するキー(_S):" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "配信元のタイトルまたはその内容から検索する文字列を入力して下さい" #: ../glade/liferea.ui.h:65 -msgid "Web Integration" -msgstr "ウェブ・サービスとの統合" +msgid "_Advanced..." +msgstr "拡張(_A)..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "ブックマークの保存先(_P):" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "全ての配信元から指定した文字列を検索し、その結果を一覧表示します" #: ../glade/liferea.ui.h:67 -msgid "Internal Browser Settings" -msgstr "内部ブラウザの設定" +msgid "Update Monitor" +msgstr "更新モニタ" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "リンクを Liferea のウィンドウ内で開く(_W)" +msgid "Pending Requests" +msgstr "保留中のリクエスト" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "JavaScript を無効にする(_D)" +msgid "Downloading Now" +msgstr "ダウンロード中のリクエスト" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "ブラウザのプラグインを使う(_E)" +msgid "Cancel _All" +msgstr "全てキャンセル(_A)" #: ../glade/liferea.ui.h:71 -msgid "External Browser Settings" -msgstr "外部ブラウザの設定" +msgid "Create News Bin" +msgstr "NewsBin の作成" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "リンクを開く場所(_O):" +msgid "_News Bin Name:" +msgstr "NewsBin の名前(_N):" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "情報" #: ../glade/liferea.ui.h:74 -#, no-c-format msgid "" -"_Manual:\n" -"(%s for URL)" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" msgstr "" -"手動(_M):\n" -"(URL は %s で指定する)" +"Copyright (c) 2003-2012\n" +"Liferea 開発チーム\n" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea は GTK+ 版のニュース・アグリゲータです。" + +#: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "Liferea のホームページ" + +#: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "拡張検索" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "フォルダの検索(_S)..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "検索エンジンの配信元の生成" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "検索する文字列を入力して下さい" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "検索結果の最大数(_N):" + +#: ../glade/liferea.ui.h:84 +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 は指定した文字列をいろいろな検索エンジンで検索を行うために使用" +"する配信元を生成します。この配信元を保存し、他の配信元を更新することができま" +"す。" + +#: ../glade/new_subscription.ui.h:9 +msgid "Download / Postprocessing" +msgstr "ダウンロードと事後処理" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "ソースの選択" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "追加するソースの種類を選択して下さい..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "OPML/Planet の追加" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"妥当な OPML 配信元の一覧を表すローカル・ファイルまたは URL を指定して下さい。" + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "場所(_L)" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "選択(_S)..." + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "Tiny Tiny RSS アカウントの追加" + +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "tt-rss のアカウント情報を入力して下さい:" + +#: ../glade/ttrss_source.ui.h:3 +msgid "_Server URL" +msgstr "サーバの URL(_S)" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "ユーザ名(_U)" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "拡張..." + +#: ../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 "" +"自動的に配信元を探索するウェブ上の場所か、または実際に配信元が存在する場所を" +"入力して下さい。" + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Liferea の設定" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "キャッシュの扱い" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "配信元毎に保存するトピックの数(_U):" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "更新の設定" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "起動時に全ての配信先を更新する(_U)" + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "配信元を更新する間隔(_I):" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"注記: 妥当な更新時間をセットするようにして下さい。但し、単位時間内の更新回" +"数を多くしても使用するネットワーク (帯域) の無駄遣いです。" + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "配信元" + +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "表示の設定" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "フォルダが選択されたらその配下にある配信元も全て表示する(_S)" + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "既読のトピックを隠す(_H)" + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "アイコン (Favicons)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "今すぐ全ての favicon を更新する(_U)" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "フォルダ" + +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "ヘッドラインの読み込み" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "エントリの斜め読みに使用するキー(_S):" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "ウェブ・サービスとの統合" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "ブックマークの保存先(_P):" + +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "内部ブラウザの設定" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "リンクを Liferea のウィンドウ内で開く(_W)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "JavaScript を無効にする(_D)" + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "ブラウザのプラグインを使う(_E)" + +#: ../glade/prefs.ui.h:26 +msgid "External Browser Settings" +msgstr "外部ブラウザの設定" + +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "リンクを開く場所(_O):" + +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "手動" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "" + +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "ブラウザ(_B):" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "ブラウザ" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 msgid "Notification Settings" msgstr "通知の設定" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "新しいヘッドラインをポップアップ・ウィンドウで表示する(_P)" -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "パネル通知エリアの中にステータス・アイコンを表示する(_I)" -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "トレイ・アイコンの中に新しいトピックの総数を表示する(_N)" -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "トレイ・アイコンをクリックしたら最小化しないで終了する(_E)" -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "起動時にアイコン化する(_S)" -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 msgid "Toolbar Settings" msgstr "ツールバーの設定" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "ツールバーを隠す(_H)" -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "ツールバーのスタイル:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "HTTP プロキシのサーバ" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "自動検出する(_A)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "プロキシなし(_N)" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "マニュアルで設定を行う(_M):" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "プロキシのポート番号(_P):" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "プロキシのホスト(_H):" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "プロキシの認証機能を使う(_U)" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "パスワード(_W):" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "ユーザ名(_U):" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "プロキシ" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 msgid "Downloading Enclosures" msgstr "エンクロージャのダウンロード" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "参照(_B)" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "保存する場所(_S):" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "使用するコマンド(_D):" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 msgid "Opening Enclosures" msgstr "エンクロージャの開き方" -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "エンクロージャ" -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "近くにあるホストとの同期" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "ローカルの LAN で同期できるようにする(_E)" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "サービス名" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "同期" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "新しいフォルダ" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "フォルダ名(_F):" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "フォルダ名の変更" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "新しい名前(_N):" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "検索フォルダのプロパティ" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "検索する内容(_N):" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "次の条件を満足するトピックを検索します:" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "幾つかを満足するもの(_N)" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "全てを満足するもの(_A)" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "エンクロージャのダウンロード" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "ダウンロードするエンクロージャの種類:" - -#: ../glade/liferea.ui.h:120 -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:" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -"このエンクロージャに対して Liferea に何をさせるか?です。実行したいコマンドを" -"入力して下さい。ダウンロードするエンクロージャはコマンドの引数として自動的に" -"付与されます:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "URL を渡すがエンクロージャはダウンロードしない(_P)" - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "これ以降は類似したエンクロージャに対しても自動的に実行する(_D)" - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "全ての配信元から検索" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "検索する文字列(_S):" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "配信元のタイトルまたはその内容から検索する文字列を入力して下さい" - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "拡張(_A)..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "全ての配信元から指定した文字列を検索し、その結果を一覧表示します" -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "更新モニタ" +#~ msgid "Download and view feeds" +#~ msgstr "配信元をダウンロードして表示します" -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "保留中のリクエスト" - -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "ダウンロード中のリクエスト" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "全てキャンセル(_A)" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "NewsBin の作成" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "NewsBin の名前(_N):" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "情報" - -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Copyright (c) 2003-2012\n" -"Liferea 開発チーム\n" +#~ msgid "You may want to validate the feed using" +#~ msgstr "次を使って配信元の妥当性を検証した方が良いかもしれません:" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea は GTK+ 版のニュース・アグリゲータです。" +#~ msgid "bookmark" +#~ msgstr "ブックマーク" -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Liferea のホームページ" +#~ msgid "comments" +#~ msgstr "コメント" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "拡張検索" +#~ msgid "flag" +#~ msgstr "フラグ" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "フォルダの検索(_S)..." +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "エンクロージャのダウンロードに失敗しました: \"%s\"" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "検索エンジンの配信元の生成" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "エンクロージャのダウンロードが完了しました: \"%s\"" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "検索する文字列を入力して下さい" +#~ 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 "" +#~ "このバージョンの Liferea からキャッシュの形式が新しくなったので、お使いの" +#~ "古いキャッシュを変換しておきました。但し、%s にある古いキャッシュは自動的" +#~ "には削除されません。新しいキャッシュに変換できたことを確認した上で、この古" +#~ "いキャッシュを格納したフォルダを手動で削除しておいて下さい!" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "検索結果の最大数(_N):" +#~ msgid "" +#~ "Jumps to the next unread item. If necessary selects the next feed with " +#~ "unread items." +#~ msgstr "" +#~ "次の未読のトピックにジャンプします。必要であれば、未読のトピックを含む次の" +#~ "配信元を選択します。" -#: ../glade/liferea.ui.h:145 -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 は指定した文字列をいろいろな検索エンジンで検索を行うために使用" -"する配信元を生成します。この配信元を保存し、他の配信元を更新することができま" -"す。" +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "ダウンロード失敗: \"%s\"" -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" -msgstr "ダウンロードと事後処理" +#~ msgid "Download finished." +#~ msgstr "ダウンロード完了です" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "ソースの選択" +#~ msgid "Launch Item In _Tab" +#~ msgstr "タブの中に開く(_T)" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "追加するソースの種類を選択して下さい..." +#~ msgid "_Launch Item In Browser" +#~ msgstr "ブラウザで開く(_L)" -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "OPML/Planet の追加" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "URL をクリップボードへコピーする(_U)" -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"妥当な OPML 配信元の一覧を表すローカル・ファイルまたは URL を指定して下さい。" - -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "場所(_L)" +#~ msgid "Choose download directory" +#~ msgstr "ダウンロード・フォルダの選択" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "選択(_S)..." - -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "Tiny Tiny RSS アカウントの追加" - -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "tt-rss のアカウント情報を入力して下さい:" - -#: ../glade/ttrss_source.ui.h:3 -msgid "_Server URL" -msgstr "サーバの URL(_S)" +#~ msgid "Liferea Sync %s@%s" +#~ msgstr "Liferea 同期 %s@%s" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "ユーザ名(_U)" +#~ msgid "Downloading Enclosure" +#~ msgstr "エンクロージャのダウンロード" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"自動的に配信元を探索するウェブ上の場所か、または実際に配信元が存在する場所を" -"入力して下さい。" +#~ msgid "Sync" +#~ msgstr "同期" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "拡張..." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "近くにあるホストとの同期" -#~ msgid "You may want to validate the feed using" -#~ msgstr "次を使って配信元の妥当性を検証した方が良いかもしれません:" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "ローカルの LAN で同期できるようにする(_E)" #~ msgid "" -#~ "Jumps to the next unread item. If necessary selects the next feed with " -#~ "unread items." +#~ "_Manual:\n" +#~ "(%s for URL)" #~ msgstr "" -#~ "次の未読のトピックにジャンプします。必要であれば、未読のトピックを含む次の" -#~ "配信元を選択します。" +#~ "手動(_M):\n" +#~ "(URL は %s で指定する)" -#~ msgid "Liferea Sync %s@%s" -#~ msgstr "Liferea 同期 %s@%s" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "URL を渡すがエンクロージャはダウンロードしない(_P)" + +#~ msgid "_Save downloads in" +#~ msgstr "保存する場所(_S):" + +#~ msgid "_Service Name" +#~ msgstr "サービス名" diff -Nru liferea-1.8.15/po/ko.po liferea-1.10.3/po/ko.po --- liferea-1.8.15/po/ko.po 2013-06-24 22:16:16.000000000 +0200 +++ liferea-1.10.3/po/ko.po 2013-07-31 23:29:12.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: liferea 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2005-12-11 13:52+0900\n" "Last-Translator: Park Ji-In \n" "Language-Team: GNOME Korea \n" @@ -15,10 +15,9 @@ "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" +"Plural-Forms: nplurals=2; plural=0;\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "" @@ -33,7 +32,7 @@ msgstr "Liferea - 리눅스 피드 보기" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" +msgid "Read news feeds and blogs" msgstr "" #: ../xslt/feed.xml.in.h:1 @@ -154,41 +153,29 @@ msgstr "제작자" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "덧말" - -#: ../xslt/item.xml.in.h:13 #, fuzzy msgid "No comments yet." msgstr "덧말" -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 #, fuzzy msgid "Comments" msgstr "덧말" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 #, fuzzy msgid "Updating..." msgstr "%s을(를) 새로고치는 중" -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "" @@ -213,12 +200,12 @@ msgid "Default Browser" msgstr "그놈 기본 브라우져를 사용합니다" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "브라우져 명령 실패: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "%s을(를) 시작함" @@ -229,7 +216,7 @@ msgid "Authorization Error" msgstr "인증" -#: ../src/common.c:63 +#: ../src/common.c:62 #, fuzzy, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "캐시 디렉토리 %s을(를) 생설할 수 없습니다!" @@ -259,34 +246,40 @@ msgid "%b %d %Y" msgstr "" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "\"%s\"은(는) 적절한 첨부 종류 설정파일이 아닙니다!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "%s을(를) %s(으)로 변환하는 중 에러발생\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, fuzzy, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "" "캐시파일 \"%s\"을(를) 읽던중 XML 에러가 발생. 캐시파일을 가져올 수 없습니다!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." @@ -294,43 +287,43 @@ "빈 도큐먼트 입니다! OPML 도큐먼트 \"%s\"은(는) 가져오기 할 때 비어있으면 안됩" "니다." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "\"%s\"은(는) 올바른 OPML 파일이 아닙니다. Liferea는 이 파일을 가져올 수 없습" "니다." -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "가져온 피드 리스트" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "피드 목록 들여오기" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "가져오기" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 #, fuzzy msgid "OPML Files" msgstr "파일 고르기" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "피드 리스트를 내보내던 중 에러가 발생했습니다." -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "피드 목록이 내보내졌습니다" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "피드 목록 내보내기" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "내보내기" @@ -392,12 +385,12 @@ msgstr "

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

    " #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "읽지 않은 아이템이 없습니다 " -#: ../src/main.c:175 +#: ../src/main.c:164 #, fuzzy msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " @@ -406,112 +399,104 @@ " 상태는 'shown', 'iconified', 혹은 'hidden'이 될 수 있습니" "다." -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "" -#: ../src/main.c:179 +#: ../src/main.c:165 #, fuzzy msgid "Show version information and exit" msgstr " --version Liferea의 버전 정보를 보여주고 끝냅니다." -#: ../src/main.c:180 +#: ../src/main.c:166 #, fuzzy msgid "Add a new subscription" msgstr "새 서명" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 #, fuzzy msgid "Print debugging messages of all types" msgstr " --debug-all 모든 종류의 디버깅 메시지를 뿌립니다." -#: ../src/main.c:186 +#: ../src/main.c:172 #, fuzzy msgid "Print debugging messages for the cache handling" msgstr " --debug-cache 캐시 다루기에 대한 디버깅 메시지를 보여줍니다." -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr " --debug-conf 설정 다루기에 대한 디버깅 메시지를 보여줍니다." -#: ../src/main.c:188 +#: ../src/main.c:174 #, fuzzy msgid "Print debugging messages of the database handling" msgstr " --debug-cache 캐시 다루기에 대한 디버깅 메시지를 보여줍니다." -#: ../src/main.c:189 +#: ../src/main.c:175 #, fuzzy msgid "Print debugging messages of all GUI functions" msgstr " --debug-gui GUI 함수에 대한 디버깅 메시지를 보여줍니다." -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" -#: ../src/main.c:191 +#: ../src/main.c:177 #, fuzzy msgid "Print debugging messages of all network activity" msgstr " --debug-all 모든 종류의 디버깅 메시지를 뿌립니다." -#: ../src/main.c:192 +#: ../src/main.c:178 #, fuzzy msgid "Print debugging messages of all parsing functions" msgstr " --debug-parsing 모든 파싱 함수에 대한 디버깅 메시지를 보여줍니다." -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" -#: ../src/main.c:194 +#: ../src/main.c:180 #, fuzzy msgid "Print debugging messages when entering/leaving functions" msgstr "" " --debug-trace 함수를 들어가고 나오는것에 대한 디버깅 메시지를 보여줍니" "다." -#: ../src/main.c:195 +#: ../src/main.c:181 #, fuzzy msgid "Print debugging messages of the feed update processing" msgstr "" " --debug-update 피드를 업데이트하는 것에 대한 디버깅 메시지를 보여줍니다." -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr " --debug-cache 캐시 다루기에 대한 디버깅 메시지를 보여줍니다." -#: ../src/main.c:197 +#: ../src/main.c:183 #, fuzzy msgid "Print verbose debugging messages" msgstr " --debug-verbose 자세한 디버깅 메시지를 보여줍니다." -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 #, fuzzy msgid "Print debugging messages for the given topic" msgstr " --debug-cache 캐시 다루기에 대한 디버깅 메시지를 보여줍니다." -#: ../src/main.c:218 +#: ../src/main.c:202 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - 리눅스 피드 보기" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" - -#: ../src/migrate.c:340 -#, 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!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" #. Some libsoup transport errors @@ -690,74 +675,74 @@ msgid "Feed title" msgstr "피드 제목" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, fuzzy, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "피드 \"%s\"은(는) 이미 새로 고쳐졌습니다!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, fuzzy, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "" "피드가 연속적이지 않습니다. Liferea는 더이상 그 피드를 새로 고칠 수 없습니다." -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, fuzzy, c-format msgid "Updating favicon for \"%s\"" msgstr "\"%s\"의 피드 아이콘을 새로 고치는중" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." msgstr "" "이 등록피드를 읽던 중 문제가 발생했습니다. URL과 콘솔 출력을 확인하세요." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "\"%s\"의 URL이 영원히 바뀌었고, 갱신되었습니다." -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "" "\"%s\"이(가) 연속적이지 않습니다. Liferea는 그것을 더이상 새로 고칠 수 없습니" "다!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\"은(는) 마지막으로 업데이트 된 후 바뀌지 않았습니다." -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "%s을(를) 새로고치는 중" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "필터링을 위해 임시파일 %s을(를) 열던중 에러가 생겼습니다!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "에러: 파이프 %s을(를) 열 수 없습니다" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "에러: 파일 %s을(를) 열 수 없습니다" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "에러: \"%s\" 파일이 없습니다!" @@ -767,59 +752,57 @@ msgid "New Search Folder" msgstr "폴더 만들기" -#: ../src/xml.c:451 +#: ../src/xml.c:424 #, fuzzy msgid "[There were more errors. Output was truncated!]" msgstr "[해석기 에러 출력이 생략되었습니다!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 #, fuzzy msgid "XML Parser: Could not parse document:\n" msgstr "" "xmlReadMemory():·도큐먼트를 파싱할 수 없음:\n" "%s%s" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 #, fuzzy msgid "Attachments" msgstr "덧말" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "파일 고르기" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, fuzzy, c-format msgid "File Extension .%s" msgstr "파일 확장자 .%s" @@ -829,301 +812,311 @@ msgid "Couldn't find pixmap file: %s" msgstr "pixmap 파일 %s을(를) 찾을 수 없습니다" -#: ../src/ui/liferea_shell.c:311 -#, c-format +#: ../src/ui/liferea_shell.c:325 +#, fuzzy, c-format msgid " (%d new)" msgid_plural " (%d new)" -msgstr[0] "" +msgstr[0] "%d개의 새로운 아이템" +msgstr[1] "%d개의 새로운 아이템들" -#: ../src/ui/liferea_shell.c:316 -#, c-format +#: ../src/ui/liferea_shell.c:330 +#, fuzzy, c-format msgid "%d unread%s" msgid_plural "%d unread%s" -msgstr[0] "" +msgstr[0] "안 읽었음" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "도움말 항목" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "간단 도움말" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "자주 묻는 질문" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea가 온라인으로 동작합니다" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 #, fuzzy msgid "Work Offline" msgstr "오프라인 작업" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea는 현재 오프라인입니다." -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 #, fuzzy msgid "Work Online" msgstr "오프라인 작업" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 #, fuzzy msgid "_Subscriptions" msgstr "새 서명" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "전부 갱신(_A)" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 #, fuzzy msgid "Updates all subscriptions." msgstr "새 구독 더하기." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "전부 읽은 것으로 표시(_R)" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "구독하는 모든 아이템을 읽은 것으로 표시합니다." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "피드 목록 들여오기(_I)..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "OPML피드 리스트 가져오기." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "피드 리스트 내보내기 (_E)..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 #, fuzzy msgid "Exports the feed list as OPML." msgstr "OPML형식으로 피드 리스트 내보내기." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 #, fuzzy msgid "_Quit" msgstr "/끝내기(_Q)" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 #, fuzzy msgid "_Feed" msgstr "피드(_F)" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 #, fuzzy msgid "Remove _All Items" msgstr "모두 지우기(_A)" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "현재 선택된 피드의 모든 아이템을 지웁니다." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 #, fuzzy msgid "_Item" msgstr "아이템들(_I)" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "다음 안 읽은 아이템(_N)" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "다음 안 읽은 아이템(_N)" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "보기(_V)" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "글자 크기 크게하기(_I)" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "아이템 보기의 글자 크기를 늘입니다." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "글자 크기 작게하기(_D)" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "아이템 보기의 글자 크기를 작게 합니다." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 #, fuzzy msgid "_Update Monitor" msgstr "/디렉토리 갱신(_U)" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 #, fuzzy msgid "_Preferences" msgstr "기본 설정" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 #, fuzzy msgid "Edit Preferences." msgstr "설정 고치기." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 #, fuzzy msgid "S_earch" msgstr "찾기" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 #, fuzzy msgid "Search All Feeds..." msgstr "모든 피드에서 찾기." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 #, fuzzy msgid "Show the search dialog." msgstr "찾기 상자 보이거나 감추기." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "도움말(_H)" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "차례(_C)" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "이 프로그램에 대한 도움말을 봅니다." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "간단 도움말(_Q)" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Liferea의 모든 단축키 목록을 봅니다." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "자주 묻는 질문들(_F)" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "이 프로그램에 대한 자주 묻는 질문을 봅니다." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "정보(_A)" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "정보 대화창을 보여줍니다." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 #, fuzzy msgid "_Normal View" msgstr "로컬 파일(_L)" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 #, fuzzy msgid "_Wide View" msgstr "보기(_V)" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 #, fuzzy msgid "_Combined View" msgstr "간결하게 보기 토글(_C)" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 #, fuzzy msgid "Hide feeds with no unread items." msgstr "이것이 켜져 있다면 읽지 않은 아이템이 없는 피드는 숨깁니다." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "새 구독(_N)..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 #, fuzzy msgid "Adds a subscription to the feed list." msgstr "피드 목록에 새 구독 더하기." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "새 폴더(_F)..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 #, fuzzy msgid "Adds a folder to the feed list." msgstr "피드 목록에 폴더를 더합니다." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 #, fuzzy msgid "New S_earch Folder..." msgstr "새 폴더(_F)..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 #, fuzzy msgid "Adds a new search folder to the feed list." msgstr "피드 목록에 가상폴더를 더합니다." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 #, fuzzy msgid "New _Source..." msgstr "/새로 만들기(_N)/새 폴더(_N)..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 #, fuzzy msgid "Adds a new feed list source." msgstr "피드 목록에 가상폴더를 더합니다." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 #, fuzzy msgid "New _News Bin..." msgstr "/새로 만들기(_N)/새 폴더(_N)..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 #, fuzzy msgid "Adds a new news bin." msgstr "새 구독 더하기." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 #, fuzzy msgid "_Mark Items Read" msgstr "읽은 것으로 표시(_M)" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 #, fuzzy msgid "" "Marks all items of the selected feed list node / in the item list as read." @@ -1131,82 +1124,111 @@ "모든 선택된 구독 혹은 선택된 폴더의 구독의 아이템들을 모두 읽은 것으로 표시합" "니다." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 #, fuzzy msgid "_Update" msgstr "/갱신(_U)" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "선택된 구독을 혹은 모든 선택된 폴더의 구독을 새로 고칩니다." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 #, fuzzy msgid "_Properties" msgstr "등록 정보(_P)..." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "선택된 구독을 위한 속성 대화창을 엽니다." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 #, fuzzy msgid "_Remove" msgstr "모두 지우기(_A)" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "선택된 구독을 없애버립니다." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "읽은 상태를 토글(_R)" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "선택한 아이템의 읽은 상태를 토글합니다." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "아이템 플래그 토글(_F)" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "선택한 아이템의 읽은 상태를 켜거나 끕니다." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 #, fuzzy msgid "R_emove" msgstr "/아이템을 지우기(_E)" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "선택된 아이템을 없애버립니다." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "설정된 브라우져로 아이템의 링크를 엽니다." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "브라우져로 띄우기(_L)" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." +msgstr "설정된 브라우져로 아이템의 링크를 엽니다." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "외부 브라우져" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." msgstr "설정된 브라우져로 아이템의 링크를 엽니다." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "오프라인 작업" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "이 옵션을 선택하면 구독 갱신을 비활성화 합니다." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 #, fuzzy msgid "Liferea - Linux Feed Reader" msgstr "Liferea - 리눅스 피드 보기" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 #, fuzzy msgid "" "

    Welcome to Liferea, a desktop news aggregator for online news " @@ -1221,12 +1243,12 @@ "을 보려면 피드목록에서 피드를 고르세요. 머릿글이 오른쪽 판때기에 표시됩니다." "

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "\"%s\"에 대한 사용자 이름과 패스워드를 입력하세요 (%s):" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "알 수 없는 소스" @@ -1257,270 +1279,266 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea가 오프라인 상태로 동작중입니다. 새로고침이 불가능합니다." -#: ../src/ui/liferea_htmlview.c:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "" - -#: ../src/ui/liferea_htmlview.c:437 +#: ../src/ui/liferea_htmlview.c:627 #, fuzzy -msgid "Download finished." -msgstr "다운로드 프로그램(_D)" +msgid "Open Link In _Tab" +msgstr "/링크를 탭으로 띄우기(_T)" -#: ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_htmlview.c:628 #, fuzzy -msgid "Launch Link In _Tab" -msgstr "/링크를 탭으로 띄우기(_T)" +msgid "_Open Link In Browser" +msgstr "/링크를 브라우져로 띄우기(_L)" -#: ../src/ui/liferea_htmlview.c:545 +#: ../src/ui/liferea_htmlview.c:629 #, fuzzy -msgid "_Launch Link In Browser" +msgid "_Open Link In External Browser" msgstr "/링크를 브라우져로 띄우기(_L)" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 #, fuzzy msgid "_Copy Link Location" msgstr "/링크 위치 복사하기(_C)" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 #, fuzzy msgid "_Copy Image Location" msgstr "/링크 위치 복사하기(_C)" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 #, fuzzy msgid "S_ave Link As" msgstr "다른 이름으로 저장..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 #, fuzzy msgid "_Subscribe..." msgstr "/구독(_S)..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 #, fuzzy msgid "*** No title ***" msgstr "[제목 없음]" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "날짜" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "머릿글" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "아이템이 선택되지 않았습니다" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "이 아이템은 어떠한 연결도 할당되지 않았습니다." -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "아이템을 지울 피드를 선택해야 합니다!" -#: ../src/ui/popup_menu.c:116 -#, fuzzy -msgid "Launch Item In _Tab" -msgstr "/탭으로 띄우기(_L)" - -#: ../src/ui/popup_menu.c:117 -#, fuzzy -msgid "_Launch Item In Browser" -msgstr "/브라우져로 띄우기(_L)" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "" -#: ../src/ui/popup_menu.c:147 +#: ../src/ui/popup_menu.c:156 +#, c-format +msgid "_Bookmark at %s" +msgstr "" + +#: ../src/ui/popup_menu.c:160 #, fuzzy -msgid "Copy Item _URL to Clipboard" -msgstr "/아이템 URL을 클립보드로 복사(_U)" +msgid "Copy Item _Location" +msgstr "/링크 위치 복사하기(_C)" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 #, fuzzy msgid "R_emove Item" msgstr "/아이템을 지우기(_E)" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 #, fuzzy msgid "Open Enclosure..." msgstr "/첨부 열기..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 #, fuzzy msgid "Save As..." msgstr "다른 이름으로 저장..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 #, fuzzy msgid "Copy Link Location" msgstr "/링크 위치 복사하기(_C)" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 #, fuzzy msgid "_Update All" msgstr "/전부 새로 고침(_U)" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 #, fuzzy msgid "_Update Folder" msgstr "/폴더 갱신(_U)" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 #, fuzzy msgid "_Mark All As Read" msgstr "/전부 읽은 것으로 표시(_M)" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 #, fuzzy msgid "_New" msgstr "/새로 만들기(_N)" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 #, fuzzy msgid "New _Subscription..." msgstr "새 구독(_N)..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 #, fuzzy msgid "New S_ource..." msgstr "/새로 만들기(_N)/새 폴더(_N)..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 #, fuzzy msgid "Sort Feeds" msgstr "피드 목록 들여오기" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "새 구독(_N)..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 #, fuzzy msgid "GNOME default" msgstr "그놈 기본 브라우져를 사용합니다" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 #, fuzzy msgid "minutes" msgstr "분." -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr "" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr "" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "다운로드 할 디렉토리를 선택하세요" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "로컬 파일(_L)" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "보기(_V)" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "간결하게 보기 토글(_C)" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "수동" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "기본 브라우져" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "존재하는 창" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "새 창" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "새 탭" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 msgid "Terminate instead of minimizing to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "종류" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "프로그램" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, fuzzy, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1532,7 +1550,7 @@ msgid "This feed specifies no default update interval." msgstr "이 피드는 기본 갱신 주기를 정하지 않습니다." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "제목없음" @@ -1540,7 +1558,8 @@ #, c-format msgid "%d new item" msgid_plural "%d new items" -msgstr[0] "" +msgstr[0] "%d개의 새로운 아이템" +msgstr[1] "%d개의 새로운 아이템들" #: ../src/ui/ui_tray.c:224 msgid "No new items" @@ -1555,7 +1574,11 @@ "%s\n" "%d unread items" msgstr[0] "" +"%s\n" +"%d개의 안 읽은 아이템" msgstr[1] "" +"%s\n" +"%d개의 안 읽은 아이템들" #: ../src/ui/ui_tray.c:230 #, c-format @@ -1578,7 +1601,7 @@ msgid "%b %d %H:%M" msgstr "" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1588,12 +1611,12 @@ msgid "Google Reader login failed!" msgstr "" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 #, fuzzy msgid "Google Reader" msgstr "피드 캐시" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1624,30 +1647,23 @@ msgid "No feed list source types found!" msgstr "" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:269 #, fuzzy msgid "Source Type" msgstr "소스 종류:" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, fuzzy, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "변환이 성공적이지 않습니다. %i 옥텟이 변환되었습니다.\n" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " "present your tt-rss subscriptions, and will synchronize your feed list and " "reading lists." msgstr "" -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1719,8 +1735,7 @@ msgid "Please enter your Google Reader account settings." msgstr "" -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 #, fuzzy msgid "_Password" msgstr "열쇠글(_P):" @@ -1746,7 +1761,7 @@ msgid "combined view" msgstr "" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "머릿글" @@ -1798,7 +1813,7 @@ msgstr "일반" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "피드 소스" @@ -1900,51 +1915,284 @@ #: ../glade/liferea.ui.h:44 #, fuzzy -msgid "_Enforce popup notification for this subscription." -msgstr "선택된 구독을 위한 속성 대화창을 엽니다." +msgid "_Enforce popup notification for this subscription." +msgstr "선택된 구독을 위한 속성 대화창을 엽니다." + +#: ../glade/liferea.ui.h:45 +msgid "_Never do popup notification for this subscription." +msgstr "" + +#: ../glade/liferea.ui.h:46 +#, fuzzy +msgid "_Mark downloaded items as read." +msgstr "선택한 것들을 읽은 것으로 표시(_M)" + +#: ../glade/liferea.ui.h:47 +msgid "Advanced" +msgstr "" + +#: ../glade/liferea.ui.h:48 +msgid "New Folder" +msgstr "폴더 만들기" + +#: ../glade/liferea.ui.h:49 +msgid "_Folder name:" +msgstr "폴더 이름(_F):" + +#: ../glade/liferea.ui.h:50 +#, fuzzy +msgid "Rename" +msgstr "파일 이름" + +#: ../glade/liferea.ui.h:51 +#, fuzzy +msgid "_New Name:" +msgstr "이름(_N):" + +#: ../glade/liferea.ui.h:52 +#, fuzzy +msgid "Search Folder Properties" +msgstr "가상폴더 등록정보" + +#: ../glade/liferea.ui.h:53 +#, fuzzy +msgid "Search _Name:" +msgstr "피드 이름(_N):" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "" + +#: ../glade/liferea.ui.h:55 +msgid "A_ny Rule Matches" +msgstr "" + +#: ../glade/liferea.ui.h:56 +msgid "_All Rules Must Match" +msgstr "" + +#: ../glade/liferea.ui.h:57 +#, fuzzy +msgid "Open Enclosure" +msgstr "/첨부 열기..." + +#: ../glade/liferea.ui.h:58 +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "첨부를 받고 있습니다. 종류:" + +#: ../glade/liferea.ui.h:59 +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"이 첨부를 Liferea가 어떻게 하면 좋을까요? 원하는 명령을 써주세요. 다운로드한 " +"파일이 이 명령의 인자로 넘겨질 것입니다. 명령:" + +#: ../glade/liferea.ui.h:60 +msgid "_Browse" +msgstr "찾아보기(_B)" + +#: ../glade/liferea.ui.h:61 +#, fuzzy +msgid "_Do this automatically for enclosures like this from now on." +msgstr "지금부터 이런 파일은 자동으로 이렇게 합니다." + +#: ../glade/liferea.ui.h:62 +msgid "Search All Feeds" +msgstr "모든 피드에서 찾기." + +#: ../glade/liferea.ui.h:63 +msgid "_Search for:" +msgstr "찾기(_S):" + +#: ../glade/liferea.ui.h:64 +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "Liferea가 아이템 제목이나 내용에서 찾을 단어를 입력해주세요." + +#: ../glade/liferea.ui.h:65 +msgid "_Advanced..." +msgstr "" + +#: ../glade/liferea.ui.h:66 +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"모든 피드에서 지정한 내용을 찾습니다. 결과는 아이템 목록에 나타날 것 입니다." + +#: ../glade/liferea.ui.h:67 +#, fuzzy +msgid "Update Monitor" +msgstr "/디렉토리 갱신(_U)" + +#: ../glade/liferea.ui.h:68 +msgid "Pending Requests" +msgstr "" + +#: ../glade/liferea.ui.h:69 +#, fuzzy +msgid "Downloading Now" +msgstr "첨부파일 다운로드" + +#: ../glade/liferea.ui.h:70 +#, fuzzy +msgid "Cancel _All" +msgstr "전부 갱신(_A)" + +#: ../glade/liferea.ui.h:71 +msgid "Create News Bin" +msgstr "" + +#: ../glade/liferea.ui.h:72 +msgid "_News Bin Name:" +msgstr "" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "정보" + +#: ../glade/liferea.ui.h:74 +msgid "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea는 GTK+를 이용한 뉴스 수집기입니다" + +#: ../glade/liferea.ui.h:78 +#, fuzzy +msgid "Liferea Homepage" +msgstr "Liferea - 리눅스 피드 보기" + +#: ../glade/liferea.ui.h:79 +#, fuzzy +msgid "Advanced Search" +msgstr "피드스터에서 찾기" + +#: ../glade/liferea.ui.h:80 +#, fuzzy +msgid "_Search Folder..." +msgstr "새 폴더(_F)..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "아무거나 원하는 찾을 말을 입력해보세요" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "최대 결과 갯수(_N):" + +#: ../glade/liferea.ui.h:84 +#, 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 결과에 질의하는 피드 등록을 생" +"성합니다. 이것을 다른 subscription 처럼 영구히 저장하고,갱신할 수 있습니다." + +#: ../glade/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "다운로드 프로그램(_D)" + +#: ../glade/node_source.ui.h:1 +#, fuzzy +msgid "Source Selection" +msgstr "피드 종류 고르기" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "" + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" + +#: ../glade/opml_source.ui.h:3 +#, fuzzy +msgid "_Location" +msgstr "/링크 위치 복사하기(_C)" + +#: ../glade/opml_source.ui.h:4 +#, fuzzy +msgid "_Select File" +msgstr "파일 고르기" + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "" + +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "" + +#: ../glade/ttrss_source.ui.h:3 +#, fuzzy +msgid "_Server URL" +msgstr "피드 URL" + +#: ../glade/ttrss_source.ui.h:5 +#, fuzzy +msgid "_Username" +msgstr "사용자 이름:" -#: ../glade/liferea.ui.h:45 -msgid "_Never do popup notification for this subscription." +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." msgstr "" -#: ../glade/liferea.ui.h:46 -#, fuzzy -msgid "_Mark downloaded items as read." -msgstr "선택한 것들을 읽은 것으로 표시(_M)" - -#: ../glade/liferea.ui.h:47 -msgid "Advanced" +#: ../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 "" -#: ../glade/liferea.ui.h:48 +#: ../glade/prefs.ui.h:1 msgid "Liferea Preferences" msgstr "Liferea 기본 설정" -#: ../glade/liferea.ui.h:49 +#: ../glade/prefs.ui.h:2 #, fuzzy msgid "Feed Cache Handling" msgstr "피드 다루기 설정" -#: ../glade/liferea.ui.h:50 +#: ../glade/prefs.ui.h:3 msgid "Default _number of items per feed to save:" msgstr "각 피드당 저장될 기본 아이템 숫자(_N):" -#: ../glade/liferea.ui.h:51 +#: ../glade/prefs.ui.h:4 #, fuzzy msgid "Feed Update Settings" msgstr "피드 캐시" -#: ../glade/liferea.ui.h:52 +#: ../glade/prefs.ui.h:5 #, fuzzy msgid "_Update all subscriptions at startup." msgstr "새 구독 더하기." -#: ../glade/liferea.ui.h:53 +#: ../glade/prefs.ui.h:6 msgid "Default Feed Refresh _Interval:" msgstr "기본 피드 새로고침 간격(_I):" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.ui.h:55 +#: ../glade/prefs.ui.h:8 #, fuzzy msgid "" "Note: Please remember to set a reasonable refresh time. Usually it is a " @@ -1954,455 +2202,249 @@ "는 피드를15분 간격으로 다시 읽는것은 좋지 않습니다. 자동 갱신을 끄시려면 시" "간 간격을0으로 정해주세요." -#: ../glade/liferea.ui.h:56 +#: ../glade/prefs.ui.h:9 msgid "Feeds" msgstr "피드" -#: ../glade/liferea.ui.h:57 +#: ../glade/prefs.ui.h:10 #, fuzzy msgid "Folder Display Settings" msgstr "폴더 표시 설정" -#: ../glade/liferea.ui.h:58 +#: ../glade/prefs.ui.h:11 msgid "_Show the items of all child feeds when a folder is selected." msgstr "선택된 폴더안에 들은 모든 자식 피드의 아이템들을 보여줍니다(_S)." -#: ../glade/liferea.ui.h:59 +#: ../glade/prefs.ui.h:12 msgid "_Hide read items." msgstr "읽은 아이템 숨기기(_H)" -#: ../glade/liferea.ui.h:60 +#: ../glade/prefs.ui.h:13 #, fuzzy msgid "Feed Icons (Favicons)" msgstr "피드 아이콘(Favicons)" -#: ../glade/liferea.ui.h:61 +#: ../glade/prefs.ui.h:14 msgid "_Update all favicons now" msgstr "모든 피드아이콘을 지금 갱신합니다(_U)." -#: ../glade/liferea.ui.h:62 +#: ../glade/prefs.ui.h:15 msgid "Folders" msgstr "폴더" -#: ../glade/liferea.ui.h:63 +#: ../glade/prefs.ui.h:16 #, fuzzy msgid "Reading Headlines" msgstr "머릿글" -#: ../glade/liferea.ui.h:64 +#: ../glade/prefs.ui.h:17 msgid "_Skim through articles with:" msgstr "다음 항목으로 넘어가기 위한 키(_S):" -#: ../glade/liferea.ui.h:65 +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 #, fuzzy msgid "Web Integration" msgstr "방침" -#: ../glade/liferea.ui.h:66 +#: ../glade/prefs.ui.h:20 msgid "_Post Bookmarks to" msgstr "" -#: ../glade/liferea.ui.h:67 +#: ../glade/prefs.ui.h:22 #, fuzzy msgid "Internal Browser Settings" msgstr "외부 브라우져" -#: ../glade/liferea.ui.h:68 +#: ../glade/prefs.ui.h:23 msgid "Open links in Liferea's _window." msgstr "링크를 Liferea 윈도우 안에서 엽니다(_W)." -#: ../glade/liferea.ui.h:69 +#: ../glade/prefs.ui.h:24 msgid "_Disable Javascript." msgstr "자바스크립트 비활성화(_D)." -#: ../glade/liferea.ui.h:70 +#: ../glade/prefs.ui.h:25 +#, fuzzy msgid "_Enable browser plugins." -msgstr "" +msgstr "외부 브라우져" -#: ../glade/liferea.ui.h:71 +#: ../glade/prefs.ui.h:26 #, fuzzy msgid "External Browser Settings" msgstr "외부 브라우져" -#: ../glade/liferea.ui.h:72 +#: ../glade/prefs.ui.h:27 msgid "_Open link in:" msgstr "링크 여는 방법(_O):" -#: ../glade/liferea.ui.h:74 +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "수동" + +#: ../glade/prefs.ui.h:30 #, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" +msgid "(%s for URL)" msgstr "" -"수동(_M):\n" -"(URL은 %s)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "브라우져(_B):" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "브라우져" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 #, fuzzy msgid "Notification Settings" msgstr "알림 영역 " -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "새로운 머릿글로 팝업 윈도우를 보여줍니다(_P)." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "알림 영역(시스템 트레이 라고도 불리는)에 상태 아이콘을 보입니다." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "" -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "" -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 #, fuzzy msgid "Toolbar Settings" msgstr "프록시 설정" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 +#, fuzzy msgid "Toolbar _button labels:" -msgstr "" +msgstr "프록시 설정" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "HTTP 프록시 서버" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 #, fuzzy msgid "_No Proxy" msgstr "프록시" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 #, fuzzy msgid "_Manual Setting:" msgstr "메뉴 설정" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "프록시 포트(_P):" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "프록시 호스트(_H):" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 #, fuzzy msgid "Use Proxy Au_thentication" msgstr "프록시 인증을 사용합니다(_A)" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "프록시 열쇠글(_W):" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "사용자 이름(_U):" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "프록시" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 #, fuzzy msgid "Downloading Enclosures" msgstr "첨부파일 다운로드" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "찾아보기(_B)" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "다운로드한 파일 저장위치(_S)" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "다운로드 프로그램(_D)" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 #, fuzzy msgid "Opening Enclosures" msgstr "/첨부 열기..." -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "첨부" -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "피드 이름" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "폴더 만들기" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "폴더 이름(_F):" - -#: ../glade/liferea.ui.h:111 -#, fuzzy -msgid "Rename" -msgstr "파일 이름" - -#: ../glade/liferea.ui.h:112 -#, fuzzy -msgid "_New Name:" -msgstr "이름(_N):" - -#: ../glade/liferea.ui.h:113 -#, fuzzy -msgid "Search Folder Properties" -msgstr "가상폴더 등록정보" - -#: ../glade/liferea.ui.h:114 -#, fuzzy -msgid "Search _Name:" -msgstr "피드 이름(_N):" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "첨부파일 다운로드" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "첨부를 받고 있습니다. 종류:" - -#: ../glade/liferea.ui.h:120 -#, 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가 어떻게 하면 좋을까요? 원하는 명령을 써주세요. 다운로드한 " -"파일이 이 명령의 인자로 넘겨질 것입니다. 명령:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "" - -#: ../glade/liferea.ui.h:122 -#, fuzzy -msgid "_Do this automatically for enclosures like this from now on." -msgstr "지금부터 이런 파일은 자동으로 이렇게 합니다." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "모든 피드에서 찾기." - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "찾기(_S):" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "Liferea가 아이템 제목이나 내용에서 찾을 단어를 입력해주세요." - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "" - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"모든 피드에서 지정한 내용을 찾습니다. 결과는 아이템 목록에 나타날 것 입니다." - -#: ../glade/liferea.ui.h:128 -#, fuzzy -msgid "Update Monitor" -msgstr "/디렉토리 갱신(_U)" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "" - -#: ../glade/liferea.ui.h:130 -#, fuzzy -msgid "Downloading Now" -msgstr "첨부파일 다운로드" - -#: ../glade/liferea.ui.h:131 -#, fuzzy -msgid "Cancel _All" -msgstr "전부 갱신(_A)" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "정보" - -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea는 GTK+를 이용한 뉴스 수집기입니다" - -#: ../glade/liferea.ui.h:139 -#, fuzzy -msgid "Liferea Homepage" -msgstr "Liferea - 리눅스 피드 보기" - -#: ../glade/liferea.ui.h:140 -#, fuzzy -msgid "Advanced Search" -msgstr "피드스터에서 찾기" - -#: ../glade/liferea.ui.h:141 -#, fuzzy -msgid "_Search Folder..." -msgstr "새 폴더(_F)..." - -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "아무거나 원하는 찾을 말을 입력해보세요" - -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "최대 결과 갯수(_N):" - -#: ../glade/liferea.ui.h:145 #, 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 결과에 질의하는 피드 등록을 생" -"성합니다. 이것을 다른 subscription 처럼 영구히 저장하고,갱신할 수 있습니다." +#~ msgid "Launch Item In _Tab" +#~ msgstr "/탭으로 띄우기(_L)" -#: ../glade/new_subscription.ui.h:9 #, fuzzy -msgid "Download / Postprocessing" -msgstr "다운로드 프로그램(_D)" +#~ msgid "_Launch Item In Browser" +#~ msgstr "/브라우져로 띄우기(_L)" -#: ../glade/node_source.ui.h:1 #, fuzzy -msgid "Source Selection" -msgstr "피드 종류 고르기" - -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "" - -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "" - -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "/아이템 URL을 클립보드로 복사(_U)" -#: ../glade/opml_source.ui.h:3 -#, fuzzy -msgid "_Location" -msgstr "/링크 위치 복사하기(_C)" +#~ msgid "comments" +#~ msgstr "덧말" -#: ../glade/opml_source.ui.h:4 #, fuzzy -msgid "_Select File" -msgstr "파일 고르기" +#~ msgid "Download finished." +#~ msgstr "다운로드 프로그램(_D)" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "" +#~ msgid "Choose download directory" +#~ msgstr "다운로드 할 디렉토리를 선택하세요" -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "수동(_M):\n" +#~ "(URL은 %s)" -#: ../glade/ttrss_source.ui.h:3 -#, fuzzy -msgid "_Server URL" -msgstr "피드 URL" +#~ msgid "_Save downloads in" +#~ msgstr "다운로드한 파일 저장위치(_S)" -#: ../glade/ttrss_source.ui.h:5 #, fuzzy -msgid "_Username" -msgstr "사용자 이름:" - -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "피드 이름" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "" +#~ msgid "Downloading Enclosure" +#~ msgstr "첨부파일 다운로드" #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " @@ -3145,11 +3187,11 @@ #~ msgid "" #~ "

    Could not determine the feed type. Please check that it is a valid type and listed in the supported " +#~ "\"http://lzone.de/liferea/supported_formats.htm\">supported " #~ "formats.

    " #~ msgstr "" #~ "

    피드 종류를 알 수 없습니다.·그것이 맞는 형식인지 확인하시고 맞는 형식인지 확인하시고 지원되는 형식인지 확인해 주세요.

    " #~ msgid "Please do a search first!" @@ -3240,7 +3282,7 @@ #~ "to change the update interval, title, authentication or caching " #~ "properties of a subscription.

    To learn more about Liferea " #~ "you should read the documentation provided in the help feed or in the FAQ available at the " +#~ "href=\"http://lzone.de/liferea/faq.htm\">FAQ available at the " #~ "project homepage.

    " #~ msgstr "" #~ "

    Liferea에 오신것을 환영합니다

    왼쪽의 판자는 당신이 새로 추가할 " @@ -3736,6 +3778,9 @@ #~ msgid "conversion wasn't successful.\n" #~ msgstr "변환이 실패했습니다.\n" +#~ msgid "conversion wasn't successful. converted: %i octets.\n" +#~ msgstr "변환이 성공적이지 않습니다. %i 옥텟이 변환되었습니다.\n" + #~ msgid "not enough memory\n" #~ msgstr "메모리가 부족합니다\n" diff -Nru liferea-1.8.15/po/liferea.pot liferea-1.10.3/po/liferea.pot --- liferea-1.8.15/po/liferea.pot 2013-06-24 22:16:14.000000000 +0200 +++ liferea-1.10.3/po/liferea.pot 2013-10-08 20:14:41.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-10-08 20:14+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,8 +18,45 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.appdata.xml.in.h:1 +msgid "" +"Liferea is an abbreviation for Linux Feed Reader. It is a news aggregator " +"for online news feeds. It supports a number of different feed formats " +"including RSS/RDF, CDF and Atom. There are many other news readers " +"available, but these others are not available for Linux or require many " +"extra libraries to be installed. Liferea tries to fill this gap by creating " +"a fast, easy to use, easy to install news aggregator for GTK/GNOME." +msgstr "" + +#: ../liferea.appdata.xml.in.h:2 +msgid "Distinguishing features:" +msgstr "" + +#: ../liferea.appdata.xml.in.h:3 +msgid "Read articles when offline" +msgstr "" + +#: ../liferea.appdata.xml.in.h:4 +msgid "Synchronizes with TheOldReader" +msgstr "" + +#: ../liferea.appdata.xml.in.h:5 +msgid "Synchronizes with TinyTinyRSS" +msgstr "" + +#: ../liferea.appdata.xml.in.h:6 +msgid "Permanently save headlines in news bins" +msgstr "" + +#: ../liferea.appdata.xml.in.h:7 +msgid "Match items using search folders" +msgstr "" + +#: ../liferea.appdata.xml.in.h:8 +msgid "Play Podcasts" +msgstr "" + +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "" @@ -32,7 +69,11 @@ msgstr "" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" +msgid "Read news feeds and blogs" +msgstr "" + +#: ../liferea.desktop.in.h:5 +msgid "news;feed;aggregator;blog;podcast;" msgstr "" #: ../xslt/feed.xml.in.h:1 @@ -137,38 +178,18 @@ msgstr "" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "" - -#: ../xslt/item.xml.in.h:13 -msgid "No comments yet." -msgstr "" - -#: ../xslt/item.xml.in.h:14 msgid "Comments" msgstr "" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:11 msgid "Updating..." msgstr "" -#: ../xslt/item.xml.in.h:16 -msgid "Refresh" -msgstr "" - -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:12 msgid "Section" msgstr "" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:13 msgid "Department" msgstr "" @@ -190,12 +211,12 @@ msgid "Default Browser" msgstr "" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "" @@ -205,7 +226,7 @@ msgid "Authorization Error" msgstr "" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "" @@ -235,88 +256,94 @@ msgid "%b %d %Y" msgstr "" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:185 #, c-format msgid "Error renaming %s to %s\n" msgstr "" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:422 ../src/export.c:424 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "" -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:445 ../src/export.c:447 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" -#: ../src/export.c:440 +#: ../src/export.c:466 msgid "Imported feed list" msgstr "" -#: ../src/export.c:452 +#: ../src/export.c:478 msgid "Import Feed List" msgstr "" -#: ../src/export.c:452 +#: ../src/export.c:478 msgid "Import" msgstr "" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:478 ../src/export.c:495 ../src/fl_sources/opml_source.c:394 msgid "OPML Files" msgstr "" -#: ../src/export.c:460 +#: ../src/export.c:486 msgid "Error while exporting feed list!" msgstr "" -#: ../src/export.c:462 +#: ../src/export.c:488 msgid "Feed List exported!" msgstr "" -#: ../src/export.c:469 +#: ../src/export.c:495 msgid "Export Feed List" msgstr "" -#: ../src/export.c:469 +#: ../src/export.c:495 msgid "Export" msgstr "" -#: ../src/feed.c:255 +#: ../src/feed.c:254 msgid "" "

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

    " msgstr "" -#: ../src/feed.c:284 +#: ../src/feed.c:283 #, c-format msgid "\"%s\" updated..." msgstr "" -#: ../src/feed.c:294 +#: ../src/feed.c:293 #, c-format msgid "\"%s\" is not available" msgstr "" @@ -350,193 +377,185 @@ msgstr "" #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" msgstr "" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "Add a new subscription" msgstr "" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "" -#: ../src/main.c:187 +#: ../src/main.c:173 msgid "Print debugging messages for the configuration handling" msgstr "" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "" -#: ../src/main.c:196 +#: ../src/main.c:182 msgid "Print debugging messages of the search folder matching" msgstr "" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "" -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" - -#: ../src/migrate.c:340 -#, 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!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" #. Some libsoup transport errors -#: ../src/net.c:320 +#: ../src/net.c:329 msgid "The update request was cancelled" msgstr "" -#: ../src/net.c:321 +#: ../src/net.c:330 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:322 +#: ../src/net.c:331 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:323 +#: ../src/net.c:332 msgid "Unable to connect to remote host" msgstr "" -#: ../src/net.c:324 +#: ../src/net.c:333 msgid "Unable to connect to proxy" msgstr "" -#: ../src/net.c:325 +#: ../src/net.c:334 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:328 +#: ../src/net.c:337 msgid "The resource moved permanently to a new location" msgstr "" #. http 4xx client error -#: ../src/net.c:331 +#: ../src/net.c:340 msgid "" "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" msgstr "" -#: ../src/net.c:333 +#: ../src/net.c:342 msgid "Payment required" msgstr "" -#: ../src/net.c:334 +#: ../src/net.c:343 msgid "You're not allowed to access this resource" msgstr "" -#: ../src/net.c:335 +#: ../src/net.c:344 msgid "Resource Not Found" msgstr "" -#: ../src/net.c:336 +#: ../src/net.c:345 msgid "Method Not Allowed" msgstr "" -#: ../src/net.c:337 +#: ../src/net.c:346 msgid "Not Acceptable" msgstr "" -#: ../src/net.c:338 +#: ../src/net.c:347 msgid "Proxy authentication required" msgstr "" -#: ../src/net.c:339 +#: ../src/net.c:348 msgid "Request timed out" msgstr "" -#: ../src/net.c:340 +#: ../src/net.c:349 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "" -#: ../src/net.c:345 +#: ../src/net.c:354 msgid "There was an internal error in the update process" msgstr "" -#: ../src/net.c:347 +#: ../src/net.c:356 msgid "Feed not available: Server requested unsupported redirection!" msgstr "" -#: ../src/net.c:349 +#: ../src/net.c:358 msgid "Client Error" msgstr "" -#: ../src/net.c:351 +#: ../src/net.c:360 msgid "Server Error" msgstr "" -#: ../src/net.c:353 +#: ../src/net.c:362 msgid "An unknown networking error happened!" msgstr "" @@ -614,127 +633,125 @@ msgid "Feed title" msgstr "" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." msgstr "" -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "" -#: ../src/update.c:255 +#: ../src/update.c:258 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "" -#: ../src/update.c:278 +#: ../src/update.c:281 #, c-format msgid "%s exited with status %d" msgstr "" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:287 ../src/update.c:288 ../src/update.c:400 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:426 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "" -#: ../src/update.c:429 +#: ../src/update.c:432 #, c-format msgid "Error: There is no file \"%s\"" msgstr "" -#: ../src/vfolder.c:55 +#: ../src/vfolder.c:54 msgid "New Search Folder" msgstr "" -#: ../src/xml.c:451 +#: ../src/xml.c:410 msgid "[There were more errors. Output was truncated!]" msgstr "" -#: ../src/xml.c:604 +#: ../src/xml.c:563 msgid "XML Parser: Could not parse document:\n" msgstr "" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "" -msgstr[1] "" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "" +msgstr[1] "" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "" @@ -744,632 +761,652 @@ msgid "Couldn't find pixmap file: %s" msgstr "" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:328 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] "" msgstr[1] "" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:333 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "" msgstr[1] "" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:719 msgid "Help Topics" msgstr "" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:725 msgid "Quick Reference" msgstr "" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:731 msgid "FAQ" msgstr "" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:798 msgid "Liferea is now online" msgstr "" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:800 msgid "Work Offline" msgstr "" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:802 msgid "Liferea is now offline" msgstr "" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:804 msgid "Work Online" msgstr "" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:900 msgid "_Subscriptions" msgstr "" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:901 msgid "Update _All" msgstr "" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:901 msgid "Updates all subscriptions." msgstr "" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:903 msgid "Mark All As _Read" msgstr "" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:903 msgid "Marks read every item of every subscription." msgstr "" -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:905 msgid "_Import Feed List..." msgstr "" -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:905 msgid "Imports an OPML feed list." msgstr "" -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:906 msgid "_Export Feed List..." msgstr "" -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:906 msgid "Exports the feed list as OPML." msgstr "" -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:907 msgid "_Quit" msgstr "" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:909 msgid "_Feed" msgstr "" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:910 msgid "Remove _All Items" msgstr "" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:910 msgid "Removes all items of the currently selected feed." msgstr "" -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:913 msgid "_Item" msgstr "" +#: ../src/ui/liferea_shell.c:914 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:916 +msgid "Next Item" +msgstr "" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:921 msgid "_Next Unread Item" msgstr "" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:924 msgid "_View" msgstr "" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:925 ../src/ui/liferea_htmlview.c:653 msgid "_Increase Text Size" msgstr "" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:925 msgid "Increases the text size of the item view." msgstr "" -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:927 ../src/ui/liferea_htmlview.c:654 msgid "_Decrease Text Size" msgstr "" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:927 msgid "Decreases the text size of the item view." msgstr "" -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:930 msgid "_Tools" msgstr "" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:931 msgid "_Update Monitor" msgstr "" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:931 msgid "Show a list of all feeds currently in the update queue" msgstr "" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:933 msgid "_Preferences" msgstr "" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:933 msgid "Edit Preferences." msgstr "" -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:936 msgid "S_earch" msgstr "" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:937 msgid "Search All Feeds..." msgstr "" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:937 msgid "Show the search dialog." msgstr "" -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:939 msgid "_Help" msgstr "" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:940 msgid "_Contents" msgstr "" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:940 msgid "View help for this application." msgstr "" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:941 msgid "_Quick Reference" msgstr "" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:941 msgid "View a list of all Liferea shortcuts." msgstr "" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:943 msgid "_FAQ" msgstr "" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:943 msgid "View the FAQ for this application." msgstr "" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:944 msgid "_About" msgstr "" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:944 msgid "Shows an about dialog." msgstr "" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:948 msgid "_Normal View" msgstr "" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:948 msgid "Set view mode to mail client mode." msgstr "" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:950 msgid "_Wide View" msgstr "" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:950 msgid "Set view mode to use three vertical panes." msgstr "" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:952 msgid "_Combined View" msgstr "" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:952 msgid "Set view mode to two pane mode." msgstr "" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:957 msgid "_Reduced Feed List" msgstr "" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:957 msgid "Hide feeds with no unread items." msgstr "" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:962 msgid "_New Subscription..." msgstr "" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:962 msgid "Adds a subscription to the feed list." msgstr "" -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:964 ../src/ui/popup_menu.c:320 msgid "New _Folder..." msgstr "" -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:964 msgid "Adds a folder to the feed list." msgstr "" -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:965 ../src/ui/popup_menu.c:323 msgid "New S_earch Folder..." msgstr "" -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:965 msgid "Adds a new search folder to the feed list." msgstr "" -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:966 msgid "New _Source..." msgstr "" -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:966 msgid "Adds a new feed list source." msgstr "" -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:967 ../src/ui/popup_menu.c:325 msgid "New _News Bin..." msgstr "" -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:967 msgid "Adds a new news bin." msgstr "" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:971 msgid "_Mark Items Read" msgstr "" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:971 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "" -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:300 msgid "_Update" msgstr "" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:973 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:978 msgid "_Properties" msgstr "" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:978 msgid "Opens the property dialog for the selected subscription." msgstr "" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:979 msgid "_Remove" msgstr "" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:979 msgid "Removes the selected subscription." msgstr "" -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:983 ../src/ui/popup_menu.c:163 msgid "Toggle _Read Status" msgstr "" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:983 msgid "Toggles the read status of the selected item." msgstr "" -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:985 ../src/ui/popup_menu.c:164 msgid "Toggle Item _Flag" msgstr "" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:985 msgid "Toggles the flag status of the selected item." msgstr "" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:987 msgid "R_emove" msgstr "" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected item." msgstr "" -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:989 ../src/ui/popup_menu.c:127 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:989 +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "" + +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:128 +msgid "_Open In Browser" +msgstr "" + +#: ../src/ui/liferea_shell.c:991 +msgid "Launches the item's link in the Liferea item pane." +msgstr "" + +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:129 +msgid "Open In _External Browser" msgstr "" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:993 +msgid "Launches the item's link in the configured external browser." msgstr "" -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:998 ../src/ui/popup_menu.c:193 msgid "_Work Offline" msgstr "" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:998 msgid "This option allows you to disable subscription updating." msgstr "" -#: ../src/ui/liferea_shell.c:1244 -msgid "Liferea - Linux Feed Reader" +#: ../src/ui/liferea_shell.c:1000 +msgid "_Fullscreen" msgstr "" -#: ../src/ui/liferea_shell.c:1246 -msgid "" -"

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

    You can add new subscriptions

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

    " +#: ../src/ui/liferea_shell.c:1000 +msgid "Browse at full screen" msgstr "" -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "" -#: ../src/ui/ui_common.c:205 +#: ../src/ui/ui_common.c:211 msgid "All Files" msgstr "" -#: ../src/ui/feed_list_view.c:341 +#: ../src/ui/feed_list_view.c:348 msgid "Deleting entry" msgstr "" -#: ../src/ui/feed_list_view.c:342 +#: ../src/ui/feed_list_view.c:349 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "" -#: ../src/ui/feed_list_view.c:342 +#: ../src/ui/feed_list_view.c:349 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "" -#: ../src/ui/feed_list_view.c:354 +#: ../src/ui/feed_list_view.c:361 msgid "Deletion Confirmation" msgstr "" -#: ../src/ui/feed_list_view.c:385 +#: ../src/ui/feed_list_view.c:392 msgid "Liferea is in offline mode. No update possible." msgstr "" -#: ../src/ui/liferea_htmlview.c:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." +#: ../src/ui/liferea_htmlview.c:624 +msgid "Open Link In _Tab" msgstr "" -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +#: ../src/ui/liferea_htmlview.c:625 +msgid "_Open Link In Browser" msgstr "" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:626 +msgid "_Open Link In External Browser" msgstr "" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:629 #, c-format msgid "_Bookmark Link at %s" msgstr "" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:633 msgid "_Copy Link Location" msgstr "" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Image Location" msgstr "" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:638 msgid "S_ave Link As" msgstr "" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:640 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:643 msgid "_Subscribe..." msgstr "" -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:398 msgid "*** No title ***" msgstr "" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:661 msgid "Date" msgstr "" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:675 msgid "Headline" msgstr "" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 -msgid "No item has been selected" -msgstr "" - -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:776 ../src/ui/item_list_view.c:797 +#: ../src/ui/item_list_view.c:818 msgid "This item has no link specified!" msgstr "" -#: ../src/ui/item_list_view.c:811 -msgid "You must select a feed to delete its items!" +#: ../src/ui/item_list_view.c:780 ../src/ui/item_list_view.c:801 +#: ../src/ui/item_list_view.c:822 ../src/ui/item_list_view.c:886 +#: ../src/ui/item_list_view.c:971 ../src/ui/item_list_view.c:986 +msgid "No item has been selected" msgstr "" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" +#: ../src/ui/item_list_view.c:874 +msgid "You must select a feed to delete its items!" msgstr "" -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" +#: ../src/ui/popup_menu.c:141 +msgid "Copy to News Bin" msgstr "" -#: ../src/ui/popup_menu.c:129 -msgid "Copy to News Bin" +#: ../src/ui/popup_menu.c:155 +#, c-format +msgid "_Bookmark at %s" msgstr "" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" +#: ../src/ui/popup_menu.c:159 +msgid "Copy Item _Location" msgstr "" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:165 msgid "R_emove Item" msgstr "" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:178 msgid "Open Enclosure..." msgstr "" -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:179 msgid "Save As..." msgstr "" -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:180 msgid "Copy Link Location" msgstr "" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:194 msgid "_Update All" msgstr "" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:199 msgid "_Show Liferea" msgstr "" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:302 msgid "_Update Folder" msgstr "" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:304 msgid "_Mark All As Read" msgstr "" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:314 msgid "_New" msgstr "" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:317 msgid "New _Subscription..." msgstr "" -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:324 msgid "New S_ource..." msgstr "" -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:333 msgid "Sort Feeds" msgstr "" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:339 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 +#: ../src/ui/popup_menu.c:351 msgid "Convert To Local Subscriptions..." msgstr "" -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:87 msgid "GNOME default" msgstr "" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:88 msgid "Text below icons" msgstr "" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:89 msgid "Text beside icons" msgstr "" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:90 msgid "Icons only" msgstr "" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:91 msgid "Text only" msgstr "" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:99 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:106 msgid "Space" msgstr "" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:107 msgid " Space" msgstr "" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr "" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" +#: ../src/ui/preferences_dialog.c:113 +msgid "Normal View" +msgstr "" + +#: ../src/ui/preferences_dialog.c:114 +msgid "Wide View" msgstr "" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:115 +msgid "Combined View" +msgstr "" + +#: ../src/ui/preferences_dialog.c:500 msgid "Manual" msgstr "" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:515 msgid "Browser default" msgstr "" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:518 msgid "Existing window" msgstr "" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:521 msgid "New window" msgstr "" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:524 msgid "New tab" msgstr "" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:684 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:687 msgid "Terminate instead of minimizing to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:690 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:790 msgid "Type" msgstr "" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:793 msgid "Program" msgstr "" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:343 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1382,7 +1419,7 @@ msgid "This feed specifies no default update interval." msgstr "" -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:153 msgid "Untitled" msgstr "" @@ -1427,38 +1464,70 @@ msgid "%b %d %H:%M" msgstr "" -#: ../src/fl_sources/default_source.c:174 -#: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 -#: ../glade/simple_subscription.ui.h:1 +#: ../src/fl_sources/aol_source.c:123 +msgid "AOL Reader login failed!" +msgstr "" + +#: ../src/fl_sources/aol_source.c:153 +msgid "AOL Reader Login" +msgstr "" + +#: ../src/fl_sources/aol_source.c:268 ../src/fl_sources/default_source.c:145 +#: ../src/fl_sources/inoreader_source.c:272 +#: ../src/fl_sources/reedah_source.c:272 +#: ../src/fl_sources/theoldreader_source.c:278 +#: ../glade/new_subscription.ui.h:1 ../glade/simple_subscription.ui.h:1 msgid "New Subscription" msgstr "" -#: ../src/fl_sources/google_source.c:116 -msgid "Google Reader login failed!" +#: ../src/fl_sources/aol_source.c:361 +msgid "AOL Reader" +msgstr "" + +#: ../src/fl_sources/aol_source.c:362 +msgid "" +"Integrate the feed list of your AOL Reader account. Liferea will present " +"your AOL Reader subscriptions, and will synchronize your feed list and " +"reading lists." +msgstr "" + +#: ../src/fl_sources/inoreader_source.c:115 +msgid "InoReader login failed!" msgstr "" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/inoreader_source.c:387 +msgid "InoReader" +msgstr "" + +#: ../src/fl_sources/inoreader_source.c:388 +msgid "" +"Integrate the feed list of your InoReader account. Liferea will present your " +"InoReader subscriptions, and will synchronize your feed list and reading " +"lists." +msgstr "" + +#: ../src/fl_sources/google_source.c:148 msgid "Google Reader" msgstr "" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:149 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " "reading lists." msgstr "" -#: ../src/fl_sources/opml_source.c:325 +#: ../src/fl_sources/opml_source.c:326 msgid "Planet, BlogRoll, OPML" msgstr "" -#: ../src/fl_sources/opml_source.c:326 +#: ../src/fl_sources/opml_source.c:327 msgid "" "Integrate blogrolls or Planets in your feed list. Liferea will automatically " "add and remove feeds according to the changes of the source OPML document" msgstr "" -#: ../src/fl_sources/opml_source.c:387 +#: ../src/fl_sources/opml_source.c:394 msgid "Choose OPML File" msgstr "" @@ -1466,34 +1535,74 @@ msgid "New OPML Subscription" msgstr "" -#: ../src/fl_sources/node_source.c:238 +#: ../src/fl_sources/node_source.c:246 msgid "No feed list source types found!" msgstr "" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:276 msgid "Source Type" msgstr "" #. FIXME: something is not perfect, because if you immediately #. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 +#: ../src/fl_sources/node_source.c:420 #, c-format msgid "The '%s' subscription was successfully converted to local feeds!" msgstr "" -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/reedah_source.c:115 +msgid "Reedah login failed!" +msgstr "" + +#: ../src/fl_sources/reedah_source.c:387 +msgid "Reedah" +msgstr "" + +#: ../src/fl_sources/reedah_source.c:388 +msgid "" +"Integrate the feed list of your Reedah account. Liferea will present your " +"Reedah subscriptions, and will synchronize your feed list and reading lists." +msgstr "" + +#: ../src/fl_sources/reedah_source_feed.c:195 +msgid "Could not parse JSON returned by Reedah API!" +msgstr "" + +#: ../src/fl_sources/ttrss_source.c:93 +msgid "" +"This TinyTinyRSS source is not self-updating and Liferea does not support " +"updating TinyTinyRSS remotely at the moment. Please change the TinyTinyRSS " +"preferences to automatic updating!" +msgstr "" + +#: ../src/fl_sources/ttrss_source.c:410 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:411 msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " "present your tt-rss subscriptions, and will synchronize your feed list and " "reading lists." msgstr "" -#: ../src/fl_sources/ttrss_source_feed.c:112 -msgid "Could not parse JSON returned by tt-rss API!" +#: ../src/fl_sources/ttrss_source_feed.c:119 +msgid "Could not parse JSON returned by TinyTinyRSS API!" +msgstr "" + +#: ../src/fl_sources/theoldreader_source.c:115 +msgid "TheOldReader login failed!" +msgstr "" + +#: ../src/fl_sources/theoldreader_source.c:393 +msgid "TheOldReader" +msgstr "" + +#: ../src/fl_sources/theoldreader_source.c:394 +msgid "" +"Integrate the feed list of your TheOldReader account. Liferea will present " +"your TheOldReader subscriptions, and will synchronize your feed list and " +"reading lists." msgstr "" #: ../src/notification/libnotify.c:61 ../src/notification/libnotify.c:83 @@ -1510,26 +1619,26 @@ msgid "Visit" msgstr "" -#: ../src/notification/libnotify.c:171 ../src/notification/libnotify.c:274 +#: ../src/notification/libnotify.c:167 ../src/notification/libnotify.c:263 msgid "Open feed" msgstr "" -#: ../src/notification/libnotify.c:174 ../src/notification/libnotify.c:277 +#: ../src/notification/libnotify.c:170 ../src/notification/libnotify.c:266 msgid "Mark all as read" msgstr "" -#: ../src/notification/libnotify.c:254 +#: ../src/notification/libnotify.c:247 #, c-format msgid "%s has %d update" msgid_plural "%s has %d updates" msgstr[0] "" msgstr[1] "" -#: ../src/notification/libnotify.c:257 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:249 msgid "Feed Update" msgstr "" -#: ../src/notification/libnotify.c:271 +#: ../src/notification/libnotify.c:260 msgid "Show details" msgstr "" @@ -1559,15 +1668,25 @@ msgid "Please enter your Google Reader account settings." msgstr "" -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/inoreader_source.ui.h:3 +#: ../glade/reedah_source.ui.h:3 ../glade/ttrss_source.ui.h:4 +#: ../glade/theoldreader_source.ui.h:3 msgid "_Password" msgstr "" -#: ../glade/google_source.ui.h:4 +#: ../glade/google_source.ui.h:4 ../glade/inoreader_source.ui.h:4 +#: ../glade/reedah_source.ui.h:4 ../glade/theoldreader_source.ui.h:4 msgid "_Username (Email)" msgstr "" +#: ../glade/inoreader_source.ui.h:1 +msgid "Add InoReader Account" +msgstr "" + +#: ../glade/inoreader_source.ui.h:2 +msgid "Please enter your InoReader account settings" +msgstr "" + #: ../glade/liferea.ui.h:2 msgid "normal view" msgstr "" @@ -1584,7 +1703,7 @@ msgid "combined view" msgstr "" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "" @@ -1634,7 +1753,7 @@ msgstr "" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "" @@ -1744,418 +1863,416 @@ msgstr "" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" +msgid "New Folder" msgstr "" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" +msgid "_Folder name:" msgstr "" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" +msgid "Rename" msgstr "" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" +msgid "_New Name:" msgstr "" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." +msgid "Search Folder Properties" msgstr "" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" +msgid "Search _Name:" +msgstr "" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" msgstr "" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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." +msgid "A_ny Rule Matches" msgstr "" #: ../glade/liferea.ui.h:56 -msgid "Feeds" +msgid "_All Rules Must Match" msgstr "" #: ../glade/liferea.ui.h:57 -msgid "Folder Display Settings" +msgid "Open Enclosure" msgstr "" #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." +msgid "Open an enclosure of type:" msgstr "" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" msgstr "" #: ../glade/liferea.ui.h:60 -msgid "Feed Icons (Favicons)" +msgid "_Browse" msgstr "" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" +msgid "_Do this automatically for enclosures like this from now on." msgstr "" #: ../glade/liferea.ui.h:62 -msgid "Folders" +msgid "Search All Feeds" msgstr "" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" +msgid "_Search for:" msgstr "" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." msgstr "" #: ../glade/liferea.ui.h:65 -msgid "Web Integration" +msgid "_Advanced..." msgstr "" #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." msgstr "" #: ../glade/liferea.ui.h:67 -msgid "Internal Browser Settings" +msgid "Update Monitor" msgstr "" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." +msgid "Pending Requests" msgstr "" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." +msgid "Downloading Now" msgstr "" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." +msgid "Cancel _All" msgstr "" #: ../glade/liferea.ui.h:71 -msgid "External Browser Settings" +msgid "Create News Bin" msgstr "" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" +msgid "_News Bin Name:" +msgstr "" + +#: ../glade/liferea.ui.h:73 +msgid "About" msgstr "" #: ../glade/liferea.ui.h:74 -#, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" +msgid "Liferea is a news aggregator for GTK+" +msgstr "" + +#: ../glade/liferea.ui.h:75 +msgid "Liferea Homepage" msgstr "" #: ../glade/liferea.ui.h:76 -msgid "_Browser:" +msgid "Advanced Search" msgstr "" #: ../glade/liferea.ui.h:77 -msgid "Browser" +msgid "_Search Folder..." msgstr "" #: ../glade/liferea.ui.h:78 -msgid "Notification Settings" +msgid "Create Search Engine Feed" msgstr "" #: ../glade/liferea.ui.h:79 -msgid "Show a _popup window with new headlines." +msgid "enter any search string you want" msgstr "" #: ../glade/liferea.ui.h:80 -msgid "Show a status _icon in the notification area (system tray)." +msgid "Maximal _Number Of Result Items:" msgstr "" #: ../glade/liferea.ui.h:81 -msgid "Show _number of new items in the tray icon." -msgstr "" - -#: ../glade/liferea.ui.h:82 -msgid "T_erminate instead of minimizing to tray icon." +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.ui.h:83 -msgid "_Start in tray icon." +#: ../glade/new_subscription.ui.h:9 +msgid "Download / Postprocessing" msgstr "" -#: ../glade/liferea.ui.h:84 -msgid "Toolbar Settings" +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" msgstr "" -#: ../glade/liferea.ui.h:85 -msgid "_Hide toolbar." +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." msgstr "" -#: ../glade/liferea.ui.h:86 -msgid "Toolbar _button labels:" +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" msgstr "" -#: ../glade/liferea.ui.h:87 -msgid "GUI" +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." msgstr "" -#: ../glade/liferea.ui.h:88 -msgid "HTTP Proxy Server" +#: ../glade/opml_source.ui.h:3 +msgid "_Location" msgstr "" -#: ../glade/liferea.ui.h:89 -msgid "_Auto Detect (GNOME or environment)" +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" msgstr "" -#: ../glade/liferea.ui.h:90 -msgid "_No Proxy" +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" msgstr "" -#: ../glade/liferea.ui.h:91 -msgid "_Manual Setting:" +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" msgstr "" -#: ../glade/liferea.ui.h:92 -msgid "Proxy _Port:" +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" msgstr "" -#: ../glade/liferea.ui.h:93 -msgid "Proxy _Host:" +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" msgstr "" -#: ../glade/liferea.ui.h:94 -msgid "Use Proxy Au_thentication" +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." msgstr "" -#: ../glade/liferea.ui.h:95 -msgid "Proxy Pass_word:" +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" msgstr "" -#: ../glade/liferea.ui.h:96 -msgid "Proxy _Username:" +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." msgstr "" -#: ../glade/liferea.ui.h:97 -msgid "Proxy" +#: ../glade/prefs.ui.h:9 +msgid "Feeds" msgstr "" -#: ../glade/liferea.ui.h:98 -msgid "Downloading Enclosures" +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" msgstr "" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." msgstr "" -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." msgstr "" -#: ../glade/liferea.ui.h:101 -msgid "_Download using" +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" msgstr "" -#: ../glade/liferea.ui.h:102 -msgid "Opening Enclosures" +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" msgstr "" -#: ../glade/liferea.ui.h:103 -msgid "Enclosures" +#: ../glade/prefs.ui.h:15 +msgid "Folders" msgstr "" -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" msgstr "" -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" msgstr "" -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" msgstr "" -#: ../glade/liferea.ui.h:108 -msgid "Sync" +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" msgstr "" -#: ../glade/liferea.ui.h:109 -msgid "New Folder" +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" msgstr "" -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" msgstr "" -#: ../glade/liferea.ui.h:111 -msgid "Rename" +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." msgstr "" -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." msgstr "" -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." msgstr "" -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" +#: ../glade/prefs.ui.h:26 +msgid "External Browser Settings" msgstr "" -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" msgstr "" -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" +#: ../glade/prefs.ui.h:28 +msgid "_Manual:" msgstr "" -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" msgstr "" -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" +#: ../glade/prefs.ui.h:31 +msgid "_Browser:" msgstr "" -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" +#: ../glade/prefs.ui.h:32 +msgid "Browser" msgstr "" -#: ../glade/liferea.ui.h:120 -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:" +#: ../glade/prefs.ui.h:33 +msgid "Notification Settings" msgstr "" -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." +#: ../glade/prefs.ui.h:34 +msgid "Show a _popup window with new headlines." msgstr "" -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." +#: ../glade/prefs.ui.h:35 +msgid "Show a status _icon in the notification area (system tray)." msgstr "" -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" +#: ../glade/prefs.ui.h:36 +msgid "Show _number of new items in the tray icon." msgstr "" -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" +#: ../glade/prefs.ui.h:37 +msgid "T_erminate instead of minimizing to tray icon." msgstr "" -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." +#: ../glade/prefs.ui.h:38 +msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." +#: ../glade/prefs.ui.h:39 +msgid "Toolbar Settings" msgstr "" -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." +#: ../glade/prefs.ui.h:40 +msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" +#: ../glade/prefs.ui.h:41 +msgid "Toolbar _button labels:" msgstr "" -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" +#: ../glade/prefs.ui.h:42 +msgid "GUI" msgstr "" -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" +#: ../glade/prefs.ui.h:43 +msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" +#: ../glade/prefs.ui.h:44 +msgid "_Auto Detect (GNOME or environment)" msgstr "" -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" +#: ../glade/prefs.ui.h:45 +msgid "_No Proxy" msgstr "" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" +#: ../glade/prefs.ui.h:46 +msgid "_Manual Setting:" msgstr "" -#: ../glade/liferea.ui.h:134 -msgid "About" +#: ../glade/prefs.ui.h:47 +msgid "Proxy _Port:" msgstr "" -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" +#: ../glade/prefs.ui.h:48 +msgid "Proxy _Host:" msgstr "" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" +#: ../glade/prefs.ui.h:49 +msgid "Use Proxy Au_thentication" msgstr "" -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" +#: ../glade/prefs.ui.h:50 +msgid "Proxy Pass_word:" msgstr "" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" +#: ../glade/prefs.ui.h:51 +msgid "Proxy _Username:" msgstr "" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." +#: ../glade/prefs.ui.h:52 +msgid "Proxy" msgstr "" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" +#: ../glade/prefs.ui.h:53 +msgid "Downloading Enclosures" msgstr "" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" +#: ../glade/prefs.ui.h:54 +msgid "_Download using" msgstr "" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" +#: ../glade/prefs.ui.h:55 +msgid "Opening Enclosures" msgstr "" -#: ../glade/liferea.ui.h:145 -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." +#: ../glade/prefs.ui.h:56 +msgid "Enclosures" msgstr "" -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" +#: ../glade/reedah_source.ui.h:1 +msgid "Add Reedah Account" msgstr "" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." +#: ../glade/reedah_source.ui.h:2 +msgid "Please enter your Reedah account settings" msgstr "" -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." msgstr "" -#: ../glade/opml_source.ui.h:2 +#: ../glade/simple_subscription.ui.h:4 msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" - -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "" - -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" +"Enter a website location to use feed autodiscovery or in case you know it " +"the exact feed location." msgstr "" #: ../glade/ttrss_source.ui.h:1 @@ -2174,12 +2291,10 @@ msgid "_Username" msgstr "" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." +#: ../glade/theoldreader_source.ui.h:1 +msgid "Add TheOldReader Account" msgstr "" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." +#: ../glade/theoldreader_source.ui.h:2 +msgid "Please enter your TheOldReader account settings." msgstr "" diff -Nru liferea-1.8.15/po/lt.po liferea-1.10.3/po/lt.po --- liferea-1.8.15/po/lt.po 2013-06-24 22:16:16.000000000 +0200 +++ liferea-1.10.3/po/lt.po 2013-07-31 23:29:12.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: liferea-1.6.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2011-08-22 15:08+0300\n" "Last-Translator: Mindaugas Baranauskas \n" "Language-Team: Lithuanian \n" @@ -19,8 +19,7 @@ "%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.2\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -33,8 +32,8 @@ msgstr "Liferea naujienų kanalų skaitytuvė" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Parsiųskite ir skaitykite naujienas" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -144,38 +143,26 @@ msgstr "Sukūrė" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "svarbus" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "įrašyti į adresyną" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "komentarai" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Dar niekas nekomentavo." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Komentarai" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Atnaujinama..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Atnaujinti" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Sekcija" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Padalinys" @@ -198,12 +185,12 @@ msgid "Default Browser" msgstr "Numatytoji GNOME naršyklė" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Nepavyko įvykdyti naršyklės komandos: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Paleidžiama: „%s“" @@ -213,7 +200,7 @@ msgid "Authorization Error" msgstr "Prieigos teisės klaida" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Nepavyksta sukurti podėlio katalogo „%s“!" @@ -243,75 +230,81 @@ msgid "%b %d %Y" msgstr "%Y %b %d" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "„%s“ nėra tinkama intarpų tipų konfigūracijos rinkmena!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "NEPAVYKO parsiųsti intarpo: „%s“" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Baigta parsiųsti intarpą: „%s“" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Klaida %s pervadinant į %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "XML klaida skaitant OPML rinkmeną! Negalima importuoti „%s“!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "" "Tuščias dokumentas! Importuotinas OPML dokumentas „%s“ neturėtų būti tuščias." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "„%s“ nėra tinkamas OPML dokumentas! „Liferea“ negali importuoti šios " "rinkmenos!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Importuotas naujienų kanalų sąrašas" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importuoti kanalų sąrašą" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importuoti" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 msgid "OPML Files" msgstr "" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Klaida eksportuojant naujienų kanalų sąrašą!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Naujienų kanalų sąrašas eksportuotas!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Eksportuoti naujienų kanalų sąrašą" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Eksportuoti" @@ -363,116 +356,104 @@ msgstr "Nepavyksta apibrėžti naujienų kanalo tipo." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "Nėra nėra neskaitytų straipsnių " -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" msgstr "" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Rodyti informaciją apie versiją ir išeiti" -#: ../src/main.c:180 +#: ../src/main.c:166 #, fuzzy msgid "Add a new subscription" msgstr "Nauja prenumerata" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Rodyti visus derinimo pranešimus" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "Rodyti derinimo pranešimus, susijusius su podėlio apdorojimu" -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr "Rodyti derinimo pranešimus, susijusius su konfigūracijos apdorojimu" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "Rodyti derinimo pranešimus, susijusius su duomenų bazės apdorojimu" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "Rodyti derinimo pranešimus, susijusius su grafine sąsaja" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "Rodyti visus derinimo pranešimus, susijusius su tinklo veikla" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "Rodyti visus derinimo pranešimus, susijusius su analizavimu" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "Rodyti derinimo pranešimus, jei funkcija atliekama pernelyg ilgai" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Rodyti derinimo pranešimus apie įėjimą/išėjimą iš funkcijų" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "Rodyti derinimo pranešimus, susijusius su naujienų kanalo atnaujinimu" -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr "Rodyti derinimo pranešimus, susijusius su podėlio apdorojimu" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "Rodyti nurodytos temos derinimo pranešimus" -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, Linux programa naujienų kanalų skaitymui" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" -"Daugiau informacijos rasite apsilankę http://liferea.sourceforge.net/ " +"Daugiau informacijos rasite apsilankę http://lzone.de/liferea/ " "svetainėje." -#: ../src/migrate.c:340 -#, 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 "" -"Ši „Liferea“ programos versija naudoja naują podėlio formatą, seni duomenys " -"jau konvertuoti į naująjį formatą. Podėlio turinys (%s) nebuvo automatiškai " -"pašalintas. Kai įsitikinsite, kad duomenys sėkmingai perkelti, šį aplanką " -"pašalinkite savarankiškai!" - #. Some libsoup transport errors #: ../src/net.c:320 msgid "The update request was cancelled" @@ -639,71 +620,71 @@ msgid "Feed title" msgstr "Naujienų kanalo pavadinimas" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "„%s“ prenumerata jau atnaujinta!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "„%s“ prenumerata nebegalima. „Liferea“ jos nebeatnaujins!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Atnaujinti „%s“ ženkliuką" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." msgstr "" "Klaida skaitant prenumeratą. Patikrinkite URL ir žiūrėkite išvestį konsolėje." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "„%s“ URL negrįžtamai pasikeitė ir buvo atnaujintas" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "„%s“ nutraukė veiklą. „Liferea“ nebegalės atnaujinti!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "„%s“ pasikeitė po paskutinio atnaujinimo" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Atnaujinama: „%s“" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s baigimo kodas %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Klaida: nepavyksta atverti kanalo „%s“" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Klaida: nepavyksta atverti rinkmenos „%s“" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Klaida: nėra „%s“ rinkmenos" @@ -712,56 +693,54 @@ msgid "New Search Folder" msgstr "Naujas paieškos aplankas" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Buvo ir daugiau klaidų. Išvestis sutrumpinta!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "XML analizavimas: nepavyksta išanalizuoti dokumento:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Priedai" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d priedas" -msgstr[1] "%d priedai" -msgstr[2] "%d priedų" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " B" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d priedas" +msgstr[1] "%d priedai" +msgstr[2] "%d priedų" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Rinkmenos pasirinkimas" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, fuzzy, c-format msgid "File Extension .%s" msgstr "Rinkmenos prievardis .%s" @@ -771,7 +750,7 @@ msgid "Couldn't find pixmap file: %s" msgstr "" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" @@ -779,7 +758,7 @@ msgstr[1] " (%d nauji)" msgstr[2] " (%d naujų)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" @@ -787,337 +766,375 @@ msgstr[1] "%d neskaityti%s" msgstr[2] "%d neskaitytų%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Žinyno temos" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Trumpa informacija" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "D. U. K." -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "„Liferea“ programai šiuo metu leidžiama prisijungti prie interneto" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Atsijungti" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "„Liferea“ programai šiuo metu draudžiama prisijungti prie interneto" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Prisijungti" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Prenumeratos" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "Viską _atnaujinti" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Atnaujinti visas prenumeratas." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Visus žymėti _skaitytais" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Pažymėti visų prenumeratų visus straipsnius." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Importuoti kanalų sąrašą..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importuoti OPML naujienų kanalų sąrašą." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Eksportuoti kanalų sąrašą..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Eksportuoti naujienų kanalų sąrašą kaip OPML" -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Baigti" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Kanalas" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Pašalinti _visus" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Pašalinti visus pasirinkto naujienų kanalo straipsnius." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_Straipsnis" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "_Tolesnis neskaitytas" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "_Tolesnis neskaitytas" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "Ro_dymas" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "Pa_didinti teksto dydį" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Padidinti rodinio teksto dydį." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "Su_mažinti teksto dydį" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Sumažinti rodinio teksto dydį." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "Į_rankiai" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "_Atnaujinimo stebėjimas" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "Rodo visus atnaujinimo eilėje esančius naujienų kanalų sąrašą" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Nuostatos" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Keisti nuostatas" -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "Pa_ieška" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Ieškoti visuose naujienų kanaluose..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Rodyti paieškos dialogo langą." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Pagalba" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Turinys" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Rodyti šios programos žinyną." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Trumpa informacija" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Rodyti visus „Liferea“ sparčiuosius klavišus." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_D. U. K." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Rodyti dažniausiai užduodamus klausimus." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_Apie" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Rodyti dialogo langą apie programą." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "_Normalus rodinys" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "_Platus rodinys" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Rodyti trijuose vertikaliuose polangiuose" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "_Bendras rodinys" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Rodyti dviejuose polangiuose" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "_Sutrumpintas kanalų sąrašas" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Slėpti naujienų kanalus, kuriuose nėra neskaitytų straipsnių." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "Nauja prenumerata..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Prenumeruoti naują naujienų kanalą" -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Naujas _aplankas..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Naujienų kanalų sąraše sukurti naują aplanką." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Naujas pa_ieškos aplankas..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Naujienų kanalų sąraše sukurti naują paieškos aplanką." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Naujas _šaltinis..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Pridėti naują kanalų sąrašo šaltinį." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "" -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "Žymėti _skaitytu" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "" -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Atnaujinti" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "" "Atnaujini pasirinktą prenumeratą arba visas pasirinkto aplanko prenumeratas." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "_Savybės..." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Atverti pasirinktos prenumeratos savybių dialogą." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "Pa_šalinti" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Nutraukti pasirinktą prenumeratą." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Keisti _skaitymo būseną" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Pakeisti pasirinkto straipsnio skaitymo būseną." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Keisti straipsnio s_varbumą" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Pakeisti pasirinkto straipsnio svarbumo būseną." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "Pa_šalinti" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Pašalinti pasirinktą straipsnį." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Straipsnio nuorodą atveria sukonfigūruotoje naršyklėje." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "Atverti _naršyklėje" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." +msgstr "Straipsnio nuorodą atveria sukonfigūruotoje naršyklėje." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Išorinės naršyklės nuostatos" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." msgstr "Straipsnio nuorodą atveria sukonfigūruotoje naršyklėje." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "Dirbti _neprisijungus" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Ši parinktis leidžia uždrausti prenumeratos atnaujinimą." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea – Linux naujienų kanalų skaitytuvė" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 #, fuzzy msgid "" "

    Welcome to Liferea, a desktop news aggregator for online news " @@ -1132,12 +1149,12 @@ "prenumerata“. Norėdami naršyti naujienų kanalo antraštes, pasirinkite kanalą " "naujienų kanalų sąraše; antraštes matysite dešiniame polangyje.

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Įveskite „%s“ (%s) naudotojo vardą ir slaptažodį:" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Nežinomas šaltinis" @@ -1168,251 +1185,252 @@ msgid "Liferea is in offline mode. No update possible." msgstr "„Liferea“ veikia neprisijungusia veiksena. Atnaujinti negalima." -#: ../src/ui/liferea_htmlview.c:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "NEPAVYKO parsiųsti intarpo: „%s“" - -#: ../src/ui/liferea_htmlview.c:437 +#: ../src/ui/liferea_htmlview.c:627 #, fuzzy -msgid "Download finished." -msgstr "_Parsiųsti naudojant" - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +msgid "Open Link In _Tab" msgstr "Nuorodą atverti _kortelėje" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "Nuorodą atverti _naršyklėje" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "Nuorodą atverti _naršyklėje" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "Įtraukti į %s _adresyną" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Kopijuoti nuorodą" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 #, fuzzy msgid "_Copy Image Location" msgstr "_Kopijuoti nuorodą" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 #, fuzzy msgid "S_ave Link As" msgstr "Įrašyti kaip..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Prenumeruoti..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Be pavadinimo ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Data" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Antraštė" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Nepažymėtas nei vienas straipsnis" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Šis straipsnis be nuorodos!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Nurodykite naujienų kanalą, kurio straipsnius norite pašalinti!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Straipsnį atverti _kortelėje" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "_Straipsnį atverti naršyklėje" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "_URL kopijuoti į iškarpinę" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "Įtraukti į %s _adresyną" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "_Kopijuoti nuorodą" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "_Pašalinti straipsnį" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Atverti intarpą..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Įrašyti kaip..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "Kopijuoti nuorodą" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "_Atnaujinti visus" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "_Rodyti „Liferea“" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "_Atnaujinti aplanką" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "_Visus žymėti skaitytais" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_Naujas" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "Nauja p_renumerata..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "Naujas _šaltinis" -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 #, fuzzy msgid "Sort Feeds" msgstr "Importuoti kanalų sąrašą" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "Nauja prenumerata..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "GNOME numatytoji" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Tekstas po ženkliukais" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Tekstas šalia ženkliukų" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Tik ženkliukai" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Tik tekstas" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "min." -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "val." -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "d." -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Tarpas" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr "Vald + tarpas" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr "Alt + tarpas" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Pasirinkite parsiuntimo katalogą" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "_Normalus rodinys" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "_Platus rodinys" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "_Bendras rodinys" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "(Kita)" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "numatytojoje naršyklėje" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "esamame lange" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "naujame lange" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "naujoje kortelėje" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 #, fuzzy msgid "Terminate instead of minimizing to the messaging menu" msgstr "_Baigti, o ne nuleisti į sistemos dėklą." -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Tipas" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Programa" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1426,7 +1444,7 @@ msgid "This feed specifies no default update interval." msgstr "Šis naujienų kanalas neturi numatytojo atnaujinimo intervalo." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "" @@ -1481,7 +1499,7 @@ msgid "%b %d %H:%M" msgstr "" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1491,11 +1509,11 @@ msgid "Google Reader login failed!" msgstr "" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1524,29 +1542,22 @@ msgid "No feed list source types found!" msgstr "" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:269 msgid "Source Type" msgstr "Šaltinio tipas" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " "present your tt-rss subscriptions, and will synchronize your feed list and " "reading lists." msgstr "" -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1616,8 +1627,7 @@ msgid "Please enter your Google Reader account settings." msgstr "" -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Slaptažodis" @@ -1641,7 +1651,7 @@ msgid "combined view" msgstr "bendras rodinys" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Antraštės" @@ -1693,7 +1703,7 @@ msgstr "Bendra" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 #, fuzzy msgid "Feed Source" msgstr "Naujienų kanalo šaltinis" @@ -1804,470 +1814,524 @@ msgstr "Sudėtingiau" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Liferea nuostatos" +msgid "New Folder" +msgstr "Naujas aplankas" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "_Aplanko pavadinimas" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Numatytasis naujienų kanale saugomų straipsnių _skaičius:" +msgid "Rename" +msgstr "Pervadinti" #: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "Naujienų kanalų atnaujinimas" +msgid "_New Name:" +msgstr "_Naujas pavadinimas:" #: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Atnaujinti visas prenumeratas." +msgid "Search Folder Properties" +msgstr "Paieškos aplanko savybės" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Numatytasis kanalo atnaujinimo _intervalas:" +msgid "Search _Name:" +msgstr "_Paieškos pavadinimas:" + +#: ../glade/liferea.ui.h:54 +#, fuzzy +msgid "Find Items that meet the following criteria" +msgstr "Ieškoti straipsnių pagal nurodytus kriterijus" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" +msgid "A_ny Rule Matches" +msgstr "Atitinka _bent vieną taisyklę" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Naujienų kanalai" +msgid "_All Rules Must Match" +msgstr "Atitinka _visas taisykles" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "Aplankų rodymo nuostatos" +msgid "Open Enclosure" +msgstr "Atverti intarpą..." #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "" +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Parsiuntimas intarpų, kurių tipas yra:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "_Slėpti perskaitytus straipsnius." +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" #: ../glade/liferea.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Naujienų kanalų ženkliukai" +msgid "_Browse" +msgstr "_Naršyti" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_Atnaujinti visus ženkliukus dabar" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "Nuo šiol taip _elgtis su visais tokio tipo intarpais." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Aplankai" +msgid "Search All Feeds" +msgstr "Paieška visuose naujienų kanaluose" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "neskaitytos antraštės" +msgid "_Search for:" +msgstr "_Ko ieškoti:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." msgstr "" #: ../glade/liferea.ui.h:65 -#, fuzzy -msgid "Web Integration" -msgstr "Orientacija" +msgid "_Advanced..." +msgstr "_Sudėtingiau..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." msgstr "" #: ../glade/liferea.ui.h:67 -#, fuzzy -msgid "Internal Browser Settings" -msgstr "Vidinės naršyklės nuostatos" +msgid "Update Monitor" +msgstr "Atnaujinimo stebėjimas" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Nuorodas atverti „Liferea“ lange." +#, fuzzy +msgid "Pending Requests" +msgstr "Laukiančios užklausos" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Uždrausti „JavaScript“." +#, fuzzy +msgid "Downloading Now" +msgstr "Šiuo metu parsiunčiama" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "Įgalinti _naršyklių papildinius." +msgid "Cancel _All" +msgstr "_Atšaukti visus" #: ../glade/liferea.ui.h:71 -#, fuzzy -msgid "External Browser Settings" -msgstr "Išorinės naršyklės nuostatos" +msgid "Create News Bin" +msgstr "" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "Nuorodą _atverti:" +msgid "_News Bin Name:" +msgstr "" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Apie" #: ../glade/liferea.ui.h:74 -#, no-c-format +#, fuzzy msgid "" -"_Manual:\n" -"(%s for URL)" -msgstr "" -"_Kita:\n" -"(%s žymi URL)" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" +"Autorinės teisės (c) 2003-2009\n" +"Liferea komanda\n" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "„Liferea“ yra sklaidos kanalų skaitytuvė" + +#: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "Liferea puslapis" + +#: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "Sudėtingesnė paieška" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "_Kurti paieškos aplanką..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Sukurti paieškos sistemos naujienų kanalą" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "įveskite bet kokį norimą paieškos tekstą" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "" + +#: ../glade/liferea.ui.h:84 +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/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "Parsiuntimas / galutinis apdorojimas" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Šaltinio pasirinkimas" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Norimo pridėti šaltinio tipo pasirinkimas..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Pridėti OPML/Planetą" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "Nurodykite OPML naujienų kanalo sąrašo vietinę rinkmeną arba URL" + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Vieta" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "_Pasirinkti rinkmeną" + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "" + +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "" + +#: ../glade/ttrss_source.ui.h:3 +#, fuzzy +msgid "_Server URL" +msgstr "Serverio klaida" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "_Naudotojo vardas" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Sudėtingiau..." + +#: ../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 "" + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Liferea nuostatos" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Numatytasis naujienų kanale saugomų straipsnių _skaičius:" + +#: ../glade/prefs.ui.h:4 +#, fuzzy +msgid "Feed Update Settings" +msgstr "Naujienų kanalų atnaujinimas" + +#: ../glade/prefs.ui.h:5 +#, fuzzy +msgid "_Update all subscriptions at startup." +msgstr "Atnaujinti visas prenumeratas." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Numatytasis kanalo atnaujinimo _intervalas:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Naujienų kanalai" + +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "Aplankų rodymo nuostatos" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "" + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "_Slėpti perskaitytus straipsnius." + +#: ../glade/prefs.ui.h:13 +#, fuzzy +msgid "Feed Icons (Favicons)" +msgstr "Naujienų kanalų ženkliukai" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Atnaujinti visus ženkliukus dabar" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Aplankai" + +#: ../glade/prefs.ui.h:16 +#, fuzzy +msgid "Reading Headlines" +msgstr "neskaitytos antraštės" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +#, fuzzy +msgid "Web Integration" +msgstr "Orientacija" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "" + +#: ../glade/prefs.ui.h:22 +#, fuzzy +msgid "Internal Browser Settings" +msgstr "Vidinės naršyklės nuostatos" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Nuorodas atverti „Liferea“ lange." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Uždrausti „JavaScript“." -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "Įgalinti _naršyklių papildinius." + +#: ../glade/prefs.ui.h:26 +#, fuzzy +msgid "External Browser Settings" +msgstr "Išorinės naršyklės nuostatos" + +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "Nuorodą _atverti:" + +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "(Kita)" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "" + +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Naršyklė:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Naršyklė" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 #, fuzzy msgid "Notification Settings" msgstr "Informavimo nuostatos" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "" -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "" -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "" -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Baigti, o ne nuleisti į sistemos dėklą." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "Paleisti _sistemos dėkle" -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 #, fuzzy msgid "Toolbar Settings" msgstr "_Mygtukų juostos etiketės:" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "_Slėpti mygtukų juostą" -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "_Mygtukų juostos etiketės:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "Grafinė sąsaja" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "_Aptikti automatiškai (GNOME arba aplinkos)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "_Nenaudoti įgaliotojo serverio" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "_Savita nuostata" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "Prieva_das:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "Įgaliotasis ser_veris:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Nurodyti tapatybę jungiantis prie įgaliotojo _serverio" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "_Slaptažodis:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "_Naudotojo vardas:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Įgaliotasis serveris" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 #, fuzzy msgid "Downloading Enclosures" msgstr "Intarpų parsiuntimas" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Naršyti" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Siuntinius rašyti į" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Parsiųsti naudojant" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 #, fuzzy msgid "Opening Enclosures" msgstr "Atverti intarpą..." -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Intarpai" -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "_Paslaugos pavadinimas" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Sinchronizavimas" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Naujas aplankas" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Aplanko pavadinimas" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Pervadinti" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Naujas pavadinimas:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Paieškos aplanko savybės" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "_Paieškos pavadinimas:" - -#: ../glade/liferea.ui.h:115 -#, fuzzy -msgid "Find Items that meet the following criteria" -msgstr "Ieškoti straipsnių pagal nurodytus kriterijus" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "Atitinka _bent vieną taisyklę" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "Atitinka _visas taisykles" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Intarpų parsiuntimas" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Parsiuntimas intarpų, kurių tipas yra:" - -#: ../glade/liferea.ui.h:120 -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:" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "" +#~ msgid "Download and view feeds" +#~ msgstr "Parsiųskite ir skaitykite naujienas" -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "Nuo šiol taip _elgtis su visais tokio tipo intarpais." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Paieška visuose naujienų kanaluose" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Ko ieškoti:" +#~ msgid "You may want to validate the feed using" +#~ msgstr "Naujienų kanalą galite patikrinti naudodami" -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Straipsnį atverti _kortelėje" -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "_Sudėtingiau..." +#~ msgid "_Launch Item In Browser" +#~ msgstr "_Straipsnį atverti naršyklėje" -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "_URL kopijuoti į iškarpinę" -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Atnaujinimo stebėjimas" +#~ msgid "flag" +#~ msgstr "svarbus" -#: ../glade/liferea.ui.h:129 -#, fuzzy -msgid "Pending Requests" -msgstr "Laukiančios užklausos" +#~ msgid "bookmark" +#~ msgstr "įrašyti į adresyną" -#: ../glade/liferea.ui.h:130 -#, fuzzy -msgid "Downloading Now" -msgstr "Šiuo metu parsiunčiama" +#~ msgid "comments" +#~ msgstr "komentarai" -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "_Atšaukti visus" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "NEPAVYKO parsiųsti intarpo: „%s“" -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Baigta parsiųsti intarpą: „%s“" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Apie" +#~ 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 "" +#~ "Ši „Liferea“ programos versija naudoja naują podėlio formatą, seni " +#~ "duomenys jau konvertuoti į naująjį formatą. Podėlio turinys (%s) nebuvo " +#~ "automatiškai pašalintas. Kai įsitikinsite, kad duomenys sėkmingai " +#~ "perkelti, šį aplanką pašalinkite savarankiškai!" -#: ../glade/liferea.ui.h:135 #, fuzzy -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Autorinės teisės (c) 2003-2009\n" -"Liferea komanda\n" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "„Liferea“ yra sklaidos kanalų skaitytuvė" - -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Liferea puslapis" - -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Sudėtingesnė paieška" - -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "_Kurti paieškos aplanką..." - -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Sukurti paieškos sistemos naujienų kanalą" - -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "įveskite bet kokį norimą paieškos tekstą" - -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "" +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "NEPAVYKO parsiųsti intarpo: „%s“" -#: ../glade/liferea.ui.h:145 -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/new_subscription.ui.h:9 #, fuzzy -msgid "Download / Postprocessing" -msgstr "Parsiuntimas / galutinis apdorojimas" +#~ msgid "Download finished." +#~ msgstr "_Parsiųsti naudojant" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Šaltinio pasirinkimas" +#~ msgid "Choose download directory" +#~ msgstr "Pasirinkite parsiuntimo katalogą" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Norimo pridėti šaltinio tipo pasirinkimas..." - -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Pridėti OPML/Planetą" - -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "Nurodykite OPML naujienų kanalo sąrašo vietinę rinkmeną arba URL" - -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Vieta" - -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "_Pasirinkti rinkmeną" - -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "" - -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "" - -#: ../glade/ttrss_source.ui.h:3 -#, fuzzy -msgid "_Server URL" -msgstr "Serverio klaida" - -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "_Naudotojo vardas" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Kita:\n" +#~ "(%s žymi URL)" + +#~ msgid "_Save downloads in" +#~ msgstr "_Siuntinius rašyti į" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" +#~ msgid "_Service Name" +#~ msgstr "_Paslaugos pavadinimas" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Sudėtingiau..." +#~ msgid "Sync" +#~ msgstr "Sinchronizavimas" -#~ msgid "You may want to validate the feed using" -#~ msgstr "Naujienų kanalą galite patikrinti naudodami" +#~ msgid "Downloading Enclosure" +#~ msgstr "Intarpų parsiuntimas" #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " diff -Nru liferea-1.8.15/po/lv.po liferea-1.10.3/po/lv.po --- liferea-1.8.15/po/lv.po 2013-06-24 22:16:16.000000000 +0200 +++ liferea-1.10.3/po/lv.po 2013-07-31 23:29:12.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: liferea-1.8-rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-04-27 14:08+0300\n" "PO-Revision-Date: 2012-08-06 12:36+0300\n" "Last-Translator: Rihards Priedītis \n" "Language-Team: Latvian \n" @@ -23,8 +23,7 @@ "X-Poedit-Language: Latvian\n" "X-Poedit-Country: LATVIA\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -37,8 +36,8 @@ msgstr "Liferea plūsmu lasītājs" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Lejupielādēt un lasīt plūsmas" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -146,38 +145,26 @@ msgstr "Veidotājs" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "atzīme" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "grāmatzīme" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "komentāri" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Vēl nav komentāru." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Komentāri" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Atjaunina..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Atsvaidzināt" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Sadaļa" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Nodaļa" @@ -201,12 +188,12 @@ msgid "Default Browser" msgstr "Noklusētais pārlūks" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Pārlūka komanda cieta neveiksmi — %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Palaiž: “%s”" @@ -216,7 +203,7 @@ msgid "Authorization Error" msgstr "Pilnvarošanas kļūda" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Nevar izveidot kešatmiņas mapi “%s”!" @@ -246,72 +233,78 @@ msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "“%s“ nav derīgs ietvara veids konfigurācijas datnei!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Neizdevās lejupielādēt ietvaru — “%s”" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Pabeigta ietvara lejupielāde — “%s”" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Kļūda, pārsaucot %s uz %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "XML kļūda, nolasot OPML datni! Nevarēja importēt “%s”!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "Tukšs dokuments! OMPL dokumentam “%s” nevajadzētu būt tukšam." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "“%s” nav derīgs OMPL dokuments! Liferea nevar importēt šo datni!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Importēto plūsmu saraksts" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importēt plūsmu sarakstu" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importēt" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 msgid "OPML Files" msgstr "OPML datnes" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Kļūda, eksportējot plūsmu sarakstu!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Plūsmu saraksts ir eksportēts!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Eksportēt plūsmu sarakstu" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Eksportēt" @@ -367,11 +360,11 @@ msgstr "Nevarēja noteikt plūsmas tipu." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "Nav nelasītu vienumu " -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" @@ -379,101 +372,89 @@ "Palaist Liferea ar tā galveno logu stāvoklī STATE. STATE var būt “shown”, " "“iconified” vai “hidden”" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "STATE" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Parādīt informāciju par versiju un iziet" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "Add a new subscription" msgstr "Pievienot jaunu abonementu" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "uri" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Izdrukāt atkļūdošanas ziņojumus visiem tipiem" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "Izdrukāt atkļūdošanas ziņojumus kešatmiņas apstrādāšanai" -#: ../src/main.c:187 +#: ../src/main.c:173 msgid "Print debugging messages for the configuration handling" msgstr "Izdrukāt atkļūdošanas ziņojumus konfigurācijas apstrādāšanai" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "Izdrukāt atkļūdošanas ziņojumus datubāzes apstrādāšanai" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "Izdrukāt atkļūdošanas ziņojumus visām GUI funkcijām" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" "Aktivē HTML renderēšanas atkļūdošanu. Katru reizi, kad Liferea renderē HTML " -"izvadu, tas novieto HTML datnē ~/.liferea_1.8/output.xhtml" +"izvadu, tas novieto HTML datnē ~/.cache/liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "Izdrukāt atkļūdošanas ziņojumus visām tīkla aktivitātēm" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "Izdrukāt atkļūdošanas ziņojumus visām parsēšanas funkcijām" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "Izdrukāt atkļūdošanas ziņojumus, kad funkcija aizņem pārāk daudz laika" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Izdrukāt atkļūdošanas ziņojumus, kad ieiet/pamet funkcijas" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "Izdrukāt atkļūdošanas ziņojumus par plūsmu atjaunināšanas apstrādi" -#: ../src/main.c:196 +#: ../src/main.c:182 msgid "Print debugging messages of the search folder matching" msgstr "Izdrukāt atkļūdošanas ziņojumus atbilstošām meklēšanas mapēm" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Izdrukāt detalizētus atkļūdošanas ziņojumus" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "Izdrukāt atkļūdošanas ziņojumus dotajam tematam" -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, Linux plūsmu lasītājs" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "Lai uzzinātu vairāk, apmeklējiet http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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 "" -"Šī Liferea versija izmanto jaunu kešatmiņas formātu, un ir migrējusi jūsu " -"plūsmu kešatmiņu. %s kešatmiņas saturs netika automātiski izdzēsts. Lūdzu, " -"izņemiet šo mapi manuāli, kad būsiet pārliecināts, ka migrēšana ir " -"izdevusies!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Lai uzzinātu vairāk, apmeklējiet http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -641,23 +622,23 @@ msgid "Feed title" msgstr "Barotnes virsraksts" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Abonements “%s” jau tiek atjaunināts!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "Abonements “%s” vairs nav pieejams. Liferea to vairs neatjauninās!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Atjaunina “%s” favicon ikonu" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -665,48 +646,48 @@ "Lasot šo abonementu, radās problēma. Lūdzu, pārbaudiet URL un konsoles " "izvadi." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "“%s” URL ir mainīts pastāvīgi un tika atjaunināts" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "“%s” ir pārtraukts. Liferea to vairs neatjauninās!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "“%s” nav mainīts kopš iepriekšējās atjaunināšanas" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Atjaunina “%s”" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Kļūda, atverot pagaidu datni %s, lai to izmantotu filtrēšanai!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s izgāja ar statusu %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Kļūda — nevarēja atvērt konveijeru “%s”" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Kļūda — nevarēja atvērt datni “%s”" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Kļūda — nav datnes “%s”" @@ -715,56 +696,54 @@ msgid "New Search Folder" msgstr "Jauna meklēšanas mape" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Bija vairākas kļūdas. Izvade ir saīsināta!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "XML parsētājs — neizdevās analizēt dokumentu:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Pielikumi" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d pielikums" -msgstr[1] "%d pielikumi" -msgstr[2] "%d pielikumu" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " Baiti" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d pielikums" +msgstr[1] "%d pielikumi" +msgstr[2] "%d pielikumu" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Izvēlieties datni" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "Datnes paplašinājums .%s" @@ -774,7 +753,7 @@ msgid "Couldn't find pixmap file: %s" msgstr "Nevarēja atrast bitkartes datni — %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" @@ -782,7 +761,7 @@ msgstr[1] " (%d jauni)" msgstr[2] " (%d jaunu)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" @@ -790,338 +769,376 @@ msgstr[1] "%d nelasītas%s" msgstr[2] "%d nelasītu%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Palīdzības tēmas" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Ātrā rokasgrāmata" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "BUJ" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea ir tiešsaistē" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Strādāt bezsaitē" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea ir bezsaitē" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Strādāt tiešsaistē" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Abonementi" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "_Atjaunināt visus" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Atjaunina visus abonementus." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Atzīmēt visus kā _lasītus" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Atzīmē kā lasītus visus vienumus katrā abonementā." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Importēt plūsmu sarakstu..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importē OPML plūsmu sarakstu." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Eksportēt plūsmu sarakstu..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Eksportē plūsmu sarakstu kā OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Iziet" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Plūsma" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Izņemt _visus vienumus" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Izņem visus vienumus no pašlaik izvēlētās plūsmas." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "V_ienums" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "_Nākamais nelasītais" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "_Nākamais nelasītais" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Skats" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "Pal_ielināt teksta izmēru" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Palielina teksta izmēru vienumu skatā." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_Samazināt teksta izmēru" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Samazina teksta izmēru vienumu skatā." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "_Rīki" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "Atjaunināšanas _uzraugs" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "Rādīt sarakstu ar visām plūsmām, kas atrodas atjaunināšanas rindā" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Iestatījumi" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Rediģēt iestatījumus." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "M_eklēt" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Meklēt visās plūsmās..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Rādīt meklēšanas dialogu." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Palīdzība" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Saturs" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Skatīt šīs lietotnes palīdzību." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Ātrā atsauce" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Skatīt sarakstu ar visiem Liferea īsceļiem." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_BUJ" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Skatīt šīs lietotnes BUJ." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "P_ar" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Parāda informāciju par programmu." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "_Normāls skats" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Iestatīt skata režīmu uz pasta klienta režīmu." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "_Plašs skats" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Iestatīt skatīšanas režīmu uz trīs vertikālām rūtīm." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "_Kombinētais skats" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Iestatīt skatīšanas režīmu uz divu rūšu režīmu." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "_Reducētais plūsmu saraksts" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Slēpt plūsmas ar nelasītiem vienumiem." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "Jau_ns abonements..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Pievieno abonementu plūsmu sarakstam." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Jauna _mape..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Pievieno mapi plūsmu sarakstam." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Jauna m_eklēšanas mape..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Pievieno jaunu meklēšanas mapi plūsmu sarakstam." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Jaun_s avots..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Pievieno jaunu plūsmas saraksta avotu." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "Jau_ns ziņu grozs..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Pievieno jaunu ziņu grozu." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "Atzī_mēt kā lasītus" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "" "Atzīmē visus vienumus izvēlētajā plūsmas saraksta mezglā / vienumu sarakstā " "kā lasītus." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "Atja_unināt" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "Atjaunina izvēlētos abonementus vai visus abonementus izvēlētajā mapē." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "Ī_pašības" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Atver īpašību dialogu izvēlētajiem abonementiem." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "_Izņemt" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Izņem izvēlēto abonementu." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Pā_rslēgt lasīšanas statusu" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Pārslēdz lasīšanas statusu izvēlētajiem vienumiem." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Pārslēgt vienuma _atzīmi" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Pārslēdz atzīmes statusu izvēlētajam vienumam." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "Izņ_emt" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Izņem izvēlēto vienumu." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Atver vienuma saiti nokonfigurētajā pārlūkā." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "Atvērt pār_lūkā" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." +msgstr "Atver vienuma saiti nokonfigurētajā pārlūkā." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Ārējā pārlūka iestatījumi" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." msgstr "Atver vienuma saiti nokonfigurētajā pārlūkā." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "_Strādāt bezsaitē" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Šī opcija atļauj deaktivēt abonementu atjaunināšanu." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea – Linux plūsmu lasītājs" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 msgid "" "

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

    You can add new subscriptions

    • From main menu " @@ -1135,12 +1152,12 @@ "saiti uz abonementu sarakstu,
    • Liferea programmā veicot labo peles " "klikšķi uz saites un izvēloties “Abonēt”.

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Ievadiet “%s” lietotāja vārdu un paroli (%s):" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Nezināms avots" @@ -1170,246 +1187,248 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea ir bezsaites režīmā. Nevar veikt atjaunināšanu." -#: ../src/ui/liferea_htmlview.c:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Neizdevās lejupielādēt — “%s”" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "Lejupielāde pabeigta." - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +#: ../src/ui/liferea_htmlview.c:627 +#, fuzzy +msgid "Open Link In _Tab" msgstr "Atvērt sai_ti cilnē" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "Atvērt saiti pār_lūkā" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "Atvērt saiti pār_lūkā" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "Ie_grāmatot saiti %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Kopēt saites adresi" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 msgid "_Copy Image Location" msgstr "_Kopēt attēla adresi" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 msgid "S_ave Link As" msgstr "S_aglabāt saiti kā" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "S_aglabāt attēlu kā" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Abonēt..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Nav virsraksta ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Datums" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Virsraksts" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Nav izvēlētu vienumu" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Šim vienumam nav norādīta saite!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Jums jāizvēlas plūsma, lai dzēstu tās vienumus!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Atvēr_t vienumu cilnē" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "Atvērt vienumu pār_lūkā" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "Kopēt uz ziņu grozu" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Kopēt vienumu _URL starpliktuvē" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "Ie_grāmatot saiti %s" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "_Kopēt attēla adresi" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "Izņ_emt vienumu" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Atvērt ietvaru..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Saglabāt kā..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "Kopēt saites vietu" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "_Atjaunināt visas" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "_Rādīt Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "Atja_unināt mapi" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "Atzī_mēt visas kā lasītas" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "Jau_ns" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "Jaun_s abonements..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "Jauns av_ots..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 msgid "Sort Feeds" msgstr "Sakārtot plūsmas" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "Pā_rbūvēt" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "Jau_ns abonements..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(Tukšs)" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "GNOME noklusētais" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Teksts zem ikonām" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Teksts blakus ikonām" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Tikai ikonas" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Tikai teksts" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minūtes" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "stundas" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "dienas" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Atstarpe" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Atstarpe" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Atstarpe" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Izvēlieties lejupielādes mapi" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "_Normāls skats" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "_Plašs skats" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "_Kombinētais skats" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:505 msgid "Manual" msgstr "Manuāli" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:520 msgid "Browser default" msgstr "Pārlūka noklusējums" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:523 msgid "Existing window" msgstr "Esošs logs" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:526 msgid "New window" msgstr "Jauns logs" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:529 msgid "New tab" msgstr "Jauna cilne" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:688 msgid "Integrate with the messaging menu (indicator)" msgstr "Integrēt ar ziņojumu izvēlni (indikatoru)" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:691 msgid "Terminate instead of minimizing to the messaging menu" msgstr "Izslēgt, nevis minimizēt ziņojumu izvēlnē" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:694 msgid "Start minimized to the messaging menu" msgstr "Palaist minimizētu ziņojumu izvēlnē" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:794 msgid "Type" msgstr "Veids" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:797 msgid "Program" msgstr "Programma" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "(Tukšs)" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1423,7 +1442,7 @@ msgid "This feed specifies no default update interval." msgstr "Plūsma nenorāda noklusēto atjaunināšanas intervālu." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "Nenosaukts" @@ -1478,7 +1497,7 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1488,11 +1507,11 @@ msgid "Google Reader login failed!" msgstr "Google Reader pieteikšanās neizdevās!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1526,22 +1545,15 @@ msgid "No feed list source types found!" msgstr "Nav atrasti plūsmas saraksta avota tipi!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:269 msgid "Source Type" msgstr "Avota veids" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:367 msgid "Tiny Tiny RSS" msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:368 msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " "present your tt-rss subscriptions, and will synchronize your feed list and " @@ -1551,7 +1563,7 @@ "attēlos tt-rss abonementus un sinhronizēs plūsmu sarakstu un lasīšanas " "sarakstus. " -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:111 msgid "Could not parse JSON returned by tt-rss API!" msgstr "Nevarēja parsēt JSON, atgriezta tt-rss API!" @@ -1621,8 +1633,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Lūdzu, ievadiet sava Google Reader konta iestatījumus." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Parole" @@ -1646,7 +1657,7 @@ msgid "combined view" msgstr "kombinētais skats" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Virsraksti" @@ -1696,7 +1707,7 @@ msgstr "Vispārīgi" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Plūsmas avots" @@ -1811,363 +1822,127 @@ msgstr "Paplašināti" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Liferea iestatījumi" +msgid "New Folder" +msgstr "Jauna mape" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "Plūsmu kešatmiņas apkalpošana" +msgid "_Folder name:" +msgstr "_Mapes nosaukums:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "_Noklusētais vienumu skaits plūsmai, ko saglabāt:" +msgid "Rename" +msgstr "Pārsaukt" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "Plūsmas atjaunināšanas iestatījumi" +msgid "_New Name:" +msgstr "Ja_uns nosaukums:" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "_Atjaunināt visus abonementus palaižoties." +msgid "Search Folder Properties" +msgstr "Meklēt mapes īpašībās" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Noklusētais plūsmas atsvaidzināšanas _intervāls:" +msgid "Search _Name:" +msgstr "Meklēt _nosaukumu:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "Atrast vienumus, kas atbilst sekojošajiem kritērijiem" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"Piezīme — atcerieties iestatīt saprātīgus atsvaidzināšanas laikus. " -"Parasti plūsmu atjaunināšana biežāk kā reizi stundā ir tīkla resursu " -"izniekošana." +msgid "A_ny Rule Matches" +msgstr "Sakrīt kāds _noteikums" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Plūsmas" +msgid "_All Rules Must Match" +msgstr "Jās_akrīt visām kārtulām" #: ../glade/liferea.ui.h:57 -msgid "Folder Display Settings" -msgstr "Mapju attēlošanas iestatījumi" +#, fuzzy +msgid "Open Enclosure" +msgstr "Atvērt ietvaru..." #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "Rādīt vienumu_s visām apakšplūsmām, kad ir izvēlēta mape." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Lejupielādēt ietvaru ar tipu:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "Slēpt _lasītos vienumus." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"Ko Liferea vajadzētu darīt ar šo ietvaru? Lūdzu, zemāk ievadiet komandu, ko " +"vēlaties izpildīt. Lejupielādētie ietvari tiks padoti kā parametri šai " +"komandai:" #: ../glade/liferea.ui.h:60 -msgid "Feed Icons (Favicons)" -msgstr "Plūsmu ikonas (Favicon)" +msgid "_Browse" +msgstr "_Pārlūkot" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "Atja_unināt visas ikonas (favicon) tagad" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "Šā_diem ietvariem to turpmāk darīt automātiski." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Mapes" +msgid "Search All Feeds" +msgstr "Meklēt visās plūsmās" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" -msgstr "Lasa virsrakstus" +msgid "_Search for:" +msgstr "_Meklēt:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "Pārlapot rak_stus ar:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Ierakstiet meklēšanas virkni, ko Liferea vajadzētu atrast vai nu vienumu " +"virsrakstos vai to saturos." #: ../glade/liferea.ui.h:65 -msgid "Web Integration" -msgstr "Tīmekļa integrācija" +msgid "_Advanced..." +msgstr "P_aplašināti..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "Nosūtīt _grāmatzīmes uz" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"Sāk meklēt norādīto tekstu visās plūsmās. Meklēšanas rezultāti parādīsies " +"vienumu sarakstā." #: ../glade/liferea.ui.h:67 -msgid "Internal Browser Settings" -msgstr "Iekšējā pārlūka iestatījumi" +msgid "Update Monitor" +msgstr "Atjaunināšanas uzraugs" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Atvērt saites jaunā Liferea _logā." +msgid "Pending Requests" +msgstr "Gaidošie pieprasījumi" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Deaktivēt Javascript." +msgid "Downloading Now" +msgstr "Lejupielādēt tagad" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "_Aktivēt pārlūka spraudņus." +msgid "Cancel _All" +msgstr "_Atcelt visu" #: ../glade/liferea.ui.h:71 -msgid "External Browser Settings" -msgstr "Ārējā pārlūka iestatījumi" +msgid "Create News Bin" +msgstr "Izveidot ziņu grozu" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "Kur _atvērt saiti:" +msgid "_News Bin Name:" +msgstr "Ziņu groza _nosaukums:" -#: ../glade/liferea.ui.h:74 -#, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" -msgstr "" -"_Manuāli:\n" -"(%s URL)" - -#: ../glade/liferea.ui.h:76 -msgid "_Browser:" -msgstr "_Pārlūks:" - -#: ../glade/liferea.ui.h:77 -msgid "Browser" -msgstr "Pārlūks" - -#: ../glade/liferea.ui.h:78 -msgid "Notification Settings" -msgstr "Paziņojumu iestatījumi" - -#: ../glade/liferea.ui.h:79 -msgid "Show a _popup window with new headlines." -msgstr "Rādīt _uznirstošo logu ar jauniem virsrakstiem." - -#: ../glade/liferea.ui.h:80 -msgid "Show a status _icon in the notification area (system tray)." -msgstr "Rādīt statusa _ikonu paziņojumu laukā (sistēmas paplātē)." - -#: ../glade/liferea.ui.h:81 -msgid "Show _number of new items in the tray icon." -msgstr "Rādīt vienumu skaitu paplātes ikonā." - -#: ../glade/liferea.ui.h:82 -msgid "T_erminate instead of minimizing to tray icon." -msgstr "Izslēgt, n_evis minimizēt paplātes ikonā." - -#: ../glade/liferea.ui.h:83 -msgid "_Start in tray icon." -msgstr "Palai_st paplātes ikonā." - -#: ../glade/liferea.ui.h:84 -msgid "Toolbar Settings" -msgstr "Rīkjoslas iestatījumi" - -#: ../glade/liferea.ui.h:85 -msgid "_Hide toolbar." -msgstr "_Slēpt rīkjoslu." - -#: ../glade/liferea.ui.h:86 -msgid "Toolbar _button labels:" -msgstr "Rīkjoslas _pogu etiķetes:" - -#: ../glade/liferea.ui.h:87 -msgid "GUI" -msgstr "GUI" - -#: ../glade/liferea.ui.h:88 -msgid "HTTP Proxy Server" -msgstr "HTTP starpniekserveris" - -#: ../glade/liferea.ui.h:89 -msgid "_Auto Detect (GNOME or environment)" -msgstr "_Automātiski noteikt (GNOME vai vide)" - -#: ../glade/liferea.ui.h:90 -msgid "_No Proxy" -msgstr "_Nav starpniekservera" - -#: ../glade/liferea.ui.h:91 -msgid "_Manual Setting:" -msgstr "_Manuāli iestatījumi:" - -#: ../glade/liferea.ui.h:92 -msgid "Proxy _Port:" -msgstr "Starpnieka _ports:" - -#: ../glade/liferea.ui.h:93 -msgid "Proxy _Host:" -msgstr "Sta_rpniekserveris:" - -#: ../glade/liferea.ui.h:94 -msgid "Use Proxy Au_thentication" -msgstr "Izmantot starpniekservera _autentificēšanu" - -#: ../glade/liferea.ui.h:95 -msgid "Proxy Pass_word:" -msgstr "Starpnieka pa_role:" - -#: ../glade/liferea.ui.h:96 -msgid "Proxy _Username:" -msgstr "Starpnieka _lietotājvārds:" - -#: ../glade/liferea.ui.h:97 -msgid "Proxy" -msgstr "Starpniekserveris" - -#: ../glade/liferea.ui.h:98 -msgid "Downloading Enclosures" -msgstr "Lejupielādēt ietvarus" - -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Pārlūkot" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Saglabāt lejupielādes mapē" - -#: ../glade/liferea.ui.h:101 -msgid "_Download using" -msgstr "Lejupielā_dēt izmantojot" - -#: ../glade/liferea.ui.h:102 -msgid "Opening Enclosures" -msgstr "Atver ietvarus" - -#: ../glade/liferea.ui.h:103 -msgid "Enclosures" -msgstr "Ietvari" - -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "Sinhronizēts ar Nearby Hosts" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_Aktivēt lokālā tīkla sinhronizāciju" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "_Servisa nosaukums" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Sinhronizēt" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Jauna mape" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Mapes nosaukums:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Pārsaukt" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "Ja_uns nosaukums:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Meklēt mapes īpašībās" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "Meklēt _nosaukumu:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "Atrast vienumus, kas atbilst sekojošajiem kritērijiem" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "Sakrīt kāds _noteikums" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "Jās_akrīt visām kārtulām" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Lejupielādēt ietvaru" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Lejupielādēt ietvaru ar tipu:" - -#: ../glade/liferea.ui.h:120 -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 "" -"Ko Liferea vajadzētu darīt ar šo ietvaru? Lūdzu, zemāk ievadiet komandu, ko " -"vēlaties izpildīt. Lejupielādētie ietvari tiks padoti kā parametri šai " -"komandai:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Padot URL un nelejupielādēt ietvaru." - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "Šā_diem ietvariem to turpmāk darīt automātiski." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Meklēt visās plūsmās" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Meklēt:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Ierakstiet meklēšanas virkni, ko Liferea vajadzētu atrast vai nu vienumu " -"virsrakstos vai to saturos." - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "P_aplašināti..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Sāk meklēt norādīto tekstu visās plūsmās. Meklēšanas rezultāti parādīsies " -"vienumu sarakstā." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Atjaunināšanas uzraugs" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "Gaidošie pieprasījumi" - -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "Lejupielādēt tagad" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "_Atcelt visu" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Izveidot ziņu grozu" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "Ziņu groza _nosaukums:" - -#: ../glade/liferea.ui.h:134 +#: ../glade/liferea.ui.h:73 msgid "About" msgstr "Par" -#: ../glade/liferea.ui.h:135 +#: ../glade/liferea.ui.h:74 msgid "" "Copyright (c) 2003-2012\n" "The Liferea Team\n" @@ -2175,35 +1950,35 @@ "Autortiesības (c) 2003-2012\n" "Liferea komanda\n" -#: ../glade/liferea.ui.h:138 +#: ../glade/liferea.ui.h:77 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea ir ziņu sakopotājs GTK+ videi" -#: ../glade/liferea.ui.h:139 +#: ../glade/liferea.ui.h:78 msgid "Liferea Homepage" msgstr "Liferea mājaslapa" -#: ../glade/liferea.ui.h:140 +#: ../glade/liferea.ui.h:79 msgid "Advanced Search" msgstr "Paplašinātā meklēšana" -#: ../glade/liferea.ui.h:141 +#: ../glade/liferea.ui.h:80 msgid "_Search Folder..." msgstr "_Meklēšanas mape..." -#: ../glade/liferea.ui.h:142 +#: ../glade/liferea.ui.h:81 msgid "Create Search Engine Feed" msgstr "Izveidot meklēšanas dziņa plūsmu" -#: ../glade/liferea.ui.h:143 +#: ../glade/liferea.ui.h:82 msgid "enter any search string you want" msgstr "ievadiet jebkādu meklēšanas virkni" -#: ../glade/liferea.ui.h:144 +#: ../glade/liferea.ui.h:83 msgid "Maximal _Number Of Result Items:" msgstr "Maksimālais rezultāta vie_numu skaits:" -#: ../glade/liferea.ui.h:145 +#: ../glade/liferea.ui.h:84 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 " @@ -2260,7 +2035,11 @@ msgid "_Username" msgstr "_Lietotājvārds" -#: ../glade/simple_subscription.ui.h:3 +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Paplašināti..." + +#: ../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." @@ -2268,13 +2047,261 @@ "Ievadiet tīmekļa vietni, ko izmantot plūsmu automātiskai atklāšanai, vai arī " "precīzu plūsmas atrašanās vietu." -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Paplašināti..." +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Liferea iestatījumi" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Plūsmu kešatmiņas apkalpošana" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "_Noklusētais vienumu skaits plūsmai, ko saglabāt:" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Plūsmas atjaunināšanas iestatījumi" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "_Atjaunināt visus abonementus palaižoties." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Noklusētais plūsmas atsvaidzināšanas _intervāls:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"Piezīme — atcerieties iestatīt saprātīgus atsvaidzināšanas laikus. " +"Parasti plūsmu atjaunināšana biežāk kā reizi stundā ir tīkla resursu " +"izniekošana." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Plūsmas" + +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Mapju attēlošanas iestatījumi" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "Rādīt vienumu_s visām apakšplūsmām, kad ir izvēlēta mape." + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "Slēpt _lasītos vienumus." + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Plūsmu ikonas (Favicon)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "Atja_unināt visas ikonas (favicon) tagad" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Mapes" + +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Lasa virsrakstus" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "Pārlapot rak_stus ar:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Tīmekļa integrācija" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "Nosūtīt _grāmatzīmes uz" + +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Iekšējā pārlūka iestatījumi" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Atvērt saites jaunā Liferea _logā." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Deaktivēt Javascript." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "_Aktivēt pārlūka spraudņus." + +#: ../glade/prefs.ui.h:26 +msgid "External Browser Settings" +msgstr "Ārējā pārlūka iestatījumi" + +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "Kur _atvērt saiti:" + +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Manuāli" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "" + +#: ../glade/prefs.ui.h:31 +msgid "_Browser:" +msgstr "_Pārlūks:" + +#: ../glade/prefs.ui.h:32 +msgid "Browser" +msgstr "Pārlūks" + +#: ../glade/prefs.ui.h:33 +msgid "Notification Settings" +msgstr "Paziņojumu iestatījumi" + +#: ../glade/prefs.ui.h:34 +msgid "Show a _popup window with new headlines." +msgstr "Rādīt _uznirstošo logu ar jauniem virsrakstiem." + +#: ../glade/prefs.ui.h:35 +msgid "Show a status _icon in the notification area (system tray)." +msgstr "Rādīt statusa _ikonu paziņojumu laukā (sistēmas paplātē)." + +#: ../glade/prefs.ui.h:36 +msgid "Show _number of new items in the tray icon." +msgstr "Rādīt vienumu skaitu paplātes ikonā." + +#: ../glade/prefs.ui.h:37 +msgid "T_erminate instead of minimizing to tray icon." +msgstr "Izslēgt, n_evis minimizēt paplātes ikonā." + +#: ../glade/prefs.ui.h:38 +msgid "_Start in tray icon." +msgstr "Palai_st paplātes ikonā." + +#: ../glade/prefs.ui.h:39 +msgid "Toolbar Settings" +msgstr "Rīkjoslas iestatījumi" + +#: ../glade/prefs.ui.h:40 +msgid "_Hide toolbar." +msgstr "_Slēpt rīkjoslu." + +#: ../glade/prefs.ui.h:41 +msgid "Toolbar _button labels:" +msgstr "Rīkjoslas _pogu etiķetes:" + +#: ../glade/prefs.ui.h:42 +msgid "GUI" +msgstr "GUI" + +#: ../glade/prefs.ui.h:43 +msgid "HTTP Proxy Server" +msgstr "HTTP starpniekserveris" + +#: ../glade/prefs.ui.h:44 +msgid "_Auto Detect (GNOME or environment)" +msgstr "_Automātiski noteikt (GNOME vai vide)" + +#: ../glade/prefs.ui.h:45 +msgid "_No Proxy" +msgstr "_Nav starpniekservera" + +#: ../glade/prefs.ui.h:46 +msgid "_Manual Setting:" +msgstr "_Manuāli iestatījumi:" + +#: ../glade/prefs.ui.h:47 +msgid "Proxy _Port:" +msgstr "Starpnieka _ports:" + +#: ../glade/prefs.ui.h:48 +msgid "Proxy _Host:" +msgstr "Sta_rpniekserveris:" + +#: ../glade/prefs.ui.h:49 +msgid "Use Proxy Au_thentication" +msgstr "Izmantot starpniekservera _autentificēšanu" + +#: ../glade/prefs.ui.h:50 +msgid "Proxy Pass_word:" +msgstr "Starpnieka pa_role:" + +#: ../glade/prefs.ui.h:51 +msgid "Proxy _Username:" +msgstr "Starpnieka _lietotājvārds:" + +#: ../glade/prefs.ui.h:52 +msgid "Proxy" +msgstr "Starpniekserveris" + +#: ../glade/prefs.ui.h:53 +msgid "Downloading Enclosures" +msgstr "Lejupielādēt ietvarus" + +#: ../glade/prefs.ui.h:54 +msgid "_Download using" +msgstr "Lejupielā_dēt izmantojot" + +#: ../glade/prefs.ui.h:55 +msgid "Opening Enclosures" +msgstr "Atver ietvarus" + +#: ../glade/prefs.ui.h:56 +msgid "Enclosures" +msgstr "Ietvari" + +#: ../glade/prefs.ui.h:57 +msgid "Plugins" +msgstr "" + +#~ msgid "Download and view feeds" +#~ msgstr "Lejupielādēt un lasīt plūsmas" #~ msgid "You may want to validate the feed using" #~ msgstr "Jūs varētu vēlēties pārbaudīt plūsmu, izmantojot" +#~ msgid "bookmark" +#~ msgstr "grāmatzīme" + +#~ msgid "comments" +#~ msgstr "komentāri" + +#~ msgid "flag" +#~ msgstr "atzīme" + +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Neizdevās lejupielādēt ietvaru — “%s”" + +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Pabeigta ietvara lejupielāde — “%s”" + +#~ msgid "" +#~ "This version of Liferea uses a new cache format and has migrated your " +#~ "feed cache. The cache content in %s was not deleted automatically. Please " +#~ "remove this directory manually once you are sure migration was successful!" +#~ msgstr "" +#~ "Šī Liferea versija izmanto jaunu kešatmiņas formātu, un ir migrējusi jūsu " +#~ "plūsmu kešatmiņu. %s kešatmiņas saturs netika automātiski izdzēsts. " +#~ "Lūdzu, izņemiet šo mapi manuāli, kad būsiet pārliecināts, ka migrēšana ir " +#~ "izdevusies!" + #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " #~ "unread items." @@ -2282,9 +2309,55 @@ #~ "Pāriet uz nākamo nelasīto vienumu. Ja nepieciešams, izvēlas nākamo " #~ "plūsmu, kurā ir nelasīti vienumi." +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Neizdevās lejupielādēt — “%s”" + +#~ msgid "Download finished." +#~ msgstr "Lejupielāde pabeigta." + +#~ msgid "Launch Item In _Tab" +#~ msgstr "Atvēr_t vienumu cilnē" + +#~ msgid "_Launch Item In Browser" +#~ msgstr "Atvērt vienumu pār_lūkā" + +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Kopēt vienumu _URL starpliktuvē" + +#~ msgid "Choose download directory" +#~ msgstr "Izvēlieties lejupielādes mapi" + #~ msgid "Liferea Sync %s@%s" #~ msgstr "Liferea sinhronizācija %s@%s" +#~ msgid "Downloading Enclosure" +#~ msgstr "Lejupielādēt ietvaru" + +#~ msgid "Sync" +#~ msgstr "Sinhronizēt" + +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Sinhronizēts ar Nearby Hosts" + +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "_Aktivēt lokālā tīkla sinhronizāciju" + +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Manuāli:\n" +#~ "(%s URL)" + +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "_Padot URL un nelejupielādēt ietvaru." + +#~ msgid "_Save downloads in" +#~ msgstr "_Saglabāt lejupielādes mapē" + +#~ msgid "_Service Name" +#~ msgstr "_Servisa nosaukums" + #~ msgid "link cosmos" #~ msgstr "link cosmos" diff -Nru liferea-1.8.15/po/mk.po liferea-1.10.3/po/mk.po --- liferea-1.8.15/po/mk.po 2013-06-24 22:16:16.000000000 +0200 +++ liferea-1.10.3/po/mk.po 2013-07-31 23:29:12.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2004-10-24 02:34+0200\n" "Last-Translator: Tomislav Markovski \n" "Language-Team: Macedonian \n" @@ -19,8 +19,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural= n%10==1 && n%100!=11 ? 0 : 1;X-\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 #, fuzzy msgid "Liferea" msgstr "Помош за Лајфри" @@ -36,7 +35,7 @@ msgstr "Вести за Лајфри на Сорсфорџ" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" +msgid "Read news feeds and blogs" msgstr "" #: ../xslt/feed.xml.in.h:1 @@ -154,41 +153,29 @@ msgstr "креатор" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "коментари" - -#: ../xslt/item.xml.in.h:13 #, fuzzy msgid "No comments yet." msgstr "коментари" -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 #, fuzzy msgid "Comments" msgstr "коментари" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 #, fuzzy msgid "Updating..." msgstr "Ажурирам \"%s\"" -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "" @@ -213,12 +200,12 @@ msgid "Default Browser" msgstr "Прелистувач" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "команда за прелистувач е науспешна: \"%s\"" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Отворам: \"%s\"" @@ -229,7 +216,7 @@ msgid "Authorization Error" msgstr "Автентикација" -#: ../src/common.c:63 +#: ../src/common.c:62 #, fuzzy, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Не може да се креира папката за кеш %s!" @@ -259,34 +246,40 @@ msgid "%b %d %Y" msgstr "" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, fuzzy, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "" "\"%s\" не е правилен ОПМЛ документ. Лајфри не може да ја увези оваа датотека!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Не можам да преименувам %s во %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, fuzzy, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "XML грешка при читање на датотеката за кеш! Не можам да увезам \"%s\"!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." @@ -294,42 +287,42 @@ "Празен документ. ОПМЛ документот \"%s\" не смее да биде празен при " "увезување..." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "\"%s\" не е правилен ОПМЛ документ. Лајфри не може да ја увези оваа датотека!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Листата на вести е увезена" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Увези листа на вести" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Увези" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 #, fuzzy msgid "OPML Files" msgstr "Одберете датотека" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Грешка при извезување на листата со вести!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Листата со вести е извезена!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Извези листа на вести" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Извези" @@ -385,122 +378,114 @@ msgstr "" #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "Сите вести се прочитани!" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" msgstr "" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "" -#: ../src/main.c:179 +#: ../src/main.c:165 #, fuzzy msgid "Show version information and exit" msgstr " --version Покажи ја верзијата на Лајфри" -#: ../src/main.c:180 +#: ../src/main.c:166 #, fuzzy msgid "Add a new subscription" msgstr "Нова претплата" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 #, fuzzy msgid "Print debugging messages of all types" msgstr " --debug-all Print debugging messages of all types" -#: ../src/main.c:186 +#: ../src/main.c:172 #, fuzzy msgid "Print debugging messages for the cache handling" msgstr " --debug-cache Print debugging messages for the cache handling" -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr "" " --debug-conf Print debugging messages of the configuration handling" -#: ../src/main.c:188 +#: ../src/main.c:174 #, fuzzy msgid "Print debugging messages of the database handling" msgstr " --debug-cache Print debugging messages for the cache handling" -#: ../src/main.c:189 +#: ../src/main.c:175 #, fuzzy msgid "Print debugging messages of all GUI functions" msgstr " --debug-gui Print debugging messages of all GUI functions" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" -#: ../src/main.c:191 +#: ../src/main.c:177 #, fuzzy msgid "Print debugging messages of all network activity" msgstr " --debug-all Print debugging messages of all types" -#: ../src/main.c:192 +#: ../src/main.c:178 #, fuzzy msgid "Print debugging messages of all parsing functions" msgstr " --debug-parsing Print debugging messages of all parsing functions" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" -#: ../src/main.c:194 +#: ../src/main.c:180 #, fuzzy msgid "Print debugging messages when entering/leaving functions" msgstr "" " --debug-trace Print debugging messages when entering/leaving functions" -#: ../src/main.c:195 +#: ../src/main.c:181 #, fuzzy msgid "Print debugging messages of the feed update processing" msgstr "" " --debug-update Print debugging messages of the feed update processing" -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr " --debug-cache Print debugging messages for the cache handling" -#: ../src/main.c:197 +#: ../src/main.c:183 #, fuzzy msgid "Print verbose debugging messages" msgstr " --debug-verbose Print verbose debugging messages" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 #, fuzzy 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:202 msgid "Liferea, the Linux Feed Reader" msgstr "" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" - -#: ../src/migrate.c:340 -#, 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!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" #. Some libsoup transport errors @@ -681,23 +666,23 @@ msgid "Feed title" msgstr "[Наслов на предметот]" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, fuzzy, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Вестите \"%s\" веќе се ажурираат!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, fuzzy, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "Овие вести нема повеќе да се ажуриаат!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, fuzzy, c-format msgid "Updating favicon for \"%s\"" msgstr "Ажурирам \"%s\"" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -705,48 +690,48 @@ "There was a problem while reading this subscription. Please check the URL " "and console output!" -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "URL адресата на \"%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:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Ажурирам \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Не можам да отворам пајп \"%s\"!" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Не може да се отвори датотеката \"%s\"!" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Грешка: Не постои датотеката \"%s\"!" @@ -756,61 +741,59 @@ msgid "New Search Folder" msgstr "Нова папка" -#: ../src/xml.c:451 +#: ../src/xml.c:424 #, fuzzy msgid "[There were more errors. Output was truncated!]" msgstr "[Грешката од излезот на парсерот е скратена!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 #, fuzzy msgid "XML Parser: Could not parse document:\n" msgstr "" "xmlReadMemory(): Не можам да го парсирам документот:\n" "%s%s" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 #, fuzzy msgid "Attachments" msgstr "коментари" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Одберете датотека" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "" @@ -820,7 +803,7 @@ msgid "Couldn't find pixmap file: %s" msgstr "Не можам да ја најдам pixmap датотеката: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, fuzzy, c-format msgid " (%d new)" msgid_plural " (%d new)" @@ -828,7 +811,7 @@ msgstr[1] "%d нови предмети!" msgstr[2] "%d нови предмети!" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, fuzzy, c-format msgid "%d unread%s" msgid_plural "%d unread%s" @@ -836,288 +819,297 @@ msgstr[1] "е непрочитано" msgstr[2] "е непрочитано" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 #, fuzzy msgid "Quick Reference" msgstr "Уреди ги параметрите." -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Лајфри e поврзана." -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 #, fuzzy msgid "Work Offline" msgstr "Работете офлајн" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Лајфри е исклучена" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 #, fuzzy msgid "Work Online" msgstr "Работете офлајн" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 #, fuzzy msgid "_Subscriptions" msgstr "Нова претплата" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "_Ажурирај ги сите" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 #, fuzzy msgid "Updates all subscriptions." msgstr "Додај нова претплата." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 #, fuzzy msgid "Mark All As _Read" msgstr "/_Обележи сè како прочитанo" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "" -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Увези листа на вести..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Увезува OPML листа на вести." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Извези листа на вести..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Ја извезува листата на вести како OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 #, fuzzy msgid "_Quit" msgstr "/_Излез" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 #, fuzzy msgid "_Feed" msgstr "_Вести" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 #, fuzzy msgid "Remove _All Items" msgstr "Отстрани ги сите" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Ги отстранува сите предмети од тековните вести." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 #, fuzzy msgid "_Item" msgstr "_Предмети" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "_Следна непрочитана вест" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "_Следна непрочитана вест" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Поглед" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "_Зголеми го текстот" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Го зголемуива текстот во делот за читање на вестите." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_Намали го текстот" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Го намалува текстот во делот за читање на вестите." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 #, fuzzy msgid "_Update Monitor" msgstr "/_Ажурирај" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 #, fuzzy msgid "_Preferences" msgstr "Параметри" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 #, fuzzy msgid "Edit Preferences." msgstr "Уреди ги параметрите." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 #, fuzzy msgid "S_earch" msgstr "Пребарувај" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 #, fuzzy msgid "Search All Feeds..." msgstr "Барај во сите вести." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 #, fuzzy msgid "Show the search dialog." msgstr "Ја покажува или сокрива лентата за барање." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Помош" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 #, fuzzy msgid "_Quick Reference" msgstr "Уреди ги параметрите." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 #, fuzzy msgid "_About" msgstr "За" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Го покажува дијалогот за заслуги." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 #, fuzzy msgid "_Wide View" msgstr "_Поглед" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 #, fuzzy msgid "_Combined View" msgstr "Промени _компактност на преглед" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 #, fuzzy msgid "Hide feeds with no unread items." msgstr "Ако е активно, сите вести со прочитани ставки се скриени." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "_Нова претплата..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 #, fuzzy msgid "Adds a subscription to the feed list." msgstr "Додај нова претплата." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "_Нова папка..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "" -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 #, fuzzy msgid "New S_earch Folder..." msgstr "_Нова папка..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "" -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 #, fuzzy msgid "New _Source..." msgstr "_Нова папка..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "" -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 #, fuzzy msgid "New _News Bin..." msgstr "_Нова папка..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 #, fuzzy msgid "Adds a new news bin." msgstr "Додај нова претплата." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 #, fuzzy msgid "_Mark Items Read" msgstr "_Обележи како прочитано" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 #, fuzzy msgid "" "Marks all items of the selected feed list node / in the item list as read." @@ -1125,83 +1117,112 @@ "Означи ги сите вести во означената ставка како прочитани или сите вести во " "означената папка." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 #, fuzzy msgid "_Update" msgstr "/_Ажурирај" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "Ги ажурира означените ставки или сите ставки во означената папка." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 #, fuzzy msgid "_Properties" msgstr "_Својства..." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Го отвора дијалогот за параметри на означените вести." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 #, fuzzy msgid "_Remove" msgstr "Отстрани ги сите" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Отстранува вести, односно нивното ажурирање." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Промени статус во (не)прочитано" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Го менува статусот на прочитано на означениот предмет." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Промени го _знаменцето" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 #, fuzzy msgid "Toggles the flag status of the selected item." msgstr "Го менува статусот на прочитано на означениот предмет." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 #, fuzzy msgid "R_emove" msgstr "/Отстрани го предметот" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Ја отстранува избраната ставка" -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Ја отвора врската на предметот во наместениот веб прелистувач." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "_Отвори во прелистувач" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." +msgstr "Ја отвора врската на предметот во наместениот веб прелистувач." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Подесувања за надворешниот прелистувач" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." msgstr "Ја отвора врската на предметот во наместениот веб прелистувач." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 #, fuzzy msgid "_Work Offline" msgstr "Работете офлајн" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "" -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 msgid "" "

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

    You can add new subscriptions

    • From main menu " @@ -1210,12 +1231,12 @@ "'Subscribe' within Liferea

    " msgstr "" -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Внесете корисник и лозинка за \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Непознат извор" @@ -1246,268 +1267,265 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Лајфри е во офлајн режим. Нема можност за ажурирање." -#: ../src/ui/liferea_htmlview.c:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "" +#: ../src/ui/liferea_htmlview.c:627 +#, fuzzy +msgid "Open Link In _Tab" +msgstr "/_Отвори во прелистувач" -#: ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_htmlview.c:628 #, fuzzy -msgid "Launch Link In _Tab" +msgid "_Open Link In Browser" msgstr "/_Отвори во прелистувач" -#: ../src/ui/liferea_htmlview.c:545 +#: ../src/ui/liferea_htmlview.c:629 #, fuzzy -msgid "_Launch Link In Browser" +msgid "_Open Link In External Browser" msgstr "/_Отвори во прелистувач" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 #, fuzzy msgid "_Copy Link Location" msgstr "/_Копирај ја локацијата на врската" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 #, fuzzy msgid "_Copy Image Location" msgstr "/_Копирај ја локацијата на врската" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 msgid "S_ave Link As" msgstr "" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 #, fuzzy msgid "_Subscribe..." msgstr "/_Претплати се..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 #, fuzzy msgid "*** No title ***" msgstr "[Без наслов]" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Датум" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Наслов" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Нема означени ставки!" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 #, fuzzy msgid "This item has no link specified!" msgstr "Предметот нема означено врска!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Мора да одбереш вест за бришење на ставките!" -#: ../src/ui/popup_menu.c:116 -#, fuzzy -msgid "Launch Item In _Tab" -msgstr "/_Отвори ја ставката во прелистувач" - -#: ../src/ui/popup_menu.c:117 -#, fuzzy -msgid "_Launch Item In Browser" -msgstr "/_Отвори ја ставката во прелистувач" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" +#: ../src/ui/popup_menu.c:156 +#, c-format +msgid "_Bookmark at %s" msgstr "" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "/_Копирај ја локацијата на врската" + +#: ../src/ui/popup_menu.c:166 #, fuzzy msgid "R_emove Item" msgstr "/Отстрани го предметот" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "" -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "" -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 #, fuzzy msgid "Copy Link Location" msgstr "/_Копирај ја локацијата на врската" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 #, fuzzy msgid "_Update All" msgstr "/_Ажурирај ги сите" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 #, fuzzy msgid "_Show Liferea" msgstr "Помош за Лајфри" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 #, fuzzy msgid "_Update Folder" msgstr "/_Ажурирај" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 #, fuzzy msgid "_Mark All As Read" msgstr "/_Обележи сè како прочитанo" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 #, fuzzy msgid "_New" msgstr "/_Нова" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 #, fuzzy msgid "New _Subscription..." msgstr "_Нова претплата..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 #, fuzzy msgid "New S_ource..." msgstr "_Нова папка..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 #, fuzzy msgid "Sort Feeds" msgstr "Увези листа на вести" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "_Нова претплата..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 #, fuzzy msgid "minutes" msgstr "минути." -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Space" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Space" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Space" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" +#: ../src/ui/preferences_dialog.c:114 +msgid "Normal View" msgstr "" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "_Поглед" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "Промени _компактност на преглед" + +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Рачно" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Стандардни од прелистувачот" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Тековниот прозорец" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Нов прозорец" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Ново јазиче" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 msgid "Terminate instead of minimizing to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 #, fuzzy msgid "Type" msgstr "вид" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 #, fuzzy msgid "Program" msgstr "_Апликација" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, fuzzy, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1521,7 +1539,7 @@ msgid "This feed specifies no default update interval." msgstr "Овие вести немаат информација за време на ажурирање." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "Без наслов" @@ -1569,7 +1587,7 @@ msgid "%b %d %H:%M" msgstr "" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1579,11 +1597,11 @@ msgid "Google Reader login failed!" msgstr "" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 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,30 +1632,23 @@ msgid "No feed list source types found!" msgstr "" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:269 #, fuzzy msgid "Source Type" msgstr "Тип на правило:" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " "present your tt-rss subscriptions, and will synchronize your feed list and " "reading lists." msgstr "" -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1710,8 +1721,7 @@ msgid "Please enter your Google Reader account settings." msgstr "" -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 #, fuzzy msgid "_Password" msgstr "_Лозинка:" @@ -1737,7 +1747,7 @@ msgid "combined view" msgstr "" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 #, fuzzy msgid "Headlines" msgstr "Наслов" @@ -1790,7 +1800,7 @@ msgstr "Општо" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Адреса" @@ -1913,498 +1923,509 @@ msgstr "" #: ../glade/liferea.ui.h:48 -#, fuzzy -msgid "Liferea Preferences" -msgstr "Параметри на Лајфри" +msgid "New Folder" +msgstr "Нова папка" #: ../glade/liferea.ui.h:49 #, fuzzy -msgid "Feed Cache Handling" -msgstr "Работа со вести" +msgid "_Folder name:" +msgstr "Папка:" #: ../glade/liferea.ui.h:50 #, fuzzy -msgid "Default _number of items per feed to save:" -msgstr "Стандарден број на предмети од вестите за трајно паметење:" +msgid "Rename" +msgstr "Преименувај папка" #: ../glade/liferea.ui.h:51 #, fuzzy -msgid "Feed Update Settings" -msgstr "Кеш за вести" +msgid "_New Name:" +msgstr "Наслов на _вестите:" #: ../glade/liferea.ui.h:52 #, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Додај нова претплата." +msgid "Search Folder Properties" +msgstr "Својства на В-папката" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Стандарден _интервал за ажурирање на вестите:" +#, fuzzy +msgid "Search _Name:" +msgstr "Наслов на _вестите:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -#, fuzzy -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." +msgid "A_ny Rule Matches" msgstr "" -"Забелешка: Ве молам внесете разумна вредност на интервалот. Не е добро да " -"се ажурираат вестите на секои 15 минути. Наместете 0 минути доколку не " -"сакате автоматско ажурирање." #: ../glade/liferea.ui.h:56 -#, fuzzy -msgid "Feeds" -msgstr "_Вести" +msgid "_All Rules Must Match" +msgstr "" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "Подесувања за ажурирање на вестите" +msgid "Open Enclosure" +msgstr "Преглед на наслови" #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." +msgid "Open an enclosure of type:" msgstr "" #: ../glade/liferea.ui.h:59 -#, fuzzy -msgid "_Hide read items." -msgstr "_Следна непрочитана вест" +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" #: ../glade/liferea.ui.h:60 #, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Подесувања за вчитување на вестите" +msgid "_Browse" +msgstr "_Прелистувач:" #: ../glade/liferea.ui.h:61 -#, fuzzy -msgid "_Update all favicons now" -msgstr "Ажурирај ги сите вести" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "" #: ../glade/liferea.ui.h:62 #, fuzzy -msgid "Folders" -msgstr "В-папка" +msgid "Search All Feeds" +msgstr "Барај во сите вести." #: ../glade/liferea.ui.h:63 #, fuzzy -msgid "Reading Headlines" -msgstr "Наслов" +msgid "_Search for:" +msgstr "Барај за" #: ../glade/liferea.ui.h:64 -#, fuzzy -msgid "_Skim through articles with:" -msgstr "Шетај низ вестите со " +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" #: ../glade/liferea.ui.h:65 -#, fuzzy -msgid "Web Integration" -msgstr "Автентикација" +msgid "_Advanced..." +msgstr "" #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." msgstr "" #: ../glade/liferea.ui.h:67 #, fuzzy -msgid "Internal Browser Settings" -msgstr "Подесувања за надворешниот прелистувач" +msgid "Update Monitor" +msgstr "/_Ажурирај" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Ги отвора _прозорците во Лајфри." +msgid "Pending Requests" +msgstr "" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." +msgid "Downloading Now" msgstr "" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "" +#, fuzzy +msgid "Cancel _All" +msgstr "_Ажурирај ги сите" #: ../glade/liferea.ui.h:71 -#, fuzzy -msgid "External Browser Settings" -msgstr "Подесувања за надворешниот прелистувач" +msgid "Create News Bin" +msgstr "" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "_Отвори ја врската во:" +msgid "_News Bin Name:" +msgstr "" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "За" #: ../glade/liferea.ui.h:74 -#, no-c-format msgid "" -"_Manual:\n" -"(%s for URL)" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" msgstr "" -"_Рачно:\n" -"(%s за адреса)" - -#: ../glade/liferea.ui.h:76 -msgid "_Browser:" -msgstr "_Прелистувач:" #: ../glade/liferea.ui.h:77 -#, fuzzy -msgid "Browser" -msgstr "_Прелистувач:" +msgid "Liferea is a news aggregator for GTK+" +msgstr "Лајфри е прелистувач на вести за ГТК+" #: ../glade/liferea.ui.h:78 #, fuzzy -msgid "Notification Settings" -msgstr "Подесувања за известување" +msgid "Liferea Homepage" +msgstr "Помош за Лајфри" #: ../glade/liferea.ui.h:79 -msgid "Show a _popup window with new headlines." -msgstr "Покажи мал _прозорец со новите наслови." +#, fuzzy +msgid "Advanced Search" +msgstr "Пребарување со Feedster" #: ../glade/liferea.ui.h:80 #, fuzzy -msgid "Show a status _icon in the notification area (system tray)." -msgstr "" -"Покажи икона за статус во местото за известување \n" -"(познато како „фиока“)." +msgid "_Search Folder..." +msgstr "/_Преименувај папка..." #: ../glade/liferea.ui.h:81 -msgid "Show _number of new items in the tray icon." +msgid "Create Search Engine Feed" msgstr "" #: ../glade/liferea.ui.h:82 -msgid "T_erminate instead of minimizing to tray icon." -msgstr "" +msgid "enter any search string you want" +msgstr "внеси некој текст за барање" #: ../glade/liferea.ui.h:83 -msgid "_Start in tray icon." -msgstr "" +#, fuzzy +msgid "Maximal _Number Of Result Items:" +msgstr "Максимален број на резултати" #: ../glade/liferea.ui.h:84 -msgid "Toolbar Settings" +#, 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 "" +"Note: Лајфри will generate a feed subscription which is used to query the " +"Feedster results for the specified search string. You can keep this feed " +"permanently and update it like any other subscription. " -#: ../glade/liferea.ui.h:85 -msgid "_Hide toolbar." +#: ../glade/new_subscription.ui.h:9 +msgid "Download / Postprocessing" msgstr "" -#: ../glade/liferea.ui.h:86 -msgid "Toolbar _button labels:" +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" msgstr "" -#: ../glade/liferea.ui.h:87 -msgid "GUI" -msgstr "GUI" +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "" -#: ../glade/liferea.ui.h:88 -msgid "HTTP Proxy Server" +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" msgstr "" -#: ../glade/liferea.ui.h:89 -msgid "_Auto Detect (GNOME or environment)" +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." msgstr "" -#: ../glade/liferea.ui.h:90 +#: ../glade/opml_source.ui.h:3 #, fuzzy -msgid "_No Proxy" -msgstr "Прокси порта" +msgid "_Location" +msgstr "/_Копирај ја локацијата на врската" -#: ../glade/liferea.ui.h:91 -msgid "_Manual Setting:" +#: ../glade/opml_source.ui.h:4 +#, fuzzy +msgid "_Select File" +msgstr "Избери д_атотека..." + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" msgstr "" -#: ../glade/liferea.ui.h:92 -msgid "Proxy _Port:" -msgstr "Порта на _прокси:" +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "" -#: ../glade/liferea.ui.h:93 -msgid "Proxy _Host:" -msgstr "_Адреса на прокси:" +#: ../glade/ttrss_source.ui.h:3 +#, fuzzy +msgid "_Server URL" +msgstr "Грешка на опслужувачот" -#: ../glade/liferea.ui.h:94 +#: ../glade/ttrss_source.ui.h:5 #, fuzzy -msgid "Use Proxy Au_thentication" -msgstr "Користи прокси _автентикација" +msgid "_Username" +msgstr "Корисничко _име:" -#: ../glade/liferea.ui.h:95 -msgid "Proxy Pass_word:" -msgstr "_Лозинка на прокси:" +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "" -#: ../glade/liferea.ui.h:96 -msgid "Proxy _Username:" -msgstr "Корисничко _име на прокси:" +#: ../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 "" -#: ../glade/liferea.ui.h:97 -msgid "Proxy" -msgstr "Прокси порта" +#: ../glade/prefs.ui.h:1 +#, fuzzy +msgid "Liferea Preferences" +msgstr "Параметри на Лајфри" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:2 #, fuzzy -msgid "Downloading Enclosures" -msgstr "Преглед на наслови" +msgid "Feed Cache Handling" +msgstr "Работа со вести" -#: ../glade/liferea.ui.h:99 +#: ../glade/prefs.ui.h:3 #, fuzzy -msgid "_Browse" -msgstr "_Прелистувач:" +msgid "Default _number of items per feed to save:" +msgstr "Стандарден број на предмети од вестите за трајно паметење:" -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "" +#: ../glade/prefs.ui.h:4 +#, fuzzy +msgid "Feed Update Settings" +msgstr "Кеш за вести" -#: ../glade/liferea.ui.h:101 -msgid "_Download using" -msgstr "" +#: ../glade/prefs.ui.h:5 +#, fuzzy +msgid "_Update all subscriptions at startup." +msgstr "Додај нова претплата." -#: ../glade/liferea.ui.h:102 -msgid "Opening Enclosures" -msgstr "" +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Стандарден _интервал за ажурирање на вестите:" -#: ../glade/liferea.ui.h:103 -msgid "Enclosures" +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +#, fuzzy +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 "" +"Забелешка: Ве молам внесете разумна вредност на интервалот. Не е добро да " +"се ажурираат вестите на секои 15 минути. Наместете 0 минути доколку не " +"сакате автоматско ажурирање." -#: ../glade/liferea.ui.h:104 +#: ../glade/prefs.ui.h:9 #, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Наслов на вестите" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "" +msgid "Feeds" +msgstr "_Вести" -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "" +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "Подесувања за ажурирање на вестите" -#: ../glade/liferea.ui.h:108 -msgid "Sync" +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." msgstr "" -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Нова папка" +#: ../glade/prefs.ui.h:12 +#, fuzzy +msgid "_Hide read items." +msgstr "_Следна непрочитана вест" -#: ../glade/liferea.ui.h:110 +#: ../glade/prefs.ui.h:13 #, fuzzy -msgid "_Folder name:" -msgstr "Папка:" +msgid "Feed Icons (Favicons)" +msgstr "Подесувања за вчитување на вестите" -#: ../glade/liferea.ui.h:111 +#: ../glade/prefs.ui.h:14 #, fuzzy -msgid "Rename" -msgstr "Преименувај папка" +msgid "_Update all favicons now" +msgstr "Ажурирај ги сите вести" -#: ../glade/liferea.ui.h:112 +#: ../glade/prefs.ui.h:15 #, fuzzy -msgid "_New Name:" -msgstr "Наслов на _вестите:" +msgid "Folders" +msgstr "В-папка" -#: ../glade/liferea.ui.h:113 +#: ../glade/prefs.ui.h:16 #, fuzzy -msgid "Search Folder Properties" -msgstr "Својства на В-папката" +msgid "Reading Headlines" +msgstr "Наслов" -#: ../glade/liferea.ui.h:114 +#: ../glade/prefs.ui.h:17 #, fuzzy -msgid "Search _Name:" -msgstr "Наслов на _вестите:" +msgid "_Skim through articles with:" +msgstr "Шетај низ вестите со " -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" msgstr "" -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "" +#: ../glade/prefs.ui.h:19 +#, fuzzy +msgid "Web Integration" +msgstr "Автентикација" -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" msgstr "" -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "" +#: ../glade/prefs.ui.h:22 +#, fuzzy +msgid "Internal Browser Settings" +msgstr "Подесувања за надворешниот прелистувач" -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "" +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Ги отвора _прозорците во Лајфри." -#: ../glade/liferea.ui.h:120 -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:" +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." msgstr "" -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "" +#: ../glade/prefs.ui.h:25 +#, fuzzy +msgid "_Enable browser plugins." +msgstr "Подесувања за надворешниот прелистувач" -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." +#: ../glade/prefs.ui.h:26 +#, fuzzy +msgid "External Browser Settings" +msgstr "Подесувања за надворешниот прелистувач" + +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "_Отвори ја врската во:" + +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Рачно" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" msgstr "" -#: ../glade/liferea.ui.h:123 +#: ../glade/prefs.ui.h:31 +msgid "_Browser:" +msgstr "_Прелистувач:" + +#: ../glade/prefs.ui.h:32 #, fuzzy -msgid "Search All Feeds" -msgstr "Барај во сите вести." +msgid "Browser" +msgstr "_Прелистувач:" -#: ../glade/liferea.ui.h:124 +#: ../glade/prefs.ui.h:33 #, fuzzy -msgid "_Search for:" -msgstr "Барај за" +msgid "Notification Settings" +msgstr "Подесувања за известување" -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" +#: ../glade/prefs.ui.h:34 +msgid "Show a _popup window with new headlines." +msgstr "Покажи мал _прозорец со новите наслови." -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." +#: ../glade/prefs.ui.h:35 +#, fuzzy +msgid "Show a status _icon in the notification area (system tray)." msgstr "" +"Покажи икона за статус во местото за известување \n" +"(познато како „фиока“)." -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." +#: ../glade/prefs.ui.h:36 +msgid "Show _number of new items in the tray icon." msgstr "" -#: ../glade/liferea.ui.h:128 -#, fuzzy -msgid "Update Monitor" -msgstr "/_Ажурирај" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" +#: ../glade/prefs.ui.h:37 +msgid "T_erminate instead of minimizing to tray icon." msgstr "" -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" +#: ../glade/prefs.ui.h:38 +msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.ui.h:131 +#: ../glade/prefs.ui.h:39 #, fuzzy -msgid "Cancel _All" -msgstr "_Ажурирај ги сите" +msgid "Toolbar Settings" +msgstr "Подесувања за ажурирање на вестите" -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" +#: ../glade/prefs.ui.h:40 +msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" +#: ../glade/prefs.ui.h:41 +msgid "Toolbar _button labels:" msgstr "" -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "За" +#: ../glade/prefs.ui.h:42 +msgid "GUI" +msgstr "GUI" -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" +#: ../glade/prefs.ui.h:43 +msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Лајфри е прелистувач на вести за ГТК+" - -#: ../glade/liferea.ui.h:139 -#, fuzzy -msgid "Liferea Homepage" -msgstr "Помош за Лајфри" - -#: ../glade/liferea.ui.h:140 -#, fuzzy -msgid "Advanced Search" -msgstr "Пребарување со Feedster" +#: ../glade/prefs.ui.h:44 +msgid "_Auto Detect (GNOME or environment)" +msgstr "" -#: ../glade/liferea.ui.h:141 +#: ../glade/prefs.ui.h:45 #, fuzzy -msgid "_Search Folder..." -msgstr "/_Преименувај папка..." +msgid "_No Proxy" +msgstr "Прокси порта" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" +#: ../glade/prefs.ui.h:46 +msgid "_Manual Setting:" msgstr "" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "внеси некој текст за барање" +#: ../glade/prefs.ui.h:47 +msgid "Proxy _Port:" +msgstr "Порта на _прокси:" -#: ../glade/liferea.ui.h:144 -#, fuzzy -msgid "Maximal _Number Of Result Items:" -msgstr "Максимален број на резултати" +#: ../glade/prefs.ui.h:48 +msgid "Proxy _Host:" +msgstr "_Адреса на прокси:" -#: ../glade/liferea.ui.h:145 +#: ../glade/prefs.ui.h:49 #, 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 "" -"Note: Лајфри will generate a feed subscription which is used to query the " -"Feedster results for the specified search string. You can keep this feed " -"permanently and update it like any other subscription. " +msgid "Use Proxy Au_thentication" +msgstr "Користи прокси _автентикација" -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" -msgstr "" +#: ../glade/prefs.ui.h:50 +msgid "Proxy Pass_word:" +msgstr "_Лозинка на прокси:" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "" +#: ../glade/prefs.ui.h:51 +msgid "Proxy _Username:" +msgstr "Корисничко _име на прокси:" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "" +#: ../glade/prefs.ui.h:52 +msgid "Proxy" +msgstr "Прокси порта" -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "" +#: ../glade/prefs.ui.h:53 +#, fuzzy +msgid "Downloading Enclosures" +msgstr "Преглед на наслови" -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." +#: ../glade/prefs.ui.h:54 +msgid "_Download using" msgstr "" -#: ../glade/opml_source.ui.h:3 +#: ../glade/prefs.ui.h:55 #, fuzzy -msgid "_Location" -msgstr "/_Копирај ја локацијата на врската" +msgid "Opening Enclosures" +msgstr "Преглед на наслови" -#: ../glade/opml_source.ui.h:4 +#: ../glade/prefs.ui.h:56 #, fuzzy -msgid "_Select File" -msgstr "Избери д_атотека..." +msgid "Enclosures" +msgstr "Преглед на наслови" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "" - -#: ../glade/ttrss_source.ui.h:3 #, fuzzy -msgid "_Server URL" -msgstr "Грешка на опслужувачот" +#~ msgid "Launch Item In _Tab" +#~ msgstr "/_Отвори ја ставката во прелистувач" -#: ../glade/ttrss_source.ui.h:5 #, fuzzy -msgid "_Username" -msgstr "Корисничко _име:" +#~ msgid "_Launch Item In Browser" +#~ msgstr "/_Отвори ја ставката во прелистувач" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" +#~ msgid "comments" +#~ msgstr "коментари" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Рачно:\n" +#~ "(%s за адреса)" + +#, fuzzy +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Наслов на вестите" #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " @@ -2606,7 +2627,7 @@ #~ msgstr "" #~ "

    Не можам да го одредам типот на веста. Ве молам проверете дали е правилен и дали форматот е поддржанподдржан.

    " #~ msgid "" @@ -3063,7 +3084,7 @@ #~ "to change the update interval, title, authentication or caching " #~ "properties of a subscription.

    To learn more about Liferea " #~ "you should read the documentation provided in the help feed or in the FAQ available at the " +#~ "href=\"http://lzone.de/liferea/faq.htm\">FAQ available at the " #~ "project homepage.

    " #~ msgstr "" #~ "

    Добродојдовте во Лајфри

    Левиот панел ја содржи листата каде " @@ -3081,7 +3102,7 @@ #~ "интервалот за ажурирање, насловот, методот на автентикација или " #~ "параметрите за кеширање.

    За да дознаете повеќе за Лајфри " #~ "прочитајте ја документацијата во вестите за помош или пак посетете ја " -#~ "страната за ЧПП, " +#~ "страната за ЧПП, " #~ "кои се достапни на веб страната на овој " #~ "проект.

    " diff -Nru liferea-1.8.15/po/nl.po liferea-1.10.3/po/nl.po --- liferea-1.8.15/po/nl.po 2013-06-24 22:16:16.000000000 +0200 +++ liferea-1.10.3/po/nl.po 2013-07-31 23:29:12.000000000 +0200 @@ -1,15 +1,16 @@ # Dutch translation of Liferea. -# Copyright (C) 2009 +# Copyright (C) 2009, 2010, 2011, 2012, 2013 # This file is distributed under the same license as the liferea package. # Patrick Bos , 2006. +# Erwin Poeze , 2009, 2010, 2011, 2013 # # msgid "" msgstr "" -"Project-Id-Version: liferea 1.6.0-rc6\n" +"Project-Id-Version: liferea 1.10-rc4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" -"PO-Revision-Date: 2009-07-27 20:57+0100\n" +"POT-Creation-Date: 2013-06-11 22:55+0200\n" +"PO-Revision-Date: 2013-06-14 08:11+0100\n" "Last-Translator: Erwin Poeze \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -17,9 +18,9 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.5.4\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:234 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -29,27 +30,19 @@ #: ../liferea.desktop.in.h:3 msgid "Liferea Feed Reader" -msgstr "Liferea - Linux Feed Reader" +msgstr "Liferea Feed Reader" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Feeds downloaden en bekijken" +msgid "Read news feeds and blogs" +msgstr "Nieuwsfeeds en blogs lezen" #: ../xslt/feed.xml.in.h:1 -msgid "" -"This feed is discontinued. It's no longer available. Liferea won't update it " -"anymore but you can still access the cached headlines." -msgstr "" -"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:2 -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 keer bijwerken van dit abonnement is mislukt!
    HTTP-foutcode : " #: ../xslt/feed.xml.in.h:3 msgid "There were errors while parsing this feed!" @@ -65,7 +58,7 @@ #: ../xslt/feed.xml.in.h:6 msgid "You may want to contact the author/webmaster of the feed about this!" -msgstr "" +msgstr "Overweeg de auteur of webmaster van deze feed hierover te informeren!" #: ../xslt/feed.xml.in.h:7 msgid "There were errors while filtering this feed!" @@ -93,7 +86,7 @@ #: ../xslt/source.xml.in.h:2 ../xslt/folder.xml.in.h:2 msgid "children with" -msgstr "afgeleide van" +msgstr "submappen met" #: ../xslt/source.xml.in.h:3 ../xslt/folder.xml.in.h:3 #: ../xslt/vfolder.xml.in.h:2 @@ -141,38 +134,26 @@ msgstr "Producent" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "vlag" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "bookmark" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "commentaar" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Commentaar ontbreekt nog." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Commentaren" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Bijwerken..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" -msgstr "Verversen" +msgstr "Bijwerken" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Sectie" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Afdeling" @@ -181,28 +162,23 @@ msgstr "Nieuwsbak:" #: ../xslt/newsbin.xml.in.h:2 -msgid "" -"Add items to this news bin by selecting \"Copy to News Bin\" from the item " -"list context menu." -msgstr "" -"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/vfolder.xml.in.h:1 msgid "Search Folder:" msgstr "Zoeken in map:" #: ../src/browser.c:32 -#, fuzzy msgid "Default Browser" -msgstr "Standaardbrowser GNOME" +msgstr "Standaardbrowser" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Browseropdracht is mislukt: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Openen: \"%s\"" @@ -212,10 +188,10 @@ msgid "Authorization Error" msgstr "Aanmeldfout" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" -msgstr "Map buffergeheugen \"%s\" kan niet worden aangemaakt!" +msgstr "Buffergeheugenmap \"%s\" kan niet worden aangemaakt!" #. translation hint: date format for today, reorder format codes as necessary #: ../src/date.c:80 @@ -242,115 +218,104 @@ msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" -msgstr "\"%s\" is geen geldig bijlage-configuratiebestand!" +msgstr "\"%s\" is geen geldig configuratiebestand voor dit soort bijlagen!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Downloaden bijlage is MISLUKT: \"%s\"" +#: ../src/enclosure.c:288 +msgid "You have not configured a download tool yet! Please do so in the 'Download' tab in Tools/Preferences." +msgstr "Er is nog geen downloadprogramma geconfigureerd. U kunt dit doen in het tabblad 'Bijlagen' onder Extra/Voorkeuren." -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Downloaden bijlage afgerond: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" +"Opdracht is mislukt: \n" +"\n" +"%s\n" +"\n" +"Controleer of het opgegeven downloadprogramma geïnstalleerd is en functioneert. U kunt dit aanpassen in het tabblad Bijlagen on Extra/Voorkeuren." -#: ../src/export.c:174 +#: ../src/export.c:185 #, c-format msgid "Error renaming %s to %s\n" msgstr "Hernoemen van %s naar %s is mislukt\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:414 ../src/export.c:416 #, 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:396 ../src/export.c:398 +#: ../src/export.c:422 ../src/export.c:424 #, 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\" mag bij het importeren niet leeg zijn." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:445 ../src/export.c:447 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" -msgstr "" -"\"%s\" 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:440 +#: ../src/export.c:466 msgid "Imported feed list" msgstr "Lijst van geïmporteerde feeds" -#: ../src/export.c:452 +#: ../src/export.c:478 msgid "Import Feed List" msgstr "Feedlijst importeren" -#: ../src/export.c:452 +#: ../src/export.c:478 msgid "Import" msgstr "Importeren" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 -#, fuzzy +#: ../src/export.c:478 ../src/export.c:495 ../src/fl_sources/opml_source.c:394 msgid "OPML Files" -msgstr "OPML-bestand selecteren" +msgstr "OPML-bestanden" -#: ../src/export.c:460 +#: ../src/export.c:486 msgid "Error while exporting feed list!" msgstr "Exporteren feedlijst is mislukt!" -#: ../src/export.c:462 +#: ../src/export.c:488 msgid "Feed List exported!" msgstr "Feedlijst geëxporteerd!" -#: ../src/export.c:469 +#: ../src/export.c:495 msgid "Export Feed List" msgstr "Feedlijst exporteren" -#: ../src/export.c:469 +#: ../src/export.c:495 msgid "Export" msgstr "Exporteren" -#: ../src/feed.c:255 -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:254 +msgid "

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

    XML Parser Output:
    " +msgstr "

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

    XML Parser-uitvoer:
    " -#: ../src/feed.c:284 +#: ../src/feed.c:283 #, c-format msgid "\"%s\" updated..." msgstr "\"%s\" is bijgewerkt..." -#: ../src/feed.c:294 +#: ../src/feed.c:293 #, c-format msgid "\"%s\" is not available" msgstr "\"%s\" is niet beschikbaar" #: ../src/feed_parser.c:137 -msgid "" -"The URL you want Liferea to subscribe to points to a webpage and the auto " -"discovery found no feeds on this page. Maybe this webpage just does not " -"support feed auto discovery." -msgstr "" -"

    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.

    " +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:170 #, 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 een feed! Feed \"%s\" kan niet worden geladen!" #: ../src/feed_parser.c:175 msgid "Empty document!" @@ -369,118 +334,93 @@ msgstr "Kan het soort feed niet bepalen." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 -#, fuzzy +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "Er zijn geen ongelezen items " -#: ../src/main.c:175 -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:163 +msgid "Start Liferea with its main window in STATE. STATE may be `shown', `iconified', or `hidden'" +msgstr "Liferea starten met het hoofdvenster in STATUS. STATUS kan `shown', `iconified' of `hidden' zijn" -#: ../src/main.c:175 +#: ../src/main.c:163 msgid "STATE" -msgstr "STAAT" +msgstr "STATUS" -#: ../src/main.c:179 +#: ../src/main.c:164 msgid "Show version information and exit" msgstr "Versieinformatie tonen en stoppen" -#: ../src/main.c:180 -#, fuzzy +#: ../src/main.c:165 msgid "Add a new subscription" -msgstr "Nieuwe feed" +msgstr "Nieuw abonnement toevoegen" -#: ../src/main.c:180 +#: ../src/main.c:165 msgid "uri" -msgstr "" +msgstr "uri" -#: ../src/main.c:185 +#: ../src/main.c:170 msgid "Print debugging messages of all types" msgstr "Alle soorten foutmeldingen tonen" -#: ../src/main.c:186 +#: ../src/main.c:171 msgid "Print debugging messages for the cache handling" msgstr "Foutmeldingen over het gebruik van buffergeheugen tonen" -#: ../src/main.c:187 -#, fuzzy +#: ../src/main.c:172 msgid "Print debugging messages for the configuration handling" msgstr "Foutmeldingen over de configuratieafhandeling tonen" -#: ../src/main.c:188 +#: ../src/main.c:173 msgid "Print debugging messages of the database handling" msgstr "Foutmeldingen over de databaseafhandeling tonen" -#: ../src/main.c:189 +#: ../src/main.c:174 msgid "Print debugging messages of all GUI functions" 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.8/output.xhtml" -msgstr "" -"Foutopsporing HTML-opmaak ingeschakelen. Iedere keer dat Liferea HTML-" -"uitvoer opmaakt, zal het deze ook wegschrijven naar ~/.liferea_1.8/output." -"xhtml" +#: ../src/main.c:175 +msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.cache/liferea/output.xhtml" +msgstr "Foutopsporing HTML-opmaak inschakelen. Iedere keer dat Liferea HTML-uitvoer opmaakt, zal het deze ook wegschrijven naar ~/.cache/liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:176 msgid "Print debugging messages of all network activity" msgstr "Foutmeldingen over alle netwerkactiviteiten tonen" -#: ../src/main.c:192 +#: ../src/main.c:177 msgid "Print debugging messages of all parsing functions" msgstr "Foutmeldingen over alle inleesfuncties tonen" -#: ../src/main.c:193 +#: ../src/main.c:178 msgid "Print debugging messages when a function takes too long to process" msgstr "Foutmeldingen tonen als een functie er te lang over doet" -#: ../src/main.c:194 +#: ../src/main.c:179 msgid "Print debugging messages when entering/leaving functions" msgstr "Foutmeldingen over het starten en stoppen van functies tonen" -#: ../src/main.c:195 +#: ../src/main.c:180 msgid "Print debugging messages of the feed update processing" msgstr "Foutmeldingen over het bijwerken van feeds tonen" -#: ../src/main.c:196 -#, fuzzy +#: ../src/main.c:181 msgid "Print debugging messages of the search folder matching" -msgstr "Foutmeldingen over het gebruik van buffergeheugen tonen" +msgstr "Foutmeldingen over overeenkomsten van de zoekmap tonen" -#: ../src/main.c:197 +#: ../src/main.c:182 msgid "Print verbose debugging messages" msgstr "Uitgebreide foutmeldingen tonen" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:193 ../src/main.c:194 msgid "Print debugging messages for the given topic" msgstr "Foutmeldingen over het opgegeven onderwerp tonen" -#: ../src/main.c:218 +#: ../src/main.c:201 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, Linux Feed Reader" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "Meer informatie vindt u op http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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. " +#: ../src/main.c:202 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Meer informatie vindt u op http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -504,11 +444,8 @@ msgstr "Kan niet met proxy verbinden" #: ../src/net.c:325 -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" +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:328 @@ -517,12 +454,8 @@ #. http 4xx client error #: ../src/net.c:331 -msgid "" -"You are unauthorized to download this feed. Please update your username and " -"password in the feed properties dialog box" -msgstr "" -"U heeft geen toestemming om deze feed te downloaden. Voer de juiste " -"gebruikersnaam en het wachtwoord in bij het eigenschappenvenster van de feed" +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:333 msgid "Payment required" @@ -530,7 +463,7 @@ #: ../src/net.c:334 msgid "You're not allowed to access this resource" -msgstr "U mag niet bij deze bron komen" +msgstr "U heeft geen toegang tot deze bron" #: ../src/net.c:335 msgid "Resource Not Found" @@ -554,16 +487,15 @@ #: ../src/net.c:340 msgid "Gone. Resource doesn't exist. Please unsubscribe!" -msgstr "Verdwenen; bron bestaat niet. Meldt u zich af!" +msgstr "Verdwenen; bron bestaat niet meer. Meld u af!" #: ../src/net.c:345 msgid "There was an internal error in the update process" -msgstr "Er is een interne fout tijdens het bijwerkproces opgetreden" +msgstr "Er is een interne fout opgetreden tijdens het bijwerken" #: ../src/net.c:347 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:349 msgid "Client Error" @@ -651,800 +583,795 @@ msgid "Feed title" msgstr "Feedtitel" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Abonnement \"%s\" wordt al bijgewerkt!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format -msgid "" -"The subscription \"%s\" was discontinued. Liferea won't update it anymore!" -msgstr "Abonnement \"%s\" is gestopt. Liferea zal hem niet meer bijwerken!" +msgid "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" +msgstr "Abonnement \"%s\" is gestopt. Liferea zal het niet meer bijwerken!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Favicon van \"%s\" bijwerken" -#: ../src/subscription.c:192 -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:193 +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 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" -msgstr "De URL van \"%s\" is permanent veranderd en is bijgewerkt" +msgstr "De URL van \"%s\" is permanent veranderd en bijgewerkt" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" -msgstr "\"%s\" is er mee opgehouden. Liferea zal hem niet meer bijwerken!" +msgstr "\"%s\" is er mee opgehouden. Liferea zal het niet meer bijwerken!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" is niet veranderd sinds de laatste update" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Bijwerken \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:258 #, 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:278 +#: ../src/update.c:281 #, c-format msgid "%s exited with status %d" msgstr "%s afgesloten met status %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:287 ../src/update.c:288 ../src/update.c:400 #, c-format msgid "Error: Could not open pipe \"%s\"" -msgstr "Fout: pipe \"%s\" kon niet geopend worden" +msgstr "Fout: openen pipe \"%s\" is mislukt" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:426 #, c-format msgid "Error: Could not open file \"%s\"" -msgstr "Fout: bestand \"%s\" kon niet geopend worden" +msgstr "Fout: openen bestand \"%s\" is mislukt" -#: ../src/update.c:429 +#: ../src/update.c:432 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Fout: bestand \"%s\" bestaat niet" -#: ../src/vfolder.c:55 +#: ../src/vfolder.c:54 msgid "New Search Folder" msgstr "Nieuwe zoekmap" -#: ../src/xml.c:451 +#: ../src/xml.c:410 msgid "[There were more errors. Output was truncated!]" msgstr "[Er zijn meer fouten. Uitvoer is afgekapt!]" -#: ../src/xml.c:604 +#: ../src/xml.c:563 msgid "XML Parser: Could not parse document:\n" msgstr "xml-parser: kan document niet ontleden:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Bijlagen" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d bijlage" -msgstr[1] "%d bijlagen" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " bytes" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d bijlage" +msgstr[1] "%d bijlagen" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Bladeren" -#: ../src/ui/enclosure_list_view.c:404 -#, fuzzy, c-format +#: ../src/ui/enclosure_list_view.c:438 +#, c-format msgid "File Extension .%s" -msgstr "Bestandsextensie .%s" +msgstr "Bestandsextensie .%s" #: ../src/ui/icons.c:54 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Pixmap-bestand niet gevonden: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d nieuw)" msgstr[1] " (%d nieuwe)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d ongelezen%s" msgstr[1] "%d ongelezen%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Hulponderwerpen" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Sneltoetsen" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "Vaak gestelde vragen" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:795 msgid "Liferea is now online" msgstr "Liferea is online" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:797 msgid "Work Offline" msgstr "Offline-modus" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:799 msgid "Liferea is now offline" msgstr "Liferea is offline" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:801 msgid "Work Online" msgstr "Online-modus" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:897 msgid "_Subscriptions" msgstr "_Abonnementen" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:898 msgid "Update _All" msgstr "_Alles bijwerken" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:898 msgid "Updates all subscriptions." msgstr "Alle abonnementen bijwerken." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:900 msgid "Mark All As _Read" msgstr "Alles als ge_lezen markeren" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:900 msgid "Marks read every item of every subscription." msgstr "Elk item van ieder feed als gelezen markeren." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:902 msgid "_Import Feed List..." msgstr "Feedlijst _importeren..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:902 msgid "Imports an OPML feed list." msgstr "Een OPML-feedlijst importeren." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:903 msgid "_Export Feed List..." msgstr "Feedlijst e_xporteren..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:903 msgid "Exports the feed list as OPML." msgstr "De feedlijst als OPML exporteren." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:904 msgid "_Quit" msgstr "_Afsluiten" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:906 msgid "_Feed" msgstr "_Feed" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:907 msgid "Remove _All Items" msgstr "_Alle items verwijderen" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:907 msgid "Removes all items of the currently selected feed." msgstr "Alle items van de geselecteerde feed verwijderen." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:910 msgid "_Item" msgstr "_Item" +#: ../src/ui/liferea_shell.c:911 +msgid "Previous Item" +msgstr "Vorig item" + +#: ../src/ui/liferea_shell.c:913 +msgid "Next Item" +msgstr "Volgend item" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:918 msgid "_Next Unread Item" -msgstr "_Volgende ongelezen item" +msgstr "_Volgend ongelezen item" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:921 msgid "_View" msgstr "_Beeld" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:922 ../src/ui/liferea_htmlview.c:653 msgid "_Increase Text Size" msgstr "Tekst ver_groten" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:922 msgid "Increases the text size of the item view." msgstr "De tekst van de items vergroten." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:924 ../src/ui/liferea_htmlview.c:654 msgid "_Decrease Text Size" msgstr "Tekst ver_kleinen" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:924 msgid "Decreases the text size of the item view." msgstr "De tekst van de items verkleinen." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:927 msgid "_Tools" msgstr "_Extra" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:928 msgid "_Update Monitor" msgstr "_Bijwerkoverzicht" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:928 msgid "Show a list of all feeds currently in the update queue" msgstr "Een lijst tonen met alle feeds die klaar staan om bijgewerkt te worden" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:930 msgid "_Preferences" msgstr "_Voorkeuren" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:930 msgid "Edit Preferences." msgstr "Voorkeuren bewerken." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:933 msgid "S_earch" msgstr "_Zoeken" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:934 msgid "Search All Feeds..." msgstr "Alle feeds doorzoeken..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:934 msgid "Show the search dialog." msgstr "Zoekscherm tonen" -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:936 msgid "_Help" msgstr "_Hulp" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:937 msgid "_Contents" msgstr "_Inhoud" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:937 msgid "View help for this application." msgstr "De hulptekst van dit programma bekijken." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:938 msgid "_Quick Reference" msgstr "_Snelgids" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:938 msgid "View a list of all Liferea shortcuts." msgstr "Een lijst met Lifereasneltoetsen bekijken." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:940 msgid "_FAQ" msgstr "_FAQ" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:940 msgid "View the FAQ for this application." msgstr "De FAQ (meest gestelde vragen) van dit programma bekijken." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:941 msgid "_About" msgstr "_Info" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:941 msgid "Shows an about dialog." msgstr "Info over het programma en de makers." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:945 msgid "_Normal View" msgstr "_Normaal venster" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:945 msgid "Set view mode to mail client mode." msgstr "Weergavemodus omstellen naar mail-client-modus." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:947 msgid "_Wide View" msgstr "_Breed venster" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:947 msgid "Set view mode to use three vertical panes." msgstr "Weergavemodus met drie vertikale vensters instellen." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:949 msgid "_Combined View" msgstr "_Samengesteld venster" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:949 msgid "Set view mode to two pane mode." msgstr "Weergavemodus met twee vensters instellen." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:954 msgid "_Reduced Feed List" msgstr "Feedlijst _reduceren" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:954 msgid "Hide feeds with no unread items." msgstr "Feeds zonder ongelezen berichten verbergen." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:959 msgid "_New Subscription..." msgstr "_Nieuw abonnement..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:959 msgid "Adds a subscription to the feed list." msgstr "Een abonnement aan de feedlijst toevoegen." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:961 ../src/ui/popup_menu.c:320 msgid "New _Folder..." -msgstr "Nieuwe ma_p..." +msgstr "Nieuwe _map..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:961 msgid "Adds a folder to the feed list." msgstr "Een map aan de feedlijst toevoegen." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:962 ../src/ui/popup_menu.c:323 msgid "New S_earch Folder..." msgstr "Nieuwe _zoekmap..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:962 msgid "Adds a new search folder to the feed list." msgstr "Een nieuwe zoekmap aan de feedlijst toevoegen." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:963 msgid "New _Source..." msgstr "Nieuwe _bron..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:963 msgid "Adds a new feed list source." msgstr "Een feedlijstbron toevoegen." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:964 ../src/ui/popup_menu.c:325 msgid "New _News Bin..." -msgstr "Nieuwe _nieuwsbak..." +msgstr "Nieuwe nieu_wsbak..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:964 msgid "Adds a new news bin." msgstr "Voegt een nieuwe nieuwsbak toe." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:968 msgid "_Mark Items Read" msgstr "Als gelezen _markeren" -#: ../src/ui/liferea_shell.c:911 -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:968 +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:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:970 ../src/ui/popup_menu.c:300 msgid "_Update" msgstr "_Bijwerken" -#: ../src/ui/liferea_shell.c:913 -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:970 +msgid "Updates the selected subscription or all subscriptions of the selected folder." +msgstr "De geselecteerde of alle feeds in de geselecteerde map bijwerken." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:975 msgid "_Properties" msgstr "_Eigenschappen" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:975 msgid "Opens the property dialog for the selected subscription." msgstr "Het eigenschappenvenster van de geselecteerde feed openen." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:976 msgid "_Remove" msgstr "_Verwijderen" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:976 msgid "Removes the selected subscription." msgstr "Het geselecteerde abonnement verwijderen." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:980 ../src/ui/popup_menu.c:163 msgid "Toggle _Read Status" msgstr "Item _gelezen aan/uit" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:980 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:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:982 ../src/ui/popup_menu.c:164 msgid "Toggle Item _Flag" msgstr "Item _markering aan/uit" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:982 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:927 +#: ../src/ui/liferea_shell.c:984 msgid "R_emove" msgstr "V_erwijderen" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:984 msgid "Removes the selected item." msgstr "Het geselecteerde item verwijderen." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:986 ../src/ui/popup_menu.c:127 +msgid "Open In _Tab" +msgstr "In _tabblad openen" + +#: ../src/ui/liferea_shell.c:986 +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "De koppeling in een nieuw browsertabblad openen." + +#: ../src/ui/liferea_shell.c:988 ../src/ui/popup_menu.c:128 +msgid "_Open In Browser" msgstr "In browser _openen" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." -msgstr "De link van het item in de ingestelde browser openen." +#: ../src/ui/liferea_shell.c:988 +msgid "Launches the item's link in the Liferea item pane." +msgstr "De koppeling in Liferea venster tonen." + +#: ../src/ui/liferea_shell.c:990 ../src/ui/popup_menu.c:129 +msgid "Open In _External Browser" +msgstr "In _externe browser openen" + +#: ../src/ui/liferea_shell.c:990 +msgid "Launches the item's link in the configured external browser." +msgstr "De koppeling in de externe browser openen." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:995 ../src/ui/popup_menu.c:193 msgid "_Work Offline" msgstr "_Offline-modus" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:995 msgid "This option allows you to disable subscription updating." -msgstr "Deze optie schakelt het bijwerken van abonnement uit." +msgstr "Deze optie schakelt het bijwerken van abonnementen uit." + +#: ../src/ui/liferea_shell.c:997 +msgid "_Fullscreen" +msgstr "_Volledige scherm" + +#: ../src/ui/liferea_shell.c:997 +msgid "Browse at full screen" +msgstr "Met volledig scherm bladeren" -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1328 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Linux Feed Reader" -#: ../src/ui/liferea_shell.c:1246 -#, fuzzy -msgid "" -"

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

    You can add new subscriptions

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

    " -msgstr "" -"

    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/liferea_shell.c:1330 +msgid "

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

    You can add new subscriptions

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

    " +msgstr "

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

    U kunt nieuwe abonnementen toevoegen:

    • vanuit hoofdmenu 'Abonnementen' -> 'Nieuw abonnement'
    • door feed-koppelingen naar de abonnementenlijst te slepen
    • door rechtsklikken op koppelingen en 'Abonneren' binnen Liferea te selecteren

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Onbekende bron" -#: ../src/ui/ui_common.c:205 -#, fuzzy +#: ../src/ui/ui_common.c:211 msgid "All Files" -msgstr "_Lokaal bestand" +msgstr "Alle bestanden" -#: ../src/ui/feed_list_view.c:341 +#: ../src/ui/feed_list_view.c:338 msgid "Deleting entry" msgstr "Item verwijderen" -#: ../src/ui/feed_list_view.c:342 +#: ../src/ui/feed_list_view.c:339 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" -msgstr "Weet u zeker dat u \"%s\" met al zijn inhoud wilt verwijderen?" +msgstr "Weet u zeker dat u \"%s\" en zijn inhoud wilt verwijderen?" -#: ../src/ui/feed_list_view.c:342 +#: ../src/ui/feed_list_view.c:339 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Weet u zeker dat u \"%s\" wilt verwijderen?" -#: ../src/ui/feed_list_view.c:354 +#: ../src/ui/feed_list_view.c:351 msgid "Deletion Confirmation" msgstr "Verwijdering bevestigen" -#: ../src/ui/feed_list_view.c:385 +#: ../src/ui/feed_list_view.c:382 msgid "Liferea is in offline mode. No update possible." msgstr "Liferea staat in offline-modus. Bijwerken is niet mogelijk." -#: ../src/ui/liferea_htmlview.c:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Downloaden bijlage is MISLUKT: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 -#, fuzzy -msgid "Download finished." -msgstr "_Downloaden met" - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" -msgstr "Link in _tabblad openen" - -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" -msgstr "Link in _browser openen" +#: ../src/ui/liferea_htmlview.c:624 +msgid "Open Link In _Tab" +msgstr "Koppeling in _tabblad openen" + +#: ../src/ui/liferea_htmlview.c:625 +msgid "_Open Link In Browser" +msgstr "Koppeling in browser _openen" + +#: ../src/ui/liferea_htmlview.c:626 +msgid "_Open Link In External Browser" +msgstr "Koppeling in externe browser _openen" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:629 #, c-format msgid "_Bookmark Link at %s" -msgstr "Link _bookmarken als %s" +msgstr "Blad_wijzer koppeling toevoegen als %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:633 msgid "_Copy Link Location" -msgstr "Link _kopiëren" +msgstr "Koppeling _kopiëren" -#: ../src/ui/liferea_htmlview.c:555 -#, fuzzy +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Image Location" -msgstr "Link _kopiëren" +msgstr "Afbeeldingslocatie _kopiëren" -#: ../src/ui/liferea_htmlview.c:557 -#, fuzzy +#: ../src/ui/liferea_htmlview.c:638 msgid "S_ave Link As" -msgstr "Opslaan als..." +msgstr "Koppeling _opslaan als" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:640 msgid "S_ave Image As" -msgstr "" +msgstr "Afbeelding _opslaan als" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:643 msgid "_Subscribe..." msgstr "_Abonneren..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:398 msgid "*** No title ***" msgstr "*** Geen titel ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:661 msgid "Date" msgstr "Datum" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:675 msgid "Headline" msgstr "Kop" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:777 ../src/ui/item_list_view.c:798 +#: ../src/ui/item_list_view.c:819 ../src/ui/item_list_view.c:883 +#: ../src/ui/item_list_view.c:968 ../src/ui/item_list_view.c:983 msgid "No item has been selected" msgstr "Er is geen item geselecteerd" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:794 ../src/ui/item_list_view.c:815 msgid "This item has no link specified!" -msgstr "Dit item heeft geen link!" +msgstr "Dit item heeft geen koppeling!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:871 msgid "You must select a feed to delete its items!" msgstr "Selecteer een feed om zijn items te verwijderen!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Item in _tabblad openen" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "Item in _browser openen" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:141 msgid "Copy to News Bin" msgstr "Kopieer naar nieuwsbak" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Item-_URL naar klembord kopiëren" +#: ../src/ui/popup_menu.c:155 +#, c-format +msgid "_Bookmark at %s" +msgstr "Blad_wijzer toevoegen bij %s" + +#: ../src/ui/popup_menu.c:159 +msgid "Copy Item _Location" +msgstr "Itemlocatie _kopiëren" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:165 msgid "R_emove Item" msgstr "Item v_erwijderen" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:178 msgid "Open Enclosure..." msgstr "Bijlage openen..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:179 msgid "Save As..." msgstr "Opslaan als..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:180 msgid "Copy Link Location" msgstr "URL _kopiëren" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:194 msgid "_Update All" msgstr "Alle feeds _bijwerken" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:199 msgid "_Show Liferea" msgstr "Liferea _tonen" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:302 msgid "_Update Folder" msgstr "Map _bijwerken" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:304 msgid "_Mark All As Read" msgstr "Alle items als gelezen _markeren" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:314 msgid "_New" msgstr "_Nieuw" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:317 msgid "New _Subscription..." msgstr "Nieuw _abonnement..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:324 msgid "New S_ource..." msgstr "Nieuwe _bron..." -#: ../src/ui/popup_menu.c:323 -#, fuzzy +#: ../src/ui/popup_menu.c:333 msgid "Sort Feeds" -msgstr "Feedlijst importeren" +msgstr "Feeds sorteren" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:339 msgid "_Rebuild" -msgstr "" +msgstr "_Herbouwen" -#: ../src/ui/popup_menu.c:341 -#, fuzzy +#: ../src/ui/popup_menu.c:351 msgid "Convert To Local Subscriptions..." -msgstr "_Nieuw abonnement..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" +msgstr "Naar lokale abonnementen converteren..." -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:87 msgid "GNOME default" msgstr "GNOME-standaard" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:88 msgid "Text below icons" msgstr "Tekst onder pictogrammen" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:89 msgid "Text beside icons" msgstr "Tekst naast pictogrammen" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:90 msgid "Icons only" msgstr "Alleen pictogrammen" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:91 msgid "Text only" msgstr "Alleen tekst" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:99 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minuten" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "uren" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "dagen" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:106 msgid "Space" msgstr "Spatie" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:107 msgid " Space" msgstr " spatie" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " spatie" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Downloadmap kiezen" +#: ../src/ui/preferences_dialog.c:113 +msgid "Normal View" +msgstr "Normaal venster" + +#: ../src/ui/preferences_dialog.c:114 +msgid "Wide View" +msgstr "Breed venster" + +#: ../src/ui/preferences_dialog.c:115 +msgid "Combined View" +msgstr "Samengesteld venster" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:500 msgid "Manual" msgstr "Handmatig" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:515 msgid "Browser default" msgstr "Browserstandaard" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:518 msgid "Existing window" msgstr "Geopend venster" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:521 msgid "New window" msgstr "Nieuw venster" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:524 msgid "New tab" msgstr "Nieuwe tabblad" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:683 msgid "Integrate with the messaging menu (indicator)" -msgstr "" +msgstr "In systeemvak opnemen (indicator)" -#: ../src/ui/ui_prefs.c:684 -#, fuzzy +#: ../src/ui/preferences_dialog.c:686 msgid "Terminate instead of minimizing to the messaging menu" -msgstr "_Afsluiten in plaats van minimaliseren naar systeemvak." +msgstr "Afsluiten in plaats van minimaliseren naar systeemvak" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:689 msgid "Start minimized to the messaging menu" -msgstr "" +msgstr "Geminimaliseerd in systeemvak starten" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:789 msgid "Type" msgstr "Soort" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:792 msgid "Program" msgstr "Programma" +#: ../src/ui/ui_node.c:123 +msgid "(Empty)" +msgstr "(Leeg)" + +#: ../src/ui/ui_node.c:320 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" +"%s\n" +"Herbouwen" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." -msgid_plural "" -"The provider of this feed suggests an update interval of %d minutes." -msgstr[0] "" -"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/subscription_dialog.c:434 msgid "This feed specifies no default update interval." -msgstr "Deze feed specificeert geen standaard bijwerkinterval." +msgstr "Deze feed specificeert geen standaardbijwerkinterval." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:153 msgid "Untitled" msgstr "Geen titel" @@ -1485,7 +1412,7 @@ #: ../src/parsers/atom10.c:241 ../src/parsers/pie_feed.c:141 msgid "Website" -msgstr "" +msgstr "Website" #: ../src/parsers/atom10.c:251 msgid "Invalid Atom feed: unknown author" @@ -1495,43 +1422,33 @@ msgid "%b %d %H:%M" msgstr "%d %b %H:%M" -#: ../src/fl_sources/default_source.c:174 -#: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 +#: ../src/fl_sources/default_source.c:145 +#: ../src/fl_sources/google_source.c:273 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" msgstr "Nieuw abonnement" -#: ../src/fl_sources/google_source.c:116 +#: ../src/fl_sources/google_source.c:115 msgid "Google Reader login failed!" msgstr "Inloggen Google Reader is mislukt!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:394 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 -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:395 +msgid "Integrate the feed list of your Google Reader account. Liferea will present your Google Reader subscriptions, and will synchronize your feed list and reading lists." +msgstr "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:325 +#: ../src/fl_sources/opml_source.c:326 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:326 -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:327 +msgid "Integrate blogrolls or Planets in your feed list. Liferea will automatically add and remove feeds according to the changes of the source OPML document" +msgstr "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:387 +#: ../src/fl_sources/opml_source.c:394 msgid "Choose OPML File" msgstr "OPML-bestand selecteren" @@ -1541,36 +1458,30 @@ #: ../src/fl_sources/node_source.c:238 msgid "No feed list source types found!" -msgstr "Geen feedlijstbrontypen gevonden!" +msgstr "Geen bronsoorten van feedlijst gevonden!" #: ../src/fl_sources/node_source.c:268 msgid "Source Type" -msgstr "Brontype" +msgstr "Bronsoort" #. FIXME: something is not perfect, because if you immediately #. remove the subscription tree afterwards there is a double free #: ../src/fl_sources/node_source.c:412 #, c-format msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" +msgstr "Het abonnement '%s' is geconverteerd naar lokale feeds." -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:360 msgid "Tiny Tiny RSS" -msgstr "" +msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 -#, fuzzy -msgid "" -"Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " -"present your tt-rss subscriptions, and will synchronize your feed list and " -"reading lists." -msgstr "" -"De feedlijst van uw Google Reader-account integreren. Liferea toont uw " -"Google Reader-abonnementen en zal uw feedlijst en leeslijsten synchroniseren." +#: ../src/fl_sources/ttrss_source.c:361 +msgid "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will present your tt-rss subscriptions, and will synchronize your feed list and reading lists." +msgstr "De feedlijst van uw Tiny Tiny RSS 1.5+-account integreren. Liferea toont uw tt-rss-abonnementen en zal uw feedlijst en leeslijsten synchroniseren." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:119 msgid "Could not parse JSON returned by tt-rss API!" -msgstr "" +msgstr "JSON afkomstig van tt-rss API kan niet worden ontleed." #: ../src/notification/libnotify.c:61 ../src/notification/libnotify.c:83 #: ../src/notification/libnotify.c:152 @@ -1586,26 +1497,26 @@ msgid "Visit" msgstr "Bezoek" -#: ../src/notification/libnotify.c:171 ../src/notification/libnotify.c:274 +#: ../src/notification/libnotify.c:167 ../src/notification/libnotify.c:263 msgid "Open feed" msgstr "Open feed" -#: ../src/notification/libnotify.c:174 ../src/notification/libnotify.c:277 +#: ../src/notification/libnotify.c:170 ../src/notification/libnotify.c:266 msgid "Mark all as read" msgstr "Alles als gelezen markeren" -#: ../src/notification/libnotify.c:254 +#: ../src/notification/libnotify.c:247 #, c-format msgid "%s has %d update" msgid_plural "%s has %d updates" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s heeft %d nieuw bericht" +msgstr[1] "%s heeft %d nieuwe berichten" -#: ../src/notification/libnotify.c:257 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:249 msgid "Feed Update" msgstr "Feed bijwerken" -#: ../src/notification/libnotify.c:271 +#: ../src/notification/libnotify.c:260 msgid "Show details" msgstr "Details tonen" @@ -1622,12 +1533,8 @@ msgstr "_Gebruikersnaam:" #: ../glade/auth.ui.h:6 -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 "De gebruikersnaam en het wachtwoord zullen in uw Liferea-feedlijstbestand worden opgeslagen zonder versleuteling." #: ../glade/google_source.ui.h:1 msgid "Add Google Reader Account" @@ -1637,8 +1544,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Voer uw accountinstellingen van Google Reader in." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Wachtwoord" @@ -1662,7 +1568,7 @@ msgid "combined view" msgstr "samengestelde weergave" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Koppen" @@ -1675,26 +1581,24 @@ msgstr "Abonnementeigenschappen" #: ../glade/liferea.ui.h:9 -#, fuzzy msgid "Feed Name" -msgstr "Feed_naam:" +msgstr "Feed-naam" #: ../glade/liferea.ui.h:10 msgid "Feed _Name:" msgstr "Feed_naam:" #: ../glade/liferea.ui.h:11 -#, fuzzy msgid "Update Interval" -msgstr "Bijwerkoverzicht" +msgstr "Bijwerkinterval" #: ../glade/liferea.ui.h:12 msgid "_Use global default update interval." -msgstr "Standaard bijwerkinterval _gebruiken." +msgstr "Standaardinterval _gebruiken." #: ../glade/liferea.ui.h:13 msgid "_Feed specific update interval of" -msgstr "_Voor deze feed specifiek bijwerkinterval van" +msgstr "_Voor deze feed een interval van" #: ../glade/liferea.ui.h:14 msgid "_Don't update this feed automatically." @@ -1707,17 +1611,16 @@ #: ../glade/liferea.ui.h:17 #, 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.ui.h:18 msgid "General" msgstr "Algemeen" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" -msgstr "Feedbron" +msgstr "Feed-bron" #: ../glade/liferea.ui.h:20 ../glade/new_subscription.ui.h:8 msgid "Source Type:" @@ -1729,11 +1632,11 @@ #: ../glade/liferea.ui.h:22 ../glade/new_subscription.ui.h:4 msgid "_URL" -msgstr "_URL" +msgstr "_Url" #: ../glade/liferea.ui.h:23 ../glade/new_subscription.ui.h:5 msgid "_Command" -msgstr "_Commando" +msgstr "_Opdracht" #: ../glade/liferea.ui.h:24 ../glade/new_subscription.ui.h:6 msgid "_Local File" @@ -1748,26 +1651,16 @@ msgstr "Gebruik conversie_filter" #: ../glade/liferea.ui.h:27 ../glade/new_subscription.ui.h:12 -msgid "" -"Liferea can use external filter plugins in order to access feeds and " -"directories in non-supported formats. See the documentation for more " -"information." -msgstr "" -"Liferea kan van externe filterextensies gebruik maken om niet-ondersteunde " -"feeds en mappen te lezen. Zie de documentatie voor meer informatie." +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.ui.h:28 ../glade/new_subscription.ui.h:13 msgid "Convert _using:" msgstr "Converteren _met:" #: ../glade/liferea.ui.h:30 -msgid "" -"The cache setting controls if the contents of feeds are saved when Liferea " -"exits. Marked items are always saved to the cache." -msgstr "" -"De buffergeheugeninstelling bepaalt of de inhoud van de feeds bewaard wordt " -"bij het afsluiten van Liferea. Gemarkeerde items worden altijd in het " -"buffergeheugen bewaard." +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.ui.h:31 msgid "_Default cache settings" @@ -1807,9 +1700,7 @@ #: ../glade/liferea.ui.h:42 msgid "Auto-_load item link in configured browser when selecting articles." -msgstr "" -"Itemlink bij selecteren van artikelen automatische _laden in opgegeven " -"browser." +msgstr "Koppeling bij selecteren van artikelen automatisch _laden in opgegeven browser." #: ../glade/liferea.ui.h:43 msgid "Ignore _comment feeds for this subscription." @@ -1832,498 +1723,493 @@ msgstr "Uitgebreid" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Liferea-voorkeuren" +msgid "New Folder" +msgstr "Nieuwe map" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "_Mapnaam:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Standaard _aantal items die per feed moeten worden bewaard:" +msgid "Rename" +msgstr "Hernoemen" #: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "Feed bijwerken" +msgid "_New Name:" +msgstr "_Nieuwe naam:" #: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Alle abonnementen bijwerken." +msgid "Search Folder Properties" +msgstr "Eigenschappen zoekmap" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Feedvernieuwings_interval:" +msgid "Search _Name:" +msgstr "Zoek_naam:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "Zoek items die aan de volgende voorwaarden voldoen" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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." +msgid "A_ny Rule Matches" +msgstr "_Elke regel voldoet" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Feeds" +msgid "_All Rules Must Match" +msgstr "_Alle regels moeten voldoen" #: ../glade/liferea.ui.h:57 -#, fuzzy -msgid "Folder Display Settings" -msgstr "Mappenweergave" +msgid "Open Enclosure" +msgstr "Bijlage openen" #: ../glade/liferea.ui.h:58 -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." +msgid "Open an enclosure of type:" +msgstr "Bijlage openen van type:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "Gelezen items _verbergen." +msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. The enclosures URL will be supplied as an argument for this command:" +msgstr "Wat moet er met deze bijlage gebeuren? Voer hieronder de opdracht in die u wilt uitvoeren. Het URL van de bijlage zal als argument aan de opdracht worden meegegeven:" #: ../glade/liferea.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Feedpictogrammen (Favicons)" +msgid "_Browse" +msgstr "_Bladeren" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "Alle _favicons nu bijwerken" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "Voortaan deze actie automatisch voor dit soort bijlagen uitvoeren." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Mappen" +msgid "Search All Feeds" +msgstr "Alle feeds doorzoeken" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "koppen als ongelezen markeren" +msgid "_Search for:" +msgstr "_Zoeken naar:" #: ../glade/liferea.ui.h:64 +msgid "Enter a search string Liferea should find either in a items title or in its content." +msgstr "Voer zoektermen in die moeten voorkomen in de titel of de inhoud van een item." + +#: ../glade/liferea.ui.h:65 +msgid "_Advanced..." +msgstr "_Uitgebreid..." + +#: ../glade/liferea.ui.h:66 +msgid "Starts searching for the specified text in all feeds. The search result will appear in the item list." +msgstr "De zoekopdracht naar de ingevoerde tekst in alle feeds starten. Het resultaat verschijnt in de itemlijst." + +#: ../glade/liferea.ui.h:67 +msgid "Update Monitor" +msgstr "Bijwerkoverzicht" + +#: ../glade/liferea.ui.h:68 +msgid "Pending Requests" +msgstr "Wachtrij verzoeken" + +#: ../glade/liferea.ui.h:69 +msgid "Downloading Now" +msgstr "Bijwerken" + +#: ../glade/liferea.ui.h:70 +msgid "Cancel _All" +msgstr "_Alles annuleren" + +#: ../glade/liferea.ui.h:71 +msgid "Create News Bin" +msgstr "Nieuwsbak aanmaken" + +#: ../glade/liferea.ui.h:72 +msgid "_News Bin Name:" +msgstr "_Naam nieuwsbak:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Info" + +#: ../glade/liferea.ui.h:74 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea is een nieuwsverzamelaar voor GTK+" + +#: ../glade/liferea.ui.h:75 +msgid "Liferea Homepage" +msgstr "Liferea-startpagina" + +#: ../glade/liferea.ui.h:76 +msgid "Advanced Search" +msgstr "Uitgebreid zoeken" + +#: ../glade/liferea.ui.h:77 +msgid "_Search Folder..." +msgstr "Map doorzoeken..." + +#: ../glade/liferea.ui.h:78 +msgid "Create Search Engine Feed" +msgstr "Zoekmachinefeed aanmaken" + +#: ../glade/liferea.ui.h:79 +msgid "enter any search string you want" +msgstr "voer zoektermen in" + +#: ../glade/liferea.ui.h:80 +msgid "Maximal _Number Of Result Items:" +msgstr "Maximum aantal resultaten:" + +#: ../glade/liferea.ui.h:81 +msgid "Note: Liferea will generate a feed subscription which is used to query the search engine results for the specified search string. You can keep this feed permanently and update it like any other subscription." +msgstr "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/new_subscription.ui.h:9 +msgid "Download / Postprocessing" +msgstr "Download / Nabewerken" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Bronselectie" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Brontype selecteren die toegevoegd moet worden..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "OPML/Planet toevoegen" + +#: ../glade/opml_source.ui.h:2 +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.ui.h:3 +msgid "_Location" +msgstr "Locatie" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "Bestand _selecteren" + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "Tiny Tiny RSS-account toevoegen" + +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "Voer uw accountinstellingen van tt-rss in." + +#: ../glade/ttrss_source.ui.h:3 +msgid "_Server URL" +msgstr "_Server-url" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "_Gebruikersnaam" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Uitgebreid..." + +#: ../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 "Geef een websiteadres om te zoeken naar feeds of als u het weet, het exacte adres van de feed." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Liferea-voorkeuren" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Verwerker feed-buffer" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Standaard _aantal items die per feed moeten worden bewaard:" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Feed-bijwerkinstellingen" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "Alle abonnementen _bijwerken bij het opstarten." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Standaard_interval bijwerken feed:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "Note: Please remember to set a reasonable refresh time. Usually it is a waste of bandwidth to poll feeds more often than each hour." +msgstr "Stel het bijwerkinterval in op een redelijke waarde. Het is vaak niet zinvol om feeds vaker dan ieder uur te verversen." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Feeds" + +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Mappenweergaveinstellingen" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "Laat items van _alle afgeleide feeds zien als een map is geselecteerd." + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "Gelezen items _verbergen." + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Feedpictogrammen (Favicons)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "Alle _favicons nu bijwerken" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Mappen" + +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Koppen lezen" + +#: ../glade/prefs.ui.h:17 msgid "_Skim through articles with:" msgstr "Door artikelen _bladeren met:" -#: ../glade/liferea.ui.h:65 -#, fuzzy +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "Standaardmodus _weergave:" + +#: ../glade/prefs.ui.h:19 msgid "Web Integration" -msgstr "Oriëntatie" +msgstr "Webintegratie" -#: ../glade/liferea.ui.h:66 +#: ../glade/prefs.ui.h:20 msgid "_Post Bookmarks to" -msgstr "_Bookmarks doorsturen naar" +msgstr "_Bladwijzers doorsturen naar" -#: ../glade/liferea.ui.h:67 -#, fuzzy +#: ../glade/prefs.ui.h:22 msgid "Internal Browser Settings" -msgstr "Interne browser" +msgstr "Interne browserinstellingen" -#: ../glade/liferea.ui.h:68 +#: ../glade/prefs.ui.h:23 msgid "Open links in Liferea's _window." -msgstr "Links in _venster Liferea openen." +msgstr "Koppelingen in _venster openen." -#: ../glade/liferea.ui.h:69 +#: ../glade/prefs.ui.h:24 msgid "_Disable Javascript." msgstr "Javascript _uitschakelen." -#: ../glade/liferea.ui.h:70 +#: ../glade/prefs.ui.h:25 msgid "_Enable browser plugins." msgstr "Browser_plug-in inschakelen" -#: ../glade/liferea.ui.h:71 -#, fuzzy +#: ../glade/prefs.ui.h:26 msgid "External Browser Settings" -msgstr "Externe browser" +msgstr "Externe browserinstellingen" -#: ../glade/liferea.ui.h:72 +#: ../glade/prefs.ui.h:27 msgid "_Open link in:" -msgstr "_Link openen met:" +msgstr "Koppeling _openen in:" -#: ../glade/liferea.ui.h:74 +#: ../glade/prefs.ui.h:28 +msgid "_Manual:" +msgstr "_Handmatig:" + +#: ../glade/prefs.ui.h:30 #, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" -msgstr "" -"_Handmatig:\n" -"(%s = URL)" +msgid "(%s for URL)" +msgstr "(%s voor URL)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Browser:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Browser" -#: ../glade/liferea.ui.h:78 -#, fuzzy +#: ../glade/prefs.ui.h:33 msgid "Notification Settings" -msgstr "Meldingen" +msgstr "Meldingeninstellingen" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Een _pop-upvenster tonen met nieuwe koppen." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "Een statuspictogram in het mededelingengebied (systeemvak) tonen." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Aantal _nieuwe items in het systeemvak tonen" -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Afsluiten in plaats van minimaliseren naar systeemvak." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "In systeemvak _starten" -#: ../glade/liferea.ui.h:84 -#, fuzzy +#: ../glade/prefs.ui.h:39 msgid "Toolbar Settings" -msgstr "Labels werkbalkknoppen:" +msgstr "Werkbalkinstellingen" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "Werkbalk _verbergen" -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Labels werkbalkknoppen:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" -msgstr "" +msgstr "HTTP-proxy-server" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "_Automatisch detecteren (GNOME of omgeving)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "_Geen proxy" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "_Handmatige instelling:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" -msgstr "Proxy_poort:" +msgstr "Proxy _poort:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" -msgstr "Proxy_host:" +msgstr "Proxy _host:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" -msgstr "Proxyaanmelding gebruiken" +msgstr "Proxy-authenticatie gebruiken" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" -msgstr "Proxy_wachtwoord:" +msgstr "Proxy _wachtwoord:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" -msgstr "Proxy_gebruikersnaam:" +msgstr "Proxy _gebruikersnaam:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.ui.h:98 -#, fuzzy +#: ../glade/prefs.ui.h:53 msgid "Downloading Enclosures" -msgstr "Bijlage downloaden" - -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Bladeren" +msgstr "Bijlagen downloaden" -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "Downloads op_slaan in" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Downloaden met" -#: ../glade/liferea.ui.h:102 -#, fuzzy +#: ../glade/prefs.ui.h:55 msgid "Opening Enclosures" -msgstr "Bijlage openen..." +msgstr "Bijlagen openen" -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Bijlagen" -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Met nabije hosts synchroniseren" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "Lokale _LAN-synchronisatie ingeschakelen" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "_Servicenaam" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Sync" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" +msgstr "Plugins" -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Nieuwe map" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Mapnaam:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Hernoemen" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Nieuwe naam:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Eigenschappen zoekmap" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "Zoek_naam:" - -#: ../glade/liferea.ui.h:115 -#, fuzzy -msgid "Find Items that meet the following criteria" -msgstr "Zoek items die aan de volgende voorwaarden voldoen" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "_Iedere regel voldoet" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "_Alle regels moeten overeenkomen" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Bijlage downloaden" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Bijlage downloaden van type:" - -#: ../glade/liferea.ui.h:120 -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.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "URL _doorgeven en geen bijlagen downloaden." - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "Dit voortaan automatisch _doen voor dit soort bijlagen." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "In alle feeds zoeken" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Zoeken naar:" - -#: ../glade/liferea.ui.h:125 -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.ui.h:126 -msgid "_Advanced..." -msgstr "Uitgebreid..." - -#: ../glade/liferea.ui.h:127 -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.ui.h:128 -msgid "Update Monitor" -msgstr "Bijwerkoverzicht" - -#: ../glade/liferea.ui.h:129 -#, fuzzy -msgid "Pending Requests" -msgstr "Nog bijwerken" - -#: ../glade/liferea.ui.h:130 -#, fuzzy -msgid "Downloading Now" -msgstr "Nu downloaden" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "_Alles annuleren" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Nieuwsbak aanmaken" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Naam nieuwsbak:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Info" - -#: ../glade/liferea.ui.h:135 -#, fuzzy -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Copyright (c) 2003-2009\n" -"The Liferea Team\n" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea is een nieuwsverzamelaar voor GTK+" - -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Liferea-startpagina" +#~ msgid "" +#~ "Copyright (c) 2003-2012\n" +#~ "The Liferea Team\n" +#~ msgstr "" +#~ "Copyright (c) 2003-2012\n" +#~ "Het Liferea team\n" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Uitgebreid zoeken" +#~ msgid "Download and view feeds" +#~ msgstr "Feeds downloaden en bekijken" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "Doorzoeken map..." +#~ msgid "You may want to validate the feed using" +#~ msgstr "Mogelijk wilt u de geldigheid van de feed vaststellen met" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Zoekmachinefeed aanmaken" +#~ msgid "bookmark" +#~ msgstr "bladwijzer" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "voer zoektermen in" +#~ msgid "comments" +#~ msgstr "commentaar" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Maximum aantal resultaten:" +#~ msgid "flag" +#~ msgstr "vlag" -#: ../glade/liferea.ui.h:145 -#, 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 "" -"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 "Enclosure download FAILED: \"%s\"" +#~ msgstr "Downloaden bijlage is MISLUKT: \"%s\"" -#: ../glade/new_subscription.ui.h:9 -#, fuzzy -msgid "Download / Postprocessing" -msgstr "Download / Nabewerken" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Downloaden bijlage afgerond: \"%s\"" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Bronselectie" +#~ 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. " -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Brontype selecteren die toegevoegd moet worden..." +#~ 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." -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "OPML/Planet toevoegen" +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Downloaden is MISLUKT: \"%s\"" -#: ../glade/opml_source.ui.h:2 -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" +#~ msgid "Download finished." +#~ msgstr "Downloaden is afgerond." -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "Locatie" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Item in _tabblad openen" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "Bladeren..." +#~ msgid "_Launch Item In Browser" +#~ msgstr "Item in _browser openen" -#: ../glade/ttrss_source.ui.h:1 -#, fuzzy -msgid "Add Tiny Tiny RSS Account" -msgstr "Bloglines-account toevoegen" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Item-_url naar klembord kopiëren" -#: ../glade/ttrss_source.ui.h:2 -#, fuzzy -msgid "Please enter your tt-rss account settings." -msgstr "Voer uw accountinstellingen van Bloglines in." +#~ msgid "Choose download directory" +#~ msgstr "Downloadmap kiezen" -#: ../glade/ttrss_source.ui.h:3 -#, fuzzy -msgid "_Server URL" -msgstr "Serverfout" +#~ msgid "Liferea Sync %s@%s" +#~ msgstr "Liferea-sync %s@%s" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "_Gebruikersnaam" +#~ msgid "Downloading Enclosure" +#~ msgstr "Bijlage downloaden" -#: ../glade/simple_subscription.ui.h:3 -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 "Sync" +#~ msgstr "Sync" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Uitgebreid..." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Met nabije hosts synchroniseren" -#~ msgid "You may want to validate the feed using" -#~ msgstr "Mogelijk wilt u de geldigheid van de feed vaststellen met" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "Lokale _LAN-synchronisatie ingeschakelen" #~ msgid "" -#~ "Jumps to the next unread item. If necessary selects the next feed with " -#~ "unread items." +#~ "_Manual:\n" +#~ "(%s for URL)" #~ msgstr "" -#~ "Naar het volgende ongelezen item verspringen. Indien nodig de volgende " -#~ "feed met ongelezen items selecteren." +#~ "_Handmatig:\n" +#~ "(%s = url)" -#~ msgid "Liferea Sync %s@%s" -#~ msgstr "Liferea-sync %s@%s" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "Url _doorgeven en geen bijlagen downloaden." + +#~ msgid "_Save downloads in" +#~ msgstr "Downloads op_slaan in" + +#~ msgid "_Service Name" +#~ msgstr "_Servicenaam" #~ msgid "link cosmos" #~ msgstr "link cosmos" @@ -2346,6 +2232,9 @@ #~ msgid "The orientation of the tray." #~ msgstr "De oriëntatie van de tray" +#~ msgid "%s" +#~ msgstr "%s" + #~ msgid "topics_en.html" #~ msgstr "topics_en.html" @@ -2374,15 +2263,8 @@ #~ msgstr[0] "%d zoekresultaat" #~ msgstr[1] "%d zoekresultaten" -#~ 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." #~ msgid "Count" #~ msgstr "Aantal" @@ -2453,12 +2335,8 @@ #~ msgid "Bloglines" #~ msgstr "Bloglines" -#~ 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." +#~ 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." #~ msgid "feedlist.opml" #~ msgstr "feedlist_nl.opml" @@ -2492,12 +2370,8 @@ #~ msgid "text/plain" #~ msgstr "text/plain" -#~ 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." #~ msgid "Downloading Enclosures" #~ msgstr "Bijlagen downloaden" @@ -2553,8 +2427,8 @@ #~ msgid "Search _Link Cosmos with" #~ msgstr "_Link Cosmos doorzoeken met" -#~ msgid "%s" -#~ msgstr "%s" +#~ msgid "_Allow Flash in Feeds." +#~ msgstr "Flash in feeds toest_aan." #~ msgid "This item's contents is invalid." #~ msgstr "De inhoud van dit item is ongeldig." @@ -2569,42 +2443,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\"" @@ -2637,15 +2491,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." @@ -2704,12 +2553,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." @@ -2741,12 +2586,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" @@ -2842,9 +2683,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:" @@ -2870,14 +2709,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" @@ -2953,8 +2786,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" @@ -2965,10 +2797,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" @@ -3015,12 +2845,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.8.15/po/pl.po liferea-1.10.3/po/pl.po --- liferea-1.8.15/po/pl.po 2013-06-24 22:16:16.000000000 +0200 +++ liferea-1.10.3/po/pl.po 2013-07-31 23:29:12.000000000 +0200 @@ -1,29 +1,27 @@ -# Polska lokalizacja czytnika RSS Liferea +# Polish translation for liferea package. # Copyright (C) 2004, 2005 Jakub W. Jóźwicki # Copyright (C) 2006, 2007 Free Software Foundation -# Ten plik jest rozprowadzany na tej samej licencji co pakiet Liferea. +# This file is distributed under the same license as the liferea package. # Jakub W. Jozwicki , 2004, 2005. # Bart Kreska , 2006, 2007. -# Wojciech Myrda , 2011. -# +# Piotr Sokół , 2013. # msgid "" msgstr "" -"Project-Id-Version: liferea 1.4\n" +"Project-Id-Version: liferea 1.10-rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" -"PO-Revision-Date: 2007-10-20 21:26+0100\n" -"Last-Translator: Bart Kreska \n" -"Language-Team: Polish\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" +"PO-Revision-Date: 2013-05-17 11:55+0200\n" +"Last-Translator: Piotr Sokół \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" +"X-Generator: Gtranslator 2.91.5\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -33,32 +31,23 @@ #: ../liferea.desktop.in.h:3 msgid "Liferea Feed Reader" -msgstr "Czytnik Wiadomości RSS Liferea" +msgstr "Czytnik wiadomości RSS Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Subskrybuj kanały informacyjne" +msgid "Read news feeds and blogs" +msgstr "Odczytuje zawartość kanałów wiadomości i blogów" #: ../xslt/feed.xml.in.h:1 -msgid "" -"This feed is discontinued. It's no longer available. Liferea won't update it " -"anymore but you can still access the cached headlines." -msgstr "" -"Subskrypcja ta została zamknięta i nie jest już dostępna. Liferea nie będzie " -"jej uaktualniać ale masz nadal dostęp do zachowanych nagłówków." +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 "Subskrypcja tego kanału została zakończona i nie jest już możliwa. Program nie będzie go uaktualniać, ale dostęp do pobranych nagłówków pozostanie zachowany." #: ../xslt/feed.xml.in.h:2 -msgid "" -"The last update of this subscription failed!
    HTTP error code : " -msgstr "" -"Ostatnia aktualizacja tej subskrypcji nie powiodła się!
    Kod błędu " -"HTTP : " +msgid "The last update of this subscription failed!
    HTTP error code : " +msgstr "Ostatnia aktualizacja tej subskrypcji nie powiodła się!
    Kod błędu HTTP : " #: ../xslt/feed.xml.in.h:3 msgid "There were errors while parsing this feed!" -msgstr "Wystąpiły błędy przy przetwarzaniu tej subskrypcji!" +msgstr "Wystąpiły błędy podczas przetwarzania bieżącej subskrypcji!" #: ../xslt/feed.xml.in.h:4 msgid "Parser Error Details" @@ -70,11 +59,11 @@ #: ../xslt/feed.xml.in.h:6 msgid "You may want to contact the author/webmaster of the feed about this!" -msgstr "" +msgstr "Można powiadomić o tej sytuacji autora/opiekuna tego kanału!" #: ../xslt/feed.xml.in.h:7 msgid "There were errors while filtering this feed!" -msgstr "Wystąpiły błędy przy filtrowaniu tej subskrypcji!" +msgstr "Wystąpiły błędy podczas filtrowania bieżącego kanału!" #: ../xslt/feed.xml.in.h:8 msgid "Filter Error Details" @@ -82,11 +71,11 @@ #: ../xslt/feed.xml.in.h:9 msgid "Feed:" -msgstr "Subskrypcja:" +msgstr "Kanał:" #: ../xslt/feed.xml.in.h:10 ../xslt/source.xml.in.h:1 msgid "Source:" -msgstr "Źródło:" +msgstr "Adres źródłowy:" #: ../xslt/feed.xml.in.h:11 msgid "Publisher" @@ -113,15 +102,15 @@ #: ../xslt/item.xml.in.h:1 ../glade/liferea.ui.h:29 msgid "Source" -msgstr "Źródło" +msgstr "Zasób" #: ../xslt/item.xml.in.h:2 msgid "Feed" -msgstr "Subskrypcja" +msgstr "Kanał" #: ../xslt/item.xml.in.h:3 msgid "Filed under" -msgstr "Zaszeregowano w" +msgstr "Zaszeregowany w" #: ../xslt/item.xml.in.h:4 msgid "Author" @@ -129,15 +118,15 @@ #: ../xslt/item.xml.in.h:5 msgid "Shared by" -msgstr "Współdzielone przez" +msgstr "Udostępnił " #: ../xslt/item.xml.in.h:6 msgid "Via" -msgstr "Poprzez" +msgstr "Za" #: ../xslt/item.xml.in.h:7 msgid "Related" -msgstr "Pokrewne" +msgstr "Zmień nazwę" #: ../xslt/item.xml.in.h:8 msgid "Also posted in" @@ -145,41 +134,29 @@ #: ../xslt/item.xml.in.h:9 msgid "Creator" -msgstr "Twórca" +msgstr "Autor" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "flaga" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "zakładka" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "komentarze" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." -msgstr "Nie ma jeszcze komentarzy." +msgstr "Brak komentarzy." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Komentarze" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." -msgstr "Uaktualniam..." +msgstr "Uaktualnianie..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" -msgstr "Odśwież" +msgstr "Wczytaj ponownie" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Sekcja" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Wydział" @@ -188,41 +165,36 @@ msgstr "Kosz:" #: ../xslt/newsbin.xml.in.h:2 -msgid "" -"Add items to this news bin by selecting \"Copy to News Bin\" from the item " -"list context menu." -msgstr "" -"Dodaj wiadomości do kosza wybierając z menu kontekstowego \"Skopiuj do Kosza" -"\"." +msgid "Add items to this news bin by selecting \"Copy to News Bin\" from the item list context menu." +msgstr "Aby dodać nagłówek do kosza, należy wybrać z menu podręcznego polecenie „Skopiuj do kosza”." #: ../xslt/vfolder.xml.in.h:1 msgid "Search Folder:" -msgstr "Znajdź w katalogu:" +msgstr "Katalog wyników:" #: ../src/browser.c:32 -#, fuzzy msgid "Default Browser" -msgstr "Domyślna przeglądarka GNOME" +msgstr "Domyślna przeglądarka" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" -msgstr "Błąd uruchamiania przeglądarki: %s" +msgstr "Nie udało się wykonać polecenia przeglądarki: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" -msgstr "Uruchamianie: \"%s\"" +msgstr "Uruchamianie: „%s”" #. unauthorized #: ../src/comments.c:120 msgid "Authorization Error" -msgstr "Błąd autoryzacji" +msgstr "Błąd uwierzytelniania" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" -msgstr "Nie można utworzyć katalogu pamięci podręcznej \"%s\"!" +msgstr "Nie można utworzyć katalogu pamięci podręcznej „%s”!" # %l hour ( 1..12) -> %k hour ( 0..23) # %p (AM/PM) is not used in Poland @@ -255,116 +227,104 @@ msgid "%b %d %Y" msgstr "%d %B %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" -msgstr "\"%s\" nie jest poprawnym plikiem konfiguracyjnym!" +msgstr "Plik „%s” nie jest prawidłowym plikiem konfiguracyjnym!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Pobieranie załącznika nie powiodło się: \"%s\"" +#: ../src/enclosure.c:288 +msgid "You have not configured a download tool yet! Please do so in the 'Download' tab in Tools/Preferences." +msgstr "Nie skonfigurowano programu służącego do pobierania! Wymagane ustawienia można znaleźć na karcie „Pobieranie”, w oknie preferencji programu." -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Zakończono pobieranie załącznika: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" +"Nie udało się wykonać polecenia:\n" +"\n" +"%s\n" +"\n" +" Proszę sprawdzić czy zainstalowano i skonfigurowano program służący do pobierania! Wymagane ustawienia można znaleźć na karcie „Pobieranie”, w oknie preferencji programu." -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" -msgstr "Błąd przy zmianie nazwy z %s na %s\n" +msgstr "Błąd zmieniania nazwy z %s na %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" -msgstr "Błąd XML przy czytaniu pliku OPML! Nie można zaimportować \"%s\"!" +msgstr "Błąd XML czytania pliku OPML! Nie można zaimportować pliku „%s”!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format -msgid "" -"Empty document! OPML document \"%s\" should not be empty when importing." -msgstr "" -"Pusty dokument! Importowany dokument OPML \"%s\" powinien mieć niezerową " -"zawartość." +msgid "Empty document! OPML document \"%s\" should not be empty when importing." +msgstr "Pusty dokument! Importowany dokument OPML „%s” nie może być pusty." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" -msgstr "" -"\"%s\" nie jest poprawnym dokumentem OPML! Liferea nie może zaimportować " -"tego pliku!" +msgstr "Plik „%s” nie jest prawidłowym dokumentem OPML! Nie można zaimportować tego pliku!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Lista zaimportowanych subskrypcji" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importuj listę subskrypcji" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" -msgstr "Importuj" +msgstr "Zaimportuj" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 -#, fuzzy +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 msgid "OPML Files" -msgstr "Wybierz plik OPML" +msgstr "Pliki OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Błąd eksportowania listy subskrypcji!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" -msgstr "Lista subskrypcji została wyeksportowana!" +msgstr "Wyeksportowano listę subskrypcji!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Eksportuj listę subskrypcji" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" -msgstr "Eksportuj" +msgstr "Wyeksportuj" #: ../src/feed.c:255 -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 "" -"

    Nie można rozpoznać typu subskrypcji! Sprawdź czy adres źródła wskazuje " -"na zasób będący w jednym z obsługiwanych formatów subskrypcji!

    Wydruk z " -"parsera 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 "

    Nie można rozpoznać typu subskrypcji! Proszę sprawdzić czy adres źródłowy wskazuje na zasób będący w jednym z obsługiwanych formatów subskrypcji!

    Wydruk z parsera XML:
    " #: ../src/feed.c:284 #, c-format msgid "\"%s\" updated..." -msgstr "\"%s\" uaktualnione..." +msgstr "Uaktualniono „%s”..." #: ../src/feed.c:294 #, c-format msgid "\"%s\" is not available" -msgstr "\"%s\" nie jest dostępne" +msgstr "„%s” nie jest dostępne" #: ../src/feed_parser.c:137 -msgid "" -"The URL you want Liferea to subscribe to points to a webpage and the auto " -"discovery found no feeds on this page. Maybe this webpage just does not " -"support feed auto discovery." -msgstr "" -"Adres URL, który próbujesz subskrybować wkazuje na stronę WWW lecz nie udało " -"się automatycznie wykryć na niej żadnych subskrypcji. Być może ta strona nie " -"obsługuje automatycznego wykrywania subskrypcji." +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 "Wprowadzony adres URL wskazuje na witrynę internetową, lecz nie udało się wykryć na niej żadnego kanału subskrypcji. Możliwe, że ta witryna nie obsługuje automatycznego wykrywania subskrypcji." #: ../src/feed_parser.c:170 #, 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!" +msgstr "Błąd XML czytania kanału! Nie można wczytać zawartości kanału „%s”!" #: ../src/feed_parser.c:175 msgid "Empty document!" @@ -376,180 +336,151 @@ #: ../src/feed_parser.c:227 msgid "Source points to HTML document." -msgstr "Źródło wskazuje na dokument HTML." +msgstr "Adres źródłowy wskazuje na dokument HTML." #: ../src/feed_parser.c:230 msgid "Could not determine the feed type." msgstr "Nie można określić typu subskrypcji." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 -#, fuzzy +#: ../src/itemlist.c:404 msgid "There are no unread items" -msgstr "Nie ma nieprzeczytanych nagłówków " +msgstr "Brak nieprzeczytanych nagłówków " -#: ../src/main.c:175 -msgid "" -"Start Liferea with its main window in STATE. STATE may be `shown', " -"`iconified', or `hidden'" -msgstr "" -"Uruchom Liferea a oknem głównym w STANIE. STAN może być: wyświetlony, " -"mimimalizowany do ikony, lub ukryty" +#: ../src/main.c:164 +msgid "Start Liferea with its main window in STATE. STATE may be `shown', `iconified', or `hidden'" +msgstr "Uruchamia program ustalając STAN jego okna. Parametr STAN może przybierać wartość „shown”, „iconified” lub „hidden”." -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "STAN" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" -msgstr "Wyświetla numer wersji Liferea i kończy" +msgstr "Wypisuje informacje o wersji i kończy działanie" -#: ../src/main.c:180 -#, fuzzy +#: ../src/main.c:166 msgid "Add a new subscription" -msgstr "Nowa Subskrypcja" +msgstr "Dodaje nową subskrypcję" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" -msgstr "" +msgstr "URI" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" -msgstr "Wyświetla informacje debugera wszytkich typów" +msgstr "Wypisuje wszystkie komunikaty diagnozowania błędów" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" -msgstr "Wyświetla informacje debugera o użyciu cache" +msgstr "Wypisuje komunikaty diagnozowania błędów pamięci podręcznej" -#: ../src/main.c:187 -#, fuzzy +#: ../src/main.c:173 msgid "Print debugging messages for the configuration handling" -msgstr "Wyświetla informacje debugera o użyciu konfiguracji" +msgstr "Wypisuje komunikaty diagnozowania błędów konfiguracji" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" -msgstr "Wyświetla informacje debugera o użyciu bazy danych" +msgstr "Wypisuje komunikaty diagnozowania błędów bazy danych" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" -msgstr "Wyświetla informacje debugera o funcjach GUI" +msgstr "Wypisuje komunikaty diagnozowania błędów interfejsu graficznego" -#: ../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.8/output.xhtml" -msgstr "" +#: ../src/main.c:176 +msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.cache/liferea/output.xhtml" +msgstr "Włącza diagnozowanie błędów renderowania HTML. Za każdym razem kiedy program renderuje kod HTML, wygenerowany kod zastanie również zapisany do pliku ~/.cache/liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" -msgstr "Wyświetla informacje debugera o aktywności sieciowej" +msgstr "Wypisuje komunikaty diagnozowania błędów połączeń sieciowych" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" -msgstr "Wyświetla informacje debugera o funcjach parsingu" +msgstr "Wypisuje komunikaty diagnozowania błędów funkcji przetwarzania" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" -msgstr "Wyświetla informacje debugera jeśli funcja procesuje się zbyt długo" +msgstr "Wypisuje komunikaty diagnozowania błędów, jeśli funkcja przetwarzana jest zbyt długo" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" -msgstr "Wyświetla informacje debugera dla funkcji wejścia/wyjścia" +msgstr "Wypisuje komunikaty diagnozowania błędów podczas uruchamiania/kończenia działania funkcji" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" -msgstr "Wyświetla informacje debugera o procesowanej subskrypcji" +msgstr "Wypisuje komunikaty diagnozowania błędów uaktualniania kanałów" -#: ../src/main.c:196 -#, fuzzy +#: ../src/main.c:182 msgid "Print debugging messages of the search folder matching" -msgstr "Wyświetla informacje debugera o użyciu cache" +msgstr "Wypisuje komunikaty diagnozowania błędów dopasowywania katalogów wyników" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" -msgstr "Wyświetl rozszerzone informacje debugera" +msgstr "Wypisuje dodatkowe komunikaty diagnozowania błędów" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" -msgstr "Wyświetla informacje debugera na dany temat" +msgstr "Wypisuje informacje diagnozowania błędów na dany temat" -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" -msgstr "Liferea, Linux Feed Reader" +msgstr "Liferea, czytnik wiadomości dla systemu Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" -"Dla uzyskania więcej informacji odwiedź http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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 "" -"Ta wersja Liferea używa nowego formatu pamięci podręcznej i stara zawartość " -"została skonwertowana. Dane wersji %s nie zostały usunięte.Usuń ten katalog " -"ręcznie jeśli migracja się powiodła!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Więcej informacji można znaleźć na stronie http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 msgid "The update request was cancelled" -msgstr "Update został przerwany" +msgstr "Anulowano żądanie uaktualnienia" #: ../src/net.c:321 msgid "Unable to resolve destination host name" -msgstr "Nie można odszukać adresu docelowego" +msgstr "Nie można określić nazwy komputera docelowego" #: ../src/net.c:322 msgid "Unable to resolve proxy host name" -msgstr "Nie można odszukać adresu serwera proxy" +msgstr "Nie można określić nazwy komputera pośrednika" #: ../src/net.c:323 msgid "Unable to connect to remote host" -msgstr "Nie można połączyć ze zdalnym hostem" +msgstr "Nie można nawiązać połączenia ze zdalnym komputerem" #: ../src/net.c:324 msgid "Unable to connect to proxy" -msgstr "Nie można połączyć z serwerem proxy" +msgstr "Nie można nawiązać połączenia z pośrednikiem" #: ../src/net.c:325 -msgid "" -"A network error occurred, or the other end closed the connection unexpectedly" -msgstr "" -"Nastąpił błąd połączenia sieciowego, lub druga strona niespodziewanie " -"zakończyła połączenie" +msgid "A network error occurred, or the other end closed the connection unexpectedly" +msgstr "Wystąpił błąd sieci lub z innego powodu połączenie zostało niespodziewanie przerwane" #. http 3xx redirection #: ../src/net.c:328 msgid "The resource moved permanently to a new location" -msgstr "Zródło definitywnie przeniesiono do nowej lokalizacji" +msgstr "Zasób został przeniesiony w inne położenie" #. http 4xx client error #: ../src/net.c:331 -msgid "" -"You are unauthorized to download this feed. Please update your username and " -"password in the feed properties dialog box" -msgstr "" -"Nie masz dostępu do tej subskrypcji. Uaktualnij nazwę użytkownika i hasło w " -"oknie ustawień subskrypcji." +msgid "You are unauthorized to download this feed. Please update your username and password in the feed properties dialog box" +msgstr "Nie uwierzytelniono dostępu do tego kanału. Proszę uaktualnić nazwę użytkownika i hasło w oknie ustawień kanału." #: ../src/net.c:333 msgid "Payment required" -msgstr "Wymagana opłata" +msgstr "Wymagane uiszczenie opłaty" #: ../src/net.c:334 msgid "You're not allowed to access this resource" -msgstr "Nie możesz korzystać z tej subskrypcji" +msgstr "Brak dostępu do tego zasobu" #: ../src/net.c:335 msgid "Resource Not Found" -msgstr "Zasób Nie Odnaleziony" +msgstr "Zasób nie odnaleziony" #: ../src/net.c:336 msgid "Method Not Allowed" -msgstr "Niedozwolona Metoda" +msgstr "Niedozwolona metoda" #: ../src/net.c:337 msgid "Not Acceptable" @@ -557,7 +488,7 @@ #: ../src/net.c:338 msgid "Proxy authentication required" -msgstr "Wymagana autoryzacja pośrednika sieciowego (proxy)" +msgstr "Wymagane uwierzytelnienie pośrednika sieciowego (proxy)" #: ../src/net.c:339 msgid "Request timed out" @@ -569,12 +500,11 @@ #: ../src/net.c:345 msgid "There was an internal error in the update process" -msgstr "Wystąpił błąd wewnętrzny podczas auktualniania" +msgstr "Wystąpił wewnętrzny błąd podczas uaktalniania" #: ../src/net.c:347 msgid "Feed not available: Server requested unsupported redirection!" -msgstr "" -"Subskrypcja niedostępna: Serwer zażądał nieobsługiwanego przekierowania!" +msgstr "Subskrypcja niedostępna: serwer zażądał nieobsługiwanego przekierowania!" #: ../src/net.c:349 msgid "Client Error" @@ -612,27 +542,27 @@ #: ../src/rule.c:177 msgid "Read status" -msgstr "Flaga przeczytania" +msgstr "Stan przeczytania" #: ../src/rule.c:177 msgid "is unread" -msgstr "nieprzeczytana" +msgstr "nieprzeczytany" #: ../src/rule.c:177 msgid "is read" -msgstr "przeczytana" +msgstr "przeczytany" #: ../src/rule.c:178 msgid "Flag status" -msgstr "Flaga statusu" +msgstr "Stan wyróżnienia" #: ../src/rule.c:178 msgid "is flagged" -msgstr "ma flagę" +msgstr "wyróżniony" #: ../src/rule.c:178 msgid "is unflagged" -msgstr "nie ma flagi" +msgstr "niewyróżniony" #: ../src/rule.c:179 msgid "Podcast" @@ -652,160 +582,151 @@ #: ../src/rule.c:180 msgid "is set" -msgstr "jest oznaczona" +msgstr "ustalona" #: ../src/rule.c:180 msgid "is not set" -msgstr "jest nieoznaczona" +msgstr "nieustalona" #: ../src/rule.c:181 msgid "Feed title" -msgstr "Tytuł subskrypcji" +msgstr "Nazwa kanału" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" -msgstr "Subskrypcja \"%s\" jest już uaktualniana!" +msgstr "Subskrypcja „%s” jest w trakcie uaktualniania!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format -msgid "" -"The subscription \"%s\" was discontinued. Liferea won't update it anymore!" -msgstr "" -"Subskrypcja \"%s\" została zamknięta. Liferea nie będzie jej więcej " -"uaktualniać!" +msgid "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" +msgstr "Subskrypcja „%s” została zakończona. Program nie będzie jej więcej uaktualniać!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" -msgstr "Uaktualnianie ikony dla \"%s\"" +msgstr "Uaktualnianie ikony dla „%s”" -#: ../src/subscription.c:192 -msgid "" -"There was a problem while reading this subscription. Please check the URL " -"and console output." -msgstr "" -"Wystąpił problem przy czytaniu subskrypcji. Sprawdź adres URL oraz " -"komunikaty na konsoli" +#: ../src/subscription.c:193 +msgid "There was a problem while reading this subscription. Please check the URL and console output." +msgstr "Wystąpił problem podczas czytania subskrypcji. Proszę sprawdzić poprawność adresu URL oraz komunikaty błędów." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" -msgstr "URL \"%s\" zmienił się i został uaktualniony" +msgstr "Adres URL „%s” zmienił się i został uaktualniony" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" -msgstr "\"%s\" został zamknięty. Liferea nie będzie go więcej uaktualniać!" +msgstr "Subskrypcja kanału „%s” została zakończona. Program nie będzie go więcej uaktualniać!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" -msgstr "\"%s\" nie zmienił się od ostaniej aktualizacji" +msgstr "Zawartość kanału „%s” nie zmieniła się od czasu ostatniego uaktualniania" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" -msgstr "Uaktualnianie \"%s\"" +msgstr "Uaktualnianie „%s”" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" -msgstr "Błąd otwierania pliku tymczasowego %s potrzebnego do filtrowania!" +msgstr "Błąd otwierania pliku tymczasowego %s, wymaganego do filtrowania!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" -msgstr "%s zakończył ze statusem %d" +msgstr "%s zakończył ze stanem %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" -msgstr "Błąd: Nie można otworzyć potoku \"%s\"" +msgstr "Błąd: nie można otworzyć potoku „%s”" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" -msgstr "Błąd: Nie można otworzyć pliku \"%s\"" +msgstr "Błąd: nie można otworzyć pliku „%s”" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" -msgstr "Błąd: Nie ma takiego pliku \"%s\"" +msgstr "Błąd: nie ma takiego pliku „%s”" #: ../src/vfolder.c:55 msgid "New Search Folder" -msgstr "Nowy Katalog Wyników" +msgstr "Nowy katalog wyników" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" -msgstr "[Wystąpiło więcej błędów. Wydruk został obcięty!]" +msgstr "[Wystąpiło więcej błędów. Komunikat został skrócony!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" -msgstr "XML Parser: Nie można przetworzyć dokumentu:\n" +msgstr "Parser XML: nie można przetworzyć dokumentu:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Załączniki" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" -msgstr " Bajty" +msgstr " Bajtów" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" -msgstr "" +msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" -msgstr "" +msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" -msgstr "" +msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" -msgstr "" +msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d załącznik" +msgstr[1] "%d załączniki" +msgstr[2] "%d załączników" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" -msgstr "Wybierz plik" +msgstr "Wybór pliku" -#: ../src/ui/enclosure_list_view.c:404 -#, fuzzy, c-format +#: ../src/ui/enclosure_list_view.c:438 +#, c-format msgid "File Extension .%s" -msgstr "Rozszerzenie pliku .%s" +msgstr "Rozszerzenie pliku .%s" #: ../src/ui/icons.c:54 #, c-format msgid "Couldn't find pixmap file: %s" -msgstr "Nie można odnaleźć pliku graficznego: %s" +msgstr "Nie można odnaleźć pliku pixmapy: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" -msgstr[0] "%d nowa" -msgstr[1] "%d nowe" -msgstr[2] "%d nowych" +msgstr[0] "(%d nowa)" +msgstr[1] "(%d nowe)" +msgstr[2] "(%d nowych)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" @@ -813,371 +734,386 @@ msgstr[1] "%d nieprzeczytane%s" msgstr[2] "%d nieprzeczytanych%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Tematy pomocy" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Streszczenie" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" -msgstr "FAQ" +msgstr "Najczęściej zadawane pytania" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" -msgstr "Liferea działa teraz w trybie online" +msgstr "Program działa w trybie połączonym" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" -msgstr "Pracuj Offline" +msgstr "Przełącza w tryb rozłączony" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" -msgstr "Liferea działa teraz w trybie offline" +msgstr "Program działa w trybie rozłączonym" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" -msgstr "Pracuj Online" +msgstr "Przełącza w tryb połączony" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Subskrypcje" # Skrócone (toolbar) -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" -msgstr "Uaktu_alnij" +msgstr "Uaktualnij _wszystkie" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." -msgstr "Uaktualnia wszystkie subskrypcje." +msgstr "Uaktualnia wszystkie subskrypcje" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" -msgstr "_Oznacz jako przeczytane" +msgstr "_Oznacz wszystkie jako przeczytane" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." -msgstr "Oznacza każdy element każdej subskrypcji jako przeczytany." +msgstr "Oznacza wszystkie nagłówki każdej subskrypcji jako przeczytane" -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Importuj listę subskrypcji..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." -msgstr "Importuje listę subskrypcji OPML." +msgstr "Importuje listę kanałów z pliku w formacie OPML" -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Eksportuj listę subskrypcji..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." -msgstr "Eksportuje listę subskrypcji jako OPML." +msgstr "Eksportuje listę kanałów do pliku w formacie OPML" -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" -msgstr "_Wyjście" +msgstr "Za_kończ" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" -msgstr "_Wiadomości" +msgstr "_Kanał" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" -msgstr "Usuń wszys_tkie" +msgstr "Usuń _wszystkie nagłówki" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." -msgstr "Usuwa wszystkie nagłówki z zaznaczonej subskrypcji." +msgstr "Usuwa wszystkie nagłówki z zaznaczonego kanału" # Subskypcje, Wiadomości, Nagłówki - l. mnoga -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" -msgstr "_Nagłówki" +msgstr "_Nagłówek" + +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "Poprzedni" + +# Skrócone (toolbar) +#: ../src/ui/liferea_shell.c:924 +msgid "Next Item" +msgstr "Następny" # Skrócone (toolbar) #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" -msgstr "_Następny" +msgstr "_Następny nieprzeczytany" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" -msgstr "Wi_dok" +msgstr "_Widok" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" -msgstr "Z_większ rozmiar czcionki" +msgstr "Z_większ rozmiar tekstu" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." -msgstr "Zwiększa rozmiar tekstu oglądanego nagłówka." +msgstr "Zwiększa rozmiar tekstu wyświetlanego artykułu" -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" -msgstr "Z_mniejsz rozmiar czcionki" +msgstr "Z_mniejsz rozmiar tekstu" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." -msgstr "Zmniejsza rozmiar tekstu oglądanej artykułu." +msgstr "Zmniejsza rozmiar tekstu wyświetlanego artykułu" -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" -msgstr "Na_rzędzia" +msgstr "_Narzędzia" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "_Monitor uaktualniania" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" -msgstr "Wyświetl listę subskrypcji oczekujących na uaktualnienie" +msgstr "Wyświetla listę kanałów oczekujących na uaktualnienie" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" -msgstr "_Preferencje" +msgstr "P_referencje" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." -msgstr "Edytuje preferencje." +msgstr "Konfiguruje ustawienia programu" -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" -msgstr "_Znajdź" +msgstr "_Wyszukiwanie" # Skrocone (toolbar) -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." -msgstr "Znajdź..." +msgstr "Wyszukaj..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." -msgstr "Pokazuje pole wyszukiwania." +msgstr "Wyświetla okno wyszukiwania" -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" -msgstr "_Pomoc" +msgstr "Pomo_c" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" -msgstr "_Zawartość" +msgstr "_Spis treści" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." -msgstr "Zobacz pomoc dla tej aplikacji." +msgstr "Wyświetla zawartość podręcznika użytkownika programu" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Streszczenie" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." -msgstr "Zobacz listę skrótów klawiszowych Liferea." +msgstr "Wyświetla listę skrótów klawiszowych programu" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" -msgstr "_FAQ" +msgstr "_Najczęściej zadawane pytania" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." -msgstr "Zobacz FAQ tej aplikacji." +msgstr "Wyświetla najczęściej zadawane pytania i odpowiedzi związane z programem" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" -msgstr "_O Programie" +msgstr "_O programie" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." -msgstr "Pokazuje informacje o programie." +msgstr "Wyświetla informacje o programie" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" -msgstr "Widok _zwykły" +msgstr "_Zwykły" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." -msgstr "Ustawia widok jak w programie pocztowym." +msgstr "Przełącza typ widoku znany z programów pocztowych" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" -msgstr "Widok _szeroki" +msgstr "_Szeroki" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." -msgstr "Ustawia widok w trzech pionowych panelach." +msgstr "Przełącza typ widoku wyświetlający zawartość w trzech pionowych panelach" # Skrocone (toolbar) -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" -msgstr "Widok _kombinowany" +msgstr "_Połączony" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." -msgstr "Ustawia widok dwupanelowy." +msgstr "Przełącza typ widoku wyświetlający zawartość w dwóch panelach" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" -msgstr "_Skrócona Lista Subskrypcji" +msgstr "_Skrócona lista subskrypcji" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." -msgstr "Ukryj subskrypcje bez nieprzeczytanych nagłówków." +msgstr "Ukrywa na liście kanały nie zawierające nieprzeczytanych nagłówków" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." -msgstr "_Nowa Subskrypcja..." +msgstr "_Nowa subskrypcja..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." -msgstr "Dodaje nową subskrypcję." +msgstr "Dodaje do listy kanałów nową subskrypcję" -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." -msgstr "Nowy _Katalog..." +msgstr "Nowy _katalog..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." -msgstr "Dodaje katalog do listy subskrypcji." +msgstr "Tworzy nowy katalog na liście kanałów" -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." -msgstr "Nowy Katalog _Wyników..." +msgstr "Nowy katalog _wyników..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." -msgstr "Dodaje nowy Katalog Wyników do listy subskrypcji." +msgstr "Tworzy nowy katalog wyszukiwania na liście subskrypcji" -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." -msgstr "Nowe Ź_ródło..." +msgstr "Nowy _zasób..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." -msgstr "Dodaje nowe źródło do listy subskrypcji." +msgstr "Dodaje nowy zasób do listy kanałów" -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." -msgstr "Nowy _Kosz..." +msgstr "Nowy _kosz..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." -msgstr "Dodaje nowy Kosz." +msgstr "Tworzy nowy kosz wiadomości" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" -msgstr "Oznacz Jako _Przeczytane" +msgstr "_Oznacz jako przeczytane" -#: ../src/ui/liferea_shell.c:911 -msgid "" -"Marks all items of the selected feed list node / in the item list as read." -msgstr "" -"Oznacza wszystkie nagłówki zaznaczonej subskrypcji lub cały zaznaczony " -"katalog jako przeczytane." +#: ../src/ui/liferea_shell.c:979 +msgid "Marks all items of the selected feed list node / in the item list as read." +msgstr "Oznacza wszystkie nagłówki zaznaczonej subskrypcji lub cały zaznaczony katalog jako przeczytane." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Uaktualnij" -#: ../src/ui/liferea_shell.c:913 -msgid "" -"Updates the selected subscription or all subscriptions of the selected " -"folder." -msgstr "" -"Uaktualnia zaznaczone subskrypcje lub wszystkie subskrypcje z zaznaczonego " -"katalogu." +#: ../src/ui/liferea_shell.c:981 +msgid "Updates the selected subscription or all subscriptions of the selected folder." +msgstr "Uaktualnia zaznaczoną subskrypcję lub wszystkie subskrypcje w zaznaczonym katalogu" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" -msgstr "_Właściwości" +msgstr "_Właściwości..." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." -msgstr "Otwiera okno właściwości zaznaczonej subskrypcji." +msgstr "Otwiera okno właściwości zaznaczonej subskrypcji" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "_Usuń" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." -msgstr "Usuwa zaznaczone subskrypcje." +msgstr "Usuwa zaznaczone subskrypcje" -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" -msgstr "_Status przeczytania" +msgstr "Przełącz oznaczenie p_rzeczytania" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." -msgstr "Zmienia status przeczytania zaznaczonego nagłówka." +msgstr "Przełącza oznaczenie przeczytania zaznaczonego nagłówka" -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" -msgstr "_Flaga nagłówka" +msgstr "Przełącz _wyróżnienie" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." -msgstr "Zmienia flagę zaznaczonego nagłówka." +msgstr "Przełącza wyróżnienie zaznaczonego nagłówka" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" -msgstr "_Usuń nagłówek" +msgstr "_Usuń" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." -msgstr "Usuwa zaznaczony nagłówek." +msgstr "Usuwa zaznaczony nagłówek" -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" -msgstr "_Otwórz w przeglądarce" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "Otwórz w nowej _karcie" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." -msgstr "Otwiera odnośnik nagłówka w przeglądarce WWW." +#: ../src/ui/liferea_shell.c:997 +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Otwiera odnośnik nagłówka w nowej karcie programu" + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +msgid "_Open In Browser" +msgstr "_Otwórz w panelu" + +#: ../src/ui/liferea_shell.c:999 +msgid "Launches the item's link in the Liferea item pane." +msgstr "Otwiera odnośnik nagłówka w panelu programu" + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +msgid "Open In _External Browser" +msgstr "Otwórz w p_rzeglądarce internetowej" + +#: ../src/ui/liferea_shell.c:1001 +msgid "Launches the item's link in the configured external browser." +msgstr "Otwiera odnośnik nagłówka w zewnętrznej przeglądarce internetowej" -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" -msgstr "Pracuj _Offline" +msgstr "_Tryb rozłączony" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." -msgstr "Blokuje uaktualnianie subskrypcji." +msgstr "Blokuje uaktualnianie subskrypcji" -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "_Pełny ekran" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "Wyświetla zawartość na pełnym ekranie" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" -msgstr "Liferea - Linux Feed Reader" +msgstr "Liferea - czytnik wiadomości dla systemu Linux" -#: ../src/ui/liferea_shell.c:1246 -#, fuzzy -msgid "" -"

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

    You can add new subscriptions

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

    " -msgstr "" -"

    Witaj w Liferea, programie do czytania wiadomości online.

    Lewe okno zawiera listę subskrypcji. Aby dodać subskrypcję, wybierz " -"Subskrypcje -> Nowa Subskrypcja. Zaznacz subskrypcję w lewym oknie aby " -"obejrzeć jej zawartość. Nagłówki zostaną pokazane w prawym oknie.

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

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

    You can add new subscriptions

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

    " +msgstr "

    Witamy w programie Liferea, czytniku wiadomości sieciowych.

    Po lewej stronie okna znajduje się lista kanałów. Nową subskrypcję można utworzyć na kilka sposobów:

    • wybierając polecenie „Nowa subskrypcja” z menu „Subskrypcje”,
    • przeciągnąć odnośnik kanału na listę subskrypcji,
    • wybierając polecenie „Subskrybuj” z menu podręcznego odnośnika.

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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):" +msgstr "Proszę wprowadzić nazwę użytkownika i hasło dla „%s” (%s):" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" -msgstr "Nieznane źródło" +msgstr "Nieznany zasób" #: ../src/ui/ui_common.c:205 -#, fuzzy msgid "All Files" -msgstr "_Plik lokalny" +msgstr "Wszystkie pliki" # WTF? #: ../src/ui/feed_list_view.c:341 @@ -1187,12 +1123,12 @@ #: ../src/ui/feed_list_view.c:342 #, 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ą?" +msgstr "Usunąć „%s” wraz z całą zawartością?" #: ../src/ui/feed_list_view.c:342 #, c-format msgid "Are you sure that you want to delete \"%s\"?" -msgstr "Czy napewno chcesz usunąć \"%s\"?" +msgstr "Usunąć „%s”?" #: ../src/ui/feed_list_view.c:354 msgid "Deletion Confirmation" @@ -1200,270 +1136,262 @@ #: ../src/ui/feed_list_view.c:385 msgid "Liferea is in offline mode. No update possible." -msgstr "Liferea działa w trybie offline. Uaktualnienia nie są możliwe." +msgstr "Program działa w trybie rozłączonym. Uaktualnienia nie są możliwe." -#: ../src/ui/liferea_htmlview.c:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Pobieranie załącznika nie powiodło się: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 -#, fuzzy -msgid "Download finished." -msgstr "Po_bieraj programem:" - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" -msgstr "Pok_aż Odnośnik w Zakładce" - -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" -msgstr "Pokaż Odnośnik w Prze_glądarce" +#: ../src/ui/liferea_htmlview.c:627 +msgid "Open Link In _Tab" +msgstr "Otwórz odnośnik w _karcie" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:628 +msgid "_Open Link In Browser" +msgstr "_Otwórz odnośnik" + +#: ../src/ui/liferea_htmlview.c:629 +msgid "_Open Link In External Browser" +msgstr "_Otwórz odnośnik w przeglądarce" + +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" -msgstr "_Dodaj do Zakładek na %s" +msgstr "_Opublikuj odnośnik na %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" -msgstr "_Kopiuj Adres Odnośnika" +msgstr "_Skopiuj adres odnośnika" -#: ../src/ui/liferea_htmlview.c:555 -#, fuzzy +#: ../src/ui/liferea_htmlview.c:639 msgid "_Copy Image Location" -msgstr "_Kopiuj Adres Odnośnika" +msgstr "_Skopiuj adres obrazu" -#: ../src/ui/liferea_htmlview.c:557 -#, fuzzy +#: ../src/ui/liferea_htmlview.c:641 msgid "S_ave Link As" -msgstr "Zapisz Jako..." +msgstr "_Zapisz odnośnik jako..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" -msgstr "" +msgstr "Z_apisz obraz jako" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Subskrybuj..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Bez tytułu ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Data" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Nagłówek" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" -msgstr "Żaden nagłówek nie został zaznaczony" +msgstr "Nie zanzaczono żadnego nagłówka" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" -msgstr "Ten nagłówek nie ma przypisanego odnośnika!" +msgstr "Ten nagłówek nie posiada przypisanego odnośnika!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" -msgstr "Musisz zaznaczyć subskrypcję aby usunąć jej nagłówki!" +msgstr "Należy zaznaczyć kanał, aby usunąć jego nagłówki!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Pokaż Nagłówek w _Zakładce" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "Pokaż Nagłówek w Prze_glądarce" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" -msgstr "Skopiuj do Kosza" +msgstr "Skopiuj do kosza" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "_Skopiuj URL do Schowka" +#: ../src/ui/popup_menu.c:156 +#, c-format +msgid "_Bookmark at %s" +msgstr "_Opublikuj na %s" -#: ../src/ui/popup_menu.c:153 -msgid "R_emove Item" -msgstr "_Usuń Nagłówek" +#: ../src/ui/popup_menu.c:160 +msgid "Copy Item _Location" +msgstr "Skopiuj adres _nagłówka" #: ../src/ui/popup_menu.c:166 +msgid "R_emove Item" +msgstr "_Usuń nagłówek" + +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." -msgstr "Otwórz Załącznik..." +msgstr "Otwórz załącznik..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." -msgstr "Zapisz Jako..." +msgstr "Zapisz jako..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" -msgstr "_Kopiuj Adres Odnośnika" +msgstr "Skopiuj adres odnośnika" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" -msgstr "U_aktualnij Wszystko" +msgstr "_Uaktualnij wszystkie" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" -msgstr "_Pokaż Liferea" +msgstr "_Wyświetlanie okna programu" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" -msgstr "_Uaktualnij Katalog" +msgstr "_Uaktualnij katalog" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" -msgstr "_Oznacz Jako Przeczytane" +msgstr "_Oznacz wszystkie jako przeczytane" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_Nowy" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." -msgstr "_Nowa Subskrypcja..." +msgstr "Nowa _subskrypcja..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." -msgstr "Nowe Ź_ródło..." +msgstr "Nowy _zasób..." -#: ../src/ui/popup_menu.c:323 -#, fuzzy +#: ../src/ui/popup_menu.c:329 msgid "Sort Feeds" -msgstr "Importuj listę subskrypcji" +msgstr "Posortuj kanały" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" -msgstr "" - -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "_Nowa Subskrypcja..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" +msgstr "_Wczytaj ponownie" -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "Domyślne ustawienia GNOME" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" -msgstr "Tekst poniżej ikon" +msgstr "Etykiety poniżej ikon" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" -msgstr "Tekst obok ikon" +msgstr "Etykiety obok ikon" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Tylko ikony" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" -msgstr "Tylko tekst" +msgstr "Tylko etykiety" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minut" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "godzin" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "dni" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Spacja" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Spacja" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Spacja" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Wybierz katalog na pobrane pliki" +#: ../src/ui/preferences_dialog.c:114 +msgid "Normal View" +msgstr "Zwykły" + +#: ../src/ui/preferences_dialog.c:115 +msgid "Wide View" +msgstr "Szeroki" + +# Skrocone (toolbar) +#: ../src/ui/preferences_dialog.c:116 +msgid "Combined View" +msgstr "Połączony" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" -msgstr "(Ręczny wybór)" +msgstr "Własne polecenie" # Otworz odnosnik w: -> -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" -msgstr "(Domyślne zachowanie)" +msgstr "Domyślne zachowanie" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" -msgstr "Istniejącym oknie" +msgstr "W bieżącym oknie" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" -msgstr "Nowym oknie" +msgstr "W nowym oknie" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" -msgstr "Nowej karcie" +msgstr "W nowej karcie" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" -msgstr "" +msgstr "Zintegrowanie z menu wiadomości" -#: ../src/ui/ui_prefs.c:684 -#, fuzzy +#: ../src/ui/preferences_dialog.c:685 msgid "Terminate instead of minimizing to the messaging menu" -msgstr "_Zakończ program zamiast minimalizować do ikony" +msgstr "Kończenie programu zamiast minimalizowania do menu wiadomości" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" -msgstr "" +msgstr "Uruchamia" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Typ" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Program" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "(Pusty)" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" +"%s\n" +"Ponowne wczytywanie zawartości" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." -msgid_plural "" -"The provider of this feed suggests an update interval of %d minutes." -msgstr[0] "Zalecana częstotliwość odświeżania subskrypcji to %d minuta." -msgstr[1] "Zalecana częstotliwość odświeżania subskrypcji to %d minuty." -msgstr[2] "Zalecana częstotliwość odświeżania subskrypcji to %d minut." +msgid_plural "The provider of this feed suggests an update interval of %d minutes." +msgstr[0] "Zalecana częstość uaktualniania kanału wynosi %d minutę." +msgstr[1] "Zalecana częstość uaktualniania kanału wynosi %d minuty." +msgstr[2] "Zalecana częstość uaktualniania kanału wynosi %d minut." #: ../src/ui/subscription_dialog.c:434 msgid "This feed specifies no default update interval." -msgstr "Ta subskrypcja nie ma domyślnej częstotliwości odświeżania." +msgstr "Kanał nie posiada domyślnej częstości uaktualniania." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" -msgstr "" +msgstr "Nieograniczony" #: ../src/ui/ui_tray.c:221 #, c-format @@ -1487,13 +1415,13 @@ "%d unread items" msgstr[0] "" "%s\n" -"%d nowy nagłówek" +"%d nieprzeczytany nagłówek" msgstr[1] "" "%s\n" -"%d nowe nagłówki" +"%d nieprzeczytane nagłówki" msgstr[2] "" "%s\n" -"%d nowych nagłówków" +"%d nieprzeczytanych nagłówków" #: ../src/ui/ui_tray.c:230 #, c-format @@ -1502,42 +1430,37 @@ "No unread items" msgstr "" "%s\n" -"Brak nieprzeczytanych" +"Brak nieprzeczytanych nagłówków" #: ../src/parsers/atom10.c:241 ../src/parsers/pie_feed.c:141 msgid "Website" -msgstr "" +msgstr "Witryna internetowa" #: ../src/parsers/atom10.c:251 msgid "Invalid Atom feed: unknown author" -msgstr "Nieprawidłowe źródło Atom: autor nieznany" +msgstr "Nieprawidłowy kanał Atom: nieznany autor" #: ../src/parsers/ns_ag.c:70 msgid "%b %d %H:%M" msgstr "%B %d %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" -msgstr "Nowa Subskrypcja" +msgstr "Nowa subskrypcja" #: ../src/fl_sources/google_source.c:116 msgid "Google Reader login failed!" -msgstr "Logowanie go Google Reader nie powiodło się!" +msgstr "Nie udało się zalogować do konta Google Reader!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 -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 "" -"Dołącz listę subskrypcji z konta Google Readera. Liferea pokaże te " -"subskrypcje oraz zsynchronizuję z twoją listą." +#: ../src/fl_sources/google_source.c:384 +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 "Dołącza listę kanałów konta Google Reader. Program wyświetli subskrypcje Google Reader i będzie synchronizować listy kanałów oraz czytania." #: ../src/fl_sources/opml_source.c:325 msgid "Planet, BlogRoll, OPML" @@ -1545,16 +1468,12 @@ # Blogrolle -> Blogrole? #: ../src/fl_sources/opml_source.c:326 -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 "" -"Dołącz Blogrolle i Planety do listy subskrypcji. Liferea będzie dodawać i " -"usuwać subskrypcje zgodnie ze zmianami źródła OPML." +msgid "Integrate blogrolls or Planets in your feed list. Liferea will automatically add and remove feeds according to the changes of the source OPML document" +msgstr "Dołącza listy kanałów Blogroll i Planet. Program będzie automatycznie dodawał i usuwał kanały zgodnie ze zmianami źródłowego dokumentu OPML." #: ../src/fl_sources/opml_source.c:387 msgid "Choose OPML File" -msgstr "Wybierz plik OPML" +msgstr "Wybór pliku OPML" #: ../src/fl_sources/opml_source.h:28 msgid "New OPML Subscription" @@ -1564,44 +1483,31 @@ 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:269 msgid "Source Type" msgstr "Rodzaj źródła:" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" -msgstr "" +msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 -#, fuzzy -msgid "" -"Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " -"present your tt-rss subscriptions, and will synchronize your feed list and " -"reading lists." -msgstr "" -"Dołącz listę subskrypcji z konta Google Readera. Liferea pokaże te " -"subskrypcje oraz zsynchronizuję z twoją listą." +#: ../src/fl_sources/ttrss_source.c:363 +msgid "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will present your tt-rss subscriptions, and will synchronize your feed list and reading lists." +msgstr "Dołącza listy kanałów konta Tiny Tiny RSS 1.5+. Program wyświetli subskrypcje tt-rss i będzie synchronizować listy kanałów oraz czytania." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" -msgstr "" +msgstr "Nie można przetworzyć danych JSON zwróconych przez API tt-rss!" #: ../src/notification/libnotify.c:61 ../src/notification/libnotify.c:83 #: ../src/notification/libnotify.c:152 msgid "This feed does not exist anymore!" -msgstr "Ta subskrypcja już nie istnieje!" +msgstr "Ten kanał już nie istnieje!" #: ../src/notification/libnotify.c:125 #, c-format msgid "This news entry has no headline" -msgstr "Na nowa subskrypcja nie ma nagłówków" +msgstr "Ta wiadomość nie posiada nagłówka" #: ../src/notification/libnotify.c:130 msgid "Visit" @@ -1609,7 +1515,7 @@ #: ../src/notification/libnotify.c:171 ../src/notification/libnotify.c:274 msgid "Open feed" -msgstr "Otwórz subskrypcję" +msgstr "Otwórz kanał" #: ../src/notification/libnotify.c:174 ../src/notification/libnotify.c:277 msgid "Mark all as read" @@ -1619,21 +1525,21 @@ #, c-format msgid "%s has %d update" msgid_plural "%s has %d updates" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%s posiada %d uaktualnienie" +msgstr[1] "%s posiada %d uaktualnienia" +msgstr[2] "%s posiada %d uaktualnień" #: ../src/notification/libnotify.c:257 ../src/notification/libnotify.c:259 msgid "Feed Update" -msgstr "Aktualizacja subskrypcji" +msgstr "Uaktualnienie kanału" #: ../src/notification/libnotify.c:271 msgid "Show details" -msgstr "Pokaż szczegóły" +msgstr "Wyświetl szczegóły" #: ../glade/auth.ui.h:1 msgid "Authentication" -msgstr "Autentykacja" +msgstr "Uwierzytelnianie" #: ../glade/auth.ui.h:4 ../glade/liferea.ui.h:37 msgid "_Password:" @@ -1641,32 +1547,27 @@ #: ../glade/auth.ui.h:5 ../glade/liferea.ui.h:38 msgid "User_name:" -msgstr "_Użytkownik:" +msgstr "_Nazwa użytkownika:" #: ../glade/auth.ui.h:6 -msgid "" -"Note: The username and password will be saved to your Liferea feedlist " -"file without using encryption." -msgstr "" -"Uwaga: Nazwa użytkownika i hasło zostaną zapisane w pliku subskrypcji w " -"postaci niezakodowanej." +msgid "Note: The username and password will be saved to your Liferea feedlist file without using encryption." +msgstr "Uwaga: nazwa użytkownika i hasło zostaną zapisane w pliku subskrypcji w postaci niezaszyfrowanej." #: ../glade/google_source.ui.h:1 msgid "Add Google Reader Account" -msgstr "Dodaj konto Google Reader" +msgstr "Dodawanie konta Google Reader" #: ../glade/google_source.ui.h:2 msgid "Please enter your Google Reader account settings." -msgstr "Wprowadź dane konta Google Reader" +msgstr "Proszę wprowadzić dane konta Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Hasło:" #: ../glade/google_source.ui.h:4 msgid "_Username (Email)" -msgstr "_Użytkownik (adres e-mail)" +msgstr "_Nazwa użytkownika (adres e-mail)" #: ../glade/liferea.ui.h:2 msgid "normal view" @@ -1682,9 +1583,9 @@ #: ../glade/liferea.ui.h:5 msgid "combined view" -msgstr "widok kombinowany" +msgstr "widok połączony" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Nagłówki" @@ -1694,36 +1595,32 @@ #: ../glade/liferea.ui.h:8 msgid "Subscription Properties" -msgstr "Właściwości Subskrypcji" +msgstr "Właściwości subskrypcji" #: ../glade/liferea.ui.h:9 -#, fuzzy msgid "Feed Name" -msgstr "_Nazwa Subskrypcji:" +msgstr "Nazwa kanału" #: ../glade/liferea.ui.h:10 msgid "Feed _Name:" -msgstr "_Nazwa Subskrypcji:" +msgstr "_Nazwa:" #: ../glade/liferea.ui.h:11 -#, fuzzy msgid "Update Interval" -msgstr "Monitor uaktualniania" +msgstr "Częstość uaktualniania" #: ../glade/liferea.ui.h:12 msgid "_Use global default update interval." -msgstr "_Użyj globalnej częstotliwości uaktualnień" +msgstr "_Używanie domyślnych wartości globalnych" #: ../glade/liferea.ui.h:13 msgid "_Feed specific update interval of" -msgstr "Zalecana częstotliwość uaktualnień:" +msgstr "_Określenie indywidualnej częstości uaktualniania:" #: ../glade/liferea.ui.h:14 msgid "_Don't update this feed automatically." -msgstr "Nie uaktualniaj tej subskrypcji _automatycznie" +msgstr "_Pomijanie automatycznego uaktualniania" -# headline, item -> nagłówek -# feed, subscription -> subskrypcja #: ../glade/liferea.ui.h:15 msgid " " msgstr " " @@ -1731,67 +1628,56 @@ #: ../glade/liferea.ui.h:17 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." -msgstr "Dostawca tej subskrypcji zaleca uaktualnianie co %d minut." +msgstr "Dostawca tego kanału zaleca jego uaktualnianie co %d minut." #: ../glade/liferea.ui.h:18 msgid "General" -msgstr "Główne" +msgstr "Ogólne" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 -#, fuzzy +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" -msgstr "Źródło subskrypcji" +msgstr "Zasób subskrypcji" #: ../glade/liferea.ui.h:20 ../glade/new_subscription.ui.h:8 msgid "Source Type:" -msgstr "Rodzaj źródła:" +msgstr "Rodzaj:" #: ../glade/liferea.ui.h:21 ../glade/new_subscription.ui.h:3 msgid "_Source:" -msgstr "Ź_ródło" +msgstr "_Adres źródłowy:" #: ../glade/liferea.ui.h:22 ../glade/new_subscription.ui.h:4 msgid "_URL" -msgstr "_URL" +msgstr "Adres _URL" #: ../glade/liferea.ui.h:23 ../glade/new_subscription.ui.h:5 msgid "_Command" -msgstr "Pole_cenie" +msgstr "_Polecenie" #: ../glade/liferea.ui.h:24 ../glade/new_subscription.ui.h:6 msgid "_Local File" -msgstr "_Plik lokalny" +msgstr "P_lik lokalny" #: ../glade/liferea.ui.h:25 ../glade/new_subscription.ui.h:7 msgid "Select File..." -msgstr "Wybierz plik..." +msgstr "Wskaż plik..." #: ../glade/liferea.ui.h:26 ../glade/new_subscription.ui.h:11 msgid "Use conversion _filter" -msgstr "Używaj _filtra konwersji" +msgstr "Używanie _filtra konwertującego" #: ../glade/liferea.ui.h:27 ../glade/new_subscription.ui.h:12 -msgid "" -"Liferea can use external filter plugins in order to access feeds and " -"directories in non-supported formats. See the documentation for more " -"information." -msgstr "" -"Liferea może używać zewnętrznych wtyczek filtrujących by uzyskać dostęp do " -"subskrypcji i katalogów w nieobsługiwanych formatach. Zajrzyj do " -"dokumentacji po więcej informacji." +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 "Program może używać zewnętrznych wtyczek filtrujących, aby uzyskać dostęp do subskrypcji i katalogów w nieobsługiwanych formatach. Więcej informacji na ten temat można znaleźć w dokumentacji programu." #: ../glade/liferea.ui.h:28 ../glade/new_subscription.ui.h:13 msgid "Convert _using:" -msgstr "_Konwertuj używając:" +msgstr "_Konwertowanie za pomocą:" #: ../glade/liferea.ui.h:30 -msgid "" -"The cache setting controls if the contents of feeds are saved when Liferea " -"exits. Marked items are always saved to the cache." -msgstr "" -"Ustawienie pamięci podręcznej określa czy zawartości subskrypcji są " -"zapisywane przy wyjściu z programu. Zaznaczone nagłówki są zawsze zapisywane." +msgid "The cache setting controls if the contents of feeds are saved when Liferea exits. Marked items are always saved to the cache." +msgstr "Konfiguracja pamięci podręcznej określa czy zawartości kanałów są zapisywane podczas kończenia działania programu. Zaznaczone nagłówki są zawsze przechowywane w pamięci podręcznej." #: ../glade/liferea.ui.h:31 msgid "_Default cache settings" @@ -1799,28 +1685,27 @@ #: ../glade/liferea.ui.h:32 msgid "Di_sable cache" -msgstr "_Wyłącz pamięć podręczną" +msgstr "_Wyłączenie pamięci podręcznej" #: ../glade/liferea.ui.h:33 msgid "_Unlimited cache" -msgstr "_Bez limitu rozmiaru pamięci podręcznej" +msgstr "_Nieograniczony rozmiar pamięci podręcznej" #: ../glade/liferea.ui.h:34 -#, fuzzy msgid "_Number of items to save:" -msgstr "Domyślna zapisywana _liczba nagłówków w subskrypcji:" +msgstr "Domyślna _ilość przechowywanych nagłówków:" #: ../glade/liferea.ui.h:35 msgid "Archive" -msgstr "Archiwum" +msgstr "Archiwizowanie" #: ../glade/liferea.ui.h:36 msgid "Use HTTP _authentication" -msgstr "Używaj _autentykacji HTTP" +msgstr "Używanie _uwierzytelniania HTTP" #: ../glade/liferea.ui.h:39 ../glade/new_subscription.ui.h:10 msgid "_Don't use proxy for download" -msgstr "_Nie używaj proxy do pobierania" +msgstr "Pobieranie _bez użycia pośrednika" #: ../glade/liferea.ui.h:40 msgid "Download" @@ -1828,1069 +1713,443 @@ #: ../glade/liferea.ui.h:41 msgid "_Automatically download all enclosures of this feed." -msgstr "_Automatycznie pobieraj załączniki dla tej subskrypcji" +msgstr "_Automatyczne pobieranie załączników" #: ../glade/liferea.ui.h:42 msgid "Auto-_load item link in configured browser when selecting articles." -msgstr "" -"Podczas czytania automatycznie ładu_j nagłówki w zewnętrznej przeglądarce" +msgstr "Automatyczne _otwieranie zaznaczonych nagłówków w przeglądarce internetowej" #: ../glade/liferea.ui.h:43 msgid "Ignore _comment feeds for this subscription." -msgstr "Ignoruj komentarze dla tej subskrypcji." +msgstr "Ignorowanie kanałów _komentarzy" #: ../glade/liferea.ui.h:44 msgid "_Enforce popup notification for this subscription." -msgstr "Otwiera okno notyfikacji dla tej subskrypcji." +msgstr "_Wymuszenie wyświetlania podręcznych powiadomień" #: ../glade/liferea.ui.h:45 msgid "_Never do popup notification for this subscription." -msgstr "_Nigdy nie ukazuj notyfikacji dla tej subskrypcji." +msgstr "_Pomijanie wyświetlania podręcznych powiadomień" #: ../glade/liferea.ui.h:46 msgid "_Mark downloaded items as read." -msgstr "_Oznacz Ściągnięte jako przeczytane." +msgstr "O_znaczanie pobranych nagłówków jako przeczytane" #: ../glade/liferea.ui.h:47 msgid "Advanced" msgstr "Zaawansowane" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Preferencje Liferea" +msgid "New Folder" +msgstr "Nowy katalog" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "Na_zwa katalogu:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Domyślna zapisywana _liczba nagłówków w subskrypcji:" +msgid "Rename" +msgstr "Zmiana nazwy" #: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "Aktualizacja subskrypcji" +msgid "_New Name:" +msgstr "_Nowa nazwa:" #: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Uaktualnia wszystkie subskrypcje." +msgid "Search Folder Properties" +msgstr "Właściwości katalogu wyników" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Domyślna _częstotliwość uaktualnień subskrypcji:" +msgid "Search _Name:" +msgstr "_Nazwa wyszukiwania:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "Wyszukanie nagłówków spełniających następujące kryteria" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"Uwaga: Pamiętaj o ustawieniu rozsądnego czasu odświeżania. Uaktualnianie " -"subskrypcji częściej niż co godzinę zwykle niepotrzebnie obciąża łącze." +msgid "A_ny Rule Matches" +msgstr "Dopasowanie j_akiejkolwiek reguły" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Subskrypcje" +msgid "_All Rules Must Match" +msgstr "Dopasowanie _wszystkich reguł" #: ../glade/liferea.ui.h:57 -#, fuzzy -msgid "Folder Display Settings" -msgstr "Ustawienia wyświetlania katalogów" +msgid "Open Enclosure" +msgstr "Otwieranie załącznika" #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "_Pokazuj elementy wszystkich subskrypcji gdy katalog jest zaznaczony" +msgid "Open an enclosure of type:" +msgstr "Pobieranie załącznika typu:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "_Ukryj przeczytane elementy" +msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. The enclosures URL will be supplied as an argument for this command:" +msgstr "Co zrobić z tym załącznikiem? Proszę wprowadzić polecenie do wykonania. Adres URL pliku zostanie przekazany jako parametr:" #: ../glade/liferea.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Ikony subskrypcji (favicons)" - -#: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "Ua_ktualnij wszystkie ikony" - -#: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Katalogi" - -#: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "nieprzeczytanych nagłówków" - -#: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "_Przełącznik nagłówków:" - -#: ../glade/liferea.ui.h:65 -#, fuzzy -msgid "Web Integration" -msgstr "Orientacja" - -#: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Wyślij zakładki do:" - -#: ../glade/liferea.ui.h:67 -#, fuzzy -msgid "Internal Browser Settings" -msgstr "Ustawienia wewnętrznej przęglądarki" - -#: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Otwieraj odnośniki w _oknie Liferea" - -#: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "Wyłącz Java_Script" - -#: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "" - -#: ../glade/liferea.ui.h:71 -#, fuzzy -msgid "External Browser Settings" -msgstr "Ustawienia zewnętrznej przęglądarki" - -#: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "O_twórz odnośnik w:" - -#: ../glade/liferea.ui.h:74 -#, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" -msgstr "" -"_Ręcznie:\n" -"(%s jako URL)" - -#: ../glade/liferea.ui.h:76 -msgid "_Browser:" -msgstr "_Przeglądarka:" - -#: ../glade/liferea.ui.h:77 -msgid "Browser" -msgstr "Przeglądarka" - -#: ../glade/liferea.ui.h:78 -#, fuzzy -msgid "Notification Settings" -msgstr "Ustawienia powiadamiania" - -#: ../glade/liferea.ui.h:79 -msgid "Show a _popup window with new headlines." -msgstr "Pokazuj wyskakujące _okno z nowymi nagłówkami" - -#: ../glade/liferea.ui.h:80 -msgid "Show a status _icon in the notification area (system tray)." -msgstr "Pokazuj i_konę statusu w obszarze powiadamiania" - -#: ../glade/liferea.ui.h:81 -msgid "Show _number of new items in the tray icon." -msgstr "Pokazuj _liczbę nowych wiadomości na ikonie" - -#: ../glade/liferea.ui.h:82 -msgid "T_erminate instead of minimizing to tray icon." -msgstr "_Zakończ program zamiast minimalizować do ikony" - -#: ../glade/liferea.ui.h:83 -msgid "_Start in tray icon." -msgstr "_Rozpocznij zminimalizowany." - -#: ../glade/liferea.ui.h:84 -#, fuzzy -msgid "Toolbar Settings" -msgstr "Opi_sy ikon na pasku narzędzi:" - -#: ../glade/liferea.ui.h:85 -msgid "_Hide toolbar." -msgstr "_Ukryj pasek narzędzi." - -#: ../glade/liferea.ui.h:86 -msgid "Toolbar _button labels:" -msgstr "Opi_sy ikon na pasku narzędzi:" - -#: ../glade/liferea.ui.h:87 -msgid "GUI" -msgstr "Interfejs" - -#: ../glade/liferea.ui.h:88 -msgid "HTTP Proxy Server" -msgstr "" - -#: ../glade/liferea.ui.h:89 -msgid "_Auto Detect (GNOME or environment)" -msgstr "Wykryj _automatycznie (GNOME)" - -#: ../glade/liferea.ui.h:90 -msgid "_No Proxy" -msgstr "_Bez Proxy" - -#: ../glade/liferea.ui.h:91 -msgid "_Manual Setting:" -msgstr "_Ręczne ustawienia:" - -#: ../glade/liferea.ui.h:92 -msgid "Proxy _Port:" -msgstr "_Port Proxy:" - -#: ../glade/liferea.ui.h:93 -msgid "Proxy _Host:" -msgstr "_Host Proxy:" - -#: ../glade/liferea.ui.h:94 -msgid "Use Proxy Au_thentication" -msgstr "Używaj au_tentykacji proxy" - -#: ../glade/liferea.ui.h:95 -msgid "Proxy Pass_word:" -msgstr "Ha_sło:" - -#: ../glade/liferea.ui.h:96 -msgid "Proxy _Username:" -msgstr "Nazwa _użytkownika:" - -#: ../glade/liferea.ui.h:97 -msgid "Proxy" -msgstr "Proxy" - -#: ../glade/liferea.ui.h:98 -#, fuzzy -msgid "Downloading Enclosures" -msgstr "Pobieranie załącznika" - -#: ../glade/liferea.ui.h:99 msgid "_Browse" msgstr "Prze_glądaj" -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Zapisuj pobrane w:" - -#: ../glade/liferea.ui.h:101 -msgid "_Download using" -msgstr "Po_bieraj programem:" - -#: ../glade/liferea.ui.h:102 -#, fuzzy -msgid "Opening Enclosures" -msgstr "Otwórz Załącznik..." - -#: ../glade/liferea.ui.h:103 -msgid "Enclosures" -msgstr "Załączniki" - -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Zsynchronizowano z Pobliskimi Hostami" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_Włącz Synchronizację po Sieci LAN" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "Nazwa _Serwisu" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Synchronizacja" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Nowy Katalog" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "Na_zwa Katalogu:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Zmień nazwę" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Nowa nazwa:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Właściwości Katalogu Wyników" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "Wyszukuj _Nazwę:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "_Jakakolwiek Pasująca Reguła" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "_Wszystkie Reguły Muszą Spełniać" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Pobieranie załącznika" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Pobieranie załącznika typu:" - -#: ../glade/liferea.ui.h:120 -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 "" -"Co zrobić z tym załącznikiem? Wprowadź komendę do wykonania. Pobrany plik " -"zostanie przekazany jako argument dla tej komendy:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Omiń URL i nie ściągaj załacznika." - -#: ../glade/liferea.ui.h:122 -#, fuzzy +#: ../glade/liferea.ui.h:61 msgid "_Do this automatically for enclosures like this from now on." -msgstr "_Wykonuj tę czynność automatycznie dla tego typu plików" +msgstr "_Wykonywanie tej czynności automatycznie dla tego typu plików" # Skrócone (toolbar) -#: ../glade/liferea.ui.h:123 +#: ../glade/liferea.ui.h:62 msgid "Search All Feeds" -msgstr "Znajdź" +msgstr "Wyszukiwanie" -#: ../glade/liferea.ui.h:124 +#: ../glade/liferea.ui.h:63 msgid "_Search for:" -msgstr "_Znajdź frazę:" +msgstr "_Wyszukiwanie tekstu:" -#: ../glade/liferea.ui.h:125 -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.ui.h:64 +msgid "Enter a search string Liferea should find either in a items title or in its content." +msgstr "Wprowadza wyrażenie do wyszukania w tytułach nagłówków lub w ich zawartości" -#: ../glade/liferea.ui.h:126 +#: ../glade/liferea.ui.h:65 msgid "_Advanced..." msgstr "_Zaawansowane..." -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Rozpoczyna wyszukiwanie tekstu we wszystkich subskrypcjach. Wyniki pojawią " -"się na liście nagłówków." +#: ../glade/liferea.ui.h:66 +msgid "Starts searching for the specified text in all feeds. The search result will appear in the item list." +msgstr "Rozpoczyna wyszukiwanie tekstu we wszystkich subskrypcjach. Wyniki pojawią się na liście nagłówków." -#: ../glade/liferea.ui.h:128 +#: ../glade/liferea.ui.h:67 msgid "Update Monitor" msgstr "Monitor uaktualniania" -#: ../glade/liferea.ui.h:129 -#, fuzzy +#: ../glade/liferea.ui.h:68 msgid "Pending Requests" -msgstr "Zadania w toku" +msgstr "Oczekujące" -#: ../glade/liferea.ui.h:130 -#, fuzzy +#: ../glade/liferea.ui.h:69 msgid "Downloading Now" -msgstr "Aktualnie pobierane" +msgstr "Pobierane" -#: ../glade/liferea.ui.h:131 +#: ../glade/liferea.ui.h:70 msgid "Cancel _All" -msgstr "_Anuluj wszystko" +msgstr "Anuluj _wszystkie" -#: ../glade/liferea.ui.h:132 +#: ../glade/liferea.ui.h:71 msgid "Create News Bin" -msgstr "Utwórz nowy Kosz" +msgstr "Tworzenie nowego kosza" -#: ../glade/liferea.ui.h:133 +#: ../glade/liferea.ui.h:72 msgid "_News Bin Name:" -msgstr "_Nazwa Kosza:" +msgstr "_Nazwa kosza:" -#: ../glade/liferea.ui.h:134 +#: ../glade/liferea.ui.h:73 msgid "About" msgstr "O Programie" -#: ../glade/liferea.ui.h:135 +#: ../glade/liferea.ui.h:74 msgid "" "Copyright (c) 2003-2012\n" "The Liferea Team\n" msgstr "" +"Copyright (c) 2003-2012\n" +"Zespół Liferea\n" -#: ../glade/liferea.ui.h:138 +#: ../glade/liferea.ui.h:77 msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea to czytnik wiadomości RSS oparty na GTK+" +msgstr "Odczytuje zawartość kanałów wiadomości, wykorzystując interfejs GTK+" -#: ../glade/liferea.ui.h:139 +#: ../glade/liferea.ui.h:78 msgid "Liferea Homepage" -msgstr "Strona Domowa Liferea" +msgstr "Strona główna programu" -#: ../glade/liferea.ui.h:140 +#: ../glade/liferea.ui.h:79 msgid "Advanced Search" -msgstr "Zaawansowane Wyszukiwanie" +msgstr "Zaawansowane" -#: ../glade/liferea.ui.h:141 +#: ../glade/liferea.ui.h:80 msgid "_Search Folder..." -msgstr "Katalog Wyników..." +msgstr "Utwórz _katalog wyników" -#: ../glade/liferea.ui.h:142 +#: ../glade/liferea.ui.h:81 msgid "Create Search Engine Feed" -msgstr "Utwórz subskrypcję silnika wyszukiwania" +msgstr "Utwórz kanał modułu wyszukiwania" -#: ../glade/liferea.ui.h:143 +#: ../glade/liferea.ui.h:82 msgid "enter any search string you want" msgstr "wpisz frazę do wyszukania" -#: ../glade/liferea.ui.h:144 +#: ../glade/liferea.ui.h:83 msgid "Maximal _Number Of Result Items:" -msgstr "_Maksymalna liczba nagłówków w wynikach:" +msgstr "_Maksymalna ilość nagłówków w wynikach:" -#: ../glade/liferea.ui.h:145 -#, 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 "" -"Informacja: Liferea wygeneruje subskrypcję, która jest używana do " -"odpytywania wyszukiwarek o zadaną frazę. Możesz ją subskrybować na stałe i " -"uaktualniać tak jak inne subskrypcje. " +#: ../glade/liferea.ui.h:84 +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 "Informacja: Liferea wygeneruje subskrypcję, która jest używana do odpytywania wyszukiwarek o zadaną frazę. Możesz ją subskrybować na stałe i uaktualniać tak jak inne subskrypcje. " #: ../glade/new_subscription.ui.h:9 -#, fuzzy msgid "Download / Postprocessing" -msgstr "Pobieranie / Przetwarzanie" +msgstr "Pobieranie / przetwarzanie" #: ../glade/node_source.ui.h:1 msgid "Source Selection" -msgstr "Wybór źródła" +msgstr "Wybór zasobu" #: ../glade/node_source.ui.h:2 msgid "Select the source type you want to add..." -msgstr "Wybierz typ źródła które chcesz dodać..." +msgstr "Proszę wybrać rodzaj dodawanego zasobu..." #: ../glade/opml_source.ui.h:1 msgid "Add OPML/Planet" -msgstr "Dodaj OPML/Planet" +msgstr "Dodawanie OPML/Planet" #: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "Wprowadź nazwę pliku lokalnego lub adres subskrypcji OPML" +msgid "Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "Proszę wprowadzić ścieżkę pliku lokalnego lub adres URL subskrypcji OPML." #: ../glade/opml_source.ui.h:3 msgid "_Location" -msgstr "_Położenie" +msgstr "_Położenie:" #: ../glade/opml_source.ui.h:4 msgid "_Select File" -msgstr "_Wybierz plik..." +msgstr "_Wskaż plik..." #: ../glade/ttrss_source.ui.h:1 -#, fuzzy msgid "Add Tiny Tiny RSS Account" -msgstr "Dodaj konto Bloglines" +msgstr "Dodawanie konta Tiny Tiny RSS" #: ../glade/ttrss_source.ui.h:2 -#, fuzzy msgid "Please enter your tt-rss account settings." -msgstr "Wprowadź dane konta Bloglines" +msgstr "Proszę wprowadzić ustawienia konta tt-rss." #: ../glade/ttrss_source.ui.h:3 -#, fuzzy msgid "_Server URL" -msgstr "Błąd serwera" +msgstr "Adres URL _serwera:" #: ../glade/ttrss_source.ui.h:5 msgid "_Username" -msgstr "_Użytkownik:" - -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Wprowadź URL strony aby automatycznie wykryć dostępne subskrypcje lub " -"bezpośredni adres subskrypcji jeśli go znasz" +msgstr "_Nazwa użytkownika:" -#: ../glade/simple_subscription.ui.h:4 +#: ../glade/simple_subscription.ui.h:2 msgid "Advanced..." msgstr "Zaawansowane..." -#~ msgid "You may want to validate the feed using" -#~ msgstr "Możesz walidować tę subskrypcję używając" +#: ../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 "Proszę wprowadzić adres URL witryny internetowej, aby automatycznie wykryć dostępne subskrypcje lub znany, bezpośredni adres subskrypcji." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Preferencje Liferea" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Pamięć podręczna" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Domyślna _ilość przechowywanych nagłówków:" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Uaktualnianie" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "_Uaktualnianie wszystkich subskrypcji podczas uruchamiania" + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Domyślna _częstość uaktualnień subskrypcji:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "Note: Please remember to set a reasonable refresh time. Usually it is a waste of bandwidth to poll feeds more often than each hour." +msgstr "Uwaga: proszę wprowadzić rozsądną wartość. Uaktualnianie subskrypcji częściej niż co godzinę, zwykle niepotrzebnie obciąża łącze." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Kanały" + +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Wyświetlanie" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "_Wyświetlanie wszystkich nagłówków subskrypcji zaznaczonego katalogu" + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "_Ukrywanie przeczytanych nagłówków" + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Ikony kanałów" -#~ msgid "" -#~ "Jumps to the next unread item. If necessary selects the next feed with " -#~ "unread items." -#~ msgstr "" -#~ "Przechodzi do następnego nieprzeczytanego nagłówka. Jeśli trzeba, wybiera " -#~ "następną subskrypcję." +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Uaktualnij wszystkie ikony" -#~ msgid "Liferea Sync %s@%s" -#~ msgstr "Synchronizacja Liferea %s@%s" +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Katalogi" -#~ msgid "Print debugging messages for the plugin loading" -#~ msgstr "Wyświetla informacje debugera o ładownych pluginach" +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Czytanie" -#~ msgid "Liferea seems to be running already!" -#~ msgstr "Wygląda na to, że Liferea już jest uruchomiona!" +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "_Skrót klawiszowy służący do przełączania artykułów:" -#~ msgid "Update status" -#~ msgstr "Status aktualizacji" +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "_Domyślny widok:" -#~ msgid "was updated" -#~ msgstr "uaktualnione" +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Integracja z usługami sieciowymi" -#~ msgid "was not updated" -#~ msgstr "nie została uaktualniona" +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Publikowanie odnośników:" -#~ msgid "The orientation of the tray." -#~ msgstr "Orientacja obszaru powiadamiania." +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Wbudowana przeglądarka" -#~ msgid "%s" -#~ msgstr "%s" +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Otwieranie odnośników w _oknie programu" -#~ msgid "topics_en.html" -#~ msgstr "topics_en.html" +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "Wyłączenie Java_script" -#~ msgid "reference_en.html" -#~ msgstr "reference_en.html" +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "_Włączenie wtyczek" -#~ msgid "faq_en.html" -#~ msgstr "faq_en.html" +#: ../glade/prefs.ui.h:26 +msgid "External Browser Settings" +msgstr "Zewnętrzna przeglądarka" -#~ msgid "_Script Manager" -#~ msgstr "Menedżer _skryptów" +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "_Otwieranie odnośników:" -#~ msgid "Allows to configure and edit LUA hook scripts" -#~ msgstr "Pozwala edytować i konfigurować skrypty LUA." +#: ../glade/prefs.ui.h:28 +msgid "_Manual:" +msgstr "_Własne polecenie:" -#~ msgid "Search With ..." -#~ msgstr "Znajdź z..." +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "(parametr %s zostanie zastąpiony adresem URL)" -#~ msgid "%d Search Result for \"%s\"" -#~ msgid_plural "%d Search Results for \"%s\"" -#~ msgstr[0] "%d wynik dla \"%s\"" -#~ msgstr[1] "%d wyniki dla \"%s\"" -#~ msgstr[2] "%d wyników dla \"%s\"" +#: ../glade/prefs.ui.h:31 +msgid "_Browser:" +msgstr "_Przeglądarka:" -#, fuzzy -#~ msgid "%d Search Result" -#~ msgid_plural "%d Search Results" -#~ msgstr[0] "%d wynik dla \"%s\"" -#~ msgstr[1] "%d wyniki dla \"%s\"" -#~ msgstr[2] "%d wyników dla \"%s\"" +#: ../glade/prefs.ui.h:32 +msgid "Browser" +msgstr "Przeglądarka" -#~ 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 zawiera teraz wszystkie nagłówki pasujące do zadanych kryteriów " -#~ "wyszukiwania. Jeśli chcesz zapisać wyniki, naciśnij przycisk \"Katalog " -#~ "Wyników\" w oknie wyszukiwania a Liferea doda nowy katalog do listy " -#~ "subskrypcji." +#: ../glade/prefs.ui.h:33 +msgid "Notification Settings" +msgstr "Powiadamianie" -#~ msgid "Count" -#~ msgstr "Licznik" +#: ../glade/prefs.ui.h:34 +msgid "Show a _popup window with new headlines." +msgstr "_Okno podręczne z nowymi nagłówkami" -#~ msgid "You have to select a feed entry" -#~ msgstr "Musisz zaznaczyć subskrypcję" +#: ../glade/prefs.ui.h:35 +msgid "Show a status _icon in the notification area (system tray)." +msgstr "_Ikona stanu w obszarze powiadamiania" -#~ msgid "(empty)" -#~ msgstr "(pusty)" +#: ../glade/prefs.ui.h:36 +msgid "Show _number of new items in the tray icon." +msgstr "I_lość nowych nagłówków wyświetlana w ikonie" -#~ msgid "_Delete" -#~ msgstr "U_suń" +#: ../glade/prefs.ui.h:37 +msgid "T_erminate instead of minimizing to tray icon." +msgstr "_Kończenie programu zamiast minimalizowania do ikony" -#~ msgid "_Properties..." -#~ msgstr "_Właściwości..." +#: ../glade/prefs.ui.h:38 +msgid "_Start in tray icon." +msgstr "_Minimalizowanie do ikony podczas uruchamiania" -#~ msgid "Update out-dated feeds" -#~ msgstr "Uaktualnij nieaktualne subskrypcje" +#: ../glade/prefs.ui.h:39 +msgid "Toolbar Settings" +msgstr "Pasek narzędziowy" -#~ msgid "Force update of all feeds" -#~ msgstr "Wymuś uaktualnienie wszystkich subskrypcji" +#: ../glade/prefs.ui.h:40 +msgid "_Hide toolbar." +msgstr "_Ukrywanie" -#~ msgid "No feed update at all" -#~ msgstr "Brak uaktualnienia subskrypcji" +#: ../glade/prefs.ui.h:41 +msgid "Toolbar _button labels:" +msgstr "Etykiety p_rzycisków:" -# WTF? -#~ msgid "startup" -#~ msgstr "start" +#: ../glade/prefs.ui.h:42 +msgid "GUI" +msgstr "Interfejs" -#~ msgid "feed updated" -#~ msgstr "subskrypcja uaktualniona" +#: ../glade/prefs.ui.h:43 +msgid "HTTP Proxy Server" +msgstr "Serwer pośrednika sieciowego" -#~ msgid "feed added" -#~ msgstr "subskrypcja dodana" +#: ../glade/prefs.ui.h:44 +msgid "_Auto Detect (GNOME or environment)" +msgstr "_Automatyczne wykrywanie (GNOME)" -#~ msgid "item selected" -#~ msgstr "nagłówek zaznaczony" - -#~ msgid "feed selected" -#~ msgstr "subskrypcja zaznaczona" - -#~ msgid "item unselected" -#~ msgstr "nagłówek odznaczony" - -#~ msgid "feed unselected" -#~ msgstr "subskrypcja odznaczona" - -#~ msgid "shutdown" -#~ msgstr "wyjście" - -#~ msgid "Sorry, no scripting support available!" -#~ msgstr "Obsługa skryptów nie jest dostępna!" - -#~ msgid "Script Name" -#~ msgstr "Nazwa skryptu" - -#~ msgid "No script selected!" -#~ msgstr "Nie wybrano skryptu!" - -#~ msgid "Create a new search feed." -#~ msgstr "Tworzy subskrypcję wyszukiwania." - -#~ msgid "Liferea is unable to display this item's content." -#~ msgstr "Liferea nie jest w stanie wyświetlić zawartości tego elementu." - -#~ msgid "

    View this item's content.

    " -#~ msgstr "

    Podgląd zawartości tego elementu.

    " - -#~ msgid "Bloglines" -#~ msgstr "Bloglines" - -#~ 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 "" -#~ "Dołącz listę subskrypcji z konta Bloglines. Liferea pokaże te subskrypcje " -#~ "jako drzewo tylko do odczytu." - -#~ msgid "feedlist.opml" -#~ msgstr "feedlist_pl.opml" - -#~ msgid "%s has %d new / updated headline\n" -#~ msgid_plural "%s has %d new / updated headlines\n" -#~ msgstr[0] "%s ma %d nowy / aktualny nagłówek\n" -#~ msgstr[1] "%s ma %d nowe / aktualne nagłówki\n" -#~ msgstr[2] "%s ma %d nowych / aktualnych nagłówków\n" - -#~ msgid " " -#~ msgstr " " - -#~ msgid " " -#~ msgstr " " - -#~ msgid " " -#~ msgstr " " - -#~ msgid "Hook" -#~ msgstr "Uchwyt" - -#~ msgid "Registered Scripts" -#~ msgstr "Skrypty" - -#~ msgid "Script Code" -#~ msgstr "Kod skryptu" - -#~ msgid "text/plain" -#~ msgstr "text/plain" - -#~ msgid "" -#~ "This option can cause significant delays when loading folders " -#~ "containing many feeds." -#~ msgstr "" -#~ "Ta opcja może spowolnić ładowanie katalogów zawierających wiele " -#~ "subskrypcji" - -#~ msgid "Downloading Enclosures" -#~ msgstr "Pobieranie załączników" - -#~ msgid "Feed Cache Handling" -#~ msgstr "Obsługa pamięci podręcznej subskrypcji" - -#~ msgid "Feed Name" -#~ msgstr "Nazwa Subskrypcji" - -#~ msgid "Feed Update Settings" -#~ msgstr "Ustawienia uaktualniania subskrypcji" - -#~ msgid "HTTP Proxy Server" -#~ msgstr "Serwer Proxy HTTP" - -#~ msgid "Opening Enclosures" -#~ msgstr "Otwieranie załączników" - -#~ msgid "Reading Headlines" -#~ msgstr "Przeglądanie nagłówków" - -#~ msgid "Toolbar Settings" -#~ msgstr "Ustawienia Paska Narzędzi" - -#~ msgid "Update Interval" -#~ msgstr "Częstotliwość uaktualnień" - -#~ msgid "Web Integration" -#~ msgstr "Integracja z siecią" - -#~ msgid "Add Script" -#~ msgstr "Dodaj skrypt" - -#~ msgid "At _startup:" -#~ msgstr "_Na starcie:" - -#, fuzzy -#~ msgid "Attention Profile" -#~ msgstr "Profil Powiadomień" - -#~ msgid "Create new script" -#~ msgstr "Utwórz nowy skrypt" - -#~ msgid "Exec Command" -#~ msgstr "Komenda uruchamiająca" - -#~ msgid "Reuse existing script" -#~ msgstr "Użyj istniejącego skryptu" - -#~ msgid "Script Manager" -#~ msgstr "Menedżer skryptów" - -#, fuzzy -#~ msgid "Search _Link Cosmos with" -#~ msgstr "_Znajdź w odnośniku" - -#~ msgid "_Allow Flash in Feeds." -#~ msgstr "_Pozwól na wyświetlanie Flash w Subskrypcjach" - -#, fuzzy -#~ msgid "FAILED to download enclosure: \"%s\"" -#~ msgstr "Zakończono pobieranie załącznika: \"%s\"" - -#, fuzzy -#~ msgid "" -#~ "Copyright (c) 2003-2009\n" -#~ "Lars Lindner and \n" -#~ "Nathan J. Conrad \n" -#~ msgstr "" -#~ "Copyright (c) 2003-2007\n" -#~ "Lars Lindner oraz \n" -#~ "Nathan J. Conrad \n" - -#~ msgid "/_Bookmark Link at %s" -#~ msgstr "/_Dodaj do zakładek na %s" - -#~ msgid "/Toggle _Read Status" -#~ msgstr "/Status _przeczytania" - -#~ msgid "/Toggle Item _Flag" -#~ msgstr "/_Flaga nagłówka" - -#, fuzzy -#~ msgid "/_Preferences" -#~ msgstr "_Preferencje" - -#~ msgid "/_Quit" -#~ msgstr "/_Wyjście" - -#, fuzzy -#~ msgid "/Copy Link Location" -#~ msgstr "/_Kopiuj adres odnośnika" - -#~ msgid "/_Update" -#~ msgstr "/_Uaktualnij" - -#~ msgid "/_New/New _Subscription..." -#~ msgstr "/_Nowy/Nowa _Subskrypcja..." - -#~ msgid "/_New/New _Folder..." -#~ msgstr "/_Nowy/Nowy Ka_talog..." - -#~ msgid "/_New/New S_earch Folder..." -#~ msgstr "/_Nowy/Nowy Katalog _Wyników..." - -#~ msgid "/_New/New S_ource..." -#~ msgstr "/_Nowy/Nowe Ź_ródło..." - -#~ msgid "/_New/New _News Bin..." -#~ msgstr "/_Nowy/Nowy _Kosz..." - -#~ msgid "Rule" -#~ msgstr "Reguła" - -#~ msgid "Liferea Homepage" -#~ msgstr "" -#~ "Strona domowa Liferea" - -#~ msgid "" -#~ "Code, Patches, Debugging\n" -#~ "\n" -#~ "James Doherty\n" -#~ "Jeremy Messenger\n" -#~ "John McKnight\n" -#~ "Tomasz Maka\n" -#~ "Karl Soderstrom\n" -#~ "Christophe Barbe\n" -#~ "Juho Snellman\n" -#~ "Roshan Revankar\n" -#~ "Oliver Feiler\n" -#~ "Niklas Morberg\n" -#~ "Johannes Schlueter\n" -#~ "Pierre Phaneuf\n" -#~ "ahmed el-helw\n" -#~ "James Bowes\n" -#~ "Marc Deslauriers\n" -#~ "Amit D. Chaudhary\n" -#~ "Christoph Hohmann\n" -#~ "Raphael Slinckx\n" -#~ "Bjorn Monnens\n" -#~ "Thomas de Grenier de Latour\n" -#~ "Aristotle Pagaltzis\n" -#~ "Norman Jonas\n" -#~ "Sebastian Droege\n" -#~ "Daniel Gryniewicz\n" -#~ "Remi Cardona\n" -#~ "Frederic Peters\n" -#~ "Don Malcolm\n" -#~ "Ed Catmur\n" -#~ "Chris Pirillo\n" -#~ "Eric Anderson\n" -#~ "and many more...\n" -#~ "\n" -#~ "Code from other projects\n" -#~ "\n" -#~ "Anders Carlsson (tray icon support)\n" -#~ "Philippe Martin, Brion Vibber (favicon support)\n" -#~ "Jonathan Blandford (GtkTreeModelFilter)\n" -#~ "Kristian Rietveld (GtkTreeModelFilter)\n" -#~ "\n" -#~ "Included Software\n" -#~ "\n" -#~ "Liferea uses the XSPF Web Music Player to \n" -#~ "allow direct podcast playback. This player was \n" -#~ "written by Fabricio Zuardi and can be found \n" -#~ "at http://musicplayer.sourceforge.net" -#~ msgstr "" -#~ "Kodowanie, łaty, wyszukiwanie błędów\n" -#~ "\n" -#~ "James Doherty\n" -#~ "Jeremy Messenger\n" -#~ "John McKnight\n" -#~ "Tomasz Maka\n" -#~ "Karl Soderstrom\n" -#~ "Christophe Barbe\n" -#~ "Juho Snellman\n" -#~ "Roshan Revankar\n" -#~ "Oliver Feiler\n" -#~ "Niklas Morberg\n" -#~ "Johannes Schlueter\n" -#~ "Pierre Phaneuf\n" -#~ "ahmed el-helw\n" -#~ "James Bowes\n" -#~ "Marc Deslauriers\n" -#~ "Amit D. Chaudhary\n" -#~ "Christoph Hohmann\n" -#~ "Raphael Slinckx\n" -#~ "Bjorn Monnens\n" -#~ "Thomas de Grenier de Latour\n" -#~ "Aristotle Pagaltzis\n" -#~ "Norman Jonas\n" -#~ "Sebastian Droege\n" -#~ "Daniel Gryniewicz\n" -#~ "Remi Cardona\n" -#~ "Frederic Peters\n" -#~ "Don Malcolm\n" -#~ "Ed Catmur\n" -#~ "Chris Pirillo\n" -#~ "Eric Anderson\n" -#~ "i wielu innych...\n" -#~ "\n" -#~ "Kod z innych projektów\n" -#~ "\n" -#~ "Anders Carlsson (ikona w zasobniku systemowym)\n" -#~ "Philippe Martin, Brion Vibber (ikony zakładek - favicons)\n" -#~ "Jonathan Blandford (GtkTreeModelFilter)\n" -#~ "Kristian Rietveld (GtkTreeModelFilter)\n" -#~ "\n" -#~ "Dołączone oprogramowanie\n" -#~ "\n" -#~ "Liferea używa programu XSPF Web Music Player do \n" -#~ "odtwarzania podcastów audio bezpośrednio z sieci. \n" -#~ "Program ten został napisany przez Fabricio Zuardi \n" -#~ "i można go znaleźć na http://musicplayer.sourceforge.net" - -#~ msgid "Contributors" -#~ msgstr "Projekt wspomagają" - -#~ 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." -#~ msgstr "" -#~ "Uwaga: Nagłówki są dodawane do katalogu wyników jeśli pasują do\n" -#~ "przynajmniej jednej reguły dodawania. Są usuwane, jeśli pasują\n" -#~ "do przynajmniej jednej reguły usuwania." - -#~ msgid "" -#~ "Saves this search as a search folder, which will appear in the feed list." -#~ msgstr "" -#~ "Zapisuje rezultaty wyszukiwania jako Katalog Wyników, który pojawi się na " -#~ "liście subskrypcji." - -#~ msgid "Show Menu _And Toolbar" -#~ msgstr "Pokazuj menu i pasek _narzędzi" - -#~ msgid "Show _Menu Only" -#~ msgstr "Pokazuj tylko m_enu" - -#~ msgid "Show _Toolbar Only" -#~ msgstr "Pokazuj _tylko pasek narzędzi" - -#~ msgid "Translation" -#~ msgstr "Tłumaczenie" - -#~ msgid "_Limit cache to" -#~ msgstr "O_granicz rozmiar pamięci podręcznej do" - -#~ msgid "_Name:" -#~ msgstr "_Nazwa:" - -#~ msgid "items." -#~ msgstr "nagłówków." - -#~ msgid "" -#~ "minutes\n" -#~ "hours\n" -#~ "days" -#~ msgstr "" -#~ "minut\n" -#~ "godzin\n" -#~ "dni" - -#~ msgid "search" -#~ msgstr "znajdź" - -#~ msgid "Access Forbidden" -#~ msgstr "Dostęp zabroniony" - -#~ msgid "URL is invalid" -#~ msgstr "URL jest nieprawidłowy" - -#~ msgid "Unsupported network protocol" -#~ msgstr "Nieobsługiwany protokół sieciowy" - -#~ msgid "Hostname could not be found" -#~ msgstr "Nie można odnaleźć hosta o podanej nazwie" - -#~ msgid "Network connection was refused by the remote host" -#~ msgstr "Zdalny host odrzucił połączenie" - -#~ msgid "Remote host did not finish sending data" -#~ msgstr "Zdalny host nie zakończył wysyłania danych" - -#~ msgid "Too many HTTP redirects were encountered" -#~ msgstr "Napotkano zbyt wiele przekierowań HTTP" - -#~ msgid "Remote host sent an invalid response" -#~ msgstr "Zdalny host wysłał nieprawidłową odpowiedź" - -#~ msgid "Webserver's authentication method incompatible with Liferea" -#~ msgstr "Sposób autoryzacji serwera jest niekompatybilny z Liferea" - -#~ msgid "" -#~ "Unexpected end of character sequence or corrupt UTF-8 encoding! Some " -#~ "characters were dropped!" -#~ msgstr "" -#~ "Nieoczekiwany koniec sekwencji znaków lub uszkodzone kodowanie UTF-8! " -#~ "Część znaków została pominięta!" - -#~ msgid "Feed link auto discovery failed! No feed links found!" -#~ msgstr "" -#~ "Automatyczne wyszukiwanie subskrypcji nie powiodło się! Nie znaleziono " -#~ "żadnych odnośników!" - -#~ msgid " --help Print this help and exit" -#~ msgstr " --help Wyświetla ten komunikat i kończy" - -#~ msgid " --mainwindow-state=STATE" -#~ msgstr " --mainwindow-state=STAN" - -#~ msgid " Start Liferea with its main window in STATE." -#~ msgstr " Uruchamia główne okno Liferea w stanie STAN" - -#~ msgid " Possible topics are: all,cache,conf,db,gui,html" -#~ msgstr " TEMAT może być: 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 "Argument --mainwindow-state musi mieć parametr.\n" - -#~ msgid "The --session argument must be given a parameter.\n" -#~ msgstr "Argument --session musi mieć parametr.\n" - -#~ msgid "Liferea encountered an unknown argument: %s\n" -#~ msgstr "Nieznany argument: %s\n" - -#~ msgid "does match" -#~ msgstr "pasuje do" - -#~ msgid "does not match" -#~ msgstr "nie pasuje do" - -#~ msgid "Could not download \"%s\". Will retry in %d seconds." -#~ msgstr "Nie można pobrać \"%s\". Ponowna próba za %d sekund." - -#~ msgid "" -#~ "Sorry, I was not able to load any installed browser plugin! Try the --" -#~ "debug-plugins option to get debug information!" -#~ msgstr "" -#~ "Niestety nie udało się załadować żadnego modułu przeglądarki! Użyj opcji " -#~ "--debug-plugins aby dowiedzieć się więcej!" - -#~ msgid "This item does not have a link assigned!" -#~ msgstr "Ten nagłówek nie ma przypisanego odnośnika!" - -#~ msgid "No link selected!" -#~ msgstr "Żaden odnośnik nie został zaznaczony" - -#~ msgid "http://liferea.sf.net" -#~ msgstr "http://liferea.sf.net" - -#~ msgid "Updates all subscriptions. This does not update OCS directories." -#~ msgstr "Uaktualnia wszystkie subskrypcje (nie dotyczy katalogów OCS)." - -#~ msgid "/_Increase Text Size" -#~ msgstr "/Z_większ rozmiar czcionki" - -#~ msgid "/_Decrease Text Size" -#~ msgstr "/Z_mniejsz rozmiar czcionki" - -#~ msgid "/Toggle _Online|Offline" -#~ msgstr "/Przełącz tryb _Online|Offline" +#: ../glade/prefs.ui.h:45 +msgid "_No Proxy" +msgstr "_Brak" -#~ msgid "/_Preferences..." -#~ msgstr "/_Preferencje..." +#: ../glade/prefs.ui.h:46 +msgid "_Manual Setting:" +msgstr "_Ręczne ustawienia:" -#~ msgid "/_Show|Hide Window" -#~ msgstr "/Pokaż|Ukryj ok_no" +#: ../glade/prefs.ui.h:47 +msgid "Proxy _Port:" +msgstr "_Port:" + +#: ../glade/prefs.ui.h:48 +msgid "Proxy _Host:" +msgstr "_Pośrednik:" + +#: ../glade/prefs.ui.h:49 +msgid "Use Proxy Au_thentication" +msgstr "_Uwierzytelnianie pośrednika" + +#: ../glade/prefs.ui.h:50 +msgid "Proxy Pass_word:" +msgstr "_Hasło:" + +#: ../glade/prefs.ui.h:51 +msgid "Proxy _Username:" +msgstr "_Nazwa użytkownika:" + +#: ../glade/prefs.ui.h:52 +msgid "Proxy" +msgstr "Pośrednik" + +#: ../glade/prefs.ui.h:53 +msgid "Downloading Enclosures" +msgstr "Pobieranie" + +#: ../glade/prefs.ui.h:54 +msgid "_Download using" +msgstr "Po_bieranie za pomocą programu:" + +#: ../glade/prefs.ui.h:55 +msgid "Opening Enclosures" +msgstr "Otwieranie" + +#: ../glade/prefs.ui.h:56 +msgid "Enclosures" +msgstr "Załączniki" -#~ msgid "Cookie for %s has expired!" -#~ msgstr "Ciasteczko %s wygasło!" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" +msgstr "Wtyczki" diff -Nru liferea-1.8.15/po/POTFILES.in liferea-1.10.3/po/POTFILES.in --- liferea-1.8.15/po/POTFILES.in 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/po/POTFILES.in 2013-10-08 12:34:39.000000000 +0200 @@ -2,6 +2,7 @@ # List of source files containing translatable strings. +liferea.appdata.xml.in liferea.desktop.in xslt/feed.xml.in xslt/source.xml.in @@ -10,6 +11,7 @@ xslt/newsbin.xml.in xslt/vfolder.xml.in src/browser.c +src/browser_history.c src/comments.c src/comments.h src/common.c @@ -41,6 +43,8 @@ src/htmlview.h src/item.c src/item.h +src/item_history.c +src/item_history.h src/item_loader.c src/item_loader.h src/itemlist.c @@ -107,12 +111,10 @@ src/ui/liferea_shell.h src/ui/popup_menu.c src/ui/popup_menu.h -src/ui/ui_node.c -src/ui/ui_node.h -src/ui/ui_prefs.c -src/ui/ui_prefs.h -src/ui/ui_session.c -src/ui/ui_session.h +src/ui/preferences_dialog.c +src/ui/preferences_dialog.h +src/ui/feed_list_node.c +src/ui/feed_list_node.h src/ui/subscription_dialog.c src/ui/subscription_dialog.h src/ui/browser_tabs.c @@ -153,30 +155,48 @@ src/parsers/rss_channel.h src/parsers/rss_item.c src/parsers/rss_item.h +src/fl_sources/aol_source.c src/fl_sources/default_source.c src/fl_sources/default_source.h src/fl_sources/dummy_source.c src/fl_sources/dummy_source.h +src/fl_sources/inoreader_source.c +src/fl_sources/inoreader_source.h src/fl_sources/google_source.c src/fl_sources/google_source.h src/fl_sources/opml_source.c src/fl_sources/opml_source.h src/fl_sources/node_source.c src/fl_sources/node_source.h +src/fl_sources/reedah_source.c +src/fl_sources/reedah_source.h +src/fl_sources/reedah_source_feed.c +src/fl_sources/reedah_source_feed_list.c +src/fl_sources/reedah_source_feed_list.h src/fl_sources/ttrss_source.c src/fl_sources/ttrss_source.h src/fl_sources/ttrss_source_feed.c src/fl_sources/ttrss_source_feed_list.c src/fl_sources/ttrss_source_feed_list.h +src/fl_sources/theoldreader_source.c +src/fl_sources/theoldreader_source.h +src/fl_sources/theoldreader_source_edit.c +src/fl_sources/theoldreader_source_feed.c +src/fl_sources/theoldreader_source_feed_list.c +src/fl_sources/theoldreader_source_feed_list.h src/notification/libnotify.c src/notification/notification.c src/notification/notification.h src/webkit/webkit.c [type: gettext/glade]glade/auth.ui [type: gettext/glade]glade/google_source.ui +[type: gettext/glade]glade/inoreader_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/ttrss_source.ui +[type: gettext/glade]glade/prefs.ui +[type: gettext/glade]glade/reedah_source.ui [type: gettext/glade]glade/simple_subscription.ui +[type: gettext/glade]glade/ttrss_source.ui +[type: gettext/glade]glade/theoldreader_source.ui diff -Nru liferea-1.8.15/po/pt_BR.po liferea-1.10.3/po/pt_BR.po --- liferea-1.8.15/po/pt_BR.po 2013-06-24 22:16:17.000000000 +0200 +++ liferea-1.10.3/po/pt_BR.po 2013-07-31 23:29:12.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: liferea\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2009-07-18 18:05-0300\n" "Last-Translator: Leon Nardella \n" "Language-Team: Brazilian Portuguese \n" @@ -19,8 +19,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -33,8 +32,8 @@ msgstr "Agregador de Notícias Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Download e exibir fontes de notícias" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -143,38 +142,26 @@ msgstr "Criador" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "sinalizar" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "favorito" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "comentários" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Sem comentários." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "comentários" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Atualizando..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Atualizar" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Seção" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Departamento" @@ -199,12 +186,12 @@ msgid "Default Browser" msgstr "Navegador Padrão do GNOME" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Falha ao iniciar o navegador: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Iniciando: \"%s\"" @@ -214,7 +201,7 @@ msgid "Authorization Error" msgstr "Erro de Autorização" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Não foi possível criar o diretório de cache \"%s\"!" @@ -244,76 +231,82 @@ msgid "%b %d %Y" msgstr "%d de %b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "\"%s\" não é um tipo de arquivo válido de configuração de componentes!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Download do componente FALHOU: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Download do componente completo: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Erro ao renomear %s para %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "Erro de XML ao ler arquivo OPML! Não foi possível importar \"%s\"!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "" "Documento vazio! O documento OPML \"%s\" não deve estar vazio ao importar." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "\"%s\" não é um documento OPML válido! Liferea não pode importar este " "arquivo!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Lista de fontes de notícias importadas" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importar Lista de Notícias" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importar" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 #, fuzzy msgid "OPML Files" msgstr "Escolher Arquivo OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Erro ao exportar a lista de fontes de notícias!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Lista de fontes de notícias exportada!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Exportar lista de fontes de notícias" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Exportar" @@ -373,12 +366,12 @@ msgstr "Não foi possível determinar o tipo de fonte de notícias." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "Não há artigo não lido " -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" @@ -386,109 +379,97 @@ "Iniciar o Liferea com a sua janela principal em ESTADO. ESTADO pode ser " "`exibido', `iconificado', ou `oculto'" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "ESTADO" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Exibir informações de versão e sair" -#: ../src/main.c:180 +#: ../src/main.c:166 #, fuzzy msgid "Add a new subscription" msgstr "Nova Assinatura" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Imprimir mensagens de depuração de todos os tipos" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "Imprimir mensagens de depuração do manuseio de cache" -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr "Imprimir mensagens de depuração do manuseio de configurações" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "Imprimir mensagens de depuração do manuseio do bando de dados" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "Imprimir mensagens de depuração para todas as funções de GUI" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" "Habilita a depuração de renderização de HTML. Sempre que o Liferea " -"renderizar saída HTML ele também vai despejar o HTML gerado em ~/." -"liferea_1.8/output.xhtml" +"renderizar saída HTML ele também vai despejar o HTML gerado em ~/.cache/" +"liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "Imprimir mensagens de depuração para toda a atividade de rede" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "Imprimir mensagens de depuração para todas as funções de análise" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" "Imprimir mensagens de depuração quando uma função demorar muito para ser " "processada" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Imprimir mensagens de depuração ao entrar e sair de funções" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "" "Imprimir mensagens de depuração do processamento das atualizações de notícias" -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr "Imprimir mensagens de depuração do manuseio de cache" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Imprimir mensagens de depuração detalhadas" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 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:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, o Leitor de Notícias para Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" -"Para mais informações, por favor acesse http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" -"Essa versão do Liferea usa um novo formato de cache e migrou o seu cache de " -"fontes de notícias. O conteúdo do cache em %s não foi apagado " -"automaticamente. Por favor, remove esse diretório quando você tiver certeza " -"de que a migração foi bem-sucedida!" +"Para mais informações, por favor acesse http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -661,12 +642,12 @@ msgid "Feed title" msgstr "Título do item" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "A fonte de notícias \"%s\" já está sendo atualizada!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" @@ -674,12 +655,12 @@ "A fonte de notícias \"%s\" foi interrompida e não será mais atualizada pelo " "Liferea!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Atualizando o ícone da fonte de notícias \"%s\"" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -687,48 +668,48 @@ "Foi encontrado um problema ao ler esta assinatura. Por favor, verifique o " "URL e a saída no console." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "O URL de \"%s\" mudou permanentemente e foi atualizado" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "\"%s\" foi interrompido e não será mais atualizado pelo Liferea!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" não foi modificado desde a última atualização" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Atualizando \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Erro ao abrir arquivo temporário %s para usar no filtro!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s saiu com status %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Erro: Não foi possível abrir a linha de processamento \"%s\"" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Erro: Não foi possível abrir o arquivo \"%s\"" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Erro: Não há arquivo: \"%s\"" @@ -737,55 +718,53 @@ msgid "New Search Folder" msgstr "Nova Pasta Virtual" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Houve. A saída foi truncada!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "Analisador XML: Não foi possível analisar o documento:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Anexos" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d anexo" -msgstr[1] "%d anexos" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " Bytes" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d anexo" +msgstr[1] "%d anexos" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Escolher Arquivo" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, fuzzy, c-format msgid "File Extension .%s" msgstr "Extensão de Arquivo .%s" @@ -795,351 +774,389 @@ msgid "Couldn't find pixmap file: %s" msgstr "Não foi possível localizar o arquivo de imagem: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] "(%d novo)" msgstr[1] "(%d novos)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d não lido%s" msgstr[1] "%d não lidos%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Tópicos de Ajuda" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Referência Rápida" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "FAQ" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea está online" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Trabalhar Offline" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea está offline" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Trabalhar Online" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "Assinaturas" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "A_tualizar Todos" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Atualizar todas as assinaturas" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Ma_rcar Todos Como Lido" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Marca todos itens de todas assinaturas como lido." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Importar Lista de Fontes de Notícias..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importa uma lista OPML de fonte de notícias." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Exportar Lista de Notícias..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Exporta a lista de fonte de notícias como OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Sair" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Fonte de Notícias" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Remover _Todos Itens" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Remove todos os item selecionados da fonte de notícias atual." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_Itens" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "_Avançar Para Item Não Lido" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "_Avançar Para Item Não Lido" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Ver" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "_Aumentar Tamanho do Texto" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 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:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_Diminuir Tamanho do Texto" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Diminui o tamanho do texto de exibição do item." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "Ferramentas" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "Monitor de Atualização" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "Exibe uma lista de todas as fontes de notícias na fila de atualização" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Preferências" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Editar Preferências." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "Pesqui_sar" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Procurar em Todas as Fontes..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Exibe o diálogo de pesquisa." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Ajuda" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Índice" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Veja ajuda para esta aplicação." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "R_eferência Rápida" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Exibir uma lista de atalhos do Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_FAQ" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Exibir o FAQ desta aplicação." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_Sobre" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Exibe o diálogo sobre esta aplicação." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "Visualização _Normal" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Define o modo de visualização para o modo de cliente de e-mail." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "Visualização Ampla" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Define o modo de visualização para usar três painéis verticais." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "Visualização _Combinada" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Define o modo de visualização para um modo com dois painéis." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "_Reduced Feed List" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Ocultar fontes de notícias sem itens não-lidos" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "_Novas Assinaturas..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Adiciona uma nova assinatura à lista de fontes de notícias." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Nova _Pasta..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Adiciona uma pasta à lista de fontes de notícias." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Nova Pasta Virtual..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Adicionar uma nova pasta virtual à lista de fontes de notícias." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Nova Fo_nte..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Adicionar uma nova fonte de lista de fontes de notícias." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "_Novo Recipiente de Notícias..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Adiciona um novo recipiente de notícias." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "_Marcar Itens Como Lidos" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "Marca todos os itens do nó selecionado como lidos" -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Atualizar" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "" "Atualiza a assinatura selecionada ou todas assinaturas da pasta selecionada. " -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "_Propriedades" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Abre o diálogo de propriedades para a assinatura selecionada." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "_Remover" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Remove as assinaturas selecionadas." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Alte_rar para Lido ou Não Lido" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Alterna o status de leitura do item selecionado." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Alternar Sinalizador do Item" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Alterna o sinalizador de status do item selecionado." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "R_emover" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Remove os itens selecionados." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Abre o link do item no navegador configurado." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "_Abrir No Navegador" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." +msgstr "Abre o link do item no navegador configurado." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Configurações do Navegador Externo" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." msgstr "Abre o link do item no navegador configurado." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "T_rabalhar Offline" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Esta opção permite desabilitar a atualização de assinaturas." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Leitor de Fontes de Notícias do Linux" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 #, fuzzy msgid "" "

    Welcome to Liferea, a desktop news aggregator for online news " @@ -1155,12 +1172,12 @@ "notícias, selecione-a na lista de fontes de notícias e as manchetes serão " "carregadas no painel direito.

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Fonte desconhecida" @@ -1191,251 +1208,252 @@ 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:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Download do componente FALHOU: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 +#: ../src/ui/liferea_htmlview.c:627 #, fuzzy -msgid "Download finished." -msgstr "_Download usando" - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +msgid "Open Link In _Tab" msgstr "Abrir Link Em _Aba" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "_Abrir Link No Navegador" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "_Abrir Link No Navegador" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "_Salvar Link em %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Copiar Localização do Link" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 #, fuzzy msgid "_Copy Image Location" msgstr "_Copiar Localização do Link" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 #, fuzzy msgid "S_ave Link As" msgstr "Salvar Como..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Assinar..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Sem título ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Data" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Manchetes" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Nenhum item foi selecionado" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Este item não possui um link específico" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Selecione uma fonte para excluir seus itens!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Abrir Item Em _Aba" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "A_brir Item No Navegador" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "Copiar para o Recipiente de Notícias" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Copiar _URL do Item para a Área de Transferência" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "_Salvar Link em %s" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "_Copiar Localização do Link" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "R_emover Item" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Abrir Componente..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Salvar Como..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "_Copiar Localização do Link" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "At_ualizar Todos" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "_Exibir Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "At_ualizar Pasta" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "_Marcar Todos Como Lidos" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_Nova" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "Nova _Assinatura..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "Nova Fo_nte..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 #, fuzzy msgid "Sort Feeds" msgstr "Importar Lista de Notícias" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "_Novas Assinaturas..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "GNOME padrão" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Texto abaixo dos ícones" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Texto ao lado dos ícones" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Somente ícones" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Somente texto" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minutos" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "horas" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "dias" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Espaço" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Espaço" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Espaço" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Escolha o diretório de download" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "Visualização _Normal" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "Visualização Ampla" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "Visualização _Combinada" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Manual" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Navegador padrão" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Janela existente" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Nova Janela" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Nova aba" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 #, fuzzy msgid "Terminate instead of minimizing to the messaging menu" msgstr "Finalizar invés de minimizar para o ícone da band_eja" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Tipo" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Programa" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1453,7 +1471,7 @@ msgstr "" "Esta fonte de notícias não possui um intervalo de atualização definido." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "" @@ -1504,7 +1522,7 @@ msgid "%b %d %H:%M" msgstr "%d de %b %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1514,11 +1532,11 @@ msgid "Google Reader login failed!" msgstr "Falha ao efetuar login no Google Reader!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1553,22 +1571,15 @@ 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:269 msgid "Source Type" msgstr "Tipo de Fonte" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 #, fuzzy msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " @@ -1579,7 +1590,7 @@ "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/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1648,8 +1659,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Por favor digite a configuração de sua conta no Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Senha" @@ -1673,7 +1683,7 @@ msgid "combined view" msgstr "visualização combinada" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Manchetes" @@ -1726,7 +1736,7 @@ msgstr "Geral" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 #, fuzzy msgid "Feed Source" msgstr "Fonte" @@ -1845,494 +1855,558 @@ msgstr "Avançado" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Preferências do Liferea" +msgid "New Folder" +msgstr "Nova Pasta" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "N_ome da pasta:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "_Número padrão de itens por fonte de notícias para salvar:" +msgid "Rename" +msgstr "Renomear" #: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "Atualização de Fonte de Notícias" +msgid "_New Name:" +msgstr "_Novo Nome:" #: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Atualizar todas as assinaturas" +msgid "Search Folder Properties" +msgstr "Propriedades da Pasta Virtual" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "_Intervalo Padrão de Atualização de Fontes de Notícias:" +msgid "Search _Name:" +msgstr "_Nome da Pesquisa:" + +#: ../glade/liferea.ui.h:54 +#, fuzzy +msgid "Find Items that meet the following criteria" +msgstr "Encontre itens que atendam aos seguintes critérios" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"Nota: Lembre-se de definir um intervalo de atualização razoável. " -"Geralmente é um desperdício de banda atualizar fontes de notícias com uma " -"frequência maior que uma vez por hora." +msgid "A_ny Rule Matches" +msgstr "A_ny Rule Matches" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Fontes de Notícias" +msgid "_All Rules Must Match" +msgstr "_Todas as regras devem ser satisfeitas" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "Configurações de Exibição de Pastas" +msgid "Open Enclosure" +msgstr "Abrir Componente..." #: ../glade/liferea.ui.h:58 -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." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Baixando um componente do tipo:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "O_cultar itens já lidos." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"O que o Liferea deve fazer com esse componente? Por favor, insira abaixo o " +"comando que você deseja que seja executado. Os componentes baixados serão " +"fornecidos como argumentos para esse comando:" #: ../glade/liferea.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Ícones das Fontes de Notícias (Favicons)" +msgid "_Browse" +msgstr "_Navegar" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "At_ualizar todos favicons agora." +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.ui.h:62 -msgid "Folders" -msgstr "Pastas" +msgid "Search All Feeds" +msgstr "Procurar em Todas as Fontes de Notícias" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "manchetes não lidas" +msgid "_Search for:" +msgstr "Pesqui_sar por:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "Avançar pelos artigo_s rapidamente com:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Digite o termo que o Liferea deve pesquisar nos títulos de itens ou seus " +"conteúdos." #: ../glade/liferea.ui.h:65 -#, fuzzy -msgid "Web Integration" -msgstr "Orientação" +msgid "_Advanced..." +msgstr "_Avançado..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Publicar Favoritos em" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"Procura o texto especificado em todas as fontes de notícias. O resultado da " +"busca aparecerá na lista de itens." #: ../glade/liferea.ui.h:67 -#, fuzzy -msgid "Internal Browser Settings" -msgstr "Configurações do Navegador Interno" +msgid "Update Monitor" +msgstr "Atualizar Monitor" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Abrir links na _janela do Liferea." +#, fuzzy +msgid "Pending Requests" +msgstr "Requisições Pendentes" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Desabilitar Javascript." +#, fuzzy +msgid "Downloading Now" +msgstr "Baixando Agora" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "_Habilitar plugins de browser" +msgid "Cancel _All" +msgstr "C_ancelar Todos" #: ../glade/liferea.ui.h:71 +msgid "Create News Bin" +msgstr "Criar Recipiente de Notícias" + +#: ../glade/liferea.ui.h:72 +msgid "_News Bin Name:" +msgstr "_Nome do Recipiente de Notícias:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Sobre" + +#: ../glade/liferea.ui.h:74 +#, fuzzy +msgid "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" +"Copyright (c) 2003-2009\n" +"The Liferea Team\n" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea é um agregador de notícias para o GTK+" + +#: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "Liferea Homepage" + +#: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "Pesquisa Avançada" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "Pa_sta de Pesquisa..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Criar Fonte de Notícias de Motor de Pesquisas" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "digite qualquer frase para pesquisar" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "_Número Máximo de Itens por Resultado:" + +#: ../glade/liferea.ui.h:84 +#, 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 "" +"Nota: O Liferea criará uma assintatura de fonte de notícias que poderá ser " +"usado para consultar os resultados dos motores de busca pela frase " +"específica. Você poderá manter esta fonte de notícias em definitivo e " +"atualizá-la como qualquer outra assinatura. " + +#: ../glade/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "Download / Processamento" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Seleção de Fonte" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Selecione o tipo de fonte que você deseja adicionar..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Adicionar OPML/Planeta" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"Por favor especifique um arquivo local ou URL apontando para uma lista " +"válida de feed OPML." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Localização" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "_Selecionar Arquivo" + +#: ../glade/ttrss_source.ui.h:1 +#, fuzzy +msgid "Add Tiny Tiny RSS Account" +msgstr "Adicionar Conta do Bloglines" + +#: ../glade/ttrss_source.ui.h:2 +#, fuzzy +msgid "Please enter your tt-rss account settings." +msgstr "Por favor digite a configuração de sua conta no Bloglines." + +#: ../glade/ttrss_source.ui.h:3 +#, fuzzy +msgid "_Server URL" +msgstr "Erro do Servidor" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "Nome de _Usuário" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Avançado..." + +#: ../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 "" +"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." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Preferências do Liferea" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "_Número padrão de itens por fonte de notícias para salvar:" + +#: ../glade/prefs.ui.h:4 +#, fuzzy +msgid "Feed Update Settings" +msgstr "Atualização de Fonte de Notícias" + +#: ../glade/prefs.ui.h:5 +#, fuzzy +msgid "_Update all subscriptions at startup." +msgstr "Atualizar todas as assinaturas" + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "_Intervalo Padrão de Atualização de Fontes de Notícias:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"Nota: Lembre-se de definir um intervalo de atualização razoável. " +"Geralmente é um desperdício de banda atualizar fontes de notícias com uma " +"frequência maior que uma vez por hora." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Fontes de Notícias" + +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "Configurações de Exibição de Pastas" + +#: ../glade/prefs.ui.h:11 +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/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "O_cultar itens já lidos." + +#: ../glade/prefs.ui.h:13 +#, fuzzy +msgid "Feed Icons (Favicons)" +msgstr "Ícones das Fontes de Notícias (Favicons)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "At_ualizar todos favicons agora." + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Pastas" + +#: ../glade/prefs.ui.h:16 +#, fuzzy +msgid "Reading Headlines" +msgstr "manchetes não lidas" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "Avançar pelos artigo_s rapidamente com:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +#, fuzzy +msgid "Web Integration" +msgstr "Orientação" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Publicar Favoritos em" + +#: ../glade/prefs.ui.h:22 +#, fuzzy +msgid "Internal Browser Settings" +msgstr "Configurações do Navegador Interno" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Abrir links na _janela do Liferea." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Desabilitar Javascript." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "_Habilitar plugins de browser" + +#: ../glade/prefs.ui.h:26 #, fuzzy msgid "External Browser Settings" msgstr "Configurações do Navegador Externo" -#: ../glade/liferea.ui.h:72 +#: ../glade/prefs.ui.h:27 msgid "_Open link in:" msgstr "_Abrir link em:" -#: ../glade/liferea.ui.h:74 +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Manual" + +#: ../glade/prefs.ui.h:30 #, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" +msgid "(%s for URL)" msgstr "" -"_Manual:\n" -"(%s para URL)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Navegador:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Navegador" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 #, fuzzy msgid "Notification Settings" msgstr "Configuração de Notificações" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Exibe uma janela instantânea com novas manchetes." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 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.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Exibir _número de novos ítens no ícone da bandeja." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "Finalizar invés de minimizar para o ícone da band_eja" -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "_Ícone para iniciar na bandeja" -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 #, fuzzy msgid "Toolbar Settings" msgstr "Rótulos dos botões da barra de ferramentas:" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "_Ocultar a barra de ferramentas" -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Rótulos dos botões da barra de ferramentas:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "Interface Gráfica" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "Detectar _Automaticamente (GNOME ou ambiente)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "Sem Proxy" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "Configuração _Manual:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "_Porta do Proxy:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "_Servidor Proxy:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Usar Au_tenticação de Proxy" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "Se_nha do Proxy:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "_Usuário Proxy:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 #, fuzzy msgid "Downloading Enclosures" msgstr "Baixar Componente" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Navegar" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Salvar downloads em" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Download usando" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 #, fuzzy msgid "Opening Enclosures" msgstr "Abrir Componente..." -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Componentes" -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Sincronizado com Servidores Próximos" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_Habilitar Sincronização de Rede Local" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "Nome do _Serviço:" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Sincronizar" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Nova Pasta" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "N_ome da pasta:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Renomear" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Novo Nome:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Propriedades da Pasta Virtual" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "_Nome da Pesquisa:" - -#: ../glade/liferea.ui.h:115 -#, fuzzy -msgid "Find Items that meet the following criteria" -msgstr "Encontre itens que atendam aos seguintes critérios" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "A_ny Rule Matches" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "_Todas as regras devem ser satisfeitas" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Baixar Componente" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Baixando um componente do tipo:" - -#: ../glade/liferea.ui.h:120 -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 "" -"O que o Liferea deve fazer com esse componente? Por favor, insira abaixo o " -"comando que você deseja que seja executado. Os componentes baixados serão " -"fornecidos como argumentos para esse comando:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Passar a URL e não baixar o componente." - -#: ../glade/liferea.ui.h:122 -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.ui.h:123 -msgid "Search All Feeds" -msgstr "Procurar em Todas as Fontes de Notícias" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "Pesqui_sar por:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -"Digite o termo que o Liferea deve pesquisar nos títulos de itens ou seus " -"conteúdos." - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "_Avançado..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Procura o texto especificado em todas as fontes de notícias. O resultado da " -"busca aparecerá na lista de itens." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Atualizar Monitor" - -#: ../glade/liferea.ui.h:129 -#, fuzzy -msgid "Pending Requests" -msgstr "Requisições Pendentes" - -#: ../glade/liferea.ui.h:130 -#, fuzzy -msgid "Downloading Now" -msgstr "Baixando Agora" -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "C_ancelar Todos" +#~ msgid "Download and view feeds" +#~ msgstr "Download e exibir fontes de notícias" -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Criar Recipiente de Notícias" +#~ msgid "You may want to validate the feed using" +#~ msgstr "Talvez você queira validar a fonte de notícias usando" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Nome do Recipiente de Notícias:" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Abrir Item Em _Aba" -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Sobre" +#~ msgid "_Launch Item In Browser" +#~ msgstr "A_brir Item No Navegador" -#: ../glade/liferea.ui.h:135 -#, fuzzy -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Copyright (c) 2003-2009\n" -"The Liferea Team\n" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea é um agregador de notícias para o GTK+" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Copiar _URL do Item para a Área de Transferência" -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Liferea Homepage" +#~ msgid "flag" +#~ msgstr "sinalizar" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Pesquisa Avançada" +#~ msgid "bookmark" +#~ msgstr "favorito" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "Pa_sta de Pesquisa..." +#~ msgid "comments" +#~ msgstr "comentários" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Criar Fonte de Notícias de Motor de Pesquisas" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Download do componente FALHOU: \"%s\"" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "digite qualquer frase para pesquisar" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Download do componente completo: \"%s\"" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "_Número Máximo de Itens por Resultado:" +#~ 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 "" +#~ "Essa versão do Liferea usa um novo formato de cache e migrou o seu cache " +#~ "de fontes de notícias. O conteúdo do cache em %s não foi apagado " +#~ "automaticamente. Por favor, remove esse diretório quando você tiver " +#~ "certeza de que a migração foi bem-sucedida!" -#: ../glade/liferea.ui.h:145 #, 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 "" -"Nota: O Liferea criará uma assintatura de fonte de notícias que poderá ser " -"usado para consultar os resultados dos motores de busca pela frase " -"específica. Você poderá manter esta fonte de notícias em definitivo e " -"atualizá-la como qualquer outra assinatura. " +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Download do componente FALHOU: \"%s\"" -#: ../glade/new_subscription.ui.h:9 #, fuzzy -msgid "Download / Postprocessing" -msgstr "Download / Processamento" - -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Seleção de Fonte" +#~ msgid "Download finished." +#~ msgstr "_Download usando" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Selecione o tipo de fonte que você deseja adicionar..." +#~ msgid "Choose download directory" +#~ msgstr "Escolha o diretório de download" -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Adicionar OPML/Planeta" - -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Por favor especifique um arquivo local ou URL apontando para uma lista " -"válida de feed OPML." - -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Localização" - -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "_Selecionar Arquivo" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Manual:\n" +#~ "(%s para URL)" -#: ../glade/ttrss_source.ui.h:1 -#, fuzzy -msgid "Add Tiny Tiny RSS Account" -msgstr "Adicionar Conta do Bloglines" +#~ msgid "_Save downloads in" +#~ msgstr "_Salvar downloads em" -#: ../glade/ttrss_source.ui.h:2 #, fuzzy -msgid "Please enter your tt-rss account settings." -msgstr "Por favor digite a configuração de sua conta no Bloglines." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Sincronizado com Servidores Próximos" -#: ../glade/ttrss_source.ui.h:3 -#, fuzzy -msgid "_Server URL" -msgstr "Erro do Servidor" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "_Habilitar Sincronização de Rede Local" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "Nome de _Usuário" +#~ msgid "_Service Name" +#~ msgstr "Nome do _Serviço:" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"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 "Sync" +#~ msgstr "Sincronizar" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Avançado..." +#~ msgid "Downloading Enclosure" +#~ msgstr "Baixar Componente" -#~ msgid "You may want to validate the feed using" -#~ msgstr "Talvez você queira validar a fonte de notícias usando" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "_Passar a URL e não baixar o componente." #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " diff -Nru liferea-1.8.15/po/pt.po liferea-1.10.3/po/pt.po --- liferea-1.8.15/po/pt.po 2013-06-24 22:16:17.000000000 +0200 +++ liferea-1.10.3/po/pt.po 2013-07-31 23:29:12.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: liferea\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2009-06-04 01:08+0000\n" "Last-Translator: António Lima \n" "Language-Team: Portuguese \n" @@ -18,8 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -32,8 +31,8 @@ msgstr "Leitor de Fontes Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Transferir e exibir fontes" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -142,38 +141,26 @@ msgstr "Criador" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "marcar" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "marcador" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "comentários" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Ainda sem comentários." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Comentários" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "A Actualizar..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Actualizar" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Secção" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Departamento" @@ -198,12 +185,12 @@ msgid "Default Browser" msgstr "Navegador por Omissão do GNOME" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Falha ao iniciar o navegador: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "A iniciar: \"%s\"" @@ -213,7 +200,7 @@ msgid "Authorization Error" msgstr "Erro de Autorização" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Não foi possível criar o directório de cache \"%s\"!" @@ -243,77 +230,83 @@ msgid "%b %d %Y" msgstr "%d de %b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "" "\"%s\" não é um tipo de ficheiro válido de configuração de componentes!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Transferência do componente FALHOU \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Transferência do componente completa: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Erro ao renomear %s para %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "Erro de XML ao ler o ficheiro OPML! Não foi possível importar \"%s\"!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "" "Documento vazio! O documento OPML \"%s\" não deve estar vazio ao importar." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "\"%s\" não é um documento OPML válido! O Liferea não pode importar este " "ficheiro!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Lista de fontes importadas" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importar Lista de Fontes" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importar" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 #, fuzzy msgid "OPML Files" msgstr "Escolher Ficheiro OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Erro ao exportar a lista de fontes!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Lista de fontes exportada!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Exportar Lista de Fontes" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Exportar" @@ -370,12 +363,12 @@ msgstr "Não foi possível determinar o tipo de fonte." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "Não há artigos não lidos " -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" @@ -383,108 +376,96 @@ "Iniciar o Liferea com a sua janela principal em ESTADO. ESTADO pode ser " "`apresentada', `iconificada', ou `oculta'" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "ESTADO" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Apresentar informações de versão e sair" -#: ../src/main.c:180 +#: ../src/main.c:166 #, fuzzy msgid "Add a new subscription" msgstr "Nova Subscrição" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Imprimir mensagens de depuração de todos os tipos" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "Imprimir mensagens de depuração para a gestão de cache" -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr "Imprimir mensagens de depuração da gestão de configuração" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "Imprimir mensagens de depuração da gestão de bases de dados" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "Imprimir mensagens de depuração de todas as funções de IGU" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" "Activa a depuração de renderização HTML. Todas as vezes que o Liferea " -"renderiza HTML de saída irá também despejar o HTML gerado para ~/." -"liferea_1.8/output.xhtml" +"renderiza HTML de saída irá também despejar o HTML gerado para ~/.cache/" +"liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "Imprimir mensagens de depuração de toda a actividade de rede" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "Imprimir mensagens de depuração de todas as funções de parseamento" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" "Imprimir mensagens de depuração quando uma função demora demasiado a " "processar" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Imprimir mensagens de depuração ao carregar/sair de funções" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "Imprimir mensagens de depuração do processo de actualização da fonte" -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr "Imprimir mensagens de depuração para a gestão de cache" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Imprimir mensagens de depuração verbosas" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 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:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, o Leitor de Fontes para Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" -"Para mais informações, por favor visite http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" -"Esta versão do Lifera utiliza um novo formato de cache e migrou o seu cache " -"de fontes. O conteúdo do cache de %s não foi removido automaticamente. Por " -"favor, remova este directório manualmente quando tiver a certeza que a " -"actualização foi feita com sucesso!" +"Para mais informações, por favor visite http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -655,24 +636,24 @@ msgid "Feed title" msgstr "Título do item" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "A subscrição \"%s\" já está a ser actualizada!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "" "A fonte \"%s\" foi descontinuada e não será mais actualizada pelo Liferea!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "A actualizar o ícone da fonte \"%s\"" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -680,48 +661,48 @@ "Foi encontrado um problema ao ler esta subscrição. Por favor, verifique o " "URL e a saída da consola." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "O URL de \"%s\" mudou permanentemente e foi actualizado" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "\"%s\" foi interrompido e não será mais actualizado pelo Liferea!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" não foi modificado desde a última actualização" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "A Actualizar \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Erro ao abrir ficheiro temporário %s para usar na filtragem!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s saiu com estado %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Erro: Não foi possível abrir a linha de processamento \"%s\"" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Erro: Não foi possível abrir o ficheiro \"%s\"" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Erro: O ficheiro \"%s\" não existe" @@ -730,55 +711,53 @@ msgid "New Search Folder" msgstr "Nova Pasta de Procura" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Houveram mais erros. A saída foi truncada!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "Analisador XML: Não foi possível analisar o documento:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Anexos" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d anexo" -msgstr[1] "%d anexos" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr "Bytes" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "KB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d anexo" +msgstr[1] "%d anexos" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Escolher Ficheiro" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, fuzzy, c-format msgid "File Extension .%s" msgstr "Extensão de Ficheiro .%s" @@ -788,286 +767,295 @@ msgid "Couldn't find pixmap file: %s" msgstr "Não foi possível localizar o ficheiro de imagem: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] "(%d novo)" msgstr[1] "(%d novos)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d não lido%s" msgstr[1] "%d não lidos%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Tópicos de Ajuda" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Referência Rápida" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "FAQ" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea está ligado" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Trabalhar Desligado" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea está desligado" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Trabalhar Ligado" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Subscrições" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "Ac_tualizar Todas" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Actualizar todas as subscrições." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Ma_rcar Todos Como Lidos" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Marca todos itens de todas as subscrições como lidos." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Importar Lista de Fontes..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importa uma lista OPML de fontes." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Exportar Lista de Fontes.." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Exporta a lista de fontes como OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Sair" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Fonte" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Remover _Todos Itens" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Remove todos os item seleccionados da fonte actual." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_Itens" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "_Avançar Para Item Não Lido" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "_Avançar Para Item Não Lido" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Ver" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "_Aumentar Tamanho do Texto" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 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:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_Diminuir Tamanho do Texto" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Diminui o tamanho do texto de exibição do item." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "Ferramentas" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "Monitor de Actualização" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "Exibe uma lista de todas as fontes na fila de actualização" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Preferências" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Editar Preferências." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "_Procurar" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Procurar em Todas as Fontes..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Exibe o diálogo de procura." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Ajuda" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Índice" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Veja a ajuda para esta aplicação." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "R_eferência Rápida" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Exibir uma lista de atalhos do Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_FAQ" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Exibir as FAQ desta aplicação." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_Sobre" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Mostra o diálogo 'sobre'." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "Visualização _Normal" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Define o modo de visualização para o modo de cliente de e-mail." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "Visualização Alargada" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Define o modo de visualização para usar três painéis verticais." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "Visualização _Combinada" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Define o modo de visualização para um modo com dois painéis." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "Lista de Fontes _Reduzida" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Ocultar fontes sem artigos não lidos " -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "_Nova Subscrição..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Adiciona uma nova subscrição à lista de fontes." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Nova _Pasta..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Adiciona uma pasta à lista de fontes." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Nova Pasta de Procura..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Adicionar uma nova pasta de procura à lista de fontes." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Nova Fo_nte..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Adicionar uma nova fonte de lista de fontes." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "_Novo Recipiente de Notícias..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Adiciona um novo recipiente de notícias." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "_Marcar Itens Como Lidos" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "" "Marca todos os itens do nó da lista de subscrição seleccionada / na lista de " "itens como lidos." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Actualizar" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." @@ -1075,67 +1063,96 @@ "Actualiza a subscrição seleccionada ou todas subscrições da pasta " "seleccionada. " -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "_Propriedades" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Abre o diálogo de propriedades para a subscrição seleccionada." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "_Remover" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Remove as subscrições seleccionadas." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Alte_rnar para Lido ou Não Lido" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Alterna o estado de leitura do item seleccionado." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Alternar Sinalizador do Item" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Alterna o sinalizador de estado do item seleccionado." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "R_emover" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Remove os itens seleccionados." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Abre o link do item no navegador configurado." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "_Abrir No Navegador" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." msgstr "Abre o link do item no navegador configurado." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Configurações do Navegador Externo" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." +msgstr "Abre o link do item no navegador configurado." + +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "T_rabalhar Offline" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 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:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Leitor de Fontes do Linux" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 #, fuzzy msgid "" "

    Welcome to Liferea, a desktop news aggregator for online news " @@ -1150,12 +1167,12 @@ "Nova Subscrição. Para navegar pelos títulos de uma fonte,seleccione-a na " "lista e os títulos serão carregados no painel direito.

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Fonte desconhecida" @@ -1186,251 +1203,252 @@ 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:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Transferência do componente FALHOU \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 +#: ../src/ui/liferea_htmlview.c:627 #, fuzzy -msgid "Download finished." -msgstr "_Transferir usando" - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +msgid "Open Link In _Tab" msgstr "Abrir Link Em _Separador" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "_Abrir Link No Navegador" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "_Abrir Link No Navegador" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "_Marcar Link em %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Copiar Localização do Link" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 #, fuzzy msgid "_Copy Image Location" msgstr "_Copiar Localização do Link" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 #, fuzzy msgid "S_ave Link As" msgstr "Guardar Como..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Subscrever..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Sem título ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Data" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Títulos" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Nenhum item foi selecionado" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Este item não possui um link especificado!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Seleccione um fonte para apagar os seus itens!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Abrir Item Em _Separador" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "_Abrir Item No Navegador" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "Copiar para o Recipiente de Notícias" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Copiar _URL do Item para a Área de Transferência" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "_Marcar Link em %s" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "_Copiar Localização do Link" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "R_emover Item" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Abrir Componente..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Guardar Como..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "Copiar Localização do Link" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "Act_ualizar Tudo" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "_Apresentar o Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "Act_ualizar Pasta" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "_Marcar Todas Como Lidas" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_Nova" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "_Nova Subscrição..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "Nova Fo_nte..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 #, fuzzy msgid "Sort Feeds" msgstr "Importar Lista de Fontes" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "_Nova Subscrição..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "Por Omissão do GNOME" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Texto abaixo dos ícones" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Texto ao lado dos ícones" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Apenas ícones" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Apenas texto" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minutos" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "horas" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "dias" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Espaço" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Espaço" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Espaço" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Escolha o directório de transferência" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "Visualização _Normal" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "Visualização Alargada" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "Visualização _Combinada" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Manual" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Navegador por omissão" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Janela existente" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Nova Janela" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Novo separador" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 #, fuzzy msgid "Terminate instead of minimizing to the messaging menu" msgstr "Terminar em vez de minimizar para o ícone da band_eja" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Tipo" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Programa" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1445,7 +1463,7 @@ msgid "This feed specifies no default update interval." msgstr "Esta fonte não possui um intervalo de actualização por omissão." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "" @@ -1496,7 +1514,7 @@ msgid "%b %d %H:%M" msgstr "%d de %b %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1506,11 +1524,11 @@ msgid "Google Reader login failed!" msgstr "Falha ao efectuar aceder ao Google Reader!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1545,22 +1563,15 @@ 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:269 msgid "Source Type" msgstr "Tipo de Fonte" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 #, fuzzy msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " @@ -1571,7 +1582,7 @@ "apresentar as suas subscrições do Google Reader, e irá sincronizar a sua " "lista de fontes e listas de leitura." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1640,8 +1651,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Por favor insira a configuração de sua conta do Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Senha" @@ -1665,7 +1675,7 @@ msgid "combined view" msgstr "visualização combinada" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Títulos" @@ -1717,7 +1727,7 @@ msgstr "Geral" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 #, fuzzy msgid "Feed Source" msgstr "Fonte" @@ -1835,493 +1845,558 @@ msgstr "Avançado" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Preferências do Liferea" +msgid "New Folder" +msgstr "Nova Pasta" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "N_ome da pasta:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "_Número por omissão de itens por fonte para guardar:" +msgid "Rename" +msgstr "Renomear" #: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "Actualização de Fonte" +msgid "_New Name:" +msgstr "_Novo Nome:" #: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Actualizar todas as subscrições." +msgid "Search Folder Properties" +msgstr "Propriedades da Pasta Virtual" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "_Intervalo Por Omissão de Actualização de Fontes:" +msgid "Search _Name:" +msgstr "Procurar _Nome:" + +#: ../glade/liferea.ui.h:54 +#, fuzzy +msgid "Find Items that meet the following criteria" +msgstr "Procurar itens que correspondam ao seguinte critério" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"Nota: Lembre-se de definir um intervalo de actualização razoável. " -"Geralmente é um desperdício de tráfego actualizar fontes com uma frequência " -"maior que uma vez por hora." +msgid "A_ny Rule Matches" +msgstr "_Qualquer Regra Coincidente" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Fontes" +msgid "_All Rules Must Match" +msgstr "_Todas as Regras Coincidem" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "Configurações de Exibição de Pastas" +msgid "Open Enclosure" +msgstr "Abrir Componente..." #: ../glade/liferea.ui.h:58 -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." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "A transferir um componente do tipo:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "O_cultar itens já lidos." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"O que deve fazer o Liferea com este componente? Por favor, digite abaixo o " +"comando a ser executado. Os componentes transferidos serão usados como um " +"argumento para este comando:" #: ../glade/liferea.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Ícones das Fontes (Favicons)" +msgid "_Browse" +msgstr "_Navegar" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "At_ualizar todos os favicons agora." +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.ui.h:62 -msgid "Folders" -msgstr "Pastas" +msgid "Search All Feeds" +msgstr "Procurar em Todas as Fontes" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "títulos não lidos" +msgid "_Search for:" +msgstr "Pesqui_sar por:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "Avançar pelos artigo_s rapidamente com:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Digite o termo que o Liferea deve procurar nos títulos de itens ou nos seus " +"conteúdos." #: ../glade/liferea.ui.h:65 -#, fuzzy -msgid "Web Integration" -msgstr "Orientação" +msgid "_Advanced..." +msgstr "_Avançado..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Publicar Marcadores em" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"Procura o texto especificado em todas as fontes. O resultado da procura irá " +"ser exibido na lista de itens." #: ../glade/liferea.ui.h:67 -#, fuzzy -msgid "Internal Browser Settings" -msgstr "Configurações do Navegador Interno" +msgid "Update Monitor" +msgstr "Monitor de Actualização" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Abrir links na _janela do Liferea." +#, fuzzy +msgid "Pending Requests" +msgstr "Pedidos Pendentes" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Desactivar Javascript." +#, fuzzy +msgid "Downloading Now" +msgstr "A Transferir Agora" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "" +msgid "Cancel _All" +msgstr "C_ancelar Todos" #: ../glade/liferea.ui.h:71 -#, fuzzy -msgid "External Browser Settings" -msgstr "Configurações do Navegador Externo" +msgid "Create News Bin" +msgstr "Criar Recipiente de Notícias" #: ../glade/liferea.ui.h:72 +msgid "_News Bin Name:" +msgstr "_Nome do Recipiente de Notícias:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Sobre" + +#: ../glade/liferea.ui.h:74 +#, fuzzy +msgid "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" +"Copyright (c) 2003-2009\n" +"A Equipa do Liferea\n" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "O Liferea é um agregador de notícias para GTK+" + +#: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "Página Web do Liferea" + +#: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "Procura Avançada" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "Pasta de _Procura..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Criar Subscrição de Motor de Busca" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "digite qualquer termo para procurar" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "_Número Máximo de Itens por Resultado:" + +#: ../glade/liferea.ui.h:84 +#, 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 "" +"Nota: O Liferea criará uma subscrição de fonte que poderá ser usada para " +"consultar os resultados dos motores de busca pela frase específica. Poderá " +"manter esta fonte em definitivo e actualizá-la como qualquer outra " +"subscrição. " + +#: ../glade/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "Transferência / Pós-Processamento" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Selecção de Fonte" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Seleccione o tipo de fonte que deseja adicionar..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Adicionar OPML/Planeta" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"Por favor especifique um arquivo local ou URL apontando para uma lista " +"válida de fonte OPML." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Localização" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "_Seleccionar Ficheiro" + +#: ../glade/ttrss_source.ui.h:1 +#, fuzzy +msgid "Add Tiny Tiny RSS Account" +msgstr "Adicionar Conta do Bloglines" + +#: ../glade/ttrss_source.ui.h:2 +#, fuzzy +msgid "Please enter your tt-rss account settings." +msgstr "Por favor insira a configuração de sua conta do Bloglines." + +#: ../glade/ttrss_source.ui.h:3 +#, fuzzy +msgid "_Server URL" +msgstr "Erro do Servidor" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "Nome de _Utilizador" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Avançado..." + +#: ../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 "" +"Digite o endereço de website a usar na pesquisa automática ou, caso conheça, " +"o endereço exacto da fonte." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Preferências do Liferea" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "_Número por omissão de itens por fonte para guardar:" + +#: ../glade/prefs.ui.h:4 +#, fuzzy +msgid "Feed Update Settings" +msgstr "Actualização de Fonte" + +#: ../glade/prefs.ui.h:5 +#, fuzzy +msgid "_Update all subscriptions at startup." +msgstr "Actualizar todas as subscrições." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "_Intervalo Por Omissão de Actualização de Fontes:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"Nota: Lembre-se de definir um intervalo de actualização razoável. " +"Geralmente é um desperdício de tráfego actualizar fontes com uma frequência " +"maior que uma vez por hora." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Fontes" + +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "Configurações de Exibição de Pastas" + +#: ../glade/prefs.ui.h:11 +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/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "O_cultar itens já lidos." + +#: ../glade/prefs.ui.h:13 +#, fuzzy +msgid "Feed Icons (Favicons)" +msgstr "Ícones das Fontes (Favicons)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "At_ualizar todos os favicons agora." + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Pastas" + +#: ../glade/prefs.ui.h:16 +#, fuzzy +msgid "Reading Headlines" +msgstr "títulos não lidos" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "Avançar pelos artigo_s rapidamente com:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +#, fuzzy +msgid "Web Integration" +msgstr "Orientação" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Publicar Marcadores em" + +#: ../glade/prefs.ui.h:22 +#, fuzzy +msgid "Internal Browser Settings" +msgstr "Configurações do Navegador Interno" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Abrir links na _janela do Liferea." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Desactivar Javascript." + +#: ../glade/prefs.ui.h:25 +#, fuzzy +msgid "_Enable browser plugins." +msgstr "Configurações do Navegador Externo" + +#: ../glade/prefs.ui.h:26 +#, fuzzy +msgid "External Browser Settings" +msgstr "Configurações do Navegador Externo" + +#: ../glade/prefs.ui.h:27 msgid "_Open link in:" msgstr "_Abrir link em:" -#: ../glade/liferea.ui.h:74 +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Manual" + +#: ../glade/prefs.ui.h:30 #, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" +msgid "(%s for URL)" msgstr "" -"_Manual:\n" -"(%s para URL)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Navegador:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Navegador" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 #, fuzzy msgid "Notification Settings" msgstr "Configuração das Notificações" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Mostra uma janela de _popup com novos títulos." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 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.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Mostrar _número de novos itens no ícone da bandeja." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "Terminar em vez de minimizar para o ícone da band_eja" -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "_Iniciar no ícone da área de notificação." -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 #, fuzzy msgid "Toolbar Settings" msgstr "Etiquetas dos botões da barra de ferramentas:" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "_Ocultar barra de ferramentas." -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Etiquetas dos botões da barra de ferramentas:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "Interface Gráfica" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "Detectar _Automaticamente (GNOME ou ambiente)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "Sem Proxy" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "Configuração _Manual:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "_Porta do Proxy:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "_Servidor Proxy:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Usar Au_tenticação de Proxy" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "Se_nha do Proxy:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "_Utilizador Proxy:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 #, fuzzy msgid "Downloading Enclosures" msgstr "A Transferir Componente" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Navegar" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Guardar transferências em" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Transferir usando" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 #, fuzzy msgid "Opening Enclosures" msgstr "Abrir Componente..." -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Componentes" -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Sincronizado com Máquinas Próximas" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_Activar Sincronização de Rede Local" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "Nome _Serviço" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Sincronizar" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Nova Pasta" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "N_ome da pasta:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Renomear" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Novo Nome:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Propriedades da Pasta Virtual" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "Procurar _Nome:" - -#: ../glade/liferea.ui.h:115 -#, fuzzy -msgid "Find Items that meet the following criteria" -msgstr "Procurar itens que correspondam ao seguinte critério" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "_Qualquer Regra Coincidente" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "_Todas as Regras Coincidem" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "A Transferir Componente" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "A transferir um componente do tipo:" - -#: ../glade/liferea.ui.h:120 -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 "" -"O que deve fazer o Liferea com este componente? Por favor, digite abaixo o " -"comando a ser executado. Os componentes transferidos serão usados como um " -"argumento para este comando:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Passar URL e não transferir componente." - -#: ../glade/liferea.ui.h:122 -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.ui.h:123 -msgid "Search All Feeds" -msgstr "Procurar em Todas as Fontes" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "Pesqui_sar por:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -"Digite o termo que o Liferea deve procurar nos títulos de itens ou nos seus " -"conteúdos." -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "_Avançado..." +#~ msgid "Download and view feeds" +#~ msgstr "Transferir e exibir fontes" -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Procura o texto especificado em todas as fontes. O resultado da procura irá " -"ser exibido na lista de itens." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Monitor de Actualização" - -#: ../glade/liferea.ui.h:129 -#, fuzzy -msgid "Pending Requests" -msgstr "Pedidos Pendentes" - -#: ../glade/liferea.ui.h:130 -#, fuzzy -msgid "Downloading Now" -msgstr "A Transferir Agora" +#~ msgid "You may want to validate the feed using" +#~ msgstr "Poderá querer validar a fonte usando" -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "C_ancelar Todos" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Abrir Item Em _Separador" -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Criar Recipiente de Notícias" +#~ msgid "_Launch Item In Browser" +#~ msgstr "_Abrir Item No Navegador" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Nome do Recipiente de Notícias:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Sobre" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Copiar _URL do Item para a Área de Transferência" -#: ../glade/liferea.ui.h:135 -#, fuzzy -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Copyright (c) 2003-2009\n" -"A Equipa do Liferea\n" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "O Liferea é um agregador de notícias para GTK+" - -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Página Web do Liferea" +#~ msgid "flag" +#~ msgstr "marcar" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Procura Avançada" +#~ msgid "bookmark" +#~ msgstr "marcador" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "Pasta de _Procura..." +#~ msgid "comments" +#~ msgstr "comentários" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Criar Subscrição de Motor de Busca" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Transferência do componente FALHOU \"%s\"" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "digite qualquer termo para procurar" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Transferência do componente completa: \"%s\"" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "_Número Máximo de Itens por Resultado:" +#~ 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 "" +#~ "Esta versão do Lifera utiliza um novo formato de cache e migrou o seu " +#~ "cache de fontes. O conteúdo do cache de %s não foi removido " +#~ "automaticamente. Por favor, remova este directório manualmente quando " +#~ "tiver a certeza que a actualização foi feita com sucesso!" -#: ../glade/liferea.ui.h:145 #, 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 "" -"Nota: O Liferea criará uma subscrição de fonte que poderá ser usada para " -"consultar os resultados dos motores de busca pela frase específica. Poderá " -"manter esta fonte em definitivo e actualizá-la como qualquer outra " -"subscrição. " +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Transferência do componente FALHOU \"%s\"" -#: ../glade/new_subscription.ui.h:9 #, fuzzy -msgid "Download / Postprocessing" -msgstr "Transferência / Pós-Processamento" - -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Selecção de Fonte" +#~ msgid "Download finished." +#~ msgstr "_Transferir usando" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Seleccione o tipo de fonte que deseja adicionar..." +#~ msgid "Choose download directory" +#~ msgstr "Escolha o directório de transferência" -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Adicionar OPML/Planeta" - -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Por favor especifique um arquivo local ou URL apontando para uma lista " -"válida de fonte OPML." - -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Localização" - -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "_Seleccionar Ficheiro" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Manual:\n" +#~ "(%s para URL)" -#: ../glade/ttrss_source.ui.h:1 -#, fuzzy -msgid "Add Tiny Tiny RSS Account" -msgstr "Adicionar Conta do Bloglines" +#~ msgid "_Save downloads in" +#~ msgstr "_Guardar transferências em" -#: ../glade/ttrss_source.ui.h:2 #, fuzzy -msgid "Please enter your tt-rss account settings." -msgstr "Por favor insira a configuração de sua conta do Bloglines." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Sincronizado com Máquinas Próximas" -#: ../glade/ttrss_source.ui.h:3 -#, fuzzy -msgid "_Server URL" -msgstr "Erro do Servidor" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "_Activar Sincronização de Rede Local" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "Nome de _Utilizador" +#~ msgid "_Service Name" +#~ msgstr "Nome _Serviço" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Digite o endereço de website a usar na pesquisa automática ou, caso conheça, " -"o endereço exacto da fonte." +#~ msgid "Sync" +#~ msgstr "Sincronizar" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Avançado..." +#~ msgid "Downloading Enclosure" +#~ msgstr "A Transferir Componente" -#~ msgid "You may want to validate the feed using" -#~ msgstr "Poderá querer validar a fonte usando" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "_Passar URL e não transferir componente." #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " diff -Nru liferea-1.8.15/po/ro.po liferea-1.10.3/po/ro.po --- liferea-1.8.15/po/ro.po 2013-06-24 22:16:17.000000000 +0200 +++ liferea-1.10.3/po/ro.po 2013-07-31 23:29:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: liferea 1.6.0-rc6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2009-10-06 19:11+0200\n" "Last-Translator: Adi Roiban \n" "Language-Team: Romanian \n" @@ -17,8 +17,7 @@ "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " "== 0) && (n != 0))) ? 2: 1));\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -31,8 +30,8 @@ msgstr "Cititor fluxuri Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Descarcă și vizualizează fluxuri" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -141,38 +140,26 @@ msgstr "Realizat de" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "marcaj" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "favorit" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "comentarii" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Nici un comentariu până acum." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Comentarii" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "În curs de actualizare..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Actualizează" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Secțiune" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Departament" @@ -197,12 +184,12 @@ msgid "Default Browser" msgstr "Navigator implicit GNOME" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Comanda de navigare a eșuat: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Se pornește: \"%s\"" @@ -212,7 +199,7 @@ msgid "Authorization Error" msgstr "Eroare autorizare" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Nu s-a putut creat dosar cache „%s”!" @@ -242,75 +229,81 @@ msgid "%b %d %Y" msgstr "%b %d %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "„%s” nu este un fișier valid de configurare pentru atașamente!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Descărcare atașament eșuată: „%s”" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Descărcare atașament terminată: „%s”" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Eroare la redenumirea %s în %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "Eroare XML la citirea fișierului OPML! Nu s-a putut importa „%s”!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, 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ă." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, 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!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Listă flux importat" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importă listă flux" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importă" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 #, fuzzy msgid "OPML Files" msgstr "Alege fișier OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Eroare la exportarea listei de fluxuri!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Lista de flux a fost exportată!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Exportă listă flux" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Exportă" @@ -366,12 +359,12 @@ msgstr "Nu s-a putut determina tipul fluxului." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "Nu există elemente necitite " -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" @@ -379,107 +372,96 @@ "Pornește Liferea cu fereastră principală în STAREA. STAREA poate să fie " "„shown”, „iconified” sau „hidden”" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "STARE" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Arată informația despre versiune și ieși" -#: ../src/main.c:180 +#: ../src/main.c:166 #, fuzzy msgid "Add a new subscription" msgstr "Înscriere nouă" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Afișează mesaje de notificare de toate tipurile" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "Afișează mesaje de depanare pentru gestionarea cacheului" -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr "Afișează mesaje de depanare pentru gestionarea configurației" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "Afișează mesaje de depanare pentru gestionarea bazei de date" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "" "Afișează mesaje de depanare pentru toate funcțiile interfeței cu utilizator" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" "Activează depanarea randării HTMLL. De fiecare dată când Liferea randează " -"HTML va copia HTML-ul generat în ~/.liferea_1.8/output.xhtml" +"HTML va copia HTML-ul generat în ~/.cache/liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "Afișează mesaje de depanare pentru toată activitatea de rețea" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "Afișează mesaje de depanare pentru toate funcțiile de analizare" -#: ../src/main.c:193 +#: ../src/main.c:179 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" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Afișează mesaje de depanare la intrarea și ieșirea din funcții" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "" "Afișează mesaje de depanare pentru procesul de actualizare a fluxurilor" -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr "Afișează mesaje de depanare pentru gestionarea cacheului" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Afișează mesaje de depanare detaliate" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "Afișează mesaje de depanare pentru subiectul specificat" -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, cititor de fluxuri" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "Pentru mai multe informații vizitați http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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." +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Pentru mai multe informații vizitați http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -650,23 +632,23 @@ msgid "Feed title" msgstr "Titlu flux" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Abonamentul „%s” deja se actualizează!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format 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:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Se actualizeaza favicon pentru „%s”" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -674,49 +656,49 @@ "A apărut o problemă la citirea abonamentului. Verificați URL-ul și ieșirea " "consolei." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "URL-ul „%s„ s-a modificat permanent și a fost actualizat" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "„%s” este întrerupt. Liferea nu îl va mai actualiza!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "„%s” a fost modificat de la ultima actualizare." -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Se actualizează „%s”" -#: ../src/update.c:255 +#: ../src/update.c:259 #, 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!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s a ieșit în starea %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Eroare: Nu s-a putut face legătura „%s”" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Eroare: Nu s-a putut deschide fișierul „%s”!" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Eroare: Nu este nici un fișier „%s”" @@ -725,56 +707,54 @@ msgid "New Search Folder" msgstr "Dosar nou de căutare" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Au existat mai multe erori. Ieșirea a fost trunchiată!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "Analizator XML: Nu s-a putut analiza documentul:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Atașamente" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d atașament" -msgstr[1] "%d atașamente" -msgstr[2] "%d de atașamente" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " Octeți" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kO" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MO" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GO" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d atașament" +msgstr[1] "%d atașamente" +msgstr[2] "%d de atașamente" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Alegere fișier" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, fuzzy, c-format msgid "File Extension .%s" msgstr "Extensie fișier .%s" @@ -784,7 +764,7 @@ msgid "Couldn't find pixmap file: %s" msgstr "Nu s-a putut găsi fișierul imagine: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" @@ -792,7 +772,7 @@ msgstr[1] " (%d noi)" msgstr[2] " (%d noi)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" @@ -800,272 +780,281 @@ msgstr[1] "%d necitite%s" msgstr[2] "%d necitite%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Sumar pentru ajutor" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Referință rapidă" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "Întrebări frecvente" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea este conectat" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Lucru conectat" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea este conectat" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Lucru conectat" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Abonamente" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "_Actualizează toate" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Actualizează toate abonamentele." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Ma_rchează toate ca citite" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Marchează ca citite toate elementele din toate abonamentele." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Import listă flux..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importă o lista flux OPML." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Export listă flux..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Exportă lista de fluxuri ca OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Ieșire" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Flux" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Elimină to_ate elementele" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Elimină toate elementele din fluxul selectat curent." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_Element" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "_Următorul element necitit" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "_Următorul element necitit" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Vizualizare" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "Crește măr_imea textului" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Crește mărimea textului din elementul vizualizat." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "Sca_de mărimea textului" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Scade mărimea textului din elementul vizualizat." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "Ins_trumente" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "Monitor act_ualizare" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "Afișează o lista a tuturor fluxurilor în coada de actualizări curente" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Preferințe" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Editare preferințe." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "_Căutare" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Căută toate fluxurile..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Afișează dialogul de căutare." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Help" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Conținut" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Vizualizare ajutor pentru această aplicație." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "Referință ra_pidă" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Vizualizează o listă a tuturor scurtăturilor din Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "Întrebări _frecvente" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Vizualizează întrebările frecvente ale acestei aplicații" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_Despre" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Afișează dialogul despre." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "Vizualizare _normală" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Definește modul de vizualizare la modul de vizualizare client email." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "Vizualizare _lată" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Definește modul de vizualizare pentru a folosi trei panouri verticale" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "Vizualizare _combinată" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Definește mod vizualizare în modul cu 2 panouri." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "Listă _redusă fluxuri" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Ascunde fluxurile fără elemente necitite." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "Abonament _nou..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Adaugă un abonament la lista de flux." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "_Dosar nou..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Adaugă un dosar la lista de flux." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Dosar de cău_tare nou..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Adaugă un nou dosar de căutare la lista de flux." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "_Sursă nouă..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Adaugă o nouă sursă de liste fluxuri." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "_Colecție știri nouă..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Adaugă o colecție de știri nouă." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "_Marchează elementele ca citite" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 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:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "Act_ualizează" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." @@ -1073,67 +1062,96 @@ "Actualizează abonamentele selectate sau toate abonamentele din dosarul " "selectat." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "_Proprietăți" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Deschide dialogul de proprietăți pentru abonamentul selectat." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "Ște_rge" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Șterge abonamentul selectat." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Comută starea de _citire" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Comută starea de citire pentru elementele selectate." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Comută _fanion element" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Comută starea de citire pentru elementele selectate." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "_Elimină" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Elimină elementul selectat." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Deschide legăturile din elemente în navigatorul configurat." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "_Lansează în navigator" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." +msgstr "Deschide legăturile din elemente în navigatorul configurat." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Preferințe navigatorului extern" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." msgstr "Deschide legăturile din elemente în navigatorul configurat." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "_Mod deconectat" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Această opțiune vă permite să dezactivați actualizarea abonamentelor." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Cititor fluxuri Linux" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 #, fuzzy msgid "" "

    Welcome to Liferea, a desktop news aggregator for online news " @@ -1148,12 +1166,12 @@ "titlurile unui flux , selectați-l iar lista titlurilor va apărea în panoul " "din dreapta.

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Sursă necunoscută" @@ -1184,251 +1202,252 @@ 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:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Descărcare atașament eșuată: „%s”" - -#: ../src/ui/liferea_htmlview.c:437 +#: ../src/ui/liferea_htmlview.c:627 #, fuzzy -msgid "Download finished." -msgstr "_Descarcă folosind" - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +msgid "Open Link In _Tab" msgstr "Deschide legătură în _tab" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "Deschide _legătură în navigator" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "Deschide _legătură în navigator" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "_Memorează legătura la %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Copiază locația legăturii" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 #, fuzzy msgid "_Copy Image Location" msgstr "_Copiază locația legăturii" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 #, fuzzy msgid "S_ave Link As" msgstr "Salvează ca..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Abonare..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Fără titlu ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Data" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Titlul" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Nu a fost selectat nici un element" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Acest element nu are specificată o legătură!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Trebuie să alegeți un flux pentru ai șterge elementele!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Deschide elementul în _tab" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "Deschide e_lementul în navigator" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "Copiază în colecție știri" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Copiază _URL-ul elementului în memorie" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "_Memorează legătura la %s" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "_Copiază locația legăturii" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "_Elimină element" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Deschide atașament..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Salvează ca..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "Copiază locația legăturii" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "Act_ualizează tot" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "_Afișează Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "Act_ualizare dosar" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "_Marchează tot ca citit" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_Nou" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "A_bonament nou..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "Sursă n_ouă..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 #, fuzzy msgid "Sort Feeds" msgstr "Importă listă flux" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "Abonament _nou..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "Implicit GNOME" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Text sub iconițe" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Text lângă iconițe" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Doar iconițe" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Doar text" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minute" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "ore" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "zile" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Spațiu" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Spațiu" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Spațiu" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Alegeți dosarul pentru descărcare" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "Vizualizare _normală" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "Vizualizare _lată" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "Vizualizare _combinată" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Manual" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Navigatorul implicit" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Fereastră existentă" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Fereastră nouă" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Tab nou" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 #, fuzzy msgid "Terminate instead of minimizing to the messaging menu" msgstr "Închid_e în loc de minimizare în zona de notificare" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Tip" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Program" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1445,7 +1464,7 @@ msgid "This feed specifies no default update interval." msgstr "Acest flux nu are nici un interval implicit de actualizare." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "Fără titlu" @@ -1500,7 +1519,7 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1510,11 +1529,11 @@ msgid "Google Reader login failed!" msgstr "Autentificare Google Reader eșuată!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1549,22 +1568,15 @@ 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:269 msgid "Source Type" msgstr "Tip sursă" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 #, fuzzy msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " @@ -1575,7 +1587,7 @@ "va afișa abonamentele Google Reader și va sincroniza lista de fluxuri și " "starea de citire." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1645,8 +1657,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Introduceți configurările contului Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Parolă" @@ -1670,7 +1681,7 @@ msgid "combined view" msgstr "vizualizare combinată" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Titluri" @@ -1722,7 +1733,7 @@ msgstr "Generale" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Sursa feedului" @@ -1840,491 +1851,556 @@ msgstr "Avansat" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Preferințe Liferea" +msgid "New Folder" +msgstr "Dosar nou" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "Nume _dosar:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "_Numărul implicit de elemente per flux care să fie salvate:" +msgid "Rename" +msgstr "Redenumește" #: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "Actualizare flux" +msgid "_New Name:" +msgstr "Nume _nou:" #: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Actualizează toate abonamentele." +msgid "Search Folder Properties" +msgstr "Proprietăți dosar de căutare" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "_Intervalul implicit de actualizare flux:" +msgid "Search _Name:" +msgstr "_Nume căutare:" + +#: ../glade/liferea.ui.h:54 +#, fuzzy +msgid "Find Items that meet the following criteria" +msgstr "Caută elemente ce îndeplinesc următoarele criterii" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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ă." +msgid "A_ny Rule Matches" +msgstr "_Orice regulă se potrivește" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Fluxuri" +msgid "_All Rules Must Match" +msgstr "To_ate regulile se potrivesc" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "Preferințe afișare dosar" +msgid "Open Enclosure" +msgstr "Deschide atașament..." #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "Arată elementele unui flux când este _selectat un dosar." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Descărcare atașament de tipul:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "Ascun_de elementele citite." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"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.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Iconițe fluxuri (Favicons)" +msgid "_Browse" +msgstr "_Navighează" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "Act_ualizează acum toate faviconurile" +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.ui.h:62 -msgid "Folders" -msgstr "Dosare" +msgid "Search All Feeds" +msgstr "Caută în toate fluxurile" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "titluri necitite" +msgid "_Search for:" +msgstr "_Caută după:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "Ră_sfoiește articolele cu:" +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.ui.h:65 -#, fuzzy -msgid "Web Integration" -msgstr "Orientare" +msgid "_Advanced..." +msgstr "_Avansat..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Pune semne de carte la" +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.ui.h:67 -#, fuzzy -msgid "Internal Browser Settings" -msgstr "Preferințele navigatorului intern" +msgid "Update Monitor" +msgstr "Monitor actualizări" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Deschide legăturile în _fereastra din Liferea" +#, fuzzy +msgid "Pending Requests" +msgstr "Cereri în așteptare" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Dezactivare JavaScript." +#, fuzzy +msgid "Downloading Now" +msgstr "Se descarcă acum" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "Activ_ează modulele navigatorului." +msgid "Cancel _All" +msgstr "_Anulează tot" #: ../glade/liferea.ui.h:71 -#, fuzzy +msgid "Create News Bin" +msgstr "Crează colecție știri" + +#: ../glade/liferea.ui.h:72 +msgid "_News Bin Name:" +msgstr "_Nume colecție știri:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Despre" + +#: ../glade/liferea.ui.h:74 +#, fuzzy +msgid "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" +"Drepturi de autor (c) 2003-2009\n" +"Echipa Liferea\n" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea este un agregator de fluxuri pentru GTK+" + +#: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "Pagina web Liferea" + +#: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "Căutare avansată" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "_Dosar căutare..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Crează flux motor de căutare" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "introduceți orice șir doriți" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "_Numărul maxim de elemente în rezultat:" + +#: ../glade/liferea.ui.h:84 +#, 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 "" +"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/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "Descărcare / Postprocesare" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Alegere sursă" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Alegeți tipul sursei pe care doriți să o adăugați" + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Adaugă OPML/Planet" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"Specificați un fișier local sau un URL care să conțină o listă validă de " +"flux OPML." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Locație" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "Ale_gere fișier" + +#: ../glade/ttrss_source.ui.h:1 +#, fuzzy +msgid "Add Tiny Tiny RSS Account" +msgstr "Adaugă cont Bloglines" + +#: ../glade/ttrss_source.ui.h:2 +#, fuzzy +msgid "Please enter your tt-rss account settings." +msgstr "Introduceți configurările contului Bloglines" + +#: ../glade/ttrss_source.ui.h:3 +#, fuzzy +msgid "_Server URL" +msgstr "Eroare la server" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "N_ume utilizator" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Avansat..." + +#: ../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 "" +"Introduceți adresa paginii web pentru a folosi autodescoperirea fluxului sau " +"în cazul în care o știți exact, introduceți adresa fluxului." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Preferințe Liferea" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "_Numărul implicit de elemente per flux care să fie salvate:" + +#: ../glade/prefs.ui.h:4 +#, fuzzy +msgid "Feed Update Settings" +msgstr "Actualizare flux" + +#: ../glade/prefs.ui.h:5 +#, fuzzy +msgid "_Update all subscriptions at startup." +msgstr "Actualizează toate abonamentele." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "_Intervalul implicit de actualizare flux:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"Note: 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/prefs.ui.h:9 +msgid "Feeds" +msgstr "Fluxuri" + +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "Preferințe afișare dosar" + +#: ../glade/prefs.ui.h:11 +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/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "Ascun_de elementele citite." + +#: ../glade/prefs.ui.h:13 +#, fuzzy +msgid "Feed Icons (Favicons)" +msgstr "Iconițe fluxuri (Favicons)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "Act_ualizează acum toate faviconurile" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Dosare" + +#: ../glade/prefs.ui.h:16 +#, fuzzy +msgid "Reading Headlines" +msgstr "titluri necitite" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "Ră_sfoiește articolele cu:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +#, fuzzy +msgid "Web Integration" +msgstr "Orientare" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Pune semne de carte la" + +#: ../glade/prefs.ui.h:22 +#, fuzzy +msgid "Internal Browser Settings" +msgstr "Preferințele navigatorului intern" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Deschide legăturile în _fereastra din Liferea" + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Dezactivare JavaScript." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "Activ_ează modulele navigatorului." + +#: ../glade/prefs.ui.h:26 +#, fuzzy msgid "External Browser Settings" msgstr "Preferințe navigatorului extern" -#: ../glade/liferea.ui.h:72 +#: ../glade/prefs.ui.h:27 msgid "_Open link in:" msgstr "_Deschide legăturile în:" -#: ../glade/liferea.ui.h:74 +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Manual" + +#: ../glade/prefs.ui.h:30 #, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" +msgid "(%s for URL)" msgstr "" -"_Manual:\n" -"(%s pentru URL)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Navigator:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Navigator" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 #, fuzzy msgid "Notification Settings" msgstr "Preferințe notificare" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Afișează o fereastră _proeminentă cu noile titluri." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "Afișează o _iconiță de stare în zona de notificare." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 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.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "Închid_e în loc de minimizare în zona de notificare" -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "_Pornește ca iconiță în zona de notificare." -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 #, fuzzy msgid "Toolbar Settings" msgstr "Etichete _butoane bară de unelte:" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "_Ascunde bara de instrumente." -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Etichete _butoane bară de unelte:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "_Auto detectare (GNOME sau mediu de lucru)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "Fără _proxy" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "Configurări _manuale:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "_Port proxy:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "_Gazdă proxy:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Folosește au_tentificare proxy" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "Parolă pro_xy:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "N_ume utilizator proxy:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 #, fuzzy msgid "Downloading Enclosures" msgstr "Descărcare atașament" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Navighează" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Salvează descărcările în" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Descarcă folosind" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 #, fuzzy msgid "Opening Enclosures" msgstr "Deschide atașament..." -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Atașamente" -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Sincronizat cu calculatoare din apropiere" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "Activ_ează sincronizarea în rețeaua locală" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "Nume _serviciu" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Sincronizare" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Dosar nou" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "Nume _dosar:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Redenumește" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "Nume _nou:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Proprietăți dosar de căutare" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "_Nume căutare:" - -#: ../glade/liferea.ui.h:115 -#, fuzzy -msgid "Find Items that meet the following criteria" -msgstr "Caută elemente ce îndeplinesc următoarele criterii" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "_Orice regulă se potrivește" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "To_ate regulile se potrivesc" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Descărcare atașament" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Descărcare atașament de tipul:" - -#: ../glade/liferea.ui.h:120 -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.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Oferă URL și nu descărca atașamentul." - -#: ../glade/liferea.ui.h:122 -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.ui.h:123 -msgid "Search All Feeds" -msgstr "Caută în toate fluxurile" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Caută după:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." +#: ../glade/prefs.ui.h:57 +msgid "Plugins" 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.ui.h:126 -msgid "_Advanced..." -msgstr "_Avansat..." +#~ msgid "Download and view feeds" +#~ msgstr "Descarcă și vizualizează fluxuri" -#: ../glade/liferea.ui.h:127 -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.ui.h:128 -msgid "Update Monitor" -msgstr "Monitor actualizări" - -#: ../glade/liferea.ui.h:129 -#, fuzzy -msgid "Pending Requests" -msgstr "Cereri în așteptare" - -#: ../glade/liferea.ui.h:130 -#, fuzzy -msgid "Downloading Now" -msgstr "Se descarcă acum" +#~ msgid "You may want to validate the feed using" +#~ msgstr "Poate doriți să validați fluxul folosind" -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "_Anulează tot" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Deschide elementul în _tab" -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Crează colecție știri" +#~ msgid "_Launch Item In Browser" +#~ msgstr "Deschide e_lementul în navigator" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Nume colecție știri:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Despre" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Copiază _URL-ul elementului în memorie" -#: ../glade/liferea.ui.h:135 -#, fuzzy -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Drepturi de autor (c) 2003-2009\n" -"Echipa Liferea\n" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea este un agregator de fluxuri pentru GTK+" - -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Pagina web Liferea" +#~ msgid "flag" +#~ msgstr "marcaj" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Căutare avansată" +#~ msgid "bookmark" +#~ msgstr "favorit" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "_Dosar căutare..." +#~ msgid "comments" +#~ msgstr "comentarii" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Crează flux motor de căutare" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Descărcare atașament eșuată: „%s”" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "introduceți orice șir doriți" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Descărcare atașament terminată: „%s”" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "_Numărul maxim de elemente în rezultat:" +#~ 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." -#: ../glade/liferea.ui.h:145 #, 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 "" -"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 "Download FAILED: \"%s\"" +#~ msgstr "Descărcare atașament eșuată: „%s”" -#: ../glade/new_subscription.ui.h:9 #, fuzzy -msgid "Download / Postprocessing" -msgstr "Descărcare / Postprocesare" +#~ msgid "Download finished." +#~ msgstr "_Descarcă folosind" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Alegere sursă" +#~ msgid "Choose download directory" +#~ msgstr "Alegeți dosarul pentru descărcare" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Alegeți tipul sursei pe care doriți să o adăugați" - -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Adaugă OPML/Planet" - -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Specificați un fișier local sau un URL care să conțină o listă validă de " -"flux OPML." - -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Locație" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Manual:\n" +#~ "(%s pentru URL)" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "Ale_gere fișier" +#~ msgid "_Save downloads in" +#~ msgstr "_Salvează descărcările în" -#: ../glade/ttrss_source.ui.h:1 #, fuzzy -msgid "Add Tiny Tiny RSS Account" -msgstr "Adaugă cont Bloglines" +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "" +#~ "Sincronizat cu calculatoare din apropiere" -#: ../glade/ttrss_source.ui.h:2 -#, fuzzy -msgid "Please enter your tt-rss account settings." -msgstr "Introduceți configurările contului Bloglines" - -#: ../glade/ttrss_source.ui.h:3 -#, fuzzy -msgid "_Server URL" -msgstr "Eroare la server" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "Activ_ează sincronizarea în rețeaua locală" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "N_ume utilizator" +#~ msgid "_Service Name" +#~ msgstr "Nume _serviciu" -#: ../glade/simple_subscription.ui.h:3 -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 "Sync" +#~ msgstr "Sincronizare" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Avansat..." +#~ msgid "Downloading Enclosure" +#~ msgstr "Descărcare atașament" -#~ msgid "You may want to validate the feed using" -#~ msgstr "Poate doriți să validați fluxul folosind" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "_Oferă URL și nu descărca atașamentul." #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " diff -Nru liferea-1.8.15/po/ru.po liferea-1.10.3/po/ru.po --- liferea-1.8.15/po/ru.po 2013-06-24 22:16:17.000000000 +0200 +++ liferea-1.10.3/po/ru.po 2013-07-31 23:29:12.000000000 +0200 @@ -9,22 +9,20 @@ msgstr "" "Project-Id-Version: liferea 1.7.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" -"PO-Revision-Date: 2011-10-31 21:40+0300\n" -"Last-Translator: Leonid Selivanov \n" +"POT-Creation-Date: 2013-05-20 18:33+0300\n" +"PO-Revision-Date: 2013-05-29 23:44+0400\n" +"Last-Translator: Leonid Selivanov \n" "Language-Team: \n" -"Language: \n" +"Language: ru_RU\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" -"X-Poedit-Language: Russian\n" -"X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-SourceCharset: utf-8\n" +"X-Generator: Poedit 1.5.5\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:234 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -37,8 +35,8 @@ msgstr "Приложение для чтения новостей Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Скачать и просмотреть ленты" +msgid "Read news feeds and blogs" +msgstr "Читайте новостные ленты и блоги" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -71,7 +69,7 @@ #: ../xslt/feed.xml.in.h:6 msgid "You may want to contact the author/webmaster of the feed about this!" -msgstr "" +msgstr "Возможно Вы захотите сообщить об этом автору/веб-мастеру ленты!" #: ../xslt/feed.xml.in.h:7 msgid "There were errors while filtering this feed!" @@ -99,7 +97,7 @@ #: ../xslt/source.xml.in.h:2 ../xslt/folder.xml.in.h:2 msgid "children with" -msgstr "дети с" +msgstr "детей с" #: ../xslt/source.xml.in.h:3 ../xslt/folder.xml.in.h:3 #: ../xslt/vfolder.xml.in.h:2 @@ -147,38 +145,26 @@ msgstr "Создатель" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "важно" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "закладка" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "комментарии" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Комментариев пока нет." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Комментарии" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Обновление..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Обновить" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Раздел" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Отдел" @@ -202,12 +188,12 @@ msgid "Default Browser" msgstr "Браузер по умолчанию" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Ошибка команды запуска браузера: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Запуск: \"%s\"" @@ -217,7 +203,7 @@ msgid "Authorization Error" msgstr "Ошибка авторизации:" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Невозможно создать каталог кэша \"%s\"!" @@ -247,78 +233,93 @@ msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "\"%s\" — неверный конфигурационный файл типа вложения!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "НЕ УДАЛОСЬ загрузить вложение: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" +"Не задано средство загрузки! Задайте его во вкладке «Вложения» меню " +"Инструменты/Настройки." -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Получение вложения завершено: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" +"Ошибка выполнения команды: \n" +"\n" +"%s\n" +"\n" +" Убедитесь, что заданное средство загрузки установлено и функционирует " +"корректно! Его можно изменить во вкладке «Вложения» меню Инструменты/" +"Настройки." -#: ../src/export.c:174 +#: ../src/export.c:185 #, c-format msgid "Error renaming %s to %s\n" msgstr "Ошибка переименования %s в %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "Ошибка XML при чтении файла OPML! Невозможно импортировать \"%s\"!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:422 ../src/export.c:424 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "" "Документ пуст! OPML-документ \"%s\" не должен быть пустым при импортировании." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:445 ../src/export.c:447 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "OPML-документ \"%s\" не правилен! Liferea не может импортировать этот файл!" -#: ../src/export.c:440 +#: ../src/export.c:466 msgid "Imported feed list" msgstr "Импортированный список лент" -#: ../src/export.c:452 +#: ../src/export.c:478 msgid "Import Feed List" msgstr "Импорт списка лент" -#: ../src/export.c:452 +#: ../src/export.c:478 msgid "Import" msgstr "Импорт" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:478 ../src/export.c:495 ../src/fl_sources/opml_source.c:388 msgid "OPML Files" msgstr "Файлы OPML" -#: ../src/export.c:460 +#: ../src/export.c:486 msgid "Error while exporting feed list!" msgstr "Ошибка при экспортировании списка лент!" -#: ../src/export.c:462 +#: ../src/export.c:488 msgid "Feed List exported!" msgstr "Список лент экспортирован!" -#: ../src/export.c:469 +#: ../src/export.c:495 msgid "Export Feed List" msgstr "Экспорт списка лент" -#: ../src/export.c:469 +#: ../src/export.c:495 msgid "Export" msgstr "Экспорт" -#: ../src/feed.c:255 +#: ../src/feed.c:254 msgid "" "

    Could not detect the type of this feed! Please check if the source really " "points to a resource provided in one of the supported syndication formats!Вывод XML-парсера:

    " -#: ../src/feed.c:284 +#: ../src/feed.c:283 #, c-format msgid "\"%s\" updated..." msgstr "\"%s\" обновлена..." -#: ../src/feed.c:294 +#: ../src/feed.c:293 #, c-format msgid "\"%s\" is not available" msgstr "\"%s\" не доступна" @@ -369,11 +370,11 @@ msgstr "Невозможно определить тип ленты." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "Нет непрочитанных записей " -#: ../src/main.c:175 +#: ../src/main.c:163 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" @@ -381,105 +382,93 @@ "Запустить Liferea с основным окном в РЕЖИМЕ. РЕЖИМ может быть `shown', " "`iconified' или `hidden'" -#: ../src/main.c:175 +#: ../src/main.c:163 msgid "STATE" msgstr "РЕЖИМ" -#: ../src/main.c:179 +#: ../src/main.c:164 msgid "Show version information and exit" msgstr "Показать информацию о версии и выйти" -#: ../src/main.c:180 +#: ../src/main.c:165 msgid "Add a new subscription" msgstr "Добавить новую подписку" -#: ../src/main.c:180 +#: ../src/main.c:165 msgid "uri" msgstr "адрес" -#: ../src/main.c:185 +#: ../src/main.c:170 msgid "Print debugging messages of all types" msgstr "Выводить отладочную информацию всех типов" -#: ../src/main.c:186 +#: ../src/main.c:171 msgid "Print debugging messages for the cache handling" msgstr "Выводить отладочную информацию о обработке кэша" -#: ../src/main.c:187 +#: ../src/main.c:172 msgid "Print debugging messages for the configuration handling" msgstr "Выводить отладочную информацию о обработке конфигурации" -#: ../src/main.c:188 +#: ../src/main.c:173 msgid "Print debugging messages of the database handling" msgstr "Выводить отладочную информацию о обработке базы данных" -#: ../src/main.c:189 +#: ../src/main.c:174 msgid "Print debugging messages of all GUI functions" msgstr "Выводить отладочную информацию о всех функциях графического интерфейса" -#: ../src/main.c:190 -#, fuzzy +#: ../src/main.c:175 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" -"Включить отладку отрисовки HTML. Каждый раз когда Liferea отрисовывает HTML-" -"вывод она также будет сохранять генерируемый HTML в ~/.liferea_1.6/output." +"Включает отладку отрисовки HTML. Каждый раз, когда Liferea отрисовывает HTML-" +"вывод, он также будет сохранять генерируемый HTML в ~/.cache/liferea/output." "xhtml" -#: ../src/main.c:191 +#: ../src/main.c:176 msgid "Print debugging messages of all network activity" msgstr "Выводить отладочную информацию о всей сетевой активности" -#: ../src/main.c:192 +#: ../src/main.c:177 msgid "Print debugging messages of all parsing functions" msgstr "Выводить отладочную информацию о всех функциях парсинга" -#: ../src/main.c:193 +#: ../src/main.c:178 msgid "Print debugging messages when a function takes too long to process" msgstr "" "Выводить отладочную информацию когда выполнение функции занимает очень " "долгое время" -#: ../src/main.c:194 +#: ../src/main.c:179 msgid "Print debugging messages when entering/leaving functions" msgstr "Выводить отладочную информацию о начале/завершении исполнения функций" -#: ../src/main.c:195 +#: ../src/main.c:180 msgid "Print debugging messages of the feed update processing" msgstr "Выводить отладочную информацию о процессе обновления лент" -#: ../src/main.c:196 +#: ../src/main.c:181 msgid "Print debugging messages of the search folder matching" msgstr "Выводить отладочную информацию о формировании поисковой папки" -#: ../src/main.c:197 +#: ../src/main.c:182 msgid "Print verbose debugging messages" msgstr "Выводить подробную отладочную информацию" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:193 ../src/main.c:194 msgid "Print debugging messages for the given topic" msgstr "Выводить отладочную информацию для данной темы" -#: ../src/main.c:218 +#: ../src/main.c:201 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea — приложение чтения новостей для Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" -"За дополнительной информацией обратитесь к http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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!" +#: ../src/main.c:202 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" -"Эта версия Liferea использует новый формат кэша и перевела ваш кэш лент в " -"новый формат. Данные в папке %s не были удалены автоматически. Удалите её " -"самостоятельно, если вы уверены, что данные не были потеряны при обновлении!" +"За дополнительной информацией обратитесь к http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -520,8 +509,8 @@ "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" msgstr "" -"Вам нужно авторизоваться, чтобы получить доступ к этой ленте. Пожалуйста, " -"проверьте ваши имя пользователя и пароль в свойствах ленты" +"Вам нужно авторизоваться, чтобы загрузить эту ленту. Пожалуйста, проверьте " +"ваше имя пользователя и пароль в свойствах ленты" #: ../src/net.c:333 msgid "Payment required" @@ -649,24 +638,24 @@ msgid "Feed title" msgstr "Заголовок ленты" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Подписка \"%s\" уже обновлена!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "" "Подписка \"%s\" была остановлена. Liferea не будет больше её обновлять!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Обновление иконки для \"%s\"" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -674,106 +663,104 @@ "При чтении этой подписки обнаружены проблемы. Пожалуйста, проверьте URL и " "вывод консоли." -#: ../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\" остановлена. Liferea не будет больше её обновлять!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" не изменилась с момента последнего обновления" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Обновление \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:258 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Ошибка при открытии временного файла %s используемого при фильтрации!" -#: ../src/update.c:278 +#: ../src/update.c:281 #, c-format msgid "%s exited with status %d" msgstr "%s завершено с кодом %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:287 ../src/update.c:288 ../src/update.c:400 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Ошибка: Невозможно открыть канал \"%s\"" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:426 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Ошибка: Невозможно открыть файл \"%s\"" -#: ../src/update.c:429 +#: ../src/update.c:432 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Ошибка: Файл \"%s\" не существует" -#: ../src/vfolder.c:55 +#: ../src/vfolder.c:54 msgid "New Search Folder" msgstr "Новая поисковая папка" -#: ../src/xml.c:451 +#: ../src/xml.c:410 msgid "[There were more errors. Output was truncated!]" msgstr "[Произошло больше ошибок. Вывод был прерван!]" -#: ../src/xml.c:604 +#: ../src/xml.c:563 msgid "XML Parser: Could not parse document:\n" msgstr "XML-парсер: Невозможно обработать документ:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Вложения" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d вложение" -msgstr[1] "%d вложения" -msgstr[2] "%d вложений" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " Байт" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "КБ" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "МБ" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "ГБ" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d вложение" +msgstr[1] "%d вложения" +msgstr[2] "%d вложений" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Выберите файл" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "Расширение файла .%s" @@ -783,7 +770,7 @@ msgid "Couldn't find pixmap file: %s" msgstr "Не найден файл с пиксельным изображением: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" @@ -791,7 +778,7 @@ msgstr[1] " (%d новых)" msgstr[2] " (%d новых)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" @@ -799,338 +786,370 @@ msgstr[1] "%d непрочитанных%s" msgstr[2] "%d непрочитанных%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Содержание" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Краткое руководство" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "ЧаВо" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:795 msgid "Liferea is now online" msgstr "Liferea сейчас подключена" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:797 msgid "Work Offline" msgstr "Работать автономно" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:799 msgid "Liferea is now offline" msgstr "Liferea сейчас отключена" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:801 msgid "Work Online" msgstr "Подключиться" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:897 msgid "_Subscriptions" msgstr "_Подписки" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:898 msgid "Update _All" msgstr "Обновить в_сё" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:898 msgid "Updates all subscriptions." msgstr "Обновляет все подписки." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:900 msgid "Mark All As _Read" msgstr "Отметить всё как _прочитанное" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:900 msgid "Marks read every item of every subscription." msgstr "Отмечает как прочитанное каждую запись в каждой подписке." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:902 msgid "_Import Feed List..." msgstr "_Импортировать список лент..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:902 msgid "Imports an OPML feed list." msgstr "Импортирует какой-либо OPML список лент." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:903 msgid "_Export Feed List..." msgstr "_Экспортировать список лент..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:903 msgid "Exports the feed list as OPML." msgstr "Экспортирует список лент в OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:904 msgid "_Quit" msgstr "_Выход" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:906 msgid "_Feed" msgstr "_Лента" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:907 msgid "Remove _All Items" msgstr "Удалить все _записи" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:907 msgid "Removes all items of the currently selected feed." msgstr "Удаляет все записи выделенной ленты." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:910 msgid "_Item" msgstr "_Запись" +#: ../src/ui/liferea_shell.c:911 +msgid "Previous Item" +msgstr "Предыдущая запись" + +#: ../src/ui/liferea_shell.c:913 +msgid "Next Item" +msgstr "Следующая запись" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:918 msgid "_Next Unread Item" msgstr "_Следующая непрочитанная" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:921 msgid "_View" msgstr "_Вид" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:922 ../src/ui/liferea_htmlview.c:653 msgid "_Increase Text Size" msgstr "У_величить шрифт" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:922 msgid "Increases the text size of the item view." msgstr "Увеличивает размер шрифта в тексте записи." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:924 ../src/ui/liferea_htmlview.c:654 msgid "_Decrease Text Size" msgstr "У_меньшить шрифт" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:924 msgid "Decreases the text size of the item view." msgstr "Уменьшает размер шрифта в тексте записи." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:927 msgid "_Tools" msgstr "_Инструменты" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:928 msgid "_Update Monitor" msgstr "_Монитор обновлений" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:928 msgid "Show a list of all feeds currently in the update queue" msgstr "Отображает список всех лент, ожидающих обновления" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:930 msgid "_Preferences" msgstr "_Настройки" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:930 msgid "Edit Preferences." msgstr "Изменить настройки." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:933 msgid "S_earch" msgstr "П_оиск" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:934 msgid "Search All Feeds..." msgstr "Поиск по всем лентам..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:934 msgid "Show the search dialog." msgstr "Показать диалог поиска." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:936 msgid "_Help" msgstr "_Справка" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:937 msgid "_Contents" msgstr "_Содержание" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:937 msgid "View help for this application." msgstr "Открыть справку для этого приложения." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:938 msgid "_Quick Reference" msgstr "_Краткое руководство" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:938 msgid "View a list of all Liferea shortcuts." msgstr "Посмотреть список сочетаний клавиш Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:940 msgid "_FAQ" msgstr "_ЧаВо" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:940 msgid "View the FAQ for this application." msgstr "Часто задаваемые вопросы." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:941 msgid "_About" msgstr "_О программе" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:941 msgid "Shows an about dialog." msgstr "Отображает диалог \"О программе\"" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:945 msgid "_Normal View" msgstr "_Обычный вид" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:945 msgid "Set view mode to mail client mode." msgstr "Вид обычного почтового клиента." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:947 msgid "_Wide View" msgstr "_Широкий вид" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:947 msgid "Set view mode to use three vertical panes." msgstr "Вид с тремя вертикальными панелями." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:949 msgid "_Combined View" -msgstr "_Смешанный вид" +msgstr "_Сводный вид" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:949 msgid "Set view mode to two pane mode." msgstr "Установить двухпанельный вид." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:954 msgid "_Reduced Feed List" msgstr "Со_кращённый список лент" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:954 msgid "Hide feeds with no unread items." msgstr "Скрывает ленты, где нет непрочитанных статей." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:959 msgid "_New Subscription..." msgstr "Новая по_дписка..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:959 msgid "Adds a subscription to the feed list." msgstr "Добавляет подписку в список лент." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:961 ../src/ui/popup_menu.c:314 msgid "New _Folder..." msgstr "Новая пап_ка" -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:961 msgid "Adds a folder to the feed list." msgstr "Добавляет папку в список лент." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:962 ../src/ui/popup_menu.c:317 msgid "New S_earch Folder..." msgstr "Новая папка п_оиска..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:962 msgid "Adds a new search folder to the feed list." msgstr "Добавляет новую поисковую папку в список лент." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:963 msgid "New _Source..." msgstr "Новый ис_точник лент..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:963 msgid "Adds a new feed list source." msgstr "Добавляет новый источник списка лент." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:964 ../src/ui/popup_menu.c:319 msgid "New _News Bin..." msgstr "Новый _ящик новостей..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:964 msgid "Adds a new news bin." msgstr "Добавляет новый ящик новостей." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:968 msgid "_Mark Items Read" msgstr "Отметить как _прочитанные" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:968 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "" "Отмечает все записи выбранной ленты или всех лент выбранной папки как " "прочитанные." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:970 ../src/ui/popup_menu.c:294 msgid "_Update" msgstr "_Обновить" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:970 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "Обновляет выбранные подписки или все подписки в выбранной папке." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:975 msgid "_Properties" msgstr "_Свойства" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:975 msgid "Opens the property dialog for the selected subscription." msgstr "Открывает диалог свойств выбранной подписки." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:976 msgid "_Remove" msgstr "_Удалить" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:976 msgid "Removes the selected subscription." msgstr "Удаляет выбранные подписки." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:980 ../src/ui/popup_menu.c:163 msgid "Toggle _Read Status" msgstr "_Переключить статус прочтения" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:980 msgid "Toggles the read status of the selected item." msgstr "Переключает статус прочтения выбранной записи." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:982 ../src/ui/popup_menu.c:164 msgid "Toggle Item _Flag" msgstr "Переключить _важность" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:982 msgid "Toggles the flag status of the selected item." msgstr "Переключает важность выбранной записи." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:984 msgid "R_emove" msgstr "_Удалить" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:984 msgid "Removes the selected item." msgstr "Удаляет выбранную запись." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" -msgstr "Открыть в _браузере" - -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." -msgstr "Открывает ссылку на новость в указанном браузере." +#: ../src/ui/liferea_shell.c:986 ../src/ui/popup_menu.c:127 +msgid "Open In _Tab" +msgstr "Открыть во _вкладке" + +#: ../src/ui/liferea_shell.c:986 +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Открывает ссылку на запись в новой вкладке браузера Liferea." + +#: ../src/ui/liferea_shell.c:988 ../src/ui/popup_menu.c:128 +msgid "_Open In Browser" +msgstr "_Открыть в браузере" + +#: ../src/ui/liferea_shell.c:988 +msgid "Launches the item's link in the Liferea item pane." +msgstr "Открывает ссылку на запись в панели записей Liferea." + +#: ../src/ui/liferea_shell.c:990 ../src/ui/popup_menu.c:129 +msgid "Open In _External Browser" +msgstr "Открыть во внешнем _браузере" + +#: ../src/ui/liferea_shell.c:990 +msgid "Launches the item's link in the configured external browser." +msgstr "Открывает ссылку на новость в заданном внешнем браузере." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:995 ../src/ui/popup_menu.c:193 msgid "_Work Offline" msgstr "Работать _автономно" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:995 msgid "This option allows you to disable subscription updating." msgstr "Эта опция позволяет отключить обновление подписки." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:997 +msgid "_Fullscreen" +msgstr "_Полноэкранный режим" + +#: ../src/ui/liferea_shell.c:997 +msgid "Browse at full screen" +msgstr "Режим просмотра на весь экран" + +#: ../src/ui/liferea_shell.c:1328 msgid "Liferea - Linux Feed Reader" msgstr "Liferea — читалка новостей для Linux" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1330 msgid "" "

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

    You can add new subscriptions

    • From main menu " @@ -1144,281 +1163,278 @@ "подписок
    • Совершая правый клик на ссылках внутри Liferea и выбирая " "«Подписаться»

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Введите имя пользователя и пароль для \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Неизвестный источник" -#: ../src/ui/ui_common.c:205 +#: ../src/ui/ui_common.c:211 msgid "All Files" msgstr "Все файлы" -#: ../src/ui/feed_list_view.c:341 +#: ../src/ui/feed_list_view.c:338 msgid "Deleting entry" msgstr "Удаление записи" -#: ../src/ui/feed_list_view.c:342 +#: ../src/ui/feed_list_view.c:339 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "Вы уверены, что хотите удалить \"%s\" и её содержимое?" -#: ../src/ui/feed_list_view.c:342 +#: ../src/ui/feed_list_view.c:339 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Вы уверены, что хотите удалить \"%s\"?" -#: ../src/ui/feed_list_view.c:354 +#: ../src/ui/feed_list_view.c:351 msgid "Deletion Confirmation" msgstr "Подтверждение удаления" -#: ../src/ui/feed_list_view.c:385 +#: ../src/ui/feed_list_view.c:382 msgid "Liferea is in offline mode. No update possible." msgstr "Liferea в автономном режиме. Обновление невозможно." -#: ../src/ui/liferea_htmlview.c:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Скачивание НЕ УДАЛОСЬ: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "Скачивание завершено." +#: ../src/ui/liferea_htmlview.c:624 +msgid "Open Link In _Tab" +msgstr "Открыть ссылку во _вкладке" -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" -msgstr "Открыть ссылку во в_кладке" - -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:625 +msgid "_Open Link In Browser" msgstr "_Открыть ссылку в браузере" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:626 +msgid "_Open Link In External Browser" +msgstr "Открыть ссылку во внешнем _браузере" + +#: ../src/ui/liferea_htmlview.c:629 #, c-format msgid "_Bookmark Link at %s" msgstr "Создать _закладку на %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:633 msgid "_Copy Link Location" msgstr "_Копировать адрес ссылки" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Image Location" msgstr "Копировать адрес _изображения" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:638 msgid "S_ave Link As" msgstr "_Сохранить объект как" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:640 msgid "S_ave Image As" msgstr "Сохранить изо_бражение как" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:643 msgid "_Subscribe..." msgstr "_Подписаться..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:398 msgid "*** No title ***" msgstr "*** Без заголовка ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:661 msgid "Date" msgstr "Дата" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:675 msgid "Headline" msgstr "Заголовок" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:777 ../src/ui/item_list_view.c:798 +#: ../src/ui/item_list_view.c:819 ../src/ui/item_list_view.c:883 +#: ../src/ui/item_list_view.c:968 ../src/ui/item_list_view.c:983 msgid "No item has been selected" msgstr "Не выбрана запись" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:794 ../src/ui/item_list_view.c:815 msgid "This item has no link specified!" msgstr "Для этой записи не указана ссылка!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:871 msgid "You must select a feed to delete its items!" msgstr "Вы должны выбрать ленту для удаления её записей!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Открыть запись во _вкладке" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "_Открыть запись в браузере" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:141 msgid "Copy to News Bin" msgstr "Копировать в ящик новостей" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Копировать _URL записи в буфер обмена" +#: ../src/ui/popup_menu.c:155 +#, c-format +msgid "_Bookmark at %s" +msgstr "Создать _закладку на %s" + +#: ../src/ui/popup_menu.c:159 +msgid "Copy Item _Location" +msgstr "Копировать адрес _записи" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:165 msgid "R_emove Item" msgstr "_Удалить запись" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:178 msgid "Open Enclosure..." msgstr "Открыть вложение..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:179 msgid "Save As..." msgstr "Сохранить как..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:180 msgid "Copy Link Location" msgstr "Копировать адрес ссылки" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:194 msgid "_Update All" msgstr "_Обновить всё" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:199 msgid "_Show Liferea" msgstr "Показать _Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:296 msgid "_Update Folder" msgstr "_Обновить папку" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:298 msgid "_Mark All As Read" msgstr "Отметить все как _прочитанные" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:308 msgid "_New" msgstr "_Новая" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:311 msgid "New _Subscription..." msgstr "Новая _подписка..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:318 msgid "New S_ource..." msgstr "Новый _источник..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:327 msgid "Sort Feeds" msgstr "Сортировать ленты" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:333 msgid "_Rebuild" msgstr "_Перестроить" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "Новая по_дписка..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(Пусто)" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:87 msgid "GNOME default" msgstr "По умолчанию в GNOME" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:88 msgid "Text below icons" msgstr "Текст под значками" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:89 msgid "Text beside icons" msgstr "Текст рядом со значками" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:90 msgid "Icons only" msgstr "Только значки" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:91 msgid "Text only" msgstr "Только текст" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:99 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "минут" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "часов" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "дней" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:106 msgid "Space" msgstr "Пробел" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:107 msgid " Space" msgstr " Пробел" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Пробел" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Выберите каталог для сохранения" +#: ../src/ui/preferences_dialog.c:113 +msgid "Normal View" +msgstr "_Обычный вид" + +#: ../src/ui/preferences_dialog.c:114 +msgid "Wide View" +msgstr "_Широкий вид" + +#: ../src/ui/preferences_dialog.c:115 +msgid "Combined View" +msgstr "_Сводный вид" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:500 msgid "Manual" msgstr "Задать вручную" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:515 msgid "Browser default" msgstr "Как указано в браузере" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:518 msgid "Existing window" msgstr "В существующем окне" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:521 msgid "New window" msgstr "В новом окне" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:524 msgid "New tab" msgstr "В новой вкладке" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:683 msgid "Integrate with the messaging menu (indicator)" msgstr "Интегрировать с меню (индикатором) сообщений" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:686 msgid "Terminate instead of minimizing to the messaging menu" msgstr "Закрыть вместо сворачивания в меню сообщений" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:689 msgid "Start minimized to the messaging menu" msgstr "При запуске свернуть в меню сообщений" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:789 msgid "Type" msgstr "Тип" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:792 msgid "Program" msgstr "Программа" +#: ../src/ui/ui_node.c:123 +msgid "(Empty)" +msgstr "(Пусто)" + +#: ../src/ui/ui_node.c:320 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" +"%s\n" +"Перестроение" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1432,7 +1448,7 @@ msgid "This feed specifies no default update interval." msgstr "Для этой ленты не установлен интервал обновления по умолчанию." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:153 msgid "Untitled" msgstr "Без названия" @@ -1487,21 +1503,21 @@ msgid "%b %d %H:%M" msgstr "%d %b %H:%M" -#: ../src/fl_sources/default_source.c:174 -#: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 +#: ../src/fl_sources/default_source.c:145 +#: ../src/fl_sources/google_source.c:273 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" msgstr "Новая подписка" -#: ../src/fl_sources/google_source.c:116 +#: ../src/fl_sources/google_source.c:115 msgid "Google Reader login failed!" msgstr "Авторизация в Google Reader не удалась!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:382 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:383 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1511,11 +1527,11 @@ "предоставит ваши подписки и будет синхронизировать ваши списки лент и списки " "чтения." -#: ../src/fl_sources/opml_source.c:325 +#: ../src/fl_sources/opml_source.c:326 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:326 +#: ../src/fl_sources/opml_source.c:327 msgid "" "Integrate blogrolls or Planets in your feed list. Liferea will automatically " "add and remove feeds according to the changes of the source OPML document" @@ -1524,7 +1540,7 @@ "автоматически добавлять и удалять ленты в соответствии с изменениями в " "исходном документе OPML" -#: ../src/fl_sources/opml_source.c:387 +#: ../src/fl_sources/opml_source.c:388 msgid "Choose OPML File" msgstr "Выберите OPML-файл" @@ -1532,26 +1548,19 @@ msgid "New OPML Subscription" msgstr "Новая OPML-подписка" -#: ../src/fl_sources/node_source.c:238 +#: ../src/fl_sources/node_source.c:237 msgid "No feed list source types found!" msgstr "Типы источников лент не найдены!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:267 msgid "Source Type" msgstr "Тип источника" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:360 msgid "Tiny Tiny RSS" msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:361 msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " "present your tt-rss subscriptions, and will synchronize your feed list and " @@ -1561,7 +1570,7 @@ "Liferea предоставит ваши подписки tt-rss и будет синхронизировать ваши " "списки лент и списки чтения." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:119 msgid "Could not parse JSON returned by tt-rss API!" msgstr "Не удалось проанализировать JSON возвращённый tt-rss API!" @@ -1579,15 +1588,15 @@ msgid "Visit" msgstr "Посетить" -#: ../src/notification/libnotify.c:171 ../src/notification/libnotify.c:274 +#: ../src/notification/libnotify.c:167 ../src/notification/libnotify.c:263 msgid "Open feed" msgstr "Открыть ленту" -#: ../src/notification/libnotify.c:174 ../src/notification/libnotify.c:277 +#: ../src/notification/libnotify.c:170 ../src/notification/libnotify.c:266 msgid "Mark all as read" msgstr "Отметить все прочитанным" -#: ../src/notification/libnotify.c:254 +#: ../src/notification/libnotify.c:247 #, c-format msgid "%s has %d update" msgid_plural "%s has %d updates" @@ -1595,11 +1604,11 @@ msgstr[1] "%s%d обновления" msgstr[2] "%s%d обновлений" -#: ../src/notification/libnotify.c:257 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:249 msgid "Feed Update" msgstr "Обновление ленты" -#: ../src/notification/libnotify.c:271 +#: ../src/notification/libnotify.c:260 msgid "Show details" msgstr "Показать подробности" @@ -1631,8 +1640,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Пожалуйста, введите настройки вашего аккаунта Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Пароль" @@ -1654,9 +1662,9 @@ #: ../glade/liferea.ui.h:5 msgid "combined view" -msgstr "смешанный вид" +msgstr "сводный вид" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Заголовки" @@ -1706,7 +1714,7 @@ msgstr "Основные" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Источник ленты" @@ -1786,11 +1794,11 @@ #: ../glade/liferea.ui.h:39 ../glade/new_subscription.ui.h:10 msgid "_Don't use proxy for download" -msgstr "_Не использовать прокси при получении" +msgstr "_Не использовать прокси для загрузки" #: ../glade/liferea.ui.h:40 msgid "Download" -msgstr "Доступ" +msgstr "Загрузка" #: ../glade/liferea.ui.h:41 msgid "_Automatically download all enclosures of this feed." @@ -1816,474 +1824,532 @@ #: ../glade/liferea.ui.h:46 msgid "_Mark downloaded items as read." -msgstr "Отметить _полученные записи как прочитанные." +msgstr "Отметить загруженные записи как прочитанные." #: ../glade/liferea.ui.h:47 msgid "Advanced" msgstr "Дополнительно" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Настройки Liferea" +msgid "New Folder" +msgstr "Новая папка" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "Обработка кэша ленты" +msgid "_Folder name:" +msgstr "_Имя папки:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "_Количество сохраняемых по умолчанию элементов ленты:" +msgid "Rename" +msgstr "Переименование" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "Настройки обновления ленты" +msgid "_New Name:" +msgstr "_Новое название:" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "_Обновить все подписки при запуске." +msgid "Search Folder Properties" +msgstr "Свойства поисковой папки" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "_Интервал обновления лент по умолчанию:" +msgid "Search _Name:" +msgstr "_Название поиска:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "Найти записи, которые удовлетворяют следующим критериям" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"Примечание: Старайтесь использовать разумный интервал обновления. Нет " -"смысла каждые 15 минут обновлять ленту, которая изменяется раз в день. Для " -"отключения автообновления установите интервал 0 минут." +msgid "A_ny Rule Matches" +msgstr "_Любое условие соответствует" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Ленты" +msgid "_All Rules Must Match" +msgstr "_Все условия должны соответствовать" #: ../glade/liferea.ui.h:57 -msgid "Folder Display Settings" -msgstr "Настройки отображения папки" +msgid "Open Enclosure" +msgstr "Открыть вложение" #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "_Показывать записи всех вложенных лент при выборе папки." +msgid "Open an enclosure of type:" +msgstr "Открыть вложение следующего типа:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "_Скрывать прочитанные записи." +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"Что Liferea должна сделать с этим вложением? Введите необходимую команду. " +"Ссылка на вложение будет передана этой команде в качестве аргумента:" #: ../glade/liferea.ui.h:60 -msgid "Feed Icons (Favicons)" -msgstr "Иконки лент (Favicons)" +msgid "_Browse" +msgstr "_Обзор" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_Обновить все иконки сейчас" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "_Выполнять это автоматически для вложений как это." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Папки" +msgid "Search All Feeds" +msgstr "Поиск по всем лентам" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" -msgstr "Чтение заголовков" +msgid "_Search for:" +msgstr "_Искать:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "Переключение _между статьями по:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Введите строку, которую Liferea будет искать в заголовке или теле записи." #: ../glade/liferea.ui.h:65 -msgid "Web Integration" -msgstr "Интеграция с веб-сервисами" +msgid "_Advanced..." +msgstr "_Расширенный..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Опубликовать закладки в" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"Начинает поиск заданного текста во всех лентах. Результаты поиск будут " +"отображены в списке записей." #: ../glade/liferea.ui.h:67 -msgid "Internal Browser Settings" -msgstr "Настройки встроенного браузера" +msgid "Update Monitor" +msgstr "Монитор обновлений" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Открывать ссылки в _окне Liferea." +msgid "Pending Requests" +msgstr "В очереди" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "Отключить Java_script." +msgid "Downloading Now" +msgstr "Получение" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "Задействовать _расширения браузера." +msgid "Cancel _All" +msgstr "_Отменить всё" #: ../glade/liferea.ui.h:71 -msgid "External Browser Settings" -msgstr "Настройки внешнего браузера" +msgid "Create News Bin" +msgstr "Создать ящик новостей" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "Открывать _ссылку:" +msgid "_News Bin Name:" +msgstr "_Название ящика новостей:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "О программе" #: ../glade/liferea.ui.h:74 -#, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" -msgstr "" -"_Вручную:\n" -"(%s для URL)" +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea — агрегатор новостей для GTK+" + +#: ../glade/liferea.ui.h:75 +msgid "Liferea Homepage" +msgstr "Домашняя страница Liferea" #: ../glade/liferea.ui.h:76 -msgid "_Browser:" -msgstr "_Браузер:" +msgid "Advanced Search" +msgstr "Расширенный поиск" #: ../glade/liferea.ui.h:77 -msgid "Browser" -msgstr "Браузер" +msgid "_Search Folder..." +msgstr "_Поисковая папка..." #: ../glade/liferea.ui.h:78 -msgid "Notification Settings" -msgstr "Настройки уведомлений" +msgid "Create Search Engine Feed" +msgstr "Создать поисковую ленту" #: ../glade/liferea.ui.h:79 +msgid "enter any search string you want" +msgstr "введите любую строку для поиска" + +#: ../glade/liferea.ui.h:80 +msgid "Maximal _Number Of Result Items:" +msgstr "Максимальное _количество результатов:" + +#: ../glade/liferea.ui.h:81 +msgid "" +"Note: Liferea will generate a feed subscription which is used to query the " +"search engine results for the specified search string. You can keep this " +"feed permanently and update it like any other subscription." +msgstr "" +"Примечание: Liferea создаст подписку на ленту с результатами поиска по " +"вашему запросу. Вы можете сохранить эту ленту и обновлять ее аналогично " +"обычным лентам. " + +#: ../glade/new_subscription.ui.h:9 +msgid "Download / Postprocessing" +msgstr "Получение / Обработка" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Выбор источника" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Выберите тип источника, который вы хотите добавить..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Добавить OPML/Planet" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"Пожалуйста укажите путь к локальному файлу или URL ведущий к списку лент в " +"формате OPML." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Расположение" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "_Выбрать файл" + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "Добавить аккаунт Tiny Tiny RSS" + +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "Пожалуйста, введите настройки вашего аккаунта tt-rss." + +#: ../glade/ttrss_source.ui.h:3 +msgid "_Server URL" +msgstr "Адрес _сервера" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "_Имя" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Дополнительно..." + +#: ../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 "" +"Введите адрес сайта для автоматического поиска ленты или, если он известен, " +"точный адрес ленты." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Настройки Liferea" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Обработка кэша ленты" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "_Количество сохраняемых по умолчанию элементов ленты:" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Настройки обновления ленты" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "_Обновить все подписки при запуске." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "_Интервал обновления лент по умолчанию:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"Примечание: Старайтесь использовать разумный интервал обновления. Нет " +"смысла каждые 15 минут обновлять ленту, которая изменяется раз в день. Для " +"отключения автообновления установите интервал 0 минут." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Ленты" + +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Настройки отображения папки" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "_Показывать записи всех вложенных лент при выборе папки." + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "_Скрывать прочитанные записи." + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Иконки лент (Favicons)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Обновить все иконки сейчас" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Папки" + +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Чтение заголовков" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "Переключение _между статьями по:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "Режим отображения по-_умолчанию:" + +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Интеграция с веб-сервисами" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Опубликовать закладки в" + +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Настройки встроенного браузера" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Открывать ссылки в _окне Liferea." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "Отключить Java_script." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "Задействовать _расширения браузера." + +#: ../glade/prefs.ui.h:26 +msgid "External Browser Settings" +msgstr "Настройки внешнего браузера" + +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "Открывать _ссылку:" + +#: ../glade/prefs.ui.h:28 +msgid "_Manual:" +msgstr "Задать _вручную:" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "(%s для URL)" + +#: ../glade/prefs.ui.h:31 +msgid "_Browser:" +msgstr "_Браузер:" + +#: ../glade/prefs.ui.h:32 +msgid "Browser" +msgstr "Браузер" + +#: ../glade/prefs.ui.h:33 +msgid "Notification Settings" +msgstr "Настройки уведомлений" + +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Показывать _всплывающие уведомления с новыми заголовками." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "Показывать з_начок состояния в области уведомлений (системном лотке)." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Показывать _количество новых записей в значке системного лотка." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "Закрыть в_место сворачивания в значок системного лотка." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "_При запуске свернуть в системный лоток." -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 msgid "Toolbar Settings" msgstr "Настройки панели инструментов" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "_Скрыть панель инструментов." -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "На кн_опках панели инструментов:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" -msgstr "Графический интерфейс" +msgstr "Интерфейс" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr " HTTP прокси-сервер" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "Определять _автоматически (GNOME или другое окружение)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "_Без прокси" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "Настроить _вручную:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "_Порт прокси:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "А_дрес прокси:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Ав_торизация на прокси-сервере" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "Па_роль прокси:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "_Имя пользователя прокси:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Прокси" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 msgid "Downloading Enclosures" msgstr "Получение вложений" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Обзор" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "Со_хранять закачки в" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" -msgstr "_Получить с помощью" +msgstr "_Загрузить с помощью" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 msgid "Opening Enclosures" msgstr "Открытие вложений" -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Вложения" -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "Синхронизировано с близлежащими хостами" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_Включить локальную синхронизацию" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "Имя _службы" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Синхронизировать" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Новая папка" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Имя папки:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Переименование" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Новое название:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Свойства поисковой папки" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "_Название поиска:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "Найти записи, которые удовлетворяют следующим критериям" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "_Любое условие соответствует" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "_Все условия должны соответствовать" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Получение вложений" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Получение вложения следующего типа:" - -#: ../glade/liferea.ui.h:120 -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 должна сделать с этим вложением? Введите необходимую команду. " -"Полученный файл будет передан этой команде в качестве аргумента:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Перейти по ссылке, но не скачивать вложение." - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "_Выполнять это автоматически для вложений как это." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Поиск по всем лентам" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Искать:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Введите строку, которую Liferea будет искать в заголовке или теле записи." - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "_Расширенный..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Начинает поиск заданного текста во всех лентах. Результаты поиск будут " -"отображены в списке записей." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Монитор обновлений" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "В очереди" - -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "Получение" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "_Отменить всё" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Создать ящик новостей" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Название ящика новостей:" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" +msgstr "Плагины" -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "О программе" +#, fuzzy +#~ msgid "" +#~ "Copyright (c) 2003-2012\n" +#~ "The Liferea Team\n" +#~ msgstr "" +#~ "Copyright (c) 2003-2011\n" +#~ "The Liferea Team\n" -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" +#~ msgid "Download and view feeds" +#~ msgstr "Скачать и просмотреть ленты" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea — агрегатор новостей для GTK+" - -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Домашняя страница Liferea" +#~ msgid "You may want to validate the feed using" +#~ msgstr "Вы можете проверить ленту с помощью" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Расширенный поиск" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Открыть запись во _вкладке" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "_Поисковая папка..." +#~ msgid "_Launch Item In Browser" +#~ msgstr "_Открыть запись в браузере" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Создать поисковую ленту" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Копировать _URL записи в буфер обмена" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "введите любую строку для поиска" +#~ msgid "flag" +#~ msgstr "важно" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Максимальное _количество результатов:" +#~ msgid "bookmark" +#~ msgstr "закладка" -#: ../glade/liferea.ui.h:145 -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 создаст подписку на ленту с результатами поиска по " -"вашему запросу. Вы можете сохранить эту ленту и обновлять ее аналогично " -"обычным лентам. " +#~ msgid "comments" +#~ msgstr "комментарии" -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" -msgstr "Получение / Обработка" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "НЕ УДАЛОСЬ загрузить вложение: \"%s\"" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Выбор источника" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Получение вложения завершено: \"%s\"" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Выберите тип источника, который вы хотите добавить..." +#~ 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 "" +#~ "Эта версия Liferea использует новый формат кэша и перевела ваш кэш лент в " +#~ "новый формат. Данные в папке %s не были удалены автоматически. Удалите её " +#~ "самостоятельно, если вы уверены, что данные не были потеряны при " +#~ "обновлении!" -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Добавить OPML/Planet" +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Скачивание НЕ УДАЛОСЬ: \"%s\"" -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Пожалуйста укажите путь к локальному файлу или URL ведущий к списку лент в " -"формате OPML." +#~ msgid "Download finished." +#~ msgstr "Скачивание завершено." -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Расположение" +#~ msgid "Choose download directory" +#~ msgstr "Выберите каталог для сохранения" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "_Выбрать файл" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Вручную:\n" +#~ "(%s для URL)" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "Добавить аккаунт Tiny Tiny RSS" +#~ msgid "_Save downloads in" +#~ msgstr "Со_хранять закачки в" -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "Пожалуйста, введите настройки вашего аккаунта tt-rss." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Синхронизировано с близлежащими хостами" -#: ../glade/ttrss_source.ui.h:3 -msgid "_Server URL" -msgstr "Адрес _сервера" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "_Включить локальную синхронизацию" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "_Имя" +#~ msgid "_Service Name" +#~ msgstr "Имя _службы" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Введите адрес сайта для автоматического поиска ленты или, если он известен, " -"точный адрес ленты." +#~ msgid "Sync" +#~ msgstr "Синхронизировать" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Дополнительно..." +#~ msgid "Downloading Enclosure" +#~ msgstr "Получение вложений" -#~ msgid "You may want to validate the feed using" -#~ msgstr "Вы можете проверить ленту с помощью" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "_Перейти по ссылке, но не скачивать вложение." #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " diff -Nru liferea-1.8.15/po/sk.po liferea-1.10.3/po/sk.po --- liferea-1.8.15/po/sk.po 2013-06-24 22:16:17.000000000 +0200 +++ liferea-1.10.3/po/sk.po 2013-07-31 23:29:12.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: liferea\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2010-09-11 10:59+0200\n" "Last-Translator: Pavol Klačanský \n" "Language-Team: Slovak \n" @@ -17,8 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -31,8 +30,8 @@ msgstr "Liferea - čítačka kanálov" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Stiahnuť a zobraziť kanály" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -140,38 +139,26 @@ msgstr "Tvorca" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "emblém" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "záložka" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "komentáre" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Doteraz žiadne komentáre." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Komentáre" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Aktualizuje sa..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Obnoviť" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Sekcia" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Odelenie" @@ -196,12 +183,12 @@ msgid "Default Browser" msgstr "Predvolený prehliadač GNOME" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Zlyhal príkaz prehliadača: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Spúšťa sa: \"%s" @@ -211,7 +198,7 @@ msgid "Authorization Error" msgstr "Chyba autorizácie" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Nemôže byť vytvorený priečinok cache \"%s\"!" @@ -241,33 +228,39 @@ msgid "%b %d %Y" msgstr "%d. %b. %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "\"%s\" nie je platný typ prílohy konfiguračného súboru!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Sťahovanie prílohy ZLYHALO: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Sťahovanie prílohy dokončené: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Chyba premenovania %s na %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "XML chyba počas čítania OPML súboru! Nemohol byť importovaný \"%s\"!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." @@ -275,42 +268,42 @@ "Prázdny dokument! OPML dokument \"%s\" by nemal byť prázdny keď je " "importovaný." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "\"%s\" nie je platný OPML dokument! Liferea nemôže importovať tento súbor!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Zoznam dôležitých článkov" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importovať zoznam kanálov" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importovať" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 #, fuzzy msgid "OPML Files" msgstr "Zvoľte OPML súbor" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Chyba počas exportovania zoznamu kanálov!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Zoznam kanálov bol exportovaný!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Exportovať zoznam kanálov" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Exportovať" @@ -363,12 +356,12 @@ msgstr "Nepodarilo sa určiť typ kanálu." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "Nie sú tu žiadne neprečítané články " -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" @@ -376,104 +369,92 @@ "Spustí program Liferea s hlavným oknom v STAVE. STAV môže byť `shown', " "`iconified', alebo `hidden'" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "STAV" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Vypíše informácie o verzii a skončí" -#: ../src/main.c:180 +#: ../src/main.c:166 #, fuzzy msgid "Add a new subscription" msgstr "Nové prihlásenie" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Vypíše správy ladenia všetkých typov" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "Vypíše správy ladenia pre ovládanie cache" -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr "Vypíše správy ladenia ovládania konfigurácie" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "Vypíše správy ladenia ovládania databázy" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "Vypíše správy ladenia všetkých GUI funkcíí" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" "Povolí ladenie HTML vykresľovania. Zakaždým ako Liferea vykreslí HTML " -"výstup, tak bude tiež generovaný HTML výpis do ~/.liferea_1.8/output.xhtml" +"výstup, tak bude tiež generovaný HTML výpis do ~/.cache/liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "Vypíše správy ladenia všetkej sieťovej aktivity" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "Vypíše správy ladenia všetkých spracúvajúcich funkcií" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "Vypíše správy ladenia keď spracovanie funkcie trvá dlho" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Vypíše správy ladenia keď sa vchádza/vychádza z funkcíí" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "Vypíše správy ladenia postupu aktualizácie kanálov" -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr "Vypíše správy ladenia pre ovládanie cache" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Vypíše rozsiahle správy ladenia" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "Vypíše správy ladenia pre zadanú tému" -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - čítačka kanálov pre Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "Pre viac informácií navštívte http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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 "" -"Táto verzia programu Liferea používa nový formát cache a musí premiestniť " -"vašu cache kanálov. Obsah cache vo %s nebude automaticky odstránený. " -"Odstránte, prosím, tento priečinok ručne akonáhle si budete istý že " -"premiestnenie bolo úspešné!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Pre viac informácií navštívte http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -642,24 +623,24 @@ msgid "Feed title" msgstr "Názov kanálu" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Prihlásenie \"%s\" je už aktualizované!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "" "Prihlásenie \"%s\" bolo zrušené. Liferea ho nebude nabudúce aktualizovať!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Aktualizuje sa favicon pre \"%s\"" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -667,48 +648,48 @@ "Bol tu problém počas čítania tohto prihlásenia. Skontrolujte, prosím, URL a " "výstup v konzole." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "URL \"%s\" sa zmenilo natrvalo a bolo aktualizované" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "\"%s\" je zrušený. Liferea ho nebude nabudúce aktualizovať!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" sa nezmenil od poslednej aktualizácie" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Aktualizuje sa \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s skončil so stavom %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Chyba: Nepodarilo sa otvoriť rúru \"%s\"" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Chyba: Nemohol byť otvorený súbor \"%s\"" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Chyba: Nie je tam žiadny súbor \"%s\"" @@ -717,56 +698,54 @@ msgid "New Search Folder" msgstr "Nový priečinok hľadania" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Je tu viac chýb. Výstup bol skrátený!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "XML parser: Nemohol byť parsovaný dokument:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Prílohy" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d príloh" -msgstr[1] "%d príloha" -msgstr[2] "%d prílohy" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " Bajtov" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d príloh" +msgstr[1] "%d príloha" +msgstr[2] "%d prílohy" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Zvolte súbor" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, fuzzy, c-format msgid "File Extension .%s" msgstr "Súbor rozšírenia .%s" @@ -776,7 +755,7 @@ msgid "Couldn't find pixmap file: %s" msgstr "Nemohol byť nájdený súbor pixmap: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" @@ -784,7 +763,7 @@ msgstr[1] " (%d nový)" msgstr[2] " (%d nové)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" @@ -792,273 +771,282 @@ msgstr[1] "%d neprečítaný%s" msgstr[2] "%d neprečítané%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Témy pomocníka" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Rýchla príručka" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "Často kladené otázky" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea je teraz pripojená" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Pracovať ako odpojený" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea je teraz odpojená" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Pracovať ako pripojený" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "Prihlá_senia" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "Aktualizovať _všetko" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Aktualizuje všetky prihlásenia." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Označiť všetko ako p_rečítané" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Označí všetky články zo všetkých prihlásení ako prečítané." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Importovať zoznam kanálov..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importuje OPML zoznam kanálov." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Exportovať zoznam kanálov..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Exportuje zoznam kanálov ako OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Koniec" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Kanál" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Odstrániť _všetky články" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Odstráni všetky články z práve vybratého kanálu." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "Č_lánok" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "Ďa_lší neprečítaný článok" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "Ďa_lší neprečítaný článok" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Zobraziť" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "Zväčš_iť veľkosť písma" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Zväčší veľkosť písma v zobrazenom článku." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "Z_menšiť veľkosť textu" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Zmenší veľkosť písma v zobrazenom článku." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "Nás_troje" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "Monitor akt_ualizácií" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "" "Zobraziť zoznam všetkých kanálov, ktoré sú práve v rade na aktualizáciu" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Predvoľby" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Upraviť predvoľby." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "_Hľadať" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Hľadať vo všetkých článkoch..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Zobrazí dialóg hľadania." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Pomocník" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "Ob_sah" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Zobraziť pomocníka pre túto aplikáciu." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Rýchla príručka" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Zobraziť zoznam všetkých skratiek programu Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "Často k_ladené otázky" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Zobraziť Často kladené otázky pre túto aplikáciu." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_O programe" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Zobrazí dialóg o programe." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "_Normálny pohľad" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Nastaví režim zobrazenia na režim poštového klienta." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "P_ohľad na šírku" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Nastaví režim zobrazenia s použitím troch zvislých častí." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "_Kombinovaný pohľad" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Nastaví režim zobrazenia na režim s dvomi časťami." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "_Redukovať zoznam kanálov" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Skryť kanály, ktoré neobsahujú neprečítané články." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "_Nové prihlásenie..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Pridá prihlásenie do zoznamu kanálov." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Nový _priečinok..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Pridá priečinok do zoznamu kanálov." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Nový priečinok _hľadania..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Pridá nový priečinok hľadania do zoznamu kanálov." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Nový _zdroj..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Pridá nový zdroj zoznamu kanálov." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "_Nový archív..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Pridá archív." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "_Označiť články ako prečítané" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "" "Označí všetky články ako prečítané vo vybranom uzli zoznamu kanálov / v " "zozname článkov." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "Akt_ualizovať" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." @@ -1066,67 +1054,96 @@ "Aktualizuje vybrané prihlásenie alebo všetky prihlásenia vo vybranom " "priečinku." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "_Vlastnosti" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Otvorí dialóg vlastností pre vybrané prihlásenie." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "O_dstrániť" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Odstráni vybrané prihlásenie." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Prepnúť stav p_rečítaný" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Prepne stav prečítaný vybraného článku." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Prepnúť _emblém článku" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Prepne stav emblému vybraného článku." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "O_dstrániť" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Odstráni vybraný článok." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Otvorí odkaz na článok v nastavenom prehliadači." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "_Zobraziť v prehliadači" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." +msgstr "Otvorí odkaz na článok v nastavenom prehliadači." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Nastavenia vonkajšieho prehliadača" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." msgstr "Otvorí odkaz na článok v nastavenom prehliadači." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "P_racovať odpojený" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Táto voľba vám umožňuje zakázať aktualizáciu prihlásení." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - čítačka kanálov pre Linux" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 #, fuzzy msgid "" "

    Welcome to Liferea, a desktop news aggregator for online news " @@ -1141,12 +1158,12 @@ "článkov kanálu ho vyberte v zozname a článok bude načítaný v pravej časti." -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Neznámy zdroj" @@ -1177,251 +1194,252 @@ 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:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Sťahovanie prílohy ZLYHALO: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 +#: ../src/ui/liferea_htmlview.c:627 #, fuzzy -msgid "Download finished." -msgstr "_Stiahnuť použitím" - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +msgid "Open Link In _Tab" msgstr "Zobraziť odkaz na _karte" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "_Zobraziť odkaz v prehliadači" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "_Zobraziť odkaz v prehliadači" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "_Záložkovať odkaz na %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Kopírovať umiestnenie odkazu" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 #, fuzzy msgid "_Copy Image Location" msgstr "_Kopírovať umiestnenie odkazu" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 #, fuzzy msgid "S_ave Link As" msgstr "Uložiť ako..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "Prihlá_siť..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Žiadny názov ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Dátum" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Článok" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Neboli vybrané články" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Tento článok nemá špecifikovaný odkaz!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Musíte vybrať kanál ak chcete odstrániť jeho články!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Zobraziť článok na _karte" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "_Zobraziť článok v prehliadači" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "Kopírovať do archívu" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Kopírovať _URL článku do schránky" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "_Záložkovať odkaz na %s" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "_Kopírovať umiestnenie odkazu" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "O_dstrániť článok" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Otvoriť prílohu..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Uložiť ako..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "Kopírovať umiestnenie odkazu" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "Akt_ualizovať všetko" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "_Zobraziť program Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "Akt_ualizovať priečinok" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "_Označiť všetko ako prečítané" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_Nový" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "Nové prihlá_senie..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "Nový zdr_oj..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 #, fuzzy msgid "Sort Feeds" msgstr "Importovať zoznam kanálov" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "_Nové prihlásenie..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "GNOME predvolené" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Text pod ikonami" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Text vedľa ikon" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Len ikony" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Len text" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minút" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "hodín" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "dní" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Medzera" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Medzera" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Medzera" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Zvoliť priečinok na sťahovanie" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "_Normálny pohľad" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "P_ohľad na šírku" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "_Kombinovaný pohľad" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Vlastný" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Predvolený prehliadač" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Existujúce okno" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Nové okno" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Nová karta" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 #, fuzzy msgid "Terminate instead of minimizing to the messaging menu" msgstr "Ukončiť namies_to minimalizácie do ikony v oblasti upozornení." -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Typ" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Program" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1438,7 +1456,7 @@ msgid "This feed specifies no default update interval." msgstr "Tento kanál nemá určený interval aktualizácie." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "" @@ -1493,7 +1511,7 @@ msgid "%b %d %H:%M" msgstr "%d. %b. %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1503,11 +1521,11 @@ msgid "Google Reader login failed!" msgstr "Prihlásenie k Google Reader zlyhalo!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1541,22 +1559,15 @@ msgid "No feed list source types found!" msgstr "Neboli nájdené žiadne typy zdrojov zoznamu kanálov!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:269 msgid "Source Type" msgstr "Typ zdroja" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 #, fuzzy msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " @@ -1567,7 +1578,7 @@ "vaše Google Reader prihlásenie a bude synchronizovať váš zoznam kanálov a " "zoznamy článkov." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1637,8 +1648,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Vložte, prosím, vaše nastavenia účtu Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Heslo" @@ -1662,7 +1672,7 @@ msgid "combined view" msgstr "kombinovaný pohľad" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Články" @@ -1715,7 +1725,7 @@ msgstr "Všeobecné" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 #, fuzzy msgid "Feed Source" msgstr "Zdroj kanálu" @@ -1831,485 +1841,550 @@ msgstr "Pokročilé" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Predvoľby Liferea" +msgid "New Folder" +msgstr "Nový priečinok" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "_Názov priečinku:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Predvole_ný počet ukladaných článkov na kanál:" +msgid "Rename" +msgstr "Premenovať" #: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "Aktualizácia kanálu" +msgid "_New Name:" +msgstr "_Nový názov:" #: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Aktualizuje všetky prihlásenia." +msgid "Search Folder Properties" +msgstr "Vlastnosti priečinku hľadania" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Predvolený _interval obnovovania kanálu:" +msgid "Search _Name:" +msgstr "_Názov hľadania:" + +#: ../glade/liferea.ui.h:54 +#, fuzzy +msgid "Find Items that meet the following criteria" +msgstr "Nájsť články, ktoré vyhovujú nasledujúcim kritériám" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"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." +msgid "A_ny Rule Matches" +msgstr "Akékoľv_ek pravidlo sa musí zhodovať" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Kanály" +msgid "_All Rules Must Match" +msgstr "Všet_ky pravidlá sa musia zhodovať" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "Nastavenia zobrazenia priečinkov" +msgid "Open Enclosure" +msgstr "Otvoriť prílohu..." #: ../glade/liferea.ui.h:58 -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." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Sťaahuje sa príloha typu:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "Skryť _prečítané články." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"Č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.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Ikony kanálov (Favicony)" +msgid "_Browse" +msgstr "P_rehliadať" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "Akt_ualizovať všetky favicony teraz" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "O_dteraz to robiť automaticky pre prílohy ako táto." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Priečinky" +msgid "Search All Feeds" +msgstr "Hľadať vo všetkých článkoch" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "neprečítané články" +msgid "_Search for:" +msgstr "Vy_hľadávanie:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "Pre_skakovať články pomocou:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Zadajte hľadaný reťazec, ktorý by mal program Liferea nájsť v titulku článku " +"alebo v jeho obsahu." #: ../glade/liferea.ui.h:65 -#, fuzzy -msgid "Web Integration" -msgstr "Orientácia" +msgid "_Advanced..." +msgstr "_Pokročilé..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Posielať záložky do" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"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.ui.h:67 -#, fuzzy -msgid "Internal Browser Settings" -msgstr "Nastavenia vnútorného prehliadača" +msgid "Update Monitor" +msgstr "Monitor aktualizácií" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Otvoriť odkazy v ok_ne programu Liferea." +#, fuzzy +msgid "Pending Requests" +msgstr "Čakajúce požiadavky" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "Za_kázať Javascript." +#, fuzzy +msgid "Downloading Now" +msgstr "Prebieha sťahovanie" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "_Povoliť doplnky prehliadača." +msgid "Cancel _All" +msgstr "Z_rušiť všetko" #: ../glade/liferea.ui.h:71 -#, fuzzy -msgid "External Browser Settings" -msgstr "Nastavenia vonkajšieho prehliadača" +msgid "Create News Bin" +msgstr "Vytvoriť archív" #: ../glade/liferea.ui.h:72 +msgid "_News Bin Name:" +msgstr "_Názov archívu:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "O programe" + +#: ../glade/liferea.ui.h:74 +#, fuzzy +msgid "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" +"Autorské právo (c) 2003-2009\n" +"Tím Liferea\n" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea je agregátor správ pre GTK+" + +#: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "Domovská stránka programu Liferea" + +#: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "Pokročilé hľadanie" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "Priečinok _hľadania..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Vytvoriť kanál vyhľadávača" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "zadajte nejaký reťazec, ktorý chcete hľadať" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "Maximálny počet výsledných článkov:" + +#: ../glade/liferea.ui.h:84 +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/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "Sťahovanie / Postprocesing" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Výber zdroju" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Vyberte typ zdroju, ktorý chcete pridať..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Pridať OPML/Planet" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"Určite, prosím, lokálny súbor alebo URL ukazujúce na správny OPML zoznam " +"kanálov." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Umiestnenie" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "Vybrať _súbor" + +#: ../glade/ttrss_source.ui.h:1 +#, fuzzy +msgid "Add Tiny Tiny RSS Account" +msgstr "Pridať účet Bloglines" + +#: ../glade/ttrss_source.ui.h:2 +#, fuzzy +msgid "Please enter your tt-rss account settings." +msgstr "Vložte, prosím, vaše nastavenia účtu Bloglines." + +#: ../glade/ttrss_source.ui.h:3 +#, fuzzy +msgid "_Server URL" +msgstr "Chyba serveru" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "Po_užívateľské meno" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Pokročilé..." + +#: ../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 "" +"Pre automatické objavenie kanálu zadajte umiestenie webovej stránky alebo " +"zadajte presné umiestnenie kanálu, ak ho poznáte." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Predvoľby Liferea" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Predvole_ný počet ukladaných článkov na kanál:" + +#: ../glade/prefs.ui.h:4 +#, fuzzy +msgid "Feed Update Settings" +msgstr "Aktualizácia kanálu" + +#: ../glade/prefs.ui.h:5 +#, fuzzy +msgid "_Update all subscriptions at startup." +msgstr "Aktualizuje všetky prihlásenia." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Predvolený _interval obnovovania kanálu:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"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/prefs.ui.h:9 +msgid "Feeds" +msgstr "Kanály" + +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "Nastavenia zobrazenia priečinkov" + +#: ../glade/prefs.ui.h:11 +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/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "Skryť _prečítané články." + +#: ../glade/prefs.ui.h:13 +#, fuzzy +msgid "Feed Icons (Favicons)" +msgstr "Ikony kanálov (Favicony)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "Akt_ualizovať všetky favicony teraz" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Priečinky" + +#: ../glade/prefs.ui.h:16 +#, fuzzy +msgid "Reading Headlines" +msgstr "neprečítané články" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "Pre_skakovať články pomocou:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +#, fuzzy +msgid "Web Integration" +msgstr "Orientácia" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Posielať záložky do" + +#: ../glade/prefs.ui.h:22 +#, fuzzy +msgid "Internal Browser Settings" +msgstr "Nastavenia vnútorného prehliadača" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Otvoriť odkazy v ok_ne programu Liferea." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "Za_kázať Javascript." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "_Povoliť doplnky prehliadača." + +#: ../glade/prefs.ui.h:26 +#, fuzzy +msgid "External Browser Settings" +msgstr "Nastavenia vonkajšieho prehliadača" + +#: ../glade/prefs.ui.h:27 msgid "_Open link in:" msgstr "_Otvoriť odkaz v:" -#: ../glade/liferea.ui.h:74 +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Vlastný" + +#: ../glade/prefs.ui.h:30 #, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" +msgid "(%s for URL)" msgstr "" -"_Vlastný:\n" -"(%s pre URL)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "P_rehliadač:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Prehliadač" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 #, fuzzy msgid "Notification Settings" msgstr "Nastavenia upozorňovania" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Zobraziť _vyskakovacie okno s novými článkami." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "Zobraziť stavovú _ikonu v oblasti upozornení." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Zobraziť počet nových článkov v oblasti upozornení." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "Ukončiť namies_to minimalizácie do ikony v oblasti upozornení." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "_Spustiť v oblasti upozornení." -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 #, fuzzy msgid "Toolbar Settings" msgstr "Popisy _tlačidiel v paneli nástrojov:" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "_Skryť panel nástrojov." -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Popisy _tlačidiel v paneli nástrojov:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "_Automaticky zistiť (GNOME alebo prostredie)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "Žiadne pr_oxy" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "_Ručné nastavenie:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "_Port proxy:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "_Hostiteľ proxy:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Použiť proxy ov_erenie" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "_Heslo proxy:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "Po_užívateľské meno proxy:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 #, fuzzy msgid "Downloading Enclosures" msgstr "Sťahuje sa príloha" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "P_rehliadať" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Uložiť stiahnuté do" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Stiahnuť použitím" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 #, fuzzy msgid "Opening Enclosures" msgstr "Otvoriť prílohu..." -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Prílohy" -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Synchronizované s neďalekými hostiteľmi" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_Povoliť lokálnu LAN synchronizáciu" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "Názov _služby" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Synchronizovať" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Nový priečinok" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Názov priečinku:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Premenovať" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Nový názov:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Vlastnosti priečinku hľadania" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "_Názov hľadania:" - -#: ../glade/liferea.ui.h:115 -#, fuzzy -msgid "Find Items that meet the following criteria" -msgstr "Nájsť články, ktoré vyhovujú nasledujúcim kritériám" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "Akékoľv_ek pravidlo sa musí zhodovať" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "Všet_ky pravidlá sa musia zhodovať" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Sťahuje sa príloha" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Sťaahuje sa príloha typu:" - -#: ../glade/liferea.ui.h:120 -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:" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -"Č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.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Predať URL a nesťahovať prílohu." - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "O_dteraz to robiť automaticky pre prílohy ako táto." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Hľadať vo všetkých článkoch" -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "Vy_hľadávanie:" +#~ msgid "Download and view feeds" +#~ msgstr "Stiahnuť a zobraziť kanály" -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Zadajte hľadaný reťazec, ktorý by mal program Liferea nájsť v titulku článku " -"alebo v jeho obsahu." +#~ msgid "You may want to validate the feed using" +#~ msgstr "Možno chcete potvrdiť platnosť kanálu použitím" -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "_Pokročilé..." +#~ msgid "Launch Item In _Tab" +#~ msgstr "Zobraziť článok na _karte" -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Začne vyhľadávanie zadaného textu vo všetkých kanáloch. Výsledok hľadania sa " -"zobrazí v zozname článkov." +#~ msgid "_Launch Item In Browser" +#~ msgstr "_Zobraziť článok v prehliadači" -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Monitor aktualizácií" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Kopírovať _URL článku do schránky" -#: ../glade/liferea.ui.h:129 -#, fuzzy -msgid "Pending Requests" -msgstr "Čakajúce požiadavky" +#~ msgid "flag" +#~ msgstr "emblém" -#: ../glade/liferea.ui.h:130 -#, fuzzy -msgid "Downloading Now" -msgstr "Prebieha sťahovanie" +#~ msgid "bookmark" +#~ msgstr "záložka" -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "Z_rušiť všetko" +#~ msgid "comments" +#~ msgstr "komentáre" -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Vytvoriť archív" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Sťahovanie prílohy ZLYHALO: \"%s\"" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Názov archívu:" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Sťahovanie prílohy dokončené: \"%s\"" -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "O programe" +#~ 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 "" +#~ "Táto verzia programu Liferea používa nový formát cache a musí premiestniť " +#~ "vašu cache kanálov. Obsah cache vo %s nebude automaticky odstránený. " +#~ "Odstránte, prosím, tento priečinok ručne akonáhle si budete istý že " +#~ "premiestnenie bolo úspešné!" -#: ../glade/liferea.ui.h:135 #, fuzzy -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Autorské právo (c) 2003-2009\n" -"Tím Liferea\n" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea je agregátor správ pre GTK+" - -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Domovská stránka programu Liferea" - -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Pokročilé hľadanie" +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Sťahovanie prílohy ZLYHALO: \"%s\"" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "Priečinok _hľadania..." - -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Vytvoriť kanál vyhľadávača" - -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "zadajte nejaký reťazec, ktorý chcete hľadať" - -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Maximálny počet výsledných článkov:" - -#: ../glade/liferea.ui.h:145 -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/new_subscription.ui.h:9 #, fuzzy -msgid "Download / Postprocessing" -msgstr "Sťahovanie / Postprocesing" +#~ msgid "Download finished." +#~ msgstr "_Stiahnuť použitím" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Výber zdroju" +#~ msgid "Choose download directory" +#~ msgstr "Zvoliť priečinok na sťahovanie" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Vyberte typ zdroju, ktorý chcete pridať..." - -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Pridať OPML/Planet" - -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Určite, prosím, lokálny súbor alebo URL ukazujúce na správny OPML zoznam " -"kanálov." - -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Umiestnenie" - -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "Vybrať _súbor" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Vlastný:\n" +#~ "(%s pre URL)" -#: ../glade/ttrss_source.ui.h:1 -#, fuzzy -msgid "Add Tiny Tiny RSS Account" -msgstr "Pridať účet Bloglines" +#~ msgid "_Save downloads in" +#~ msgstr "_Uložiť stiahnuté do" -#: ../glade/ttrss_source.ui.h:2 #, fuzzy -msgid "Please enter your tt-rss account settings." -msgstr "Vložte, prosím, vaše nastavenia účtu Bloglines." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "" +#~ "Synchronizované s neďalekými hostiteľmi" -#: ../glade/ttrss_source.ui.h:3 -#, fuzzy -msgid "_Server URL" -msgstr "Chyba serveru" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "_Povoliť lokálnu LAN synchronizáciu" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "Po_užívateľské meno" +#~ msgid "_Service Name" +#~ msgstr "Názov _služby" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Pre automatické objavenie kanálu zadajte umiestenie webovej stránky alebo " -"zadajte presné umiestnenie kanálu, ak ho poznáte." +#~ msgid "Sync" +#~ msgstr "Synchronizovať" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Pokročilé..." +#~ msgid "Downloading Enclosure" +#~ msgstr "Sťahuje sa príloha" -#~ msgid "You may want to validate the feed using" -#~ msgstr "Možno chcete potvrdiť platnosť kanálu použitím" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "_Predať URL a nesťahovať prílohu." #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " diff -Nru liferea-1.8.15/po/sq.po liferea-1.10.3/po/sq.po --- liferea-1.8.15/po/sq.po 2013-06-24 22:16:17.000000000 +0200 +++ liferea-1.10.3/po/sq.po 2013-07-31 23:29:12.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: liferea 1.8-rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-04-27 14:08+0300\n" "PO-Revision-Date: 2012-11-09 12:13+0200\n" "Last-Translator: Besnik Bleta \n" "Language-Team: Albanian \n" @@ -17,8 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -31,8 +30,8 @@ msgstr "Lexuesi i Prurjeve Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Shkarkoji dhe shfaqi prurjet" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -140,38 +139,26 @@ msgstr "Krijues" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "flamurkë" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "faqerojtës" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "komente" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Ende pa komente." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Komente" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Po përditësohet..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Rifreskoje" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Ndarje" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Degë" @@ -195,12 +182,12 @@ msgid "Default Browser" msgstr "Shfletuesi Parazgjedhje" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Urdhri për shfletuesin dështoi: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Po niset: \"%s\"" @@ -210,7 +197,7 @@ msgid "Authorization Error" msgstr "Gabim Autorizimi" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Nuk krijohet dot drejtoria fshehtinë \"%s\"!" @@ -240,75 +227,90 @@ msgid "%b %d %Y" msgstr "%b %d %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "\"%s\" nuk është kartelë e vlefshme formësimi lloji guackash!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Shkarkimi i guackës DËSHTOI: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" +"Ende nuk keni të formësuar mjet shkarkimesh! Ju lutem, bëjeni këtë te skeda " +"'Shkarko' te Mjete/Parapëlqime." -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Shkarkimi i guackës përfundoi: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" +"Urdhri dështoi: \n" +"\n" +"%s\n" +"\n" +" Ju lutemi, shihni nëse ka të instaluar dhe funksionon në rregull ndonjë " +"mjet të formësuar shkarkimesh! Mund ta ndryshoni te skeda 'Shkarkime' te " +"Mjete/Parapëlqime." -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Gabim në riemërtimin e kartelës si % si %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "Gabim XML ndërsa lexohej kartelë OPML! Nuk u importua dot \"%s\"!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "" "Dokument bosh! Dokumenti OPML \"%s\" nuk duhet të jetë bosh kur importohet." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "\"%s\" nuk është një dokument OPML i vlefshëm! Liferea nuk e importon dot " "këtë kartelë!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Listë e importuar prurjesh" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importo Listë Prurjesh" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importo" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 msgid "OPML Files" msgstr "Kartela OPML" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Gabim gjatë eksportimit të listës së prurjeve!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Listë Prurjesh e eksportuar!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Eksporto Listë Prurjesh" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Eksporto" @@ -365,11 +367,11 @@ msgstr "Nuk u përcaktua dot lloji i prurjes" #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "Nuk ka objekte të palexuar" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" @@ -377,104 +379,92 @@ "Nise Liferea-n me dritaren e tij kryesore në GJENDJEN. GJENDJA mund të jetë " "`e shfaqur', `e ikonizuar', ose `e fshehur'." -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "GJENDJE" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Shfaq të dhëna versioni dhe dil" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "Add a new subscription" msgstr "Shtoni pajtim të ri" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "uri" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Shtyp mesazhe diagnostikimi të të gjitha llojeve" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "Shtyp mesazhe diagnostikimi gjatë trajtimit të fshehtinës" -#: ../src/main.c:187 +#: ../src/main.c:173 msgid "Print debugging messages for the configuration handling" msgstr "Shtyp mesazhe diagnostikimi gjatë trajtimmit të formësimit" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "Shtyp mesazhe diagnostikimi gjatë trajtimit të bazës së të dhënave" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "Shtyp mesazhe diagnostikimi të krejt funksioneve GUI" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" "Aktivizon diagnostikimin e vizatimit HTML. Sa herë që Liferea vizaton HTML, " -"do ta hedhë HTML-në e krijuar edhe te ~/.liferea_1.8/output.xhtml" +"do ta hedhë HTML-në e krijuar edhe te ~/.cache/liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "Shtyp mesazhe diagnostikimi për krejt veprimtarinë në rrjet" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "Shtyp mesazhe diagnostikimi për krejt funksionet e përtypjes" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" "Shtyp mesazhe diagnostikimi kur plotësimi i një funksioni zgjatet shumë" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Shtyp mesazhe diagnostikimi për funksionet hyjnë/dalin" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "Shtyp mesazhe diagnostikimi për procesin e përditësimit të prurjes" -#: ../src/main.c:196 +#: ../src/main.c:182 msgid "Print debugging messages of the search folder matching" msgstr "" "Shtyp mesazhe diagnostikimi gjatë kërkimit të përputhjeve te dosje kërkimesh" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Shtyp mesazhe fjalamane diagnostikimi" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "Shtyp mesazhe diagnostikimi për temën e treguar" -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - Lexuesi Linux i Prurjeve" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" -"Për më tepër të dhëna, ju lutemi, vizitoni http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" -"Ky version i Liferea-s përdor një format të ri fshehtine dhe e ka bërë " -"migrimin e fshehtinës së prurjes suaj. Lënda e fshehtinës nën %s nuk u fshi " -"vetvetiu. Ju lutemi, hiqeni dorazi këtë drejtori, pasi të jeni i sigurt që " -"migrimi qe i suksesshëm!" +"Për më tepër të dhëna, ju lutemi, vizitoni http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -643,23 +633,23 @@ msgid "Feed title" msgstr "Titull prurjeje" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Pajtimit \"%s\" po përditësohet ndërkohë!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "Pajtimi \"%s\" nuk vazhdon më. Liferea nuk do ta përditësojë më!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Po përditësohet favikona për \"%s\"" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -667,49 +657,49 @@ "Pati një problem gjatë leximit të këtij pajtimit. Ju lutemi, kontrolloni URL-" "në dhe atë çka jep konsola." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "URL-ja e \"%s\" ndryshoi përgjithmonë dhe është përditësuar" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "\"%s\" është ndërprerë. Liferea nuk do ta përditësojë më!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" nuk ka ndryshuar që prej përditësimit të fundit" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Po përditësohet \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "" "Gabim në hapjen e kartelës së përkohshme %s për ta përdorur për filtrim!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s përfundoi me gjendje %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Gabim: S'hapa dot tubin \"%s\"" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Gabim: S'hapa dot kartelën \"%s\"" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Gabim: Nuk ka kartelë \"%s\"" @@ -718,55 +708,53 @@ msgid "New Search Folder" msgstr "Dosje e re Kërkimi" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Pati edhe gabime të tjera. Përgjigja u cungua!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "Përtypësi XML: S'përtypa dot dokumentin:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Bashkangjitje" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d bashkangjitje" -msgstr[1] "%d bashkangjitje" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr "Bajte" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d bashkangjitje" +msgstr[1] "%d bashkangjitje" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Zgjidhni Kartelë" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "Zgjatim Kartele .%s" @@ -776,353 +764,390 @@ msgid "Couldn't find pixmap file: %s" msgstr "S'gjeta dot kartelë pixmap: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d e re)" msgstr[1] " (%d të reja)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d i palexuar%s" msgstr[1] "%d të palexuar%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Zëra Ndihme" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Reference e Shpejtë" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "FAQ" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea tani është i lidhur" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Puno i palidhur" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea tani është i palidhur" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Puno \"Online\"" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Pajtime" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "Përditëso _Tërë" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Përditëso krejt pajtimet." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Shënoji të Tëra Si të _Lexuara" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Shënon si të lexuar çdo zë të çdo pajtimi." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Importo Listë Prurjesh..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importon një listë prurjesh OPML." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Eksporto Listë Prurjesh..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Eksporton listë prurjesh si OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Dil" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Prurje" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Hiqi Tërë Zërat" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "heq tërë objektet e prurjes së përzgjedhur për çastin." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_Element" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "Objekti i Mëparshëm" + +#: ../src/ui/liferea_shell.c:924 +msgid "Next Item" +msgstr "Objekti Pasues" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "Objekti _Pasues i Palexuar" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Parje" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "_Rrit Madhësi Teksti" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 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:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_Zvogëlo Madhësi Teskti" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Zvogëlon madhësinë e tekstit për parjen e objektit." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "_Mjete" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "_Përditëso Monitorin" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "Shfaq një listë të tërë prurjeve hëpërhë në radhë për përditësime" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Parapëlqime" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Përpunoni Parapëlqimet." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "_Kërko" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Kërkoni Në Tërë Prurjet..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Shfaq dialogun e kërkimeve." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Ndihmë" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Përmbajtje" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Shihni ndihmën për këtë zbatim." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Referencë e Shpejtë" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Shihni një listë të tërë shkurtoreve të Liferea-s." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_FAQ" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Shihni FAQ për këtë zbatim." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_Rreth" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Shfaq një dialog \"rreth\"" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "Parje _Normale" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Caktoni si mënyrë parjeje mënyrën klient poste." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "Parje _Gjerasi" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Caktoni si mënyrë parjeje përdorimin e tre kuadrateve horizontalë." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "Pamje e _Ndërthurur" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Caktoni si mënyrë parjeje mënyrën me dy kuadrate." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "Listë Prurjesh e _Mpakur" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Fshihi prurjet pa objekte të palexuar. " -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "Pajtim i _Ri..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Shton te lista e prurjeve një pajtim." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "_Dosje e Re..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Shto dosje te lista e prurjeve." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "_Dosje e Re Kërkimesh..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Shton dosje të re kërkimesh te lista e prurjeve." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "_Burim i Ri..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Shton burim të ri liste prurjesh." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "Kosh i Ri _Lajmesh..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Shton një kosh të ri lajmesh." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "_Shënoji Zërat Si të Lexuar" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "" "Shënoji si të lexuar krejt zërat e nyjes së përzgjedhur te lista e " "prurjeve / te pjesa e listës." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Përditësoje" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "" "Përditëson pajtimin e përzgjedhur ose tërë pajtimet e dosjes së përzgjedhur." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "_Veti" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Hap dialog vetish të pajtimit të përzgjedhur." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "_Hiqe" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Heq pajtimin e përzgjedhur." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Këmbe Gjendje _Leximi" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Këmben gjendje leximi për objektin e përzgjedhur." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Këmbe _Shenjë Objekti" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Këmben gjendje flamurke për zërin e përzgjedhur." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "_Hiqe" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Heq objektin e përzgjedhur." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Hap lidhjen e objektit në shfletuesin e formësuar." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "_Nis Prej Shfletuesi" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." +msgstr "Hap lidhjen e objektit në shfletuesin e formësuar." + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Rregullime Shfletuesi të Jashtëm" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." msgstr "Hap lidhjen e objektit në shfletuesin e formësuar." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "_Puno i Palidhur" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Kjo mundësi ju lejon të çaktivizoni përditësim pajtimi." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "_Sa Krejt Ekrani" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "Shfletoni me ekran të plotë" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Lexues Linux Prurjesh" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 msgid "" "

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

    You can add new subscriptions

    • From main menu " @@ -1136,12 +1161,12 @@ "prurjesh deri te lista e pajtimeve
    • Duke djathtasklikuar lidhje dhe " "duke zgjedhur 'Pajtomë' te Liferea

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Burim i panjohur" @@ -1171,246 +1196,245 @@ 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:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Shkarkimi DËSHTOI: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "Shkarkimi përfundoi." - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +#: ../src/ui/liferea_htmlview.c:627 +#, fuzzy +msgid "Open Link In _Tab" msgstr "Hape Lidhjen Në _Skedë" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "_Hape Lidhjen Në Shfletues" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "_Hape Lidhjen Në Shfletues" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "_Faqeruaje Lidhjen te %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Kopjo Vendndodhje Lidhjeje" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 msgid "_Copy Image Location" msgstr "_Kopjo Vendndodhje Figure" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 msgid "S_ave Link As" msgstr "_Ruajeni Lidhjen Si" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "_Ruaje Figurën Si" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Pajtohuni..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Pa titull ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Datë" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Titull" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Nuk është zgjedhur objekt" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Këtij objekti nuk i është caktuar lidhje!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Për të fshirë objekte prurjesh, duhet të përzgjidhni një!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Hape Objektin Në _Skedë" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "_Hape Objektin Në Shfletues" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "Kopjoje te Kosh Lajmesh" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Kopjoje _URL-në e Zërit te E papastra" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "_Faqeruaje Lidhjen te %s" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "_Kopjo Vendndodhje Figure" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "_Hiqe Objektin" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Hapni Guackën..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Ruajeni Si..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "_Kopjo Vendndodhje Lidhjeje" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "_Përditësoji Krejt" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "_Shfaq Liferea-n" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "_Përditësoje Dosjen" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "_Shënoji Krejt Si të Lexuar" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "I _Ri" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "Pajtim i _Ri..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "_Burim i Ri..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 msgid "Sort Feeds" msgstr "Renditi Prurjet" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "_Rikrijoje" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "Pajtim i _Ri..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(E zbrazët)" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "Parazgjedhje GNOME" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Tekst nën ikonat" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Tekst në krah të ikonave" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Vetëm ikona" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Vetëm tekst" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minuta" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "orë" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "ditë" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Hapësirë" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Hapësirë" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Hapësirë" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Zgjidhni drejtori shkarkimesh" +#: ../src/ui/preferences_dialog.c:114 +msgid "Normal View" +msgstr "Parje Normale" + +#: ../src/ui/preferences_dialog.c:115 +msgid "Wide View" +msgstr "Parje Së Gjeri" + +#: ../src/ui/preferences_dialog.c:116 +msgid "Combined View" +msgstr "Pamje e Ndërthurur" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:505 msgid "Manual" msgstr "Dorazi" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:520 msgid "Browser default" msgstr "Parazgjedhje shfletuesi" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:523 msgid "Existing window" msgstr "Dritare ekzistuese" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:526 msgid "New window" msgstr "Dritare e re" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:529 msgid "New tab" msgstr "Skedë e re" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:688 msgid "Integrate with the messaging menu (indicator)" msgstr "Integroje me menunë e mesazheve (indikator)" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:691 msgid "Terminate instead of minimizing to the messaging menu" msgstr "Në vend që ta minimizosh si ikonë paneli, përfundoje" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:694 msgid "Start minimized to the messaging menu" msgstr "Fillo i minimizuar sa menuja e mesazheve" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:794 msgid "Type" msgstr "Lloj" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:797 msgid "Program" msgstr "Program" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "(E zbrazët)" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1427,7 +1451,7 @@ msgid "This feed specifies no default update interval." msgstr "Kjo prurje nuk ka të përcaktuar interval parazgjedhje përditësimi." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "Pa titull" @@ -1478,7 +1502,7 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1488,11 +1512,11 @@ msgid "Google Reader login failed!" msgstr "Hyrja në Google Reader dështoi!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1527,22 +1551,15 @@ 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:269 msgid "Source Type" msgstr "Lloj Burimi" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:367 msgid "Tiny Tiny RSS" msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:368 msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " "present your tt-rss subscriptions, and will synchronize your feed list and " @@ -1552,7 +1569,7 @@ "t'i paraqesë pajtimet tuaja tt-rss, si dhe do të njëkohësojë listën tuaj të " "prurjeve dhe listat e leximeve." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:111 msgid "Could not parse JSON returned by tt-rss API!" msgstr "Nuk përtypi dot JSON-in e kthyer nga API tt-rss!" @@ -1621,8 +1638,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Ju lutemi, jepni të dhënat për llogarinë tuaj te Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Fjalëkalim" @@ -1646,7 +1662,7 @@ msgid "combined view" msgstr "pamje e ndërthurur" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Tituj" @@ -1697,7 +1713,7 @@ msgstr "Të përgjithshme" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Burim Prurjeje" @@ -1814,399 +1830,162 @@ msgstr "Të mëtejshme" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Parapëlqime për Liferea-n" +msgid "New Folder" +msgstr "Dosje e Re" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "Trajtim Fshehtine Prurjesh" +msgid "_Folder name:" +msgstr "_Emër dosjeje:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "_Numër parazgjedhje zërash për prurje për t'u ruajtur:" +msgid "Rename" +msgstr "Riemërtoje" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "Rregullime Përditësimi Prurjesh" +msgid "_New Name:" +msgstr "_Emër e Ri:" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "_Përditësoji krejt pajtimet gjatë nisjes." +msgid "Search Folder Properties" +msgstr "Veti Dosjeje Kërkimesh" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "_Interval Parazgjedhje Rifreskimi Prurjeje:" +msgid "Search _Name:" +msgstr "_Emër Kërkimi:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "Gjej zëra që pajtohen me kushtin vijues" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"Shënim: Ju lutemi, kujtohuni të caktoni një kohë të arsyeshme rifreskimi. " -"Zakonisht, vjelja e prurjejeve më shpesh se një herë në çdo orë, është " -"shpërdorim i bandës." +msgid "A_ny Rule Matches" +msgstr "Përputhje Me _Çfarëdo Rregulli" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Prurje" +msgid "_All Rules Must Match" +msgstr "Përputhje Me _Krejt Rregullat" #: ../glade/liferea.ui.h:57 -msgid "Folder Display Settings" -msgstr "Rregullime Paraqitjeje Dosjesh" +msgid "Open Enclosure" +msgstr "Hapni Guackën" #: ../glade/liferea.ui.h:58 -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." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Po shkarkohet një guackë e llojit:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "_Fshih objekte të lexuar." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"Çfarë duhet të bëjë Liferea me këtë guackë? Ju lutemi, jepni më poshtë " +"urdhrin që doni të përmbushet. Kartela e shkarkuar do të përdoret si " +"argument për këtë urdhër:" #: ../glade/liferea.ui.h:60 -msgid "Feed Icons (Favicons)" -msgstr "Ikona Prurjesh (Favikona)" +msgid "_Browse" +msgstr "_Shfletoni" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_Përditësoji tërë favikonat tani" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "_Nga tani e tutje, bëje këtë vetvetiu për guacka si kjo." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Dosje" +msgid "Search All Feeds" +msgstr "Kërkoni Në Tërë Prurjet" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" -msgstr "Po lexohen Titujt" +msgid "_Search for:" +msgstr "_Kërko për:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "Shihi artikujt për_ciptas me: " +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Jepni varg kërkimi të cilin Liferea do të duhej ta gjente te titulli ose " +"lënda e një zëri." #: ../glade/liferea.ui.h:65 -msgid "Web Integration" -msgstr "Integrim Web" +msgid "_Advanced..." +msgstr "Të _mëtejshme..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Postoji Faqerojtësit te" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"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.ui.h:67 -msgid "Internal Browser Settings" -msgstr "Rregullime Shfletuesi të Brendshëm" +msgid "Update Monitor" +msgstr "Përditëso Monitorin" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Lidhjet hapi në dritaren e Liferea-s." +msgid "Pending Requests" +msgstr "Kërkesa Në Pritje të Shqyrtimit" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Çaktivizo Javascript-in." +msgid "Downloading Now" +msgstr "Po shkarkohet Tani" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "_Aktivizoni shtojca shfletuesi." +msgid "Cancel _All" +msgstr "Anuloji të Tëra" #: ../glade/liferea.ui.h:71 -msgid "External Browser Settings" -msgstr "Rregullime Shfletuesi të Jashtëm" +msgid "Create News Bin" +msgstr "Krijoni Kosh Lajmesh" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "_Hap lidhje në:" +msgid "_News Bin Name:" +msgstr "_Emër Koshi Lajmesh:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Rreth" #: ../glade/liferea.ui.h:74 -#, no-c-format msgid "" -"_Manual:\n" -"(%s for URL)" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" msgstr "" -"_Manual:\n" -"(%s për URL)" - -#: ../glade/liferea.ui.h:76 -msgid "_Browser:" -msgstr "_Shfletues:" +"Të drejta Kopjimi (c) 2003-2012\n" +"Ekipi i Liferea-s\n" #: ../glade/liferea.ui.h:77 -msgid "Browser" -msgstr "Shfletues" +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea është një grumbullues lajmesh për GTK+" #: ../glade/liferea.ui.h:78 -msgid "Notification Settings" -msgstr "Rregullime Njoftimesh" +msgid "Liferea Homepage" +msgstr "Faqja Hyrëse e Liferea-s" #: ../glade/liferea.ui.h:79 -msgid "Show a _popup window with new headlines." -msgstr "Me titujt e rinj, shfaq një dritare _flluckë." - -#: ../glade/liferea.ui.h:80 -msgid "Show a status _icon in the notification area (system tray)." -msgstr "Shfaq _ikonë gjendjeje te zona e njoftimeve (shtyllë sistemi)." - -#: ../glade/liferea.ui.h:81 -msgid "Show _number of new items in the tray icon." -msgstr "Shfaq te ikona e panelit _numrin e zërave të rinj." - -#: ../glade/liferea.ui.h:82 -msgid "T_erminate instead of minimizing to tray icon." -msgstr "Në vend që ta minimizosh si ikonë paneli, _përfundoje." - -#: ../glade/liferea.ui.h:83 -msgid "_Start in tray icon." -msgstr "_Fillo si ikonë paneli." - -#: ../glade/liferea.ui.h:84 -msgid "Toolbar Settings" -msgstr "Rregullime Paneli" - -#: ../glade/liferea.ui.h:85 -msgid "_Hide toolbar." -msgstr "_Fshihe panelin." - -#: ../glade/liferea.ui.h:86 -msgid "Toolbar _button labels:" -msgstr "_Etiketa butonash paneli:" - -#: ../glade/liferea.ui.h:87 -msgid "GUI" -msgstr "GUI" - -#: ../glade/liferea.ui.h:88 -msgid "HTTP Proxy Server" -msgstr "Shërbyes HTTP Ndërmjetës" - -#: ../glade/liferea.ui.h:89 -msgid "_Auto Detect (GNOME or environment)" -msgstr "_Vetëzbuloje (GNOME ose mejdis)" - -#: ../glade/liferea.ui.h:90 -msgid "_No Proxy" -msgstr "_Pa Ndërmjetës" - -#: ../glade/liferea.ui.h:91 -msgid "_Manual Setting:" -msgstr "_Rregullim Dorazi:" - -#: ../glade/liferea.ui.h:92 -msgid "Proxy _Port:" -msgstr "Portë \"Proxy\":" - -#: ../glade/liferea.ui.h:93 -msgid "Proxy _Host:" -msgstr "Strehë \"Proxy\":" - -#: ../glade/liferea.ui.h:94 -msgid "Use Proxy Au_thentication" -msgstr "Përdor Mirëfilltësim Përmes Ndërmjetësi" - -#: ../glade/liferea.ui.h:95 -msgid "Proxy Pass_word:" -msgstr "Fjalëkalim për \"Proxy\":" - -#: ../glade/liferea.ui.h:96 -msgid "Proxy _Username:" -msgstr "_Emër Përdoruesi për \"Proxy\":" - -#: ../glade/liferea.ui.h:97 -msgid "Proxy" -msgstr "\"Proxy\"" - -#: ../glade/liferea.ui.h:98 -msgid "Downloading Enclosures" -msgstr "Shkarkim Guackash" - -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Shfletoni" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Shkarkimet ruaji te" - -#: ../glade/liferea.ui.h:101 -msgid "_Download using" -msgstr "_Shkarko duke përdorur" - -#: ../glade/liferea.ui.h:102 -msgid "Opening Enclosures" -msgstr "Hapje Guackash" - -#: ../glade/liferea.ui.h:103 -msgid "Enclosures" -msgstr "Guacka" - -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "I njëkohësuar me Strehët Aty Afër" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_Aktivizoni Njëkohësim me LAN Vendor" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "Emër _Shërbimi" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Njëkohësoje" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Dosje e Re" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Emër dosjeje:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Riemërtoje" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Emër e Ri:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Veti Dosjeje Kërkimesh" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "_Emër Kërkimi:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "Gjej zëra që pajtohen me kushtin vijues" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "Përputhje Me _Çfarëdo Rregulli" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "Përputhje Me _Krejt Rregullat" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Shkarkim Guackash" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Po shkarkohet një guackë e llojit:" - -#: ../glade/liferea.ui.h:120 -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 "" -"Çfarë duhet të bëjë Liferea me këtë guackë? Ju lutemi, jepni më poshtë " -"urdhrin që doni të përmbushet. Kartela e shkarkuar do të përdoret si " -"argument për këtë urdhër:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "_Jepe URL-në dhe mos e shkarko guackën." - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "_Nga tani e tutje, bëje këtë vetvetiu për guacka si kjo." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Kërkoni Në Tërë Prurjet" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Kërko për:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Jepni varg kërkimi të cilin Liferea do të duhej ta gjente te titulli ose " -"lënda e një zëri." - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "Të _mëtejshme..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"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.ui.h:128 -msgid "Update Monitor" -msgstr "Përditëso Monitorin" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "Kërkesa Në Pritje të Shqyrtimit" - -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "Po shkarkohet Tani" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "Anuloji të Tëra" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Krijoni Kosh Lajmesh" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Emër Koshi Lajmesh:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Rreth" - -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Të drejta Kopjimi (c) 2003-2012\n" -"Ekipi i Liferea-s\n" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea është një grumbullues lajmesh për GTK+" - -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Faqja Hyrëse e Liferea-s" - -#: ../glade/liferea.ui.h:140 msgid "Advanced Search" msgstr "Kërkim i Thelluar" -#: ../glade/liferea.ui.h:141 +#: ../glade/liferea.ui.h:80 msgid "_Search Folder..." msgstr "_Dosje Kërkimesh..." -#: ../glade/liferea.ui.h:142 +#: ../glade/liferea.ui.h:81 msgid "Create Search Engine Feed" msgstr "Krijo Prurje Motori Kërkimesh" -#: ../glade/liferea.ui.h:143 +#: ../glade/liferea.ui.h:82 msgid "enter any search string you want" msgstr "jepni çfarëdo varg kërkimi që doni" -#: ../glade/liferea.ui.h:144 +#: ../glade/liferea.ui.h:83 msgid "Maximal _Number Of Result Items:" msgstr "_Numri më i Madh Zërash Përfundim:" -#: ../glade/liferea.ui.h:145 +#: ../glade/liferea.ui.h:84 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 " @@ -2264,7 +2043,11 @@ msgid "_Username" msgstr "_Emër përdoruesi" -#: ../glade/simple_subscription.ui.h:3 +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Të mëtejshme..." + +#: ../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." @@ -2272,13 +2055,261 @@ "Jepni vendin e \"site\"-it web, për të përdorur vetëzbulimin ose, në rast se " "e dini, vendin e saktë të prurjes." -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Të mëtejshme..." +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Parapëlqime për Liferea-n" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Trajtim Fshehtine Prurjesh" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "_Numër parazgjedhje zërash për prurje për t'u ruajtur:" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Rregullime Përditësimi Prurjesh" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "_Përditësoji krejt pajtimet gjatë nisjes." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "_Interval Parazgjedhje Rifreskimi Prurjeje:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"Shënim: Ju lutemi, kujtohuni të caktoni një kohë të arsyeshme rifreskimi. " +"Zakonisht, vjelja e prurjejeve më shpesh se një herë në çdo orë, është " +"shpërdorim i bandës." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Prurje" + +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Rregullime Paraqitjeje Dosjesh" + +#: ../glade/prefs.ui.h:11 +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/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "_Fshih objekte të lexuar." + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Ikona Prurjesh (Favikona)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Përditësoji tërë favikonat tani" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Dosje" + +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Po lexohen Titujt" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "Shihi artikujt për_ciptas me: " + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Integrim Web" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Postoji Faqerojtësit te" + +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Rregullime Shfletuesi të Brendshëm" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Lidhjet hapi në dritaren e Liferea-s." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Çaktivizo Javascript-in." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "_Aktivizoni shtojca shfletuesi." + +#: ../glade/prefs.ui.h:26 +msgid "External Browser Settings" +msgstr "Rregullime Shfletuesi të Jashtëm" + +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "_Hap lidhje në:" + +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Dorazi" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "" + +#: ../glade/prefs.ui.h:31 +msgid "_Browser:" +msgstr "_Shfletues:" + +#: ../glade/prefs.ui.h:32 +msgid "Browser" +msgstr "Shfletues" + +#: ../glade/prefs.ui.h:33 +msgid "Notification Settings" +msgstr "Rregullime Njoftimesh" + +#: ../glade/prefs.ui.h:34 +msgid "Show a _popup window with new headlines." +msgstr "Me titujt e rinj, shfaq një dritare _flluckë." + +#: ../glade/prefs.ui.h:35 +msgid "Show a status _icon in the notification area (system tray)." +msgstr "Shfaq _ikonë gjendjeje te zona e njoftimeve (shtyllë sistemi)." + +#: ../glade/prefs.ui.h:36 +msgid "Show _number of new items in the tray icon." +msgstr "Shfaq te ikona e panelit _numrin e zërave të rinj." + +#: ../glade/prefs.ui.h:37 +msgid "T_erminate instead of minimizing to tray icon." +msgstr "Në vend që ta minimizosh si ikonë paneli, _përfundoje." + +#: ../glade/prefs.ui.h:38 +msgid "_Start in tray icon." +msgstr "_Fillo si ikonë paneli." + +#: ../glade/prefs.ui.h:39 +msgid "Toolbar Settings" +msgstr "Rregullime Paneli" + +#: ../glade/prefs.ui.h:40 +msgid "_Hide toolbar." +msgstr "_Fshihe panelin." + +#: ../glade/prefs.ui.h:41 +msgid "Toolbar _button labels:" +msgstr "_Etiketa butonash paneli:" + +#: ../glade/prefs.ui.h:42 +msgid "GUI" +msgstr "GUI" + +#: ../glade/prefs.ui.h:43 +msgid "HTTP Proxy Server" +msgstr "Shërbyes HTTP Ndërmjetës" + +#: ../glade/prefs.ui.h:44 +msgid "_Auto Detect (GNOME or environment)" +msgstr "_Vetëzbuloje (GNOME ose mejdis)" + +#: ../glade/prefs.ui.h:45 +msgid "_No Proxy" +msgstr "_Pa Ndërmjetës" + +#: ../glade/prefs.ui.h:46 +msgid "_Manual Setting:" +msgstr "_Rregullim Dorazi:" + +#: ../glade/prefs.ui.h:47 +msgid "Proxy _Port:" +msgstr "Portë \"Proxy\":" + +#: ../glade/prefs.ui.h:48 +msgid "Proxy _Host:" +msgstr "Strehë \"Proxy\":" + +#: ../glade/prefs.ui.h:49 +msgid "Use Proxy Au_thentication" +msgstr "Përdor Mirëfilltësim Përmes Ndërmjetësi" + +#: ../glade/prefs.ui.h:50 +msgid "Proxy Pass_word:" +msgstr "Fjalëkalim për \"Proxy\":" + +#: ../glade/prefs.ui.h:51 +msgid "Proxy _Username:" +msgstr "_Emër Përdoruesi për \"Proxy\":" + +#: ../glade/prefs.ui.h:52 +msgid "Proxy" +msgstr "\"Proxy\"" + +#: ../glade/prefs.ui.h:53 +msgid "Downloading Enclosures" +msgstr "Shkarkim Guackash" + +#: ../glade/prefs.ui.h:54 +msgid "_Download using" +msgstr "_Shkarko duke përdorur" + +#: ../glade/prefs.ui.h:55 +msgid "Opening Enclosures" +msgstr "Hapje Guackash" + +#: ../glade/prefs.ui.h:56 +msgid "Enclosures" +msgstr "Guacka" + +#: ../glade/prefs.ui.h:57 +msgid "Plugins" +msgstr "" + +#~ msgid "Download and view feeds" +#~ msgstr "Shkarkoji dhe shfaqi prurjet" #~ msgid "You may want to validate the feed using" #~ msgstr "Mundet të doni të vleftësoni prurjen përmes " +#~ msgid "bookmark" +#~ msgstr "faqerojtës" + +#~ msgid "comments" +#~ msgstr "komente" + +#~ msgid "flag" +#~ msgstr "flamurkë" + +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Shkarkimi i guackës DËSHTOI: \"%s\"" + +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Shkarkimi i guackës përfundoi: \"%s\"" + +#~ msgid "" +#~ "This version of Liferea uses a new cache format and has migrated your " +#~ "feed cache. The cache content in %s was not deleted automatically. Please " +#~ "remove this directory manually once you are sure migration was successful!" +#~ msgstr "" +#~ "Ky version i Liferea-s përdor një format të ri fshehtine dhe e ka bërë " +#~ "migrimin e fshehtinës së prurjes suaj. Lënda e fshehtinës nën %s nuk u " +#~ "fshi vetvetiu. Ju lutemi, hiqeni dorazi këtë drejtori, pasi të jeni i " +#~ "sigurt që migrimi qe i suksesshëm!" + #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " #~ "unread items." @@ -2286,56 +2317,54 @@ #~ "Hidhet te objekti tjetër i palexuar. Nëse është e nevojshme përzgjedh " #~ "prurjen pasuese me objekte të plaexuar." -#~ msgid "Liferea Sync %s@%s" -#~ msgstr "Njëkohësim i Liferea-s %s@%s" +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Shkarkimi DËSHTOI: \"%s\"" -#~ msgid "" -#~ "You have not configured a download tool yet! Please do so in the " -#~ "'Download' tab in Tools/Preferences." -#~ msgstr "" -#~ "Ende nuk keni të formësuar mjet shkarkimesh! Ju lutem, bëjeni këtë te " -#~ "skeda 'Shkarko' te Mjete/Parapëlqime." +#~ msgid "Download finished." +#~ msgstr "Shkarkimi përfundoi." -#~ msgid "" -#~ "Command failed: \n" -#~ "\n" -#~ "%s\n" -#~ "\n" -#~ " Please check wether the configured download tool is installed and " -#~ "working correctly! You can change it in the 'Download' tab in Tools/" -#~ "Preferences." -#~ msgstr "" -#~ "Urdhri dështoi: \n" -#~ "\n" -#~ "%s\n" -#~ "\n" -#~ " Ju lutemi, shihni nëse ka të instaluar dhe funksionon në rregull ndonjë " -#~ "mjet të formësuar shkarkimesh! Mund ta ndryshoni te skeda 'Shkarkime' te " -#~ "Mjete/Parapëlqime." +#~ msgid "Launch Item In _Tab" +#~ msgstr "Hape Objektin Në _Skedë" -#~ msgid "Previous Item" -#~ msgstr "Objekti i Mëparshëm" +#~ msgid "_Launch Item In Browser" +#~ msgstr "_Hape Objektin Në Shfletues" -#~ msgid "Next Item" -#~ msgstr "Objekti Pasues" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Kopjoje _URL-në e Zërit te E papastra" -#~ msgid "_Fullscreen" -#~ msgstr "_Sa Krejt Ekrani" +#~ msgid "Choose download directory" +#~ msgstr "Zgjidhni drejtori shkarkimesh" + +#~ msgid "Liferea Sync %s@%s" +#~ msgstr "Njëkohësim i Liferea-s %s@%s" -#~ msgid "Browse at full screen" -#~ msgstr "Shfletoni me ekran të plotë" +#~ msgid "Downloading Enclosure" +#~ msgstr "Shkarkim Guackash" -#~ msgid "Normal View" -#~ msgstr "Parje Normale" +#~ msgid "Sync" +#~ msgstr "Njëkohësoje" + +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "I njëkohësuar me Strehët Aty Afër" + +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "_Aktivizoni Njëkohësim me LAN Vendor" + +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Manual:\n" +#~ "(%s për URL)" -#~ msgid "Wide View" -#~ msgstr "Parje Së Gjeri" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "_Jepe URL-në dhe mos e shkarko guackën." -#~ msgid "Combined View" -#~ msgstr "Pamje e Ndërthurur" +#~ msgid "_Save downloads in" +#~ msgstr "_Shkarkimet ruaji te" -#~ msgid "Open Enclosure" -#~ msgstr "Hapni Guackën" +#~ msgid "_Service Name" +#~ msgstr "Emër _Shërbimi" #~ msgid "Print debugging messages for the plugin loading" #~ msgstr "Shtyp mesazhe diagnostikimi për ngarkimin e shtojcës" diff -Nru liferea-1.8.15/po/sv.po liferea-1.10.3/po/sv.po --- liferea-1.8.15/po/sv.po 2013-06-24 22:16:17.000000000 +0200 +++ liferea-1.10.3/po/sv.po 2013-07-31 23:29:12.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: liferea 1.8-rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2011-10-31 09:43+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -18,8 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -32,8 +31,8 @@ msgstr "Nyhetsläsaren Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Hämta och visa kanaler" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -143,38 +142,26 @@ msgstr "Skapare" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "flagga" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "bokmärke" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "kommentarer" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Inga kommentarer än." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Kommentarer" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Uppdaterar..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Uppdatera" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Avsnitt" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Avdelning" @@ -198,12 +185,12 @@ msgid "Default Browser" msgstr "Standardwebbläsare" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Webbläsarkommandot misslyckades: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Startar: \"%s\"" @@ -213,7 +200,7 @@ msgid "Authorization Error" msgstr "Auktoriseringsfel" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Kan inte skapa cachekatalogen \"%s\"!" @@ -243,74 +230,80 @@ msgid "%b %d %Y" msgstr "%e %B %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "\"%s\" är inte en giltig konfigurationsfil för bilagetyper!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Hämtning av bilaga MISSLYCKADES: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Hämtning av bilaga är färdig: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "Fel vid namnbyte från %s till %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "XML-fel under läsning av OPML-filen! Kunde inte importera \"%s\"!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format 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:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, 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!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "Importerad kanallista" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Importera kanallista" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Importera" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 msgid "OPML Files" msgstr "OPML-filer" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Fel under export av kanallista!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Kanallistan exporterad!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Exportera kanallista" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Exportera" @@ -366,11 +359,11 @@ msgstr "Kunde inte fastställa kanaltypen." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "Det finns inga olästa artiklar" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" @@ -378,105 +371,94 @@ "Starta Liferea med dess huvudfönster i TILLSTÅND. TILLSTÅND kan vara \"shown" "\", \"iconified\" eller \"hidden\"" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "TILLSTÅND" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "Visa versionsinformation och avsluta" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "Add a new subscription" msgstr "Lägg till en ny prenumeration" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "uri" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "Skriv ut felsökningsmeddelanden av alla typer" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "Skriv ut felsökningsmeddelanden för mellanlagringshantering" -#: ../src/main.c:187 +#: ../src/main.c:173 msgid "Print debugging messages for the configuration handling" msgstr "Skriv ut felsökningsmeddelanden för konfigurationshanteringen" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "Skriv ut felsökningsmeddelanden för databashantering" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "" "Skriv ut felsökningsmeddelanden för alla grafiska gränssnittsfunktioner" -#: ../src/main.c:190 +#: ../src/main.c:176 #, fuzzy msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/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 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "Skriv ut felsökningsmeddelanden för all nätverksaktivitet" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "Skriv ut felsökningsmeddelanden för alla tolkningsfunktioner" -#: ../src/main.c:193 +#: ../src/main.c:179 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" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "Skriv ut felsökningsmeddelanden när funktioner används" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "Skriv ut felsökningsmeddelanden för kanaluppdateringsprocessen" -#: ../src/main.c:196 +#: ../src/main.c:182 msgid "Print debugging messages of the search folder matching" msgstr "Skriv ut felsökningsmeddelanden för sökmappsmatchningar" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "Skriv ut informativa felsökningsmeddelanden" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "Skriv ut felsökningsmeddelanden för angivet ämne" -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, nyhetsläsaren för Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "Besök http://liferea.sourceforge.net/ för mer information" - -#: ../src/migrate.c:340 -#, 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!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Besök http://lzone.de/liferea/ för mer information" #. Some libsoup transport errors #: ../src/net.c:320 @@ -647,12 +629,12 @@ msgid "Feed title" msgstr "Kanalnamn" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Prenumerationen \"%s\" håller redan på att uppdateras!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" @@ -660,12 +642,12 @@ "Prenumerationen \"%s\" har stängts. Liferea kommer inte att uppdatera den " "mer!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Uppdaterar kanalikonen för \"%s\"" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -673,48 +655,48 @@ "Ett problem inträffade under läsning av prenumerationen. Kontrollera URL:en " "och utmatningen i konsollen." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "URL:en för \"%s\" har ändrats permanent och blev uppdaterad" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "\"%s\" är stängd. Liferea kommer inte att uppdatera den mer!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" har inte ändrats sedan senaste uppdateringen" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Uppdaterar \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Fel vid öppning av temporärfilen %s för filtrering!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s avslutades med status %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Fel: Kunde inte öppna röret \"%s\"" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Fel: Kunde inte öppna filen \"%s\"" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Fel: Filen \"%s\" finns inte" @@ -723,55 +705,53 @@ msgid "New Search Folder" msgstr "Ny sökmapp" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Det fanns ytterligare fel. Utmatningen har kortats ned!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "XML-tolkare: Kunde inte tolka dokumentet:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Bilagor" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d bilaga" -msgstr[1] "%d bilagor" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " Byte" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d bilaga" +msgstr[1] "%d bilagor" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Välj fil" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "Filändelse .%s" @@ -781,286 +761,295 @@ msgid "Couldn't find pixmap file: %s" msgstr "Kunde inte hitta bildfilen: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d ny)" msgstr[1] " (%d nya)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d oläst%s" msgstr[1] "%d olästa%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Hjälpämnen" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Snabbreferens" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "Vanliga frågor" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea är nu i anslutet läge" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Arbeta frånkopplat" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea är nu i frånkopplat läge" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Arbeta ansluten" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "_Prenumerationer" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "Uppdatera _alla" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "Uppdaterar alla prenumerationer." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Markera alla som _lästa" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Markerar alla artiklar i alla prenumerationer som lästa." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "_Importera kanallista..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "Importerar en OPML-kanallista." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "_Exportera kanallista..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Exporterar kanallistan i som OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "A_vsluta" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Kanal" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Ta bort _alla artiklar" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Tar bort alla artiklar i den för närvarande markerade kanalen." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_Artikel" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "_Nästa olästa artikel" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "_Nästa olästa artikel" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Visa" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "_Större textstorlek" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "Ökar textstorleken i artikelvyn." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "_Mindre textstorlek" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Minskar textstorleken i artikelvyn." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "_Verktyg" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "_Uppdateringsövervakare" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "Visa en lista över alla kanaler som finns i uppdateringskön" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Inställningar" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Redigera inställningar." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "S_ök" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Sök i alla kanaler..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Visa sökrutan." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Hjälp" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_Innehåll" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Visa hjälp för detta program." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Snabbreferens" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Visa en lista över alla genvägar i Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_Frågor och svar" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Visa de vanligast ställda frågorna och svaren." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_Om" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Visar en \"Om\"-dialog." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "_Normal vy" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Ställ in vyläge till e-postklientläget." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "_Bred vy" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Ställ in vyläge till att använda tre vertikala paneler." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "_Kombinerad vy" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Ställ in vyläge till tvåpanelsläget." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "_Minskad kanallista" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "Dölj kanaler med inga olästa artiklar." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "_Ny prenumeration..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Lägger till en prenumeration till kanallistan." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Ny _mapp..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Lägger till en mapp till kanallistan." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Ny sö_kmapp..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Lägger till en ny sökmapp till kanallistan." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Ny _källa..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Lägger till en ny kanallistkälla." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "Ny _nyhetskorg..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Lägg till en ny nyhetskorg." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "_Markera artiklar som lästa" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 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:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Uppdatera" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." @@ -1068,67 +1057,96 @@ "Uppdaterar den markerade prenumerationen eller alla prenumerationer i den " "markerade mappen." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "_Egenskaper" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Öppnar egenskapsdialogen för den markerade prenumerationen." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "_Ta bort" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Tar bort den markerade prenumerationen." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "Växla _lässtatus" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Växlar lässtatus för den markerade artikeln." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Växla artikel_flagga" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Växlar flaggstatus för den markerade artikeln." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "Ta _bort" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Tar bort den markerade artikeln." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Öppnar artikelns länk i den konfigurerade webbläsaren." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "_Öppna i webbläsare" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." msgstr "Öppnar artikelns länk i den konfigurerade webbläsaren." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Inställningar för extern webbläsare" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." +msgstr "Öppnar artikelns länk i den konfigurerade webbläsaren." + +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "_Arbeta frånkopplat" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "Detta alternativ låter dig inaktivera prenumerationsuppdatering." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Nyhetsläsare för Linux" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 msgid "" "

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

    You can add new subscriptions

    • From main menu " @@ -1142,12 +1160,12 @@ "kanallänkar i prenumerationslistan
    • Genom att högerklicka på länkar " "och välja \"Prenumerera\" i Liferea

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Okänd källa" @@ -1177,246 +1195,248 @@ 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:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Hämtningen MISSLYCKADES: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "Hämtningen är färdig." - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +#: ../src/ui/liferea_htmlview.c:627 +#, fuzzy +msgid "Open Link In _Tab" msgstr "Öppna länk i _flik" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "Öppna länk i _webbläsare" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "Öppna länk i _webbläsare" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "_Bokmärk länk på %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "_Kopiera länkadress" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 msgid "_Copy Image Location" msgstr "_Kopiera bildadress" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 msgid "S_ave Link As" msgstr "Spara länk so_m" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "Sp_ara bild som" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "_Prenumerera..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** Ingen titel ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Datum" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Rubrik" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Ingen artikel har markerats" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Artikeln har ingen angiven länk!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Du måste markera en kanal för att ta bort dess artiklar!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Öppna artikel i _flik" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "Öppna artikel i _webbläsare" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "Kopiera till nyhetskorg" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Kopiera artikelns _url till urklipp" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "_Bokmärk länk på %s" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "_Kopiera bildadress" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "_Ta bort artikel" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "Öppna bilaga..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "Spara som..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "Kopiera länkadress" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "_Uppdatera alla" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "_Visa Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "_Uppdatera mapp" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "_Markera alla som lästa" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "_Ny" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "Ny p_renumeration..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "Ny _källa..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 msgid "Sort Feeds" msgstr "Sortera kanaler" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "Bygg _om" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "_Ny prenumeration..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(Tom)" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "GNOME:s standardwebbläsare" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Text under ikoner" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Text bredvid ikoner" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Endast ikoner" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Endast text" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "minuter" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "timmar" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "dygn" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Blanksteg" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Blanksteg" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Blanksteg" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Välj hämtningskatalog" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "_Normal vy" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "_Bred vy" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "_Kombinerad vy" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Manuell" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Webbläsarens standard" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Befintligt fönster" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Nytt fönster" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Ny flik" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "Integrera med meddelandemenyn (indikator)" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 msgid "Terminate instead of minimizing to the messaging menu" msgstr "Avsluta istället för att minimera till meddelandemenyn" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "Starta minimerat i meddelandemenyn" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Typ" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Program" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "(Tom)" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1430,7 +1450,7 @@ msgid "This feed specifies no default update interval." msgstr "Denna kanal anger inget standardintervall för uppdatering." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "Namnlös" @@ -1481,7 +1501,7 @@ msgid "%b %d %H:%M" msgstr "%e %B %H.%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1491,11 +1511,11 @@ msgid "Google Reader login failed!" msgstr "Inloggning mot Google Reader misslyckades!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1530,22 +1550,15 @@ 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:269 msgid "Source Type" msgstr "Källtyp" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " "present your tt-rss subscriptions, and will synchronize your feed list and " @@ -1555,7 +1568,7 @@ "presentera dina tt-rss-prenumerationer och kommer att synkronisera din " "kanallista och läslistor." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "Kunde inte tolka JSON returnerad av tt-rss API!" @@ -1624,8 +1637,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Ange dina kontoinställningar för Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Lösenord" @@ -1649,7 +1661,7 @@ msgid "combined view" msgstr "kombinerad vy" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Rubriker" @@ -1700,7 +1712,7 @@ msgstr "Allmänt" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Plats" @@ -1816,468 +1828,531 @@ msgstr "Avancerat" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Inställningar för Liferea" +msgid "New Folder" +msgstr "Ny mapp" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "Hantering av kanalcache" +msgid "_Folder name:" +msgstr "_Mappnamn:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "A_ntal artiklar per kanal att spara som standard:" +msgid "Rename" +msgstr "Byt namn" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "Inställningar för kanaluppdatering" +msgid "_New Name:" +msgstr "_Nytt namn:" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "_Uppdatera alla prenumerationer vid uppstart." +msgid "Search Folder Properties" +msgstr "Egenskaper för sökmapp" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Standardintervall för _kanaluppdatering:" +msgid "Search _Name:" +msgstr "Sök_namn:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "Hitta artiklar som matchar följande kriteria" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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." +msgid "A_ny Rule Matches" +msgstr "N_ågon regel matchar" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Kanaler" +msgid "_All Rules Must Match" +msgstr "_Alla regler måste matcha" #: ../glade/liferea.ui.h:57 -msgid "Folder Display Settings" -msgstr "Inställningar för mappvisning" +#, fuzzy +msgid "Open Enclosure" +msgstr "Öppna bilaga..." #: ../glade/liferea.ui.h:58 -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." +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Hämtar en bilaga av typen:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "_Dölj lästa artiklar." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"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.ui.h:60 -msgid "Feed Icons (Favicons)" -msgstr "Kanalikoner (Favicons)" +msgid "_Browse" +msgstr "_Bläddra" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_Uppdatera alla kanalikoner nu" +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.ui.h:62 -msgid "Folders" -msgstr "Mappar" +msgid "Search All Feeds" +msgstr "Sök i alla kanaler" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" -msgstr "Läser rubriker" +msgid "_Search for:" +msgstr "_Sök efter:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "_Bläddra igenom artiklar med:" +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.ui.h:65 -msgid "Web Integration" -msgstr "Webbintegration" +msgid "_Advanced..." +msgstr "_Avancerat..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Posta bokmärken till" +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.ui.h:67 -msgid "Internal Browser Settings" -msgstr "Inställningar för intern webbläsare" +msgid "Update Monitor" +msgstr "Uppdateringsövervakare" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Öppna länkar i Liferea-_fönstret." +msgid "Pending Requests" +msgstr "Väntande förfrågningar" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Inaktivera Javascript." +msgid "Downloading Now" +msgstr "Hämtar nu" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "_Aktivera webbläsarinstick." +msgid "Cancel _All" +msgstr "Avbryt _alla" #: ../glade/liferea.ui.h:71 -msgid "External Browser Settings" -msgstr "Inställningar för extern webbläsare" +msgid "Create News Bin" +msgstr "Skapa nyhetskorg" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "_Öppna länk i:" +msgid "_News Bin Name:" +msgstr "_Namn på nyhetskorg:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Om" #: ../glade/liferea.ui.h:74 -#, no-c-format +#, fuzzy +msgid "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" +"Copyright © 2003-2011\n" +"Liferea-teamet\n" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea är en nyhetsläsare för GTK+" + +#: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "Webbsida för Liferea" + +#: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "Avancerad sökning" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "_Sökmapp..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Skapa sökmotorkanal" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "ange en valfri söksträng" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "_Maximalt antal resulterande artiklar:" + +#: ../glade/liferea.ui.h:84 +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/new_subscription.ui.h:9 +msgid "Download / Postprocessing" +msgstr "Hämtning / Efterbehandling" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Källval" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Välj källtypen som du vill lägga till..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Lägg till OPML/Planet" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "Ange en lokal fil eller en url som pekar på en giltig OPML-kanallista." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Adress" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "_Välj fil" + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "Lägg till Tiny Tiny RSS-konto" + +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "Ange dina kontoinställningar för tt-rss." + +#: ../glade/ttrss_source.ui.h:3 +msgid "_Server URL" +msgstr "_Server-URL" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "A_nvändarnamn" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Avancerat..." + +#: ../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 "" +"Ange en webbadress att använda automatisk kanalidentifiering för eller om du " +"vet den exakta kanaladressen." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Inställningar för Liferea" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Hantering av kanalcache" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "A_ntal artiklar per kanal att spara som standard:" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Inställningar för kanaluppdatering" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "_Uppdatera alla prenumerationer vid uppstart." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Standardintervall för _kanaluppdatering:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 msgid "" -"_Manual:\n" -"(%s for URL)" +"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/prefs.ui.h:9 +msgid "Feeds" +msgstr "Kanaler" + +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Inställningar för mappvisning" + +#: ../glade/prefs.ui.h:11 +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/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "_Dölj lästa artiklar." + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Kanalikoner (Favicons)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Uppdatera alla kanalikoner nu" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Mappar" + +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Läser rubriker" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "_Bläddra igenom artiklar med:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Webbintegration" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Posta bokmärken till" + +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Inställningar för intern webbläsare" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Öppna länkar i Liferea-_fönstret." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Inaktivera Javascript." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "_Aktivera webbläsarinstick." + +#: ../glade/prefs.ui.h:26 +msgid "External Browser Settings" +msgstr "Inställningar för extern webbläsare" + +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "_Öppna länk i:" + +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Manuell" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" msgstr "" -"_Manuellt:\n" -"(%s för URL)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Webbläsare:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Webbläsare" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 msgid "Notification Settings" msgstr "Notifieringsinställningar" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Visa ett _popupfönster med de nya rubrikerna." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "Visa en status_ikon i notifieringsfältet (systembrickan)." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Visa a_ntal nya artiklar i notifieringsytan." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "A_vsluta istället för att minimera till notifieringsytan." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "_Starta i notifieringsytan." -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 msgid "Toolbar Settings" msgstr "Inställningar för verktygsrad" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "_Dölj verktygsrad." -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Etiketter för verktygsrads_knappar:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "Gränssnitt" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "Proxyserver för HTTP" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "_Identifiera automatiskt (GNOME eller miljö)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "_Ingen proxyserver" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "_Manuell inställning:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "Port för _proxy:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "_Värd för proxy:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Använd proxyau_tentisering" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "_Lösenord för proxy:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "Använda_rnamn för proxy:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxyserver" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 msgid "Downloading Enclosures" msgstr "Hämtar bilagor" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Bläddra" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Spara hämtade filer i" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Hämta med" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 msgid "Opening Enclosures" msgstr "Öppnar bilagor" -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Bilagor" -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "Synkroniserad med närliggande värdar" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_Aktivera lokal LAN-synkronisering" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "_Tjänstenamn" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Synkronisera" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Ny mapp" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Mappnamn:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Byt namn" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Nytt namn:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Egenskaper för sökmapp" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "Sök_namn:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "Hitta artiklar som matchar följande kriteria" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "N_ågon regel matchar" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "_Alla regler måste matcha" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Hämtar bilaga" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Hämtar en bilaga av typen:" - -#: ../glade/liferea.ui.h:120 -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:" - -# Denna sträng är inte direkt kristallklar -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "S_kicka URL:en och hämta inga bilagor." - -#: ../glade/liferea.ui.h:122 -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.ui.h:123 -msgid "Search All Feeds" -msgstr "Sök i alla kanaler" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Sök efter:" - -#: ../glade/liferea.ui.h:125 -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.ui.h:126 -msgid "_Advanced..." -msgstr "_Avancerat..." - -#: ../glade/liferea.ui.h:127 -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.ui.h:128 -msgid "Update Monitor" -msgstr "Uppdateringsövervakare" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "Väntande förfrågningar" - -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "Hämtar nu" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "Avbryt _alla" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Skapa nyhetskorg" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Namn på nyhetskorg:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Om" - -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -"Copyright © 2003-2012\n" -"Liferea-teamet\n" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea är en nyhetsläsare för GTK+" +#~ msgid "Download and view feeds" +#~ msgstr "Hämta och visa kanaler" -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Webbsida för Liferea" +#~ msgid "You may want to validate the feed using" +#~ msgstr "Du kanske vill validera kanalen med" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Avancerad sökning" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Öppna artikel i _flik" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "_Sökmapp..." +#~ msgid "_Launch Item In Browser" +#~ msgstr "Öppna artikel i _webbläsare" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Skapa sökmotorkanal" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Kopiera artikelns _url till urklipp" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "ange en valfri söksträng" +#~ msgid "flag" +#~ msgstr "flagga" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "_Maximalt antal resulterande artiklar:" +#~ msgid "bookmark" +#~ msgstr "bokmärke" -#: ../glade/liferea.ui.h:145 -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 "comments" +#~ msgstr "kommentarer" -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" -msgstr "Hämtning / Efterbehandling" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Hämtning av bilaga MISSLYCKADES: \"%s\"" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Källval" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Hämtning av bilaga är färdig: \"%s\"" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Välj källtypen som du vill lägga till..." +#~ 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!" -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Lägg till OPML/Planet" +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Hämtningen MISSLYCKADES: \"%s\"" -#: ../glade/opml_source.ui.h:2 -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." +#~ msgid "Download finished." +#~ msgstr "Hämtningen är färdig." -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Adress" +#~ msgid "Choose download directory" +#~ msgstr "Välj hämtningskatalog" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "_Välj fil" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Manuellt:\n" +#~ "(%s för URL)" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "Lägg till Tiny Tiny RSS-konto" +#~ msgid "_Save downloads in" +#~ msgstr "_Spara hämtade filer i" -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "Ange dina kontoinställningar för tt-rss." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Synkroniserad med närliggande värdar" -#: ../glade/ttrss_source.ui.h:3 -msgid "_Server URL" -msgstr "_Server-URL" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "_Aktivera lokal LAN-synkronisering" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "A_nvändarnamn" +#~ msgid "_Service Name" +#~ msgstr "_Tjänstenamn" -#: ../glade/simple_subscription.ui.h:3 -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 "Sync" +#~ msgstr "Synkronisera" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Avancerat..." +#~ msgid "Downloading Enclosure" +#~ msgstr "Hämtar bilaga" -#~ msgid "You may want to validate the feed using" -#~ msgstr "Du kanske vill validera kanalen med" +# Denna sträng är inte direkt kristallklar +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "S_kicka URL:en och hämta inga bilagor." #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " @@ -3012,7 +3087,7 @@ #~ msgstr "" #~ "

    Kunde inte avgöra kanalens typ. Vänligen kontrollera att den är giltig och i ett av de stödda " +#~ "\"http://lzone.de/liferea/supported_formats.htm\">de stödda " #~ "formaten.

    " #~ msgid "user defined command" diff -Nru liferea-1.8.15/po/tr.po liferea-1.10.3/po/tr.po --- liferea-1.8.15/po/tr.po 2013-06-24 22:16:17.000000000 +0200 +++ liferea-1.10.3/po/tr.po 2013-07-31 23:29:12.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: tr_new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2007-09-01 08:19+0300\n" "Last-Translator: Eren Türkay \n" "Language-Team: \n" @@ -21,8 +21,7 @@ "Plural-Forms: nplurals=2; plural=n < 2 ? 0 : 1;\n" "X-Generator: KBabel 1.11.4\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -35,8 +34,8 @@ msgstr "Liferea Haber Okuyucusu" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Haber kaynaklarını indir ve görüntüle" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -145,38 +144,26 @@ msgstr "Oluşturan" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "işaret" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "yer imi" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "yorumlar" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Henüz yorum yok" -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Yorumlar" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Güncelleniyor..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Yenile" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Kısım" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Bölüm" @@ -201,12 +188,12 @@ msgid "Default Browser" msgstr "GNOME Ön Tanımlı Web Tarayıcısı" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Tarayıcı komutu başarısız oldu: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Başlıyor: \"%s\"" @@ -216,7 +203,7 @@ msgid "Authorization Error" msgstr "Doğrulama Hatası" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Bellek klasörü \"%s\" yaratılamadı!" @@ -246,74 +233,80 @@ msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "\"%s\" geçerli bir ek türü ayar dosyası değil!" -#: ../src/enclosure.c:274 -#, fuzzy, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Ekin indirilmesi bitti: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Ekin indirilmesi bitti: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "%s öğesini %s ismine değiştirmede hata\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, fuzzy, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "Bellek dosyası okunurken XML hatası! \"%s\" içeri aktarılamadı!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "Boş dosya! \"%s\" isimli OPML dosyası içeri aktarılırken boş olmamalı." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" "\"%s\" geçerli bir OPML dosyası değil! Liferea bu dosyayı içeri aktaramıyor!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "İçe aktarılan haber listesi" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "Haber Kaynak Listesini İçeri Aktar" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "Içeri Aktar" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 #, fuzzy msgid "OPML Files" msgstr "OPML Dosyası Seç" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "Haber kaynak listesini " -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Haber Kaynak Listesi dışarı aktarıldı!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "Haber Kaynak Listesini Dışarı Aktar" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "Dışarı Aktar" @@ -369,12 +362,12 @@ msgstr "Haber kaynağı türü belirlenemedi." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "Okunmamış öğe yok " -#: ../src/main.c:175 +#: ../src/main.c:164 #, fuzzy msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " @@ -383,129 +376,117 @@ " STATE, `shown' (göster), `iconified' (simge), ya da " "`hidden' (saklı) olabilir" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "" -#: ../src/main.c:179 +#: ../src/main.c:165 #, fuzzy msgid "Show version information and exit" msgstr " --version Sürüm bilgisini ver ve çık" -#: ../src/main.c:180 +#: ../src/main.c:166 #, fuzzy msgid "Add a new subscription" msgstr "Yeni Abonelik" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 #, fuzzy msgid "Print debugging messages of all types" msgstr " --debug-all Her tür hata ayıklama mesajını göster" -#: ../src/main.c:186 +#: ../src/main.c:172 #, fuzzy msgid "Print debugging messages for the cache handling" msgstr "" " --debug-conf Ayar işlenmesi hakkındaki hata ayıklama mesajlarını göster" -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr "" " --debug-conf Ayar işlenmesi hakkındaki hata ayıklama mesajlarını göster" -#: ../src/main.c:188 +#: ../src/main.c:174 #, fuzzy msgid "Print debugging messages of the database handling" msgstr "" " --debug-conf Ayar işlenmesi hakkındaki hata ayıklama mesajlarını göster" -#: ../src/main.c:189 +#: ../src/main.c:175 #, fuzzy msgid "Print debugging messages of all GUI functions" msgstr "" " --debug-gui Grafik arayüz işlevleri hakkındaki hata ayıklama " "mesajlarını göster" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" -#: ../src/main.c:191 +#: ../src/main.c:177 #, fuzzy msgid "Print debugging messages of all network activity" msgstr " --debug-all Her tür hata ayıklama mesajını göster" -#: ../src/main.c:192 +#: ../src/main.c:178 #, fuzzy msgid "Print debugging messages of all parsing functions" msgstr "" " --debug-parsing Ayrıştırma işlevleri hakkındaki hata ayıklama mesajlarını " "göster" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" -#: ../src/main.c:194 +#: ../src/main.c:180 #, fuzzy msgid "Print debugging messages when entering/leaving functions" msgstr "" " --debug-trace İşlevlere girerken ve işlemlerden çıkarken hata ayıklama " "mesajlarını göster" -#: ../src/main.c:195 +#: ../src/main.c:181 #, fuzzy msgid "Print debugging messages of the feed update processing" msgstr "" " --debug-update Haber kaynak güncellemesi hakkındaki hata ayıklama " "mesajlarını göster" -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr "" " --debug-conf Ayar işlenmesi hakkındaki hata ayıklama mesajlarını göster" -#: ../src/main.c:197 +#: ../src/main.c:183 #, fuzzy msgid "Print verbose debugging messages" msgstr "" " --debug-verbose Gereksiz sözlerle dolu (verbose) hata ayıklama " "mesajlarını göster" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 #, fuzzy 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:202 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - Linux Haber Okuyucusu" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" -#: ../src/migrate.c:340 -#, 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 "" -"Liferea'nın bu sürümü yeni önbellekleme yapısını kullanıyor ve haber kaynağı " -"önbelleğinizi taşıdı. 1.2 sürümündeki ~/.liferea_1.2 dizininde bulunan " -"önbellek dosyaları otomatik olarak silinmedi. Lütfen bu dizini taşınma " -"işlemi başarıyla bittikten sonra el ile silin." - #. Some libsoup transport errors #: ../src/net.c:320 msgid "The update request was cancelled" @@ -680,24 +661,24 @@ msgid "Feed title" msgstr "Haber başlığı" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Bu haber kaynağı \"%s\" zaten güncelleniyor!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "" "Bu haber kaynağı \"%s\"durdurulmuş. Liferea bunu artık güncellemeyecek!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "\"%s\" için haber kaynak simgesi güncelleniyor" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." @@ -705,48 +686,48 @@ "Bu aboneliği okurken bir sorunla karşılaşıldı. Lütfen adresi ve konsol " "cıktısını kontrol edin." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "\"%s\" için adres süresiz değiştirildi ve güncelleniyor" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "\"%s\" durdurulmuş. Liferea bunu artık güncellemeyecek" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" son güncellemeden beri değişmemiş" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "\"%s\" güncelleniyor" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Filtrelemede kullanmak için %s geçici dosyasını açarken hata!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s , %d durumunda çıktı" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Hata: Pipe \"%s\" açılamadı" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Hata: Dosya \"%s\" açılamadı" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Hata: \"%s\" Böyle bir dosya yok" @@ -755,56 +736,54 @@ msgid "New Search Folder" msgstr "Yeni Arama Klasörü" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[Daha fazla hata vardı. Çıktı kısaltılmıştı!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "XML Ayrıştırıcısı: Dosya ayrıştırılamadı:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 #, fuzzy msgid "Attachments" msgstr "yorumlar" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "" -msgstr[1] "" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "" +msgstr[1] "" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Dosya Seç" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, fuzzy, c-format msgid "File Extension .%s" msgstr "Dosya Uzantısı .%s" @@ -814,279 +793,288 @@ msgid "Couldn't find pixmap file: %s" msgstr "Pixmap dosyasını bulamadı: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d yeni)" msgstr[1] " (%d yeni)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d okunmamış%s" msgstr[1] "%d okunmamış%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Yardım Konuları" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Hızlı Başvuru" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "SSS" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea şimdi çevrimiçi" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "Çevrimdışı çalış" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Liferea şimdi çevrimdışı" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "Çevrimiçi çalış" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "A_bonelikler" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "_Hepsini Güncelle" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 #, fuzzy msgid "Updates all subscriptions." msgstr "Yeni Abonelik" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "Hepsini _Okundu Olarak İşaretle" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "Her aboneliğin her öğesini okundu olarak işaretler." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "Haber Kaynak Listesini _İçeri Aktar..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "OPML haber kaynak listesini içeri aktarır." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "Haber kaynak listesini _Dışarı Aktar..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "Haber kaynak listesini OPML dosyası olarak dışarı aktarır." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "_Çık" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Haber Kaynağı" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "Tüm Öğeleri _Sil" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "Seçili haber kaynağındaki bütün öğeleri siler." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "_Öğe" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "_Sonraki Okunmamış Madde" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "_Sonraki Okunmamış Madde" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "_Görüntüle" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "Metin Boyutunu _Büyüt" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 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:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "Metin Boyutunu _Küçült" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "Madde görünümünün metin boyutunu küçültür." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "A_raçlar" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "Küçük Gü_ncelleme" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "Güncelleme kuyruğundaki bütün haber kaynalarının bir listesini göster" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "_Seçenekler" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "Seçenekleri Düzenle." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 #, fuzzy msgid "S_earch" msgstr "_Ara" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "Bütün Maddeleri Ara..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "Arama penceresini göster." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "_Yardım" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "_İçindekiler" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "Bu uygulamanın yardımını görüntüle." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "_Hızlı Başvuru" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "Liferea kısaollarının bir listesini göster." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_SSS" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "Bu uygulamanın sıkça sorulan sorularını göster" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "_Hakkında" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "Hakkında penceresini gösterir." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "_Normal Görünüm" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "Görünüm modunu, posta istemci moduna ayarla." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "_Geniş Görünüm" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "Görünüm modunu, üç dikey pano kullanacak şekilde ayarla." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "_Birleşik Görünüm" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "Görünüm modunu iki pano moduna ayarla." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 #, fuzzy msgid "Hide feeds with no unread items." msgstr "Okunmamış öğe yok " -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "_Yeni Abonelik..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "Haber kaynak listesine yeni abonelik ekler." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "Yeni _Klasör..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "Haber kaynak listesine yeni klasör ekler." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "Yeni A_rama Klasörü..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "Haber kaynak listesine yeni arama klasörü ekler." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "Yeni _Kaynak..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "Yeni haber kaynağı ekler." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 msgid "New _News Bin..." msgstr "Yeni _Haber Sepeti..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 msgid "Adds a new news bin." msgstr "Yeni haber sepeti ekler." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 #, fuzzy msgid "_Mark Items Read" msgstr "_Hepsini Okundu Olarak İşaretle" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 #, fuzzy msgid "" "Marks all items of the selected feed list node / in the item list as read." @@ -1094,78 +1082,107 @@ "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:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "_Güncelle" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "Seçili aboneliği ya da seçili klasördeki bütün abonelikleri günceller." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 #, fuzzy msgid "_Properties" msgstr "_Özellikler" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "Seçili abonelik için özellikler penceresini açar." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "_Kaldır" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "Seçili aboneliği siler." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "_Okunma Durumunu Değiştir" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "Seçili öğenin okunma durumunu değiştirir." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "Madde _İşaretini Değiştir" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "Seçili öğenin işaretini ekler ya da siler" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "K_aldır" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "Seçili öğeyi siler." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Maddenin linkini ayarlı tarayıcıda açar." + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "Tarayıcıda _Aç" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." msgstr "Maddenin linkini ayarlı tarayıcıda açar." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "Dış Tarayıcı Ayarları" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." +msgstr "Maddenin linkini ayarlı tarayıcıda açar." + +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "_Çevrimdışı Çalış" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 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:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Linux Haber Okuyucusu" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 #, fuzzy msgid "" "

    Welcome to Liferea, a desktop news aggregator for online news " @@ -1181,12 +1198,12 @@ "geçirmek için haber kaynak listesinde onu seçin. Haber başlıkları sağ panoda " "gözükecektir.

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.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:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Bilinmeyen kaynak" @@ -1217,271 +1234,267 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea çevrim dışı. Güncelleme olanaksız." -#: ../src/ui/liferea_htmlview.c:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Ekin indirilmesi bitti: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 +#: ../src/ui/liferea_htmlview.c:627 #, fuzzy -msgid "Download finished." -msgstr "_Kullanarak indir" +msgid "Open Link In _Tab" +msgstr "/Linki _Sekmede Aç" -#: ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_htmlview.c:628 #, fuzzy -msgid "Launch Link In _Tab" -msgstr "/Linki _Sekmede Aç" +msgid "_Open Link In Browser" +msgstr "/Linki _Tarayıcıda Aç" -#: ../src/ui/liferea_htmlview.c:545 +#: ../src/ui/liferea_htmlview.c:629 #, fuzzy -msgid "_Launch Link In Browser" +msgid "_Open Link In External Browser" msgstr "/Linki _Tarayıcıda Aç" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, fuzzy, c-format msgid "_Bookmark Link at %s" msgstr "/_Yer İmi Ekle %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 #, fuzzy msgid "_Copy Link Location" msgstr "/Link Adresini _Kopyala" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 #, fuzzy msgid "_Copy Image Location" msgstr "/Link Adresini _Kopyala" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 #, fuzzy msgid "S_ave Link As" msgstr "/Farklı Kaydet..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 #, fuzzy msgid "_Subscribe..." msgstr "/_Abone Ol..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 #, fuzzy msgid "*** No title ***" msgstr "*** Başlık yok ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "Tarih" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "Haber Başlığı" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "Hiçbir öğe seçilmedi" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "Bu öğe için belirlenmiş link yok!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "Bu öğeleri silmek için bir haber kaynağı seçmelisiniz!" -#: ../src/ui/popup_menu.c:116 -#, fuzzy -msgid "Launch Item In _Tab" -msgstr "/Maddeyi _Sekmede Aç" - -#: ../src/ui/popup_menu.c:117 -#, fuzzy -msgid "_Launch Item In Browser" -msgstr "/Maddeyi _Tarayıcıda Aç" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 #, fuzzy msgid "Copy to News Bin" msgstr "/Haber Sepetine Kopyala/%s" -#: ../src/ui/popup_menu.c:147 +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "/_Yer İmi Ekle %s" + +#: ../src/ui/popup_menu.c:160 #, fuzzy -msgid "Copy Item _URL to Clipboard" -msgstr "/_Adresi Geçici Panoya Kopyala" +msgid "Copy Item _Location" +msgstr "/Link Adresini _Kopyala" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 #, fuzzy msgid "R_emove Item" msgstr "/Maddeyi _Sil" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 #, fuzzy msgid "Open Enclosure..." msgstr "/Eki Aç..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 #, fuzzy msgid "Save As..." msgstr "/Farklı Kaydet..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 #, fuzzy msgid "Copy Link Location" msgstr "/Link Adresini _Kopyala" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 #, fuzzy msgid "_Update All" msgstr "/_Hepsini Güncelle" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 #, fuzzy msgid "_Show Liferea" msgstr "Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 #, fuzzy msgid "_Update Folder" msgstr "/Klasörü _Güncelle" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 #, fuzzy msgid "_Mark All As Read" msgstr "/_Hepsini Okundu Olarak İşaretle" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 #, fuzzy msgid "_New" msgstr "/_Yeni" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 #, fuzzy msgid "New _Subscription..." msgstr "_Yeni Abonelik..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 #, fuzzy msgid "New S_ource..." msgstr "Yeni _Kaynak..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 #, fuzzy msgid "Sort Feeds" msgstr "Haber Kaynak Listesini İçeri Aktar" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "_Yeni Abonelik..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "GNOME Ön Tanımlı Ayarları" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "Simgelerin altında yazı" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "Simgelerin yanında yazı" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "Sadece simge" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "Sadece yazı" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "dakika" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "saat" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "gün" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "Boşluk" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Boşluk" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " Boşluk" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "İndirilecek klasörü seçiniz" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "_Normal Görünüm" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "_Geniş Görünüm" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "_Birleşik Görünüm" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "Elle gir" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "Tarayıcı öntanımı" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "Varolan pencere" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "Yeni pencere" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "Yeni sekme" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 #, fuzzy msgid "Terminate instead of minimizing to the messaging menu" msgstr "Sim_ge durumunda küçültmek yerine programı kapat" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "Tür" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "Program" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1496,7 +1509,7 @@ msgid "This feed specifies no default update interval." msgstr "Bu haber kaynağının öntanımlı güncelleme aralığı yok." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "Başlıksız" @@ -1547,7 +1560,7 @@ msgid "%b %d %H:%M" msgstr "%d %b %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1557,11 +1570,11 @@ msgid "Google Reader login failed!" msgstr "Google Okuyucu girişi başarısız!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Okuyucu" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 #, fuzzy msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " @@ -1597,22 +1610,15 @@ 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:269 msgid "Source Type" msgstr "Kaynak Türü" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 #, fuzzy msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " @@ -1623,7 +1629,7 @@ "Okuyucu aboneliğinizi, haber kaynağı listesinde salt okunur bir altağaç " "olarak sunacak." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1692,8 +1698,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Lütfen Google Okuyucu hesap bilgilerini girin." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Şifre" @@ -1717,7 +1722,7 @@ msgid "combined view" msgstr "birleşik görünüm" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Haber Başlıkları" @@ -1769,7 +1774,7 @@ msgstr "Genel" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 #, fuzzy msgid "Feed Source" msgstr "Haber Kaynağı" @@ -1891,494 +1896,554 @@ msgstr "Ileri Düzey" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Liferea Tercihleri" +msgid "New Folder" +msgstr "Yeni Klasör" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "_Klasör ismi:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Saklanacak öntanımlı haber _sayısı" +msgid "Rename" +msgstr "Ismini değiştir" #: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "Haber Listesi Güncellemesi" +msgid "_New Name:" +msgstr "_Yeni İsim:" #: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "Yeni Abonelik" +msgid "Search Folder Properties" +msgstr "Arama Klasörü Özellikleri" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Öntanımlı Haber Güncelleme _Aralığı:" +#, fuzzy +msgid "Search _Name:" +msgstr "Haber Kaynağı _Adı:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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." +msgid "A_ny Rule Matches" msgstr "" -"Not: Lütfen güncelleme aralığı için akla yatkın bir değer seçin. " -"Genellikle 1 saat aralığından az güncelleme aralığı belirlemek bant " -"genişliğinin boşa kullanılması anlamına gelir." #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Haber Kaynakları" +msgid "_All Rules Must Match" +msgstr "" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "Klasör Görüntüleme Ayarları" +msgid "Open Enclosure" +msgstr "/Eki Aç..." #: ../glade/liferea.ui.h:58 -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" +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "Şu tür ek indiriliyor:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "_Okunan haberleri sakla." +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"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.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Haber Kaynak Simgeleri (GözdeSimge)" +msgid "_Browse" +msgstr "_Seç" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_Bütün GözdeSimgeleri şimdi güncelle" +#, 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.ui.h:62 -msgid "Folders" -msgstr "Klasörler" +msgid "Search All Feeds" +msgstr "Bütün Haber Kaynaklarını Ara" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "okunmamış haber başlığı" +msgid "_Search for:" +msgstr "_Ara:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "_Makaleleri şu tuş(lar)la gözden geçir:" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Liferea'nın, öğenin başlığında ya da içeriğinde bulmasını istediğiniz " +"dizgiyi belirtiniz." #: ../glade/liferea.ui.h:65 #, fuzzy -msgid "Web Integration" -msgstr "Yön" +msgid "_Advanced..." +msgstr "Detaylı..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Yer imlerini gönder" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"Belirtilen metni bütün haber kaynaklarında aramaya başlar. Arama sonucu öğe " +"listesinde gözükecek." #: ../glade/liferea.ui.h:67 -#, fuzzy -msgid "Internal Browser Settings" -msgstr "İç Tarayıcı Ayarları" +msgid "Update Monitor" +msgstr "Güncelleme Denetçisi" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Linkleri Liferea'nın _penceresinde aç." +#, fuzzy +msgid "Pending Requests" +msgstr "Beklemedeki İstemler" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Javascripti devreden çıkar." +#, fuzzy +msgid "Downloading Now" +msgstr "Şimdi İndiriliyor" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "" +msgid "Cancel _All" +msgstr "Hepsini _İptal Et" #: ../glade/liferea.ui.h:71 -#, fuzzy -msgid "External Browser Settings" -msgstr "Dış Tarayıcı Ayarları" +msgid "Create News Bin" +msgstr "Haber Sepeti Yarat" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "_Linki içinde aç:" +msgid "_News Bin Name:" +msgstr "_HaberSepetinin Adı:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Hakkında" #: ../glade/liferea.ui.h:74 -#, no-c-format msgid "" -"_Manual:\n" -"(%s for URL)" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" msgstr "" -"_Elle:\n" -"(Adres için %s)" -#: ../glade/liferea.ui.h:76 +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea, GTK+ için bir haber okuyucusudur" + +#: ../glade/liferea.ui.h:78 +#, fuzzy +msgid "Liferea Homepage" +msgstr "Liferea Haber Okuyucusu" + +#: ../glade/liferea.ui.h:79 +#, fuzzy +msgid "Advanced Search" +msgstr "Ileri Düzey" + +#: ../glade/liferea.ui.h:80 +#, fuzzy +msgid "_Search Folder..." +msgstr "Arama Klasörü" + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "Arama Motoru Haber Kaynağı Yarat" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "istediğiniz anahtar kelimeleri yazınız" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "En Fazla Sonuç _Sayısı" + +#: ../glade/liferea.ui.h:84 +#, 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 "" +"Not: Liferea, belirlenen anahtar kelimeler ile arama motorunu sorgulayacak " +"ve yeni bir haber kaynağı oluşturacak. Bu kaynağı saklayabilir ve herhangi " +"bir haber kaynağıyla olduğu gibi güncelleyebilirsiniz." + +#: ../glade/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "Indir / Ardişlem" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Kaynak Seçimi" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Eklemek istediğiniz kaynak tipini seçiniz..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "OPML/Planet Ekle" + +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"Yerel bir dosya ya da geçerli bir OPML haber kaynağı listesine yönelten " +"adres belirtin." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Yer" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "_Dosya Seç" + +#: ../glade/ttrss_source.ui.h:1 +#, fuzzy +msgid "Add Tiny Tiny RSS Account" +msgstr "Bloglines Hesabı Ekle" + +#: ../glade/ttrss_source.ui.h:2 +#, fuzzy +msgid "Please enter your tt-rss account settings." +msgstr "Bloglines hesap ayarlarınızı giriniz." + +#: ../glade/ttrss_source.ui.h:3 +#, fuzzy +msgid "_Server URL" +msgstr "Sunucu Hatası" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "_Kullanıcı adı" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Detaylı..." + +#: ../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 "" +"Haber kaynak otomatik keşfini kullanmak istediğiniz, ya da haber kaynağının " +"tam yerini bildiğiniz web sitesinin adresini belirtiniz. " + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Liferea Tercihleri" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Saklanacak öntanımlı haber _sayısı" + +#: ../glade/prefs.ui.h:4 +#, fuzzy +msgid "Feed Update Settings" +msgstr "Haber Listesi Güncellemesi" + +#: ../glade/prefs.ui.h:5 +#, fuzzy +msgid "_Update all subscriptions at startup." +msgstr "Yeni Abonelik" + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Öntanımlı Haber Güncelleme _Aralığı:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"Not: Lütfen güncelleme aralığı için akla yatkın bir değer seçin. " +"Genellikle 1 saat aralığından az güncelleme aralığı belirlemek bant " +"genişliğinin boşa kullanılması anlamına gelir." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Haber Kaynakları" + +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "Klasör Görüntüleme Ayarları" + +#: ../glade/prefs.ui.h:11 +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/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "_Okunan haberleri sakla." + +#: ../glade/prefs.ui.h:13 +#, fuzzy +msgid "Feed Icons (Favicons)" +msgstr "Haber Kaynak Simgeleri (GözdeSimge)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Bütün GözdeSimgeleri şimdi güncelle" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Klasörler" + +#: ../glade/prefs.ui.h:16 +#, fuzzy +msgid "Reading Headlines" +msgstr "okunmamış haber başlığı" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "_Makaleleri şu tuş(lar)la gözden geçir:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +#, fuzzy +msgid "Web Integration" +msgstr "Yön" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Yer imlerini gönder" + +#: ../glade/prefs.ui.h:22 +#, fuzzy +msgid "Internal Browser Settings" +msgstr "İç Tarayıcı Ayarları" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Linkleri Liferea'nın _penceresinde aç." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Javascripti devreden çıkar." + +#: ../glade/prefs.ui.h:25 +#, fuzzy +msgid "_Enable browser plugins." +msgstr "Dış Tarayıcı Ayarları" + +#: ../glade/prefs.ui.h:26 +#, fuzzy +msgid "External Browser Settings" +msgstr "Dış Tarayıcı Ayarları" + +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "_Linki içinde aç:" + +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "Elle gir" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "" + +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Tarayıcı:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Tarayıcı" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 #, fuzzy msgid "Notification Settings" msgstr "Uyarı Ayarları" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Yeni haber başlıklarını gösteren yeni _pencere aç." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "Uyarı alanında (sistem çubuğu) durum _simgesini göster." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Sistem ç_ekmecesinde güncellenen haber kaynağı listesini göster" -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "Sim_ge durumunda küçültmek yerine programı kapat" -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 #, fuzzy msgid "Toolbar Settings" msgstr "Araç çubuğu _düğme etiketleri:" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Araç çubuğu _düğme etiketleri:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "Grafik Arayüzü" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "O_tomatik Tanı (GNOME veya masaüstü ortamı)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "Vekil Sunucu Yok" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "E_l Ayarları:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "Vekil _Port:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "Vekil Makina _Adı:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Vekil _Kimlik Doğrulaması Kullan" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "Vekil _Şifresi:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "vekil _Kullanıcı Adı:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Vekil" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 #, fuzzy msgid "Downloading Enclosures" msgstr "Ek İndiriliyor" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Seç" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "_Indirilenleri buraya kaydet" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Kullanarak indir" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 #, fuzzy msgid "Opening Enclosures" msgstr "/Eki Aç..." -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Ekler" -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "Haber Kaynağı Adı" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "" - -#: ../glade/liferea.ui.h:106 -#, fuzzy -msgid "_Service Name" -msgstr "Senaryo Adı" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Yeni Klasör" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Klasör ismi:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Ismini değiştir" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Yeni İsim:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Arama Klasörü Özellikleri" - -#: ../glade/liferea.ui.h:114 -#, fuzzy -msgid "Search _Name:" -msgstr "Haber Kaynağı _Adı:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Ek İndiriliyor" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Şu tür ek indiriliyor:" - -#: ../glade/liferea.ui.h:120 -#, 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 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.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "" - -#: ../glade/liferea.ui.h:122 -#, 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.ui.h:123 -msgid "Search All Feeds" -msgstr "Bütün Haber Kaynaklarını Ara" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Ara:" +#~ msgid "Download and view feeds" +#~ msgstr "Haber kaynaklarını indir ve görüntüle" -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Liferea'nın, öğenin başlığında ya da içeriğinde bulmasını istediğiniz " -"dizgiyi belirtiniz." +#~ msgid "You may want to validate the feed using" +#~ msgstr "Feed adresini yandaki aracı kullanarak doğrulamak isteyebilirsiniz" -#: ../glade/liferea.ui.h:126 #, fuzzy -msgid "_Advanced..." -msgstr "Detaylı..." +#~ msgid "Launch Item In _Tab" +#~ msgstr "/Maddeyi _Sekmede Aç" -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Belirtilen metni bütün haber kaynaklarında aramaya başlar. Arama sonucu öğe " -"listesinde gözükecek." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Güncelleme Denetçisi" - -#: ../glade/liferea.ui.h:129 #, fuzzy -msgid "Pending Requests" -msgstr "Beklemedeki İstemler" +#~ msgid "_Launch Item In Browser" +#~ msgstr "/Maddeyi _Tarayıcıda Aç" -#: ../glade/liferea.ui.h:130 #, fuzzy -msgid "Downloading Now" -msgstr "Şimdi İndiriliyor" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "/_Adresi Geçici Panoya Kopyala" -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "Hepsini _İptal Et" +#~ msgid "flag" +#~ msgstr "işaret" -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Haber Sepeti Yarat" +#~ msgid "bookmark" +#~ msgstr "yer imi" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_HaberSepetinin Adı:" +#~ msgid "comments" +#~ msgstr "yorumlar" -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Hakkında" - -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" - -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea, GTK+ için bir haber okuyucusudur" - -#: ../glade/liferea.ui.h:139 #, fuzzy -msgid "Liferea Homepage" -msgstr "Liferea Haber Okuyucusu" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Ekin indirilmesi bitti: \"%s\"" -#: ../glade/liferea.ui.h:140 -#, fuzzy -msgid "Advanced Search" -msgstr "Ileri Düzey" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Ekin indirilmesi bitti: \"%s\"" -#: ../glade/liferea.ui.h:141 #, fuzzy -msgid "_Search Folder..." -msgstr "Arama Klasörü" - -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Arama Motoru Haber Kaynağı Yarat" - -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "istediğiniz anahtar kelimeleri yazınız" - -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "En Fazla Sonuç _Sayısı" +#~ msgid "" +#~ "This version of Liferea uses a new cache format and has migrated your " +#~ "feed cache. The cache content in %s was not deleted automatically. Please " +#~ "remove this directory manually once you are sure migration was successful!" +#~ msgstr "" +#~ "Liferea'nın bu sürümü yeni önbellekleme yapısını kullanıyor ve haber " +#~ "kaynağı önbelleğinizi taşıdı. 1.2 sürümündeki ~/.liferea_1.2 dizininde " +#~ "bulunan önbellek dosyaları otomatik olarak silinmedi. Lütfen bu dizini " +#~ "taşınma işlemi başarıyla bittikten sonra el ile silin." -#: ../glade/liferea.ui.h:145 #, 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 "" -"Not: Liferea, belirlenen anahtar kelimeler ile arama motorunu sorgulayacak " -"ve yeni bir haber kaynağı oluşturacak. Bu kaynağı saklayabilir ve herhangi " -"bir haber kaynağıyla olduğu gibi güncelleyebilirsiniz." +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Ekin indirilmesi bitti: \"%s\"" -#: ../glade/new_subscription.ui.h:9 #, fuzzy -msgid "Download / Postprocessing" -msgstr "Indir / Ardişlem" - -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Kaynak Seçimi" +#~ msgid "Download finished." +#~ msgstr "_Kullanarak indir" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Eklemek istediğiniz kaynak tipini seçiniz..." - -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "OPML/Planet Ekle" +#~ msgid "Choose download directory" +#~ msgstr "İndirilecek klasörü seçiniz" -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Yerel bir dosya ya da geçerli bir OPML haber kaynağı listesine yönelten " -"adres belirtin." - -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Yer" - -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "_Dosya Seç" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "_Elle:\n" +#~ "(Adres için %s)" -#: ../glade/ttrss_source.ui.h:1 -#, fuzzy -msgid "Add Tiny Tiny RSS Account" -msgstr "Bloglines Hesabı Ekle" +#~ msgid "_Save downloads in" +#~ msgstr "_Indirilenleri buraya kaydet" -#: ../glade/ttrss_source.ui.h:2 #, fuzzy -msgid "Please enter your tt-rss account settings." -msgstr "Bloglines hesap ayarlarınızı giriniz." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Haber Kaynağı Adı" -#: ../glade/ttrss_source.ui.h:3 #, fuzzy -msgid "_Server URL" -msgstr "Sunucu Hatası" +#~ msgid "_Service Name" +#~ msgstr "Senaryo Adı" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "_Kullanıcı adı" - -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Haber kaynak otomatik keşfini kullanmak istediğiniz, ya da haber kaynağının " -"tam yerini bildiğiniz web sitesinin adresini belirtiniz. " - -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Detaylı..." - -#~ msgid "You may want to validate the feed using" -#~ msgstr "Feed adresini yandaki aracı kullanarak doğrulamak isteyebilirsiniz" +#~ msgid "Downloading Enclosure" +#~ msgstr "Ek İndiriliyor" #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " diff -Nru liferea-1.8.15/po/uk.po liferea-1.10.3/po/uk.po --- liferea-1.8.15/po/uk.po 2013-06-24 22:16:18.000000000 +0200 +++ liferea-1.10.3/po/uk.po 2013-07-31 23:29:12.000000000 +0200 @@ -2,25 +2,23 @@ # Copyright © Free Software Foundation, 2010-2011 # This file is distributed under the same license as the liferea package. # -# Yuri Chornoivan , 2010, 2011. +# Yuri Chornoivan , 2010, 2011, 2013. msgid "" msgstr "" -"Project-Id-Version: liferea 1.8-rc1\n" +"Project-Id-Version: liferea 1.10-rc4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" -"PO-Revision-Date: 2011-10-23 19:41+0300\n" +"POT-Creation-Date: 2013-06-11 22:55+0200\n" +"PO-Revision-Date: 2013-06-12 17:45+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" -"Language: \n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" -"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Lokalize 1.5\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:234 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -33,25 +31,16 @@ msgstr "Програма для читання подач Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Звантаження і перегляд подач" +msgid "Read news feeds and blogs" +msgstr "Читання подач новин та блогів" #: ../xslt/feed.xml.in.h:1 -msgid "" -"This feed is discontinued. It's no longer available. Liferea won't update it " -"anymore but you can still access the cached headlines." -msgstr "" -"Супровід цієї подачі припинено. Тепер вона є недоступною. Liferea більше не " -"оновлюватиме подачі, але ви зможете читати кешовані заголовки подачі." +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 "Супровід цієї подачі припинено. Тепер вона є недоступною. Liferea більше не оновлюватиме подачі, але ви зможете читати кешовані заголовки подачі." #: ../xslt/feed.xml.in.h:2 -msgid "" -"The last update of this subscription failed!
    HTTP error code : " -msgstr "" -"Остання спроба оновлення цієї підписки зазнала невдачі!
    Код помилки " -"HTTP : " +msgid "The last update of this subscription failed!
    HTTP error code : " +msgstr "Остання спроба оновлення цієї підписки зазнала невдачі!
    Код помилки HTTP : " #: ../xslt/feed.xml.in.h:3 msgid "There were errors while parsing this feed!" @@ -67,7 +56,7 @@ #: ../xslt/feed.xml.in.h:6 msgid "You may want to contact the author/webmaster of the feed about this!" -msgstr "" +msgstr "Ймовірно, вам варто повідомити про це автора або вебмайстра, який контролює подачу!" #: ../xslt/feed.xml.in.h:7 msgid "There were errors while filtering this feed!" @@ -143,38 +132,26 @@ msgstr "Створено у" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "прапорець" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "закладка" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "коментарі" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Коментарів ще немає." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Коментарі" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Оновлення…" -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Оновити" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Розділ" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Відділ" @@ -183,12 +160,8 @@ msgstr "Кошик новин:" #: ../xslt/newsbin.xml.in.h:2 -msgid "" -"Add items to this news bin by selecting \"Copy to News Bin\" from the item " -"list context menu." -msgstr "" -"Додайте пункти до цього кошика новин за допомогою пункту «Копіювати до " -"кошика новин» контекстного меню пункту списку." +msgid "Add items to this news bin by selecting \"Copy to News Bin\" from the item list context menu." +msgstr "Додайте пункти до цього кошика новин за допомогою пункту «Копіювати до кошика новин» контекстного меню пункту списку." #: ../xslt/vfolder.xml.in.h:1 msgid "Search Folder:" @@ -198,12 +171,12 @@ msgid "Default Browser" msgstr "Типовий переглядач" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Помилка команди переглядача: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Початок: «%s»" @@ -213,7 +186,7 @@ msgid "Authorization Error" msgstr "Помилка розпізнавання" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Не вдалося створити каталог кешування «%s»!" @@ -243,117 +216,104 @@ msgid "%b %d %Y" msgstr "%d %b, %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "«%s» не коректним файлом налаштувань типів вкладень." -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Помилка звантаження вкладення: «%s»" +#: ../src/enclosure.c:288 +msgid "You have not configured a download tool yet! Please do so in the 'Download' tab in Tools/Preferences." +msgstr "Вами ще не налаштовано інструмент звантаження! Будь ласка, налаштуйте його за допомогою вкладки «Звантаження» у вікні «Інструменти → Параметри»." -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Звантаження вкладення завершено: «%s»" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" +"Не вдалося виконати команду: \n" +"\n" +"%s\n" +"\n" +" Будь ласка, переконайтеся, що вказану вами програму для звантаження даних встановлено і що ця програма працює належним чином. Змінити параметри програми можна за допомогою вкладки «Звантаження» у вікні «Інструменти → Параметри»." -#: ../src/export.c:174 +#: ../src/export.c:185 #, c-format msgid "Error renaming %s to %s\n" msgstr "Помилка під час спроби перейменування %s на %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" -msgstr "" -"Помилка у XML під час спроби читання файла OPML. Не вдалося імпортувати «%s»." +msgstr "Помилка у XML під час спроби читання файла OPML. Не вдалося імпортувати «%s»." -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:422 ../src/export.c:424 #, c-format -msgid "" -"Empty document! OPML document \"%s\" should not be empty when importing." -msgstr "" -"Порожній документ. Документ OPML «%s» не повинен бути порожнім під час " -"імпортування." +msgid "Empty document! OPML document \"%s\" should not be empty when importing." +msgstr "Порожній документ. Документ OPML «%s» не повинен бути порожнім під час імпортування." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:445 ../src/export.c:447 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" -msgstr "" -"«%s» не є коректним документом OPML. Liferea не здатна імпортувати цей файл." +msgstr "«%s» не є коректним документом OPML. Liferea не здатна імпортувати цей файл." -#: ../src/export.c:440 +#: ../src/export.c:466 msgid "Imported feed list" msgstr "Список імпортованих подач" -#: ../src/export.c:452 +#: ../src/export.c:478 msgid "Import Feed List" msgstr "Імпортувати список подач" -#: ../src/export.c:452 +#: ../src/export.c:478 msgid "Import" msgstr "Імпортувати" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:478 ../src/export.c:495 ../src/fl_sources/opml_source.c:394 msgid "OPML Files" msgstr "Файли OPML" -#: ../src/export.c:460 +#: ../src/export.c:486 msgid "Error while exporting feed list!" msgstr "Помилка під час спроби експортування списку подач." -#: ../src/export.c:462 +#: ../src/export.c:488 msgid "Feed List exported!" msgstr "Список подач експортовано." -#: ../src/export.c:469 +#: ../src/export.c:495 msgid "Export Feed List" msgstr "Експортувати список подач" -#: ../src/export.c:469 +#: ../src/export.c:495 msgid "Export" msgstr "Експортувати" -#: ../src/feed.c:255 -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 "" -"

    Не вдалося визначити тип цієї подачі. Будь ласка, переконайтеся у тому, " -"що адреса джерела є посиланням на ресурс у одному з форматів збирання даних." -"

    Виведені інструментом обробки XML дані:
    " +#: ../src/feed.c:254 +msgid "

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

    XML Parser Output:
    " +msgstr "

    Не вдалося визначити тип цієї подачі. Будь ласка, переконайтеся у тому, що адреса джерела є посиланням на ресурс у одному з форматів збирання даних.

    Виведені інструментом обробки XML дані:
    " -#: ../src/feed.c:284 +#: ../src/feed.c:283 #, c-format msgid "\"%s\" updated..." msgstr "«%s» оновлено…" -#: ../src/feed.c:294 +#: ../src/feed.c:293 #, c-format msgid "\"%s\" is not available" msgstr "«%s» недоступна" #: ../src/feed_parser.c:137 -msgid "" -"The URL you want Liferea to subscribe to points to a webpage and the auto " -"discovery found no feeds on this page. Maybe this webpage just does not " -"support feed auto discovery." -msgstr "" -"Вказана Liferea адреса для оформлення підписки відповідає веб-сторінці. " -"Інструментові автоматичного виявлення подач не вдалося виявити на цій " -"сторінці жодної подачі. Можливо, на цій веб-сторінці не передбачено " -"автоматичного виявлення подач." +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 адреса для оформлення підписки відповідає веб-сторінці. Інструментові автоматичного виявлення подач не вдалося виявити на цій сторінці жодної подачі. Можливо, на цій веб-сторінці не передбачено автоматичного виявлення подач." #: ../src/feed_parser.c:170 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" -msgstr "" -"Під час читання подачі було виявлено помилку у XML. Не вдалося завантажити " -"подачу «%s»." +msgstr "Під час читання подачі було виявлено помилку у XML. Не вдалося завантажити подачу «%s»." #: ../src/feed_parser.c:175 msgid "Empty document!" @@ -372,119 +332,93 @@ msgstr "Не вдалося визначити тип подачі." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "Немає непрочитаних пунктів" -#: ../src/main.c:175 -msgid "" -"Start Liferea with its main window in STATE. STATE may be `shown', " -"`iconified', or `hidden'" -msgstr "" -"Запустити Liferea з головним вікном у режимі СТАН. СТАН може приймати " -"значення «shown» (показ), «iconified» (згортання) або " -"«hidden» (приховування)." +#: ../src/main.c:163 +msgid "Start Liferea with its main window in STATE. STATE may be `shown', `iconified', or `hidden'" +msgstr "Запустити Liferea з головним вікном у режимі СТАН. СТАН може приймати значення «shown» (показ), «iconified» (згортання) або «hidden» (приховування)." -#: ../src/main.c:175 +#: ../src/main.c:163 msgid "STATE" msgstr "СТАН" -#: ../src/main.c:179 +#: ../src/main.c:164 msgid "Show version information and exit" msgstr "Показати інформацію про версію і завершити роботу" -#: ../src/main.c:180 +#: ../src/main.c:165 msgid "Add a new subscription" msgstr "Додати нову підписку" -#: ../src/main.c:180 +#: ../src/main.c:165 msgid "uri" msgstr "адреса" -#: ../src/main.c:185 +#: ../src/main.c:170 msgid "Print debugging messages of all types" msgstr "Виводити діагностичні повідомлення всіх типів" -#: ../src/main.c:186 +#: ../src/main.c:171 msgid "Print debugging messages for the cache handling" msgstr "Виводити діагностичні повідомлення щодо обробки кешу" -#: ../src/main.c:187 +#: ../src/main.c:172 msgid "Print debugging messages for the configuration handling" msgstr "Виводити діагностичні повідомлення щодо обробки налаштувань" -#: ../src/main.c:188 +#: ../src/main.c:173 msgid "Print debugging messages of the database handling" msgstr "Виводити діагностичні повідомлення щодо обробки бази даних" -#: ../src/main.c:189 +#: ../src/main.c:174 msgid "Print debugging messages of all GUI functions" msgstr "Виводити діагностичні повідомлення щодо функцій інтерфейсу" -#: ../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.8/output.xhtml" -msgstr "" -"Увімкнути діагностику обробки HTML. Під час кожного сеансу обробки HTML у " -"Liferea програма створюватиме дамп HTML за адресою ~/.liferea_1.8/output." -"xhtml" +#: ../src/main.c:175 +msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.cache/liferea/output.xhtml" +msgstr "Увімкнути діагностику обробки HTML. Під час кожного сеансу обробки HTML у Liferea програма створюватиме дамп HTML за адресою ~/.cache/liferea/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:176 msgid "Print debugging messages of all network activity" msgstr "Виводити діагностичні повідомлення для всіх дій, пов’язаних з мережею" -#: ../src/main.c:192 +#: ../src/main.c:177 msgid "Print debugging messages of all parsing functions" msgstr "Виводити діагностичні повідомлення щодо функцій обробки" -#: ../src/main.c:193 +#: ../src/main.c:178 msgid "Print debugging messages when a function takes too long to process" -msgstr "" -"Виводити діагностичні повідомлення, якщо обробка у функції триває занадто " -"довго" +msgstr "Виводити діагностичні повідомлення, якщо обробка у функції триває занадто довго" -#: ../src/main.c:194 +#: ../src/main.c:179 msgid "Print debugging messages when entering/leaving functions" msgstr "Виводити діагностичні повідомлення під час входу-виходу з функцій" -#: ../src/main.c:195 +#: ../src/main.c:180 msgid "Print debugging messages of the feed update processing" msgstr "Виводити діагностичні повідомлення обробки оновлення подач" -#: ../src/main.c:196 +#: ../src/main.c:181 msgid "Print debugging messages of the search folder matching" msgstr "Виводити діагностичні повідомлення щодо пошуку відповідних тек" -#: ../src/main.c:197 +#: ../src/main.c:182 msgid "Print verbose debugging messages" msgstr "Виводити докладні діагностичні повідомлення" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:193 ../src/main.c:194 msgid "Print debugging messages for the given topic" msgstr "Виводити діагностичні повідомлення з вказаною темою" -#: ../src/main.c:218 +#: ../src/main.c:201 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, програма для читання подач у Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" -"Докладніше про програму можна дізнатися за адресою http://liferea." -"sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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 "" -"У цій версії Liferea внесено зміни до формату даних кешу. Було виконано " -"перетворення даних у новий формат кешу подач. Вміст кешу у %s не було " -"вилучено у автоматичному режимі. Будь ласка, вилучіть цей каталог вручну, " -"якщо вважаєте, що перенесення даних завершено успішно." +#: ../src/main.c:202 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Докладніше про програму можна дізнатися за адресою http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -508,11 +442,8 @@ msgstr "Не вдалося встановити з’єднання з проксі-сервером" #: ../src/net.c:325 -msgid "" -"A network error occurred, or the other end closed the connection unexpectedly" -msgstr "" -"Сталася помилка роботи з мережею або з’єднання було несподівано розірвано з " -"боку джерела даних" +msgid "A network error occurred, or the other end closed the connection unexpectedly" +msgstr "Сталася помилка роботи з мережею або з’єднання було несподівано розірвано з боку джерела даних" #. http 3xx redirection #: ../src/net.c:328 @@ -521,12 +452,8 @@ #. http 4xx client error #: ../src/net.c:331 -msgid "" -"You are unauthorized to download this feed. Please update your username and " -"password in the feed properties dialog box" -msgstr "" -"Ви не маєте прав доступу для звантаження цієї подачі. Будь ласка, оновіть " -"дані щодо імені користувача і пароля у діалоговому вікні властивостей подачі." +msgid "You are unauthorized to download this feed. Please update your username and password in the feed properties dialog box" +msgstr "Ви не маєте прав доступу для звантаження цієї подачі. Будь ласка, оновіть дані щодо імені користувача і пароля у діалоговому вікні властивостей подачі." #: ../src/net.c:333 msgid "Payment required" @@ -566,9 +493,7 @@ #: ../src/net.c:347 msgid "Feed not available: Server requested unsupported redirection!" -msgstr "" -"Подача недоступна: сервером надіслано запит на непідтримуваний тип " -"переспрямування." +msgstr "Подача недоступна: сервером надіслано запит на непідтримуваний тип переспрямування." #: ../src/net.c:349 msgid "Client Error" @@ -656,137 +581,124 @@ msgid "Feed title" msgstr "Заголовок подачі" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Дані підписки «%s» вже оновлюються." -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format -msgid "" -"The subscription \"%s\" was discontinued. Liferea won't update it anymore!" -msgstr "" -"Підписка «%s» вже не підтримується авторами. Liferea більше не буде її " -"оновлювати." +msgid "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" +msgstr "Підписка «%s» вже не підтримується авторами. Liferea більше не буде її оновлювати." -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Оновлення піктограми «%s»" -#: ../src/subscription.c:192 -msgid "" -"There was a problem while reading this subscription. Please check the URL " -"and console output." -msgstr "" -"Під час спроби читання цієї підписки виникли проблеми. Будь ласка, " -"перевірте, чи правильно вказано адресу, і ознайомтеся з даними, виведеними " -"до консолі." +#: ../src/subscription.c:193 +msgid "There was a problem while reading this subscription. Please check the URL and console output." +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» вже не підтримується авторами. Liferea більше не буде оновлювати дані." +msgstr "«%s» вже не підтримується авторами. Liferea більше не буде оновлювати дані." -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "«%s» не змінювалася з часу останнього оновлення" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Оновлення «%s»" -#: ../src/update.c:255 +#: ../src/update.c:258 #, c-format msgid "Error opening temp file %s to use for filtering!" -msgstr "" -"Помилка під час спроби відкриття файла тимчасових даних %s, який " -"використовується для фільтрування." +msgstr "Помилка під час спроби відкриття файла тимчасових даних %s, який використовується для фільтрування." -#: ../src/update.c:278 +#: ../src/update.c:281 #, c-format msgid "%s exited with status %d" msgstr "%s завершила роботу з повідомленням про стан %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:287 ../src/update.c:288 ../src/update.c:400 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Помилка: не вдалося відкрити канал «%s»" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:426 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Помилка: не вдалося відкрити файл «%s»" -#: ../src/update.c:429 +#: ../src/update.c:432 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Помилка: файла «%s» не існує" -#: ../src/vfolder.c:55 +#: ../src/vfolder.c:54 msgid "New Search Folder" msgstr "Нова тека пошуку" -#: ../src/xml.c:451 +#: ../src/xml.c:410 msgid "[There were more errors. Output was truncated!]" msgstr "[Були і інші помилки. Дані про них обрізано.]" -#: ../src/xml.c:604 +#: ../src/xml.c:563 msgid "XML Parser: Could not parse document:\n" msgstr "Обробка XML: не вдалося обробити документ:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Долучення" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d долучення" -msgstr[1] "%d долучення" -msgstr[2] "%d долучень" -msgstr[3] "%d долучення" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " байтів" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "кБ" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "МБ" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "ГБ" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d долучення" +msgstr[1] "%d долучення" +msgstr[2] "%d долучень" +msgstr[3] "%d долучення" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Виберіть файл" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "Файли з суфіксом .%s" @@ -796,7 +708,7 @@ msgid "Couldn't find pixmap file: %s" msgstr "Не вдалося знайти файл зображення: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" @@ -805,7 +717,7 @@ msgstr[2] " (%d нових)" msgstr[3] " (%d нова)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" @@ -814,648 +726,658 @@ msgstr[2] "%d непрочитаних%s" msgstr[3] "%d непрочитана%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Розділи довідки" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Швидке ознайомлення" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "Поширені питання" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:795 msgid "Liferea is now online" msgstr "Liferea працює у мережі" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:797 msgid "Work Offline" msgstr "Працювати автономно" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:799 msgid "Liferea is now offline" msgstr "Liferea працює у автономному режимі" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:801 msgid "Work Online" msgstr "Працювати в мережі" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:897 msgid "_Subscriptions" msgstr "_Підписки" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:898 msgid "Update _All" msgstr "Оновити _всі" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:898 msgid "Updates all subscriptions." msgstr "Оновити всі підписки." -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:900 msgid "Mark All As _Read" msgstr "Позначити всі _як прочитані" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:900 msgid "Marks read every item of every subscription." msgstr "Позначити всі пункти у всіх підписках як прочитані." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:902 msgid "_Import Feed List..." msgstr "_Імпортувати список подач…" -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:902 msgid "Imports an OPML feed list." msgstr "Імпортувати список подач у форматі OPML." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:903 msgid "_Export Feed List..." msgstr "_Експортувати список подач…" -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:903 msgid "Exports the feed list as OPML." msgstr "Експортувати список подач у форматі OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:904 msgid "_Quit" msgstr "Ви_йти" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:906 msgid "_Feed" msgstr "П_одача" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:907 msgid "Remove _All Items" msgstr "Вилу_чити всі пункти" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:907 msgid "Removes all items of the currently selected feed." msgstr "Вилучити всі пункти з поточної позначеної подачі." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:910 msgid "_Item" msgstr "П_ункт" +#: ../src/ui/liferea_shell.c:911 +msgid "Previous Item" +msgstr "Попередній пункт" + +#: ../src/ui/liferea_shell.c:913 +msgid "Next Item" +msgstr "Наступний пункт" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:918 msgid "_Next Unread Item" msgstr "_Наступний непрочитаний пункт" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:921 msgid "_View" msgstr "П_ерегляд" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:922 ../src/ui/liferea_htmlview.c:653 msgid "_Increase Text Size" msgstr "З_більшити розмір символів" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:922 msgid "Increases the text size of the item view." msgstr "Збільшити розмір символів на панелі перегляду." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:924 ../src/ui/liferea_htmlview.c:654 msgid "_Decrease Text Size" msgstr "З_меншити розмір символів" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:924 msgid "Decreases the text size of the item view." msgstr "Зменшити розмір символів на панелі перегляду." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:927 msgid "_Tools" msgstr "_Інструменти" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:928 msgid "_Update Monitor" msgstr "С_постереження за оновленням" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:928 msgid "Show a list of all feeds currently in the update queue" msgstr "Показати список всіх пунктів подач, які перебувають у черзі оновлення" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:930 msgid "_Preferences" msgstr "П_араметри" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:930 msgid "Edit Preferences." msgstr "Змінити параметри роботи програми." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:933 msgid "S_earch" msgstr "По_шук" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:934 msgid "Search All Feeds..." msgstr "Шукати у всіх подачах…" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:934 msgid "Show the search dialog." msgstr "Показати діалогове вікно пошуку." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:936 msgid "_Help" msgstr "_Довідка" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:937 msgid "_Contents" msgstr "_Зміст" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:937 msgid "View help for this application." msgstr "Показати довідку до цієї програми." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:938 msgid "_Quick Reference" msgstr "_Швидке ознайомлення" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:938 msgid "View a list of all Liferea shortcuts." msgstr "Показати список всіх клавіатурних скорочень Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:940 msgid "_FAQ" msgstr "_ЧаП" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:940 msgid "View the FAQ for this application." msgstr "Показати список поширених питань щодо програми та відповідей на них." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:941 msgid "_About" msgstr "_Про програму" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:941 msgid "Shows an about dialog." msgstr "Показати діалогове вікно даними щодо програми." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:945 msgid "_Normal View" msgstr "_Звичайний перегляд" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:945 msgid "Set view mode to mail client mode." msgstr "Перемкнути програму у режим перегляду клієнта електронної пошти." -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:947 msgid "_Wide View" msgstr "_Широкий режим" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:947 msgid "Set view mode to use three vertical panes." msgstr "Перемкнути програму у режим показу трьох вертикальних панелей." -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:949 msgid "_Combined View" msgstr "_Комбінований перегляд" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:949 msgid "Set view mode to two pane mode." msgstr "Перемкнути програму у режим перегляду з двома панелями." -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:954 msgid "_Reduced Feed List" msgstr "Ст_ислий список подач" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:954 msgid "Hide feeds with no unread items." msgstr "Приховати подачі, у яких немає непрочитаних пунктів." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:959 msgid "_New Subscription..." msgstr "О_формити підписку…" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:959 msgid "Adds a subscription to the feed list." msgstr "Додати до списку подач новий запис подачі." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:961 ../src/ui/popup_menu.c:320 msgid "New _Folder..." msgstr "С_творити теку…" -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:961 msgid "Adds a folder to the feed list." msgstr "Додати до списку подач нову теку." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:962 ../src/ui/popup_menu.c:323 msgid "New S_earch Folder..." msgstr "Створити т_еку пошуку…" -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:962 msgid "Adds a new search folder to the feed list." msgstr "Додати до списку подач новий запис теки пошуку." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:963 msgid "New _Source..." msgstr "Створити д_жерело…" -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:963 msgid "Adds a new feed list source." msgstr "Додати нове джерело списку подач." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:964 ../src/ui/popup_menu.c:325 msgid "New _News Bin..." msgstr "Ст_ворити кошик новин…" -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:964 msgid "Adds a new news bin." msgstr "Додати новий кошик новин." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:968 msgid "_Mark Items Read" msgstr "П_означити пункти як прочитані" -#: ../src/ui/liferea_shell.c:911 -msgid "" -"Marks all items of the selected feed list node / in the item list as read." -msgstr "" -"Позначити всі пункти позначеного вузла у списку подач або у списку пунктів " -"як прочитані." +#: ../src/ui/liferea_shell.c:968 +msgid "Marks all items of the selected feed list node / in the item list as read." +msgstr "Позначити всі пункти позначеного вузла у списку подач або у списку пунктів як прочитані." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:970 ../src/ui/popup_menu.c:300 msgid "_Update" msgstr "_Оновити" -#: ../src/ui/liferea_shell.c:913 -msgid "" -"Updates the selected subscription or all subscriptions of the selected " -"folder." +#: ../src/ui/liferea_shell.c:970 +msgid "Updates the selected subscription or all subscriptions of the selected folder." msgstr "Оновити поточну подачу або всі подачі у позначеній теці." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:975 msgid "_Properties" msgstr "_Властивості" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:975 msgid "Opens the property dialog for the selected subscription." msgstr "Відкрити діалогове вікно параметрів позначеного пункту підписки." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:976 msgid "_Remove" msgstr "В_илучити" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:976 msgid "Removes the selected subscription." msgstr "Вилучити позначений пункт підписки." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:980 ../src/ui/popup_menu.c:163 msgid "Toggle _Read Status" msgstr "Перемкнути стан п_рочитання" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:980 msgid "Toggles the read status of the selected item." msgstr "Перемкнути стан прочитання позначеного пункту." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:982 ../src/ui/popup_menu.c:164 msgid "Toggle Item _Flag" msgstr "Перемкнути п_рапорець пункту" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:982 msgid "Toggles the flag status of the selected item." msgstr "Перемкнути прапорець стану позначеного пункту." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:984 msgid "R_emove" msgstr "Ви_лучити" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:984 msgid "Removes the selected item." msgstr "Вилучити позначений пункт." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:986 ../src/ui/popup_menu.c:127 +msgid "Open In _Tab" +msgstr "Відкрити у в_кладці" + +#: ../src/ui/liferea_shell.c:986 +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Відкрити посилання пункту на новій панелі перегляду Liferea." + +#: ../src/ui/liferea_shell.c:988 ../src/ui/popup_menu.c:128 +msgid "_Open In Browser" msgstr "Ві_дкрити у переглядачі" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." -msgstr "" -"Відкрити посилання пункту у вказаній вами програмі для перегляду інтернету." +#: ../src/ui/liferea_shell.c:988 +msgid "Launches the item's link in the Liferea item pane." +msgstr "Відкрити посилання пункту на панелі записів Liferea." + +#: ../src/ui/liferea_shell.c:990 ../src/ui/popup_menu.c:129 +msgid "Open In _External Browser" +msgstr "Відкрити у _зовнішньому переглядачі" + +#: ../src/ui/liferea_shell.c:990 +msgid "Launches the item's link in the configured external browser." +msgstr "Відкрити посилання пункту у вказаній вами зовнішній програмі для перегляду інтернету." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:995 ../src/ui/popup_menu.c:193 msgid "_Work Offline" msgstr "_Автономний режим" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:995 msgid "This option allows you to disable subscription updating." msgstr "За допомогою цього пункту ви можете вимкнути оновлення подач." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:997 +msgid "_Fullscreen" +msgstr "На весь _екран" + +#: ../src/ui/liferea_shell.c:997 +msgid "Browse at full screen" +msgstr "Перегляд у повноекранному режимі" + +#: ../src/ui/liferea_shell.c:1328 msgid "Liferea - Linux Feed Reader" msgstr "Liferea — програма для читання подач у Linux" -#: ../src/ui/liferea_shell.c:1246 -msgid "" -"

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

    You can add new subscriptions

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

    " -msgstr "" -"

    Ласкаво просимо до Liferea, програми для обробки новин, що " -"надходять мережевими подачами новин.

    Щоб додати підписку, " -"скористайтеся одним з таких варіантів дій:

    • виберіть у меню програми " -"пункт «Підписки → Нова підписка»;
    • скиньте посилання на підписку на " -"панель списку підписок;
    • наведіть вказівник миші на посилання, " -"клацніть правою кнопкою і виберіть пункт «Підписатися…» у вікні Liferea

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

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

    You can add new subscriptions

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

    " +msgstr "

    Ласкаво просимо до Liferea, програми для обробки новин, що надходять мережевими подачами новин.

    Щоб додати підписку, скористайтеся одним з таких варіантів дій:

    • виберіть у меню програми пункт «Підписки → Нова підписка»;
    • скиньте посилання на підписку на панель списку підписок;
    • наведіть вказівник миші на посилання, клацніть правою кнопкою і виберіть пункт «Підписатися…» у вікні Liferea

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Вкажіть ім’я користувача та пароль для доступу до «%s» (%s):" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Невідоме джерело" -#: ../src/ui/ui_common.c:205 +#: ../src/ui/ui_common.c:211 msgid "All Files" msgstr "Всі файли" -#: ../src/ui/feed_list_view.c:341 +#: ../src/ui/feed_list_view.c:338 msgid "Deleting entry" msgstr "Вилучення запису" -#: ../src/ui/feed_list_view.c:342 +#: ../src/ui/feed_list_view.c:339 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "Ви справді бажаєте вилучити «%s» і всі дані, які там зберігаються?" -#: ../src/ui/feed_list_view.c:342 +#: ../src/ui/feed_list_view.c:339 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Ви справді бажаєте вилучити «%s»?" -#: ../src/ui/feed_list_view.c:354 +#: ../src/ui/feed_list_view.c:351 msgid "Deletion Confirmation" msgstr "Підтвердження вилучення" -#: ../src/ui/feed_list_view.c:385 +#: ../src/ui/feed_list_view.c:382 msgid "Liferea is in offline mode. No update possible." msgstr "Liferea працює у автономному режимі. Оновлення даних неможливе." -#: ../src/ui/liferea_htmlview.c:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Помилка під час звантаження: «%s»" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "Звантаження завершено." - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +#: ../src/ui/liferea_htmlview.c:624 +msgid "Open Link In _Tab" msgstr "Відкрити посилання у в_кладці" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" -msgstr "Ві_дкрити посилання у браузері" +#: ../src/ui/liferea_htmlview.c:625 +msgid "_Open Link In Browser" +msgstr "Ві_дкрити посилання у переглядачі" + +#: ../src/ui/liferea_htmlview.c:626 +msgid "_Open Link In External Browser" +msgstr "Ві_дкрити посилання у зовнішньому переглядачі" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:629 #, c-format msgid "_Bookmark Link at %s" msgstr "С_творити закладку для посилання на %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:633 msgid "_Copy Link Location" msgstr "_Копіювати посилання" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Image Location" msgstr "_Копіювати адресу зображення" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:638 msgid "S_ave Link As" msgstr "З_берегти посилання як" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:640 msgid "S_ave Image As" msgstr "З_берегти зображення як" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:643 msgid "_Subscribe..." msgstr "_Підписатися…" -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:398 msgid "*** No title ***" msgstr "*** без заголовка ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:661 msgid "Date" msgstr "Дата" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:675 msgid "Headline" msgstr "Заголовок" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:777 ../src/ui/item_list_view.c:798 +#: ../src/ui/item_list_view.c:819 ../src/ui/item_list_view.c:883 +#: ../src/ui/item_list_view.c:968 ../src/ui/item_list_view.c:983 msgid "No item has been selected" msgstr "Не позначено жодного пункту" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:794 ../src/ui/item_list_view.c:815 msgid "This item has no link specified!" msgstr "У цьому пункті не вказано жодного посилання." -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:871 msgid "You must select a feed to delete its items!" msgstr "Для вилучення пунктів подачі слід вказати якусь з подач." -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Відкрити пункт у в_кладці" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "Ві_дкрити пункт у переглядачі" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:141 msgid "Copy to News Bin" msgstr "Копіювати до кошика новин" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Копіювати _адресу з пункту до буфера" +#: ../src/ui/popup_menu.c:155 +#, c-format +msgid "_Bookmark at %s" +msgstr "С_творити закладку для %s" + +#: ../src/ui/popup_menu.c:159 +msgid "Copy Item _Location" +msgstr "Копіювати _адресу пункту" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:165 msgid "R_emove Item" msgstr "Ви_лучити пункт" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:178 msgid "Open Enclosure..." msgstr "Відкрити вкладення…" -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:179 msgid "Save As..." msgstr "Зберегти як…" -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:180 msgid "Copy Link Location" msgstr "Скопіювати адресу посилання" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:194 msgid "_Update All" msgstr "_Оновити всі" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:199 msgid "_Show Liferea" msgstr "По_казати Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:302 msgid "_Update Folder" msgstr "_Оновити теку" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:304 msgid "_Mark All As Read" msgstr "Поз_начити всі як прочитані" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:314 msgid "_New" msgstr "_Створити" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:317 msgid "New _Subscription..." msgstr "Нова п_ідписка…" -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:324 msgid "New S_ource..." msgstr "Нове д_жерело…" -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:333 msgid "Sort Feeds" msgstr "Впорядкувати подачі" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:339 msgid "_Rebuild" msgstr "П_еребудувати" -#: ../src/ui/popup_menu.c:341 -#, fuzzy +#: ../src/ui/popup_menu.c:351 msgid "Convert To Local Subscriptions..." -msgstr "О_формити підписку…" - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(Порожньо)" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" +msgstr "Перетворити на локальні підписки…" -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:87 msgid "GNOME default" msgstr "Типові параметри GNOME" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:88 msgid "Text below icons" msgstr "Текст під піктограмами" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:89 msgid "Text beside icons" msgstr "Текст збоку від піктограм" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:90 msgid "Icons only" msgstr "Лише піктограми" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:91 msgid "Text only" msgstr "Лише текст" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:99 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "хвилин" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "годин" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "днів" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:106 msgid "Space" msgstr "Пробіл" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:107 msgid " Space" msgstr " Пробіл" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Пробіл" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Виберіть каталог для звантаження даних" +#: ../src/ui/preferences_dialog.c:113 +msgid "Normal View" +msgstr "Звичайний перегляд" + +#: ../src/ui/preferences_dialog.c:114 +msgid "Wide View" +msgstr "Широкий режим" + +#: ../src/ui/preferences_dialog.c:115 +msgid "Combined View" +msgstr "Комбінований перегляд" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:500 msgid "Manual" msgstr "Вручну" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:515 msgid "Browser default" msgstr "Типовий для переглядача" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:518 msgid "Existing window" msgstr "У існуючому вікні" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:521 msgid "New window" msgstr "У новому вікні" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:524 msgid "New tab" msgstr "У новій вкладці" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:683 msgid "Integrate with the messaging menu (indicator)" msgstr "Вбудовуватися до меню (індикатора) повідомлень" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:686 msgid "Terminate instead of minimizing to the messaging menu" msgstr "Завершувати роботу замість згортання до меню повідомлень" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:689 msgid "Start minimized to the messaging menu" msgstr "Запускати згорнутою до меню повідомлень" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:789 msgid "Type" msgstr "Тип" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:792 msgid "Program" msgstr "Програма" +#: ../src/ui/ui_node.c:123 +msgid "(Empty)" +msgstr "(Порожньо)" + +#: ../src/ui/ui_node.c:320 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" +"%s\n" +"Перезбирання" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." -msgid_plural "" -"The provider of this feed suggests an update interval of %d minutes." -msgstr[0] "" -"Надавачем цієї подачі рекомендовано проміжок між оновленнями у %d хвилину." -msgstr[1] "" -"Надавачем цієї подачі рекомендовано проміжок між оновленнями у %d хвилини." -msgstr[2] "" -"Надавачем цієї подачі рекомендовано проміжок між оновленнями у %d хвилин." -msgstr[3] "" -"Надавачем цієї подачі рекомендовано проміжок між оновленнями у %d хвилину." +msgid_plural "The provider of this feed suggests an update interval of %d minutes." +msgstr[0] "Надавачем цієї подачі рекомендовано проміжок між оновленнями у %d хвилину." +msgstr[1] "Надавачем цієї подачі рекомендовано проміжок між оновленнями у %d хвилини." +msgstr[2] "Надавачем цієї подачі рекомендовано проміжок між оновленнями у %d хвилин." +msgstr[3] "Надавачем цієї подачі рекомендовано проміжок між оновленнями у %d хвилину." #: ../src/ui/subscription_dialog.c:434 msgid "This feed specifies no default update interval." msgstr "У цій подачі не вказано ніякого типового проміжку між оновленнями." -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:153 msgid "Untitled" msgstr "Без назви" @@ -1514,44 +1436,33 @@ msgid "%b %d %H:%M" msgstr "%d %b, %k:%M" -#: ../src/fl_sources/default_source.c:174 -#: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 +#: ../src/fl_sources/default_source.c:145 +#: ../src/fl_sources/google_source.c:273 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" msgstr "Нова підписка" -#: ../src/fl_sources/google_source.c:116 +#: ../src/fl_sources/google_source.c:115 msgid "Google Reader login failed!" msgstr "Помилка під час спроби входу до системи Google Reader." -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:394 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 -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 "" -"Інтегрувати список подач вашого облікового запису Google Reader. Liferea " -"показуватиме ваші підписки Google Reader і виконуватиме синхронізацію вашого " -"спису подач та списку прочитаних пунктів." +#: ../src/fl_sources/google_source.c:395 +msgid "Integrate the feed list of your Google Reader account. Liferea will present your Google Reader subscriptions, and will synchronize your feed list and reading lists." +msgstr "Інтегрувати список подач вашого облікового запису Google Reader. Liferea показуватиме ваші підписки Google Reader і виконуватиме синхронізацію вашого спису подач та списку прочитаних пунктів." -#: ../src/fl_sources/opml_source.c:325 +#: ../src/fl_sources/opml_source.c:326 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:326 -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 або Planets у ваш список подач. Liferea автоматично " -"додаватиме і вилучатиме пункти подач відповідно до змін у вихідному " -"документі OPML." +#: ../src/fl_sources/opml_source.c:327 +msgid "Integrate blogrolls or Planets in your feed list. Liferea will automatically add and remove feeds according to the changes of the source OPML document" +msgstr "Інтегрувати blogrolls або Planets у ваш список подач. Liferea автоматично додаватиме і вилучатиме пункти подач відповідно до змін у вихідному документі OPML." -#: ../src/fl_sources/opml_source.c:387 +#: ../src/fl_sources/opml_source.c:394 msgid "Choose OPML File" msgstr "Виберіть файл OPML" @@ -1572,26 +1483,19 @@ #: ../src/fl_sources/node_source.c:412 #, c-format msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" +msgstr "Ппідписні дані «%s» успішно перетворено на локальні подачі!" -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:360 msgid "Tiny Tiny RSS" msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 -msgid "" -"Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " -"present your tt-rss subscriptions, and will synchronize your feed list and " -"reading lists." -msgstr "" -"Інтегрувати список подач вашого облікового запису Tiny Tiny RSS версії 1.5 і " -"новіших версій. Liferea показуватиме ваші підписки tt-rss і виконуватиме " -"синхронізацію вашого спису подач та списку прочитаних пунктів." +#: ../src/fl_sources/ttrss_source.c:361 +msgid "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will present your tt-rss subscriptions, and will synchronize your feed list and reading lists." +msgstr "Інтегрувати список подач вашого облікового запису Tiny Tiny RSS версії 1.5 і новіших версій. Liferea показуватиме ваші підписки tt-rss і виконуватиме синхронізацію вашого спису подач та списку прочитаних пунктів." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:119 msgid "Could not parse JSON returned by tt-rss API!" -msgstr "" -"Не вдалося обробити код JSON, повернутий програмним інтерфейсом tt-rss!" +msgstr "Не вдалося обробити код JSON, повернутий програмним інтерфейсом tt-rss!" #: ../src/notification/libnotify.c:61 ../src/notification/libnotify.c:83 #: ../src/notification/libnotify.c:152 @@ -1607,15 +1511,15 @@ msgid "Visit" msgstr "Відвідати" -#: ../src/notification/libnotify.c:171 ../src/notification/libnotify.c:274 +#: ../src/notification/libnotify.c:167 ../src/notification/libnotify.c:263 msgid "Open feed" msgstr "Відкрити подачу" -#: ../src/notification/libnotify.c:174 ../src/notification/libnotify.c:277 +#: ../src/notification/libnotify.c:170 ../src/notification/libnotify.c:266 msgid "Mark all as read" msgstr "Позначити всі як прочитані" -#: ../src/notification/libnotify.c:254 +#: ../src/notification/libnotify.c:247 #, c-format msgid "%s has %d update" msgid_plural "%s has %d updates" @@ -1624,11 +1528,11 @@ msgstr[2] "У %s виявлено %d оновлень" msgstr[3] "У %s виявлено %d оновлення" -#: ../src/notification/libnotify.c:257 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:249 msgid "Feed Update" msgstr "Оновлення подач" -#: ../src/notification/libnotify.c:271 +#: ../src/notification/libnotify.c:260 msgid "Show details" msgstr "Показати подробиці" @@ -1645,12 +1549,8 @@ msgstr "_Користувач:" #: ../glade/auth.ui.h:6 -msgid "" -"Note: The username and password will be saved to your Liferea feedlist " -"file without using encryption." -msgstr "" -"Зауваження: ім’я користувача і пароль буде збережено у вашому файлі " -"списку подач Liferea без будь-якого шифрування." +msgid "Note: The username and password will be saved to your Liferea feedlist file without using encryption." +msgstr "Зауваження: ім’я користувача і пароль буде збережено у вашому файлі списку подач Liferea без будь-якого шифрування." #: ../glade/google_source.ui.h:1 msgid "Add Google Reader Account" @@ -1660,8 +1560,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Будь ласка, вкажіть параметри вашого облікового запису Google Reader." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Пароль" @@ -1685,7 +1584,7 @@ msgid "combined view" msgstr "суміщений перегляд" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Заголовки" @@ -1728,15 +1627,14 @@ #: ../glade/liferea.ui.h:17 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." -msgstr "" -"Цим надавачем подач запропоновано проміжок між оновленнями у %d хвилин." +msgstr "Цим надавачем подач запропоновано проміжок між оновленнями у %d хвилин." #: ../glade/liferea.ui.h:18 msgid "General" msgstr "Загальне" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Джерело подачі" @@ -1769,28 +1667,16 @@ msgstr "Використовувати _фільтр перетворення" #: ../glade/liferea.ui.h:27 ../glade/new_subscription.ui.h:12 -msgid "" -"Liferea can use external filter plugins in order to access feeds and " -"directories in non-supported formats. See the documentation for more " -"information." -msgstr "" -"У Liferea передбачено використання зовнішніх додатків фільтрування для " -"доступу до даних подач і каталогів, формат яких не підтримується основною " -"програмою. Докладніше про ці додатки можна дізнатися з документації до " -"програми." +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.ui.h:28 ../glade/new_subscription.ui.h:13 msgid "Convert _using:" msgstr "Перетворити за _допомогою:" #: ../glade/liferea.ui.h:30 -msgid "" -"The cache setting controls if the contents of feeds are saved when Liferea " -"exits. Marked items are always saved to the cache." -msgstr "" -"За допомогою параметра кешування можна керувати збереженням даних подач під " -"час завершення роботи Liferea. Дані позначених пунктів завжди " -"зберігатимуться у сховищі даних (кеші)." +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. Дані позначених пунктів завжди зберігатимуться у сховищі даних (кеші)." #: ../glade/liferea.ui.h:31 msgid "_Default cache settings" @@ -1830,8 +1716,7 @@ #: ../glade/liferea.ui.h:42 msgid "Auto-_load item link in configured browser when selecting articles." -msgstr "" -"А_втозавантажувати посилання у вказаному переглядачі після позначення статті" +msgstr "А_втозавантажувати посилання у вказаному переглядачі після позначення статті" #: ../glade/liferea.ui.h:43 msgid "Ignore _comment feeds for this subscription." @@ -1854,480 +1739,493 @@ msgstr "Додатково" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Параметри Liferea" +msgid "New Folder" +msgstr "Нова тека" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "Обробка кешу подач" +msgid "_Folder name:" +msgstr "_Назва теки:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Типова _кількість збережених пунктів на подачу:" +msgid "Rename" +msgstr "Перейменувати" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "Параметри оновлення подач" +msgid "_New Name:" +msgstr "_Нова назва:" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "_Оновлювати всі підписки під час запуску" +msgid "Search Folder Properties" +msgstr "Властивості теки пошуку" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Типовий проміжок між _оновленнями подачі:" +msgid "Search _Name:" +msgstr "_Назва пошуку:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "Знайти пункти, які відповідають вказаним нижче критеріям" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"Зауваження: будь ласка, не забудьте вказати прийнятний проміжок часу між " -"оновленнями. Зазвичай, опитування подач з інтервалом, меншим за одну годину, " -"є простим марнуванням потужностей каналу зв’язку." +msgid "A_ny Rule Matches" +msgstr "Ві_дповідність будь-якому з правил" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Подачі" +msgid "_All Rules Must Match" +msgstr "В_ідповідність кожному з правил" #: ../glade/liferea.ui.h:57 -msgid "Folder Display Settings" -msgstr "Параметри показу тек" +msgid "Open Enclosure" +msgstr "Відкрити вкладення" #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "По_казувати пункти всіх вкладених подач, якщо позначено теку" +msgid "Open an enclosure of type:" +msgstr "Відкрити вкладення такого типу:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "При_ховувати прочитані пункти" +msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. The enclosures URL will be supplied as an argument for this command:" +msgstr "Які дії слід виконувати Liferea з цим вкладенням? Будь ласка, вкажіть нижче команду, яку слід виконати. Дані щодо адреси вкладень буде додано до аргументів вказаної команди." #: ../glade/liferea.ui.h:60 -msgid "Feed Icons (Favicons)" -msgstr "Піктограми подач (улюблені)" +msgid "_Browse" +msgstr "Ви_брати" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "_Оновити всі піктограми улюблених зараз" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "Ви_конувати вказану дію автоматично для всіх вкладено, подібних до цього" #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Теки" +msgid "Search All Feeds" +msgstr "Шукати у всіх подачах" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" -msgstr "Читання заголовків" +msgid "_Search for:" +msgstr "_Шукати:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "Про_глянути статті з:" +msgid "Enter a search string Liferea should find either in a items title or in its content." +msgstr "Вкажіть рядок, який Liferea має знайти у заголовках пунктів або їх тексті." #: ../glade/liferea.ui.h:65 -msgid "Web Integration" -msgstr "Інтернет-інтеграція" +msgid "_Advanced..." +msgstr "Д_одатково…" #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "_Додати закладки до" +msgid "Starts searching for the specified text in all feeds. The search result will appear in the item list." +msgstr "Розпочати пошук вказаного фрагмента тексту у всіх подачах. Результат пошуку буде показано у списку пунктів." #: ../glade/liferea.ui.h:67 -msgid "Internal Browser Settings" -msgstr "Параметри переглядача інтернету" +msgid "Update Monitor" +msgstr "Спостереження за оновленням" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Відкривати поси_лання у вікні Liferea" +msgid "Pending Requests" +msgstr "Запити у черзі" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "Ви_мкнути Javascript" +msgid "Downloading Now" +msgstr "Звантаження" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "_Увімкнути додатки переглядача" +msgid "Cancel _All" +msgstr "Скасувати _всі" #: ../glade/liferea.ui.h:71 +msgid "Create News Bin" +msgstr "Створити кошик новин" + +#: ../glade/liferea.ui.h:72 +msgid "_News Bin Name:" +msgstr "_Назва кошика новин:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Про програму" + +#: ../glade/liferea.ui.h:74 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea програма для читання новин з використанням GTK+" + +#: ../glade/liferea.ui.h:75 +msgid "Liferea Homepage" +msgstr "Домашня сторінка Liferea" + +#: ../glade/liferea.ui.h:76 +msgid "Advanced Search" +msgstr "Складний пошук" + +#: ../glade/liferea.ui.h:77 +msgid "_Search Folder..." +msgstr "_Тека пошуку…" + +#: ../glade/liferea.ui.h:78 +msgid "Create Search Engine Feed" +msgstr "Створення подачі рушія пошуку" + +#: ../glade/liferea.ui.h:79 +msgid "enter any search string you want" +msgstr "вкажіть ключ пошуку" + +#: ../glade/liferea.ui.h:80 +msgid "Maximal _Number Of Result Items:" +msgstr "Максимальна _кількість пунктів-відповідників:" + +#: ../glade/liferea.ui.h:81 +msgid "Note: Liferea will generate a feed subscription which is used to query the search engine results for the specified search string. You can keep this feed permanently and update it like any other subscription." +msgstr "Зауваження: Liferea створити підписку на подачу, яка використовуватиметься для опитування рушія пошуку щодо результатів пошуку вказаного рядка. Ви можете зберегти таку подачу і оновлювати її дані подібно до будь-якої іншої підписки." + +#: ../glade/new_subscription.ui.h:9 +msgid "Download / Postprocessing" +msgstr "Звантаження/Обробка" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Вибір джерела" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Виберіть тип джерела, яке слід додати…" + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Додати OPML/Planet" + +#: ../glade/opml_source.ui.h:2 +msgid "Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "Будь ласка, вкажіть локальний файл або адресу URL, що вказує на коректний список подач у форматі OPML." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Адреса" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "_Вибрати файл" + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "Додавання облікового запису Tiny Tiny RSS" + +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "Будь ласка, вкажіть параметри вашого облікового запису tt-rss." + +#: ../glade/ttrss_source.ui.h:3 +msgid "_Server URL" +msgstr "_Адреса сервера" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "_Користувач" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Додатково…" + +#: ../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 "Вкажіть адресу веб-сайта для автоматичного пошуку подач або, якщо вона вам відома, точну адресу подачі." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Параметри Liferea" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Обробка кешу подач" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Типова _кількість збережених пунктів на подачу:" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Параметри оновлення подач" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "_Оновлювати всі підписки під час запуску" + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Типовий проміжок між _оновленнями подачі:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "Note: Please remember to set a reasonable refresh time. Usually it is a waste of bandwidth to poll feeds more often than each hour." +msgstr "Зауваження: будь ласка, не забудьте вказати прийнятний проміжок часу між оновленнями. Зазвичай, опитування подач з інтервалом, меншим за одну годину, є простим марнуванням потужностей каналу зв’язку." + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Подачі" + +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Параметри показу тек" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "По_казувати пункти всіх вкладених подач, якщо позначено теку" + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "При_ховувати прочитані пункти" + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Піктограми подач (улюблені)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "_Оновити всі піктограми улюблених зараз" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Теки" + +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Читання заголовків" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "Про_глянути статті з:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "_Типовий режим перегляду:" + +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Інтернет-інтеграція" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "_Додати закладки до" + +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Параметри переглядача інтернету" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Відкривати поси_лання у вікні Liferea" + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "Ви_мкнути Javascript" + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "_Увімкнути додатки переглядача" + +#: ../glade/prefs.ui.h:26 msgid "External Browser Settings" msgstr "Параметри зовнішнього переглядача" -#: ../glade/liferea.ui.h:72 +#: ../glade/prefs.ui.h:27 msgid "_Open link in:" msgstr "В_ідкривати посилання у:" -#: ../glade/liferea.ui.h:74 +#: ../glade/prefs.ui.h:28 +msgid "_Manual:" +msgstr "В_ручну:" + +#: ../glade/prefs.ui.h:30 #, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" -msgstr "" -"В_ручну:\n" -"(%s для URL)" +msgid "(%s for URL)" +msgstr "(%s для адреси)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Переглядач:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Переглядач" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 msgid "Notification Settings" msgstr "Параметри сповіщення" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Показувати _контекстне вікно з новими заголовками" -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "Показувати п_іктограму стану у області сповіщень (системному лотку)" -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Показувати _кількість нових пунктів за допомогою піктограми лотка" -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "З_авершувати роботу замість згортання до системного лотка" -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "_Запускати згорнутою у лоток" -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 msgid "Toolbar Settings" msgstr "Параметри панелі інструментів" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "При_ховувати панель інструментів" -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Мітки _кнопок панелі інструментів:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "Інтерфейс" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "Проксі-сервер HTTP" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "_Автоматичне визначення (GNOME або середовище)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "_Без проксі" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "_Ручне налаштування:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "Проксі-п_орт:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "Проксі-_вузол:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "Використовувати проксі-р_озпізнавання" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "_Пароль проксі:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "_Користувач проксі:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Проксі" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 msgid "Downloading Enclosures" msgstr "Звантаження вкладень" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "Ви_брати" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "З_берігати звантажені дані у" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "_Звантажувати за допомогою" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 msgid "Opening Enclosures" msgstr "Відкриття вкладень" -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Вкладення" -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "Синхронізація з близькими вузлами" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "_Увімкнути синхронізацію локальною мережею" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "Назва с_лужби" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Синхронізація" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Нова тека" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "_Назва теки:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Перейменувати" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "_Нова назва:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Властивості теки пошуку" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "_Назва пошуку:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "Знайти пункти, які відповідають вказаним нижче критеріям" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "Ві_дповідність будь-якому з правил" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "В_ідповідність кожному з правил" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Звантаження вкладення" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Звантаження вкладення типу:" - -#: ../glade/liferea.ui.h:120 -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 з цим вкладенням? Будь ласка, вкажіть нижче " -"команду, яку слід виконати. Дані щодо файлів звантажених вкладень буде " -"додано до аргументів вказаної команди." - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "П_ередати адресу і не звантажувати вкладення" - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "" -"Ви_конувати вказану дію автоматично для всіх вкладено, подібних до цього" - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Шукати у всіх подачах" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Шукати:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Вкажіть рядок, який Liferea має знайти у заголовках пунктів або їх тексті." - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "Д_одатково…" - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Розпочати пошук вказаного фрагмента тексту у всіх подачах. Результат пошуку " -"буде показано у списку пунктів." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Спостереження за оновленням" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "Запити у черзі" - -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "Звантаження" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "Скасувати _всі" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Створити кошик новин" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "_Назва кошика новин:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Про програму" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" +msgstr "Додатки" -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"© Команда Liferea\n" -"2003–2011\n" +#~ msgid "" +#~ "Copyright (c) 2003-2012\n" +#~ "The Liferea Team\n" +#~ msgstr "" +#~ "© Команда Liferea\n" +#~ "2003–2012\n" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea програма для читання новин з використанням GTK+" +#~ msgid "Download and view feeds" +#~ msgstr "Звантаження і перегляд подач" -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Домашня сторінка Liferea" +#~ msgid "You may want to validate the feed using" +#~ msgstr "Ви можете перевірити цю подачу за допомогою" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Складний пошук" +#~ msgid "bookmark" +#~ msgstr "закладка" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "_Тека пошуку…" +#~ msgid "comments" +#~ msgstr "коментарі" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Створення подачі рушія пошуку" +#~ msgid "flag" +#~ msgstr "прапорець" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "вкажіть ключ пошуку" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Помилка звантаження вкладення: «%s»" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Максимальна _кількість пунктів-відповідників:" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Звантаження вкладення завершено: «%s»" -#: ../glade/liferea.ui.h:145 -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 створити підписку на подачу, яка використовуватиметься " -"для опитування рушія пошуку щодо результатів пошуку вказаного рядка. Ви " -"можете зберегти таку подачу і оновлювати її дані подібно до будь-якої іншої " -"підписки." +#~ 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 "У цій версії Liferea внесено зміни до формату даних кешу. Було виконано перетворення даних у новий формат кешу подач. Вміст кешу у %s не було вилучено у автоматичному режимі. Будь ласка, вилучіть цей каталог вручну, якщо вважаєте, що перенесення даних завершено успішно." -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" -msgstr "Звантаження/Обробка" +#~ msgid "Jumps to the next unread item. If necessary selects the next feed with unread items." +#~ msgstr "Перейти до наступного непрочитаного пункту. Якщо у поточній подачі більше немає таких пунктів, програма перейде до читання наступної." -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Вибір джерела" +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Помилка під час звантаження: «%s»" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Виберіть тип джерела, яке слід додати…" +#~ msgid "Download finished." +#~ msgstr "Звантаження завершено." -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Додати OPML/Planet" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Відкрити пункт у в_кладці" -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Будь ласка, вкажіть локальний файл або адресу URL, що вказує на коректний " -"список подач у форматі OPML." +#~ msgid "_Launch Item In Browser" +#~ msgstr "Ві_дкрити пункт у переглядачі" -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Адреса" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Копіювати _адресу з пункту до буфера" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "_Вибрати файл" +#~ msgid "Choose download directory" +#~ msgstr "Виберіть каталог для звантаження даних" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "Додавання облікового запису Tiny Tiny RSS" +#~ msgid "Liferea Sync %s@%s" +#~ msgstr "Синхронізація Liferea %s@%s" -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "Будь ласка, вкажіть параметри вашого облікового запису tt-rss." +#~ msgid "Downloading Enclosure" +#~ msgstr "Звантаження вкладення" -#: ../glade/ttrss_source.ui.h:3 -msgid "_Server URL" -msgstr "_Адреса сервера" +#~ msgid "Sync" +#~ msgstr "Синхронізація" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "_Користувач" +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Синхронізація з близькими вузлами" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Вкажіть адресу веб-сайта для автоматичного пошуку подач або, якщо вона вам " -"відома, точну адресу подачі." - -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Додатково…" - -#~ msgid "You may want to validate the feed using" -#~ msgstr "Ви можете перевірити цю подачу за допомогою" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "_Увімкнути синхронізацію локальною мережею" #~ msgid "" -#~ "Jumps to the next unread item. If necessary selects the next feed with " -#~ "unread items." +#~ "_Manual:\n" +#~ "(%s for URL)" #~ msgstr "" -#~ "Перейти до наступного непрочитаного пункту. Якщо у поточній подачі більше " -#~ "немає таких пунктів, програма перейде до читання наступної." +#~ "В_ручну:\n" +#~ "(%s для URL)" -#~ msgid "Liferea Sync %s@%s" -#~ msgstr "Синхронізація Liferea %s@%s" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "П_ередати адресу і не звантажувати вкладення" + +#~ msgid "_Save downloads in" +#~ msgstr "З_берігати звантажені дані у" + +#~ msgid "_Service Name" +#~ msgstr "Назва с_лужби" #~ msgid "link cosmos" #~ msgstr "посилання cosmos" @@ -2382,16 +2280,8 @@ #~ msgstr[2] "%d відповідників" #~ msgstr[3] "%d відповідник" -#~ 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 "" -#~ "У списку пунктів тепер залишилися лише пункти, що відповідають вказаному " -#~ "шаблону пошуку. Якщо вам потрібно зберегти ці результати пошуку, ви " -#~ "можете натиснути кнопку «Тека пошуку» у діалоговому вікні пошуку: Liferea " -#~ "додасть теку пошуку до вашого списку подач." +#~ 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 "У списку пунктів тепер залишилися лише пункти, що відповідають вказаному шаблону пошуку. Якщо вам потрібно зберегти ці результати пошуку, ви можете натиснути кнопку «Тека пошуку» у діалоговому вікні пошуку: Liferea додасть теку пошуку до вашого списку подач." #~ msgid "You have to select a feed entry" #~ msgstr "Вам слід позначити запис подачі" @@ -2459,13 +2349,8 @@ #~ msgid "Bloglines" #~ msgstr "Bloglines" -#~ 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 "" -#~ "Інтегрувати список подач з вашого облікового запису на Bloglines. Liferea " -#~ "покаже вашу підписку Bloglines окремим придатним лише для читання " -#~ "піддеревом у списку подач." +#~ 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 "Інтегрувати список подач з вашого облікового запису на Bloglines. Liferea покаже вашу підписку Bloglines окремим придатним лише для читання піддеревом у списку подач." #~ msgid "feedlist.opml" #~ msgstr "feedlist.opml" @@ -2498,12 +2383,8 @@ #~ msgid "text/plain" #~ msgstr "text/plain" -#~ msgid "" -#~ "This option can cause significant delays when loading folders " -#~ "containing many feeds." -#~ msgstr "" -#~ "Позначення цього пункту може спричинити значні затримки під час " -#~ "завантаження тек, що містять багато подач." +#~ msgid "This option can cause significant delays when loading folders containing many feeds." +#~ msgstr "Позначення цього пункту може спричинити значні затримки під час завантаження тек, що містять багато подач." #~ msgid "Downloading Enclosures" #~ msgstr "Звантаження вкладень" diff -Nru liferea-1.8.15/po/vi.po liferea-1.10.3/po/vi.po --- liferea-1.8.15/po/vi.po 2013-06-24 22:16:18.000000000 +0200 +++ liferea-1.10.3/po/vi.po 2013-07-31 23:29:12.000000000 +0200 @@ -1,27 +1,25 @@ # Vietnamese translation for liferea. -# Copyright © 2012 Free Software Foundation, Inc. +# Copyright © 2013 Free Software Foundation, Inc. # This file is distributed under the same license as the liferea package. -# Trần Ngọc Quân , 2012. +# Trần Ngọc Quân , 2012-2013. # msgid "" msgstr "" -"Project-Id-Version: liferea-1.8-rc1\n" +"Project-Id-Version: liferea-1.10-rc4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" -"PO-Revision-Date: 2012-06-15 13:59+0700\n" +"POT-Creation-Date: 2013-06-11 22:55+0200\n" +"PO-Revision-Date: 2013-06-13 07:38+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" -"Language: \n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Poedit-Language: Vietnamese\n" -"X-Poedit-Country: VIET NAM\n" -"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-SourceCharset: UTF-8\n" +"X-Generator: Poedit 1.5.5\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:234 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -34,26 +32,16 @@ msgstr "Bộ đọc Feed Liferea" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "Tải về và trình bày feed" +msgid "Read news feeds and blogs" +msgstr "Đọc các tin mới và blog" #: ../xslt/feed.xml.in.h:1 -msgid "" -"This feed is discontinued. It's no longer available. Liferea won't update it " -"anymore but you can still access the cached headlines." -msgstr "" -"Feed này không còn được kết nối nữa. Nó không sẵn dùng. Liferea sau này " -"không thể cập nhật thêm nữa nhưng bạn vẫn có thể truy cập các đề mục đã được " -"nhớ tạm. " +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 này không còn được kết nối nữa. Nó không sẵn dùng. Liferea sau này không thể cập nhật thêm nữa nhưng bạn vẫn có thể truy cập các đề mục đã được nhớ tạm. " #: ../xslt/feed.xml.in.h:2 -msgid "" -"The last update of this subscription failed!
    HTTP error code : " -msgstr "" -"Lần cập nhật cuối địa chỉ đặt xem dài hạn này gặp lỗi!
    Mã lỗi HTTP " -": " +msgid "The last update of this subscription failed!
    HTTP error code : " +msgstr "Lần cập nhật cuối địa chỉ đặt xem dài hạn này gặp lỗi!
    Mã lỗi HTTP : " #: ../xslt/feed.xml.in.h:3 msgid "There were errors while parsing this feed!" @@ -69,7 +57,7 @@ #: ../xslt/feed.xml.in.h:6 msgid "You may want to contact the author/webmaster of the feed about this!" -msgstr "" +msgstr "Bạn có lẽ cần liên hệ với người quản lý trang web hay tác giả của feed về vấn đề này!" #: ../xslt/feed.xml.in.h:7 msgid "There were errors while filtering this feed!" @@ -89,7 +77,7 @@ #: ../xslt/feed.xml.in.h:11 msgid "Publisher" -msgstr "Nơi xuất bản" +msgstr "Nhà xuất bản" #: ../xslt/feed.xml.in.h:12 msgid "Copyright" @@ -145,38 +133,26 @@ msgstr "Người tạo" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "cờ" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "dấu trang" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "ghi chú" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "Vẫn chưa có ghi chú nào." -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "Ghi chú" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "Đang cập nhật..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "Làm mới lại" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "Phần" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "Phòng ban" @@ -185,12 +161,8 @@ msgstr "Thùng rác tin tức:" #: ../xslt/newsbin.xml.in.h:2 -msgid "" -"Add items to this news bin by selecting \"Copy to News Bin\" from the item " -"list context menu." -msgstr "" -"Thêm các mục vào thùng rác tin tức này bằng cách chọn \"Sao chép vào Thùng " -"rác Tin tức\" từ trình đơn ngữ cảnh danh sách mục tin." +msgid "Add items to this news bin by selecting \"Copy to News Bin\" from the item list context menu." +msgstr "Thêm các mục vào thùng rác tin tức này bằng cách chọn \"Sao chép vào Thùng rác Tin tức\" từ trình đơn ngữ cảnh danh sách mục tin." #: ../xslt/vfolder.xml.in.h:1 msgid "Search Folder:" @@ -200,12 +172,12 @@ msgid "Default Browser" msgstr "Trình duyệt mặc định" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "Lệnh duyệt gặp lỗi: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "Đang khởi chạy: \"%s\"" @@ -215,7 +187,7 @@ msgid "Authorization Error" msgstr "Lỗi xác thực" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Không thể tạo thư mục nhớ đệm \"%s\"!" @@ -245,109 +217,99 @@ msgid "%b %d %Y" msgstr "%b %d %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "\"%s\" không phải là tập tin cấu hình kiểu tài liệu đính kèm hợp lệ!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "Tải về tài liệu đính kèm GẶP LỖI: \"%s\"" +#: ../src/enclosure.c:288 +msgid "You have not configured a download tool yet! Please do so in the 'Download' tab in Tools/Preferences." +msgstr "Bạn vẫn chưa cấu hình công cụ tải về! Hãy làm điều đó tại tab 'Tải về' trong 'Công cụ/Cá nhân hóa'." -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "Tải về tài liệu đính kèm đã hoàn tất: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" +"Lệnh gặp lỗi: \n" +"\n" +"%s\n" +"\n" +" Hãy kiểm tra xem công cụ 'tải về' đã được cấu hình và hoạt động có chính xác hay không! Bạn thay đổi chúng tại tab 'Tải về' trong 'Công cụ/Cá nhân hóa'." -#: ../src/export.c:174 +#: ../src/export.c:185 #, c-format msgid "Error renaming %s to %s\n" msgstr "Gặp lỗi khi thay đổi tên %s thành %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "XML gặp lỗi khi đọc tập tin OPML! Không thể nhập vào \"%s\"!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:422 ../src/export.c:424 #, c-format -msgid "" -"Empty document! OPML document \"%s\" should not be empty when importing." -msgstr "" -"Tài liệu trống rỗng! Tài liệu OPML \"%s\" không nên là trống rỗng trong khi " -"nó được dùng để nhập vào." +msgid "Empty document! OPML document \"%s\" should not be empty when importing." +msgstr "Tài liệu trống rỗng! Tài liệu OPML \"%s\" không nên là trống rỗng trong khi nó được dùng để nhập vào." -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:445 ../src/export.c:447 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" -msgstr "" -"\"%s\" không phải là tài liệu định dạng OPML hợp lệ! Liferea không thể nhập " -"vào tập tin này!" +msgstr "\"%s\" không phải là tài liệu định dạng OPML hợp lệ! Liferea không thể nhập vào tập tin này!" -#: ../src/export.c:440 +#: ../src/export.c:466 msgid "Imported feed list" msgstr "Nhập vào danh sách feed" -#: ../src/export.c:452 +#: ../src/export.c:478 msgid "Import Feed List" msgstr "Nhập vào danh sách feed" -#: ../src/export.c:452 +#: ../src/export.c:478 msgid "Import" msgstr "Nhập" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:478 ../src/export.c:495 ../src/fl_sources/opml_source.c:394 msgid "OPML Files" msgstr "Tập tin OPML" -#: ../src/export.c:460 +#: ../src/export.c:486 msgid "Error while exporting feed list!" msgstr "Gặp lỗi khi xuất ra danh sách feed!" -#: ../src/export.c:462 +#: ../src/export.c:488 msgid "Feed List exported!" msgstr "Danh sách feed đã được xuất ra!" -#: ../src/export.c:469 +#: ../src/export.c:495 msgid "Export Feed List" msgstr "Xuất ra danh sách feed" -#: ../src/export.c:469 +#: ../src/export.c:495 msgid "Export" msgstr "Xuất" -#: ../src/feed.c:255 -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 "" -"

    Không thể dò tìm kiểu của feed này! Xin hãy kiểm tra xem nguồn của nó có " -"thực sự chỉ vào một nguồn tài nguyên được cung cấp bởi một trong số định " -"dạng được hỗ trợ!!

    Bộ phân tích XML Kết xuất:
    " +#: ../src/feed.c:254 +msgid "

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

    XML Parser Output:
    " +msgstr "

    Không thể dò tìm kiểu của feed này! Xin hãy kiểm tra xem nguồn của nó có thực sự chỉ vào một nguồn tài nguyên được cung cấp bởi một trong số định dạng được hỗ trợ!!

    Bộ phân tích XML Kết xuất:
    " -#: ../src/feed.c:284 +#: ../src/feed.c:283 #, c-format msgid "\"%s\" updated..." msgstr "\"%s\" đã được cập nhật..." -#: ../src/feed.c:294 +#: ../src/feed.c:293 #, c-format msgid "\"%s\" is not available" msgstr "\"%s\" không sẵn sàng" #: ../src/feed_parser.c:137 -msgid "" -"The URL you want Liferea to subscribe to points to a webpage and the auto " -"discovery found no feeds on this page. Maybe this webpage just does not " -"support feed auto discovery." -msgstr "" -"Địa chỉ URL bạn muốn Liferea đặt xem dài hạn chỉ đến một trang web và hệ " -"thống tự động không tìm thấy feed nào trên trang này. Có lẽ trang web này " -"không hỗ trợ chương trình tự dò tìm feed." +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 "Địa chỉ URL bạn muốn Liferea đặt xem dài hạn chỉ đến một trang web và hệ thống tự động không tìm thấy feed nào trên trang này. Có lẽ trang web này không hỗ trợ chương trình tự dò tìm feed." #: ../src/feed_parser.c:170 #, c-format @@ -371,117 +333,93 @@ msgstr "Không thể xác định được kiểu của feed." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 msgid "There are no unread items" msgstr "Không có mục tin nào chưa đọc cả" -#: ../src/main.c:175 -msgid "" -"Start Liferea with its main window in STATE. STATE may be `shown', " -"`iconified', or `hidden'" -msgstr "" -"Khởi động Liferea với cửa sổ chính trong trạng thái STATE. STATE có thể là " -"`shown', `iconified', hoặc `hidden'" +#: ../src/main.c:163 +msgid "Start Liferea with its main window in STATE. STATE may be `shown', `iconified', or `hidden'" +msgstr "Khởi động Liferea với cửa sổ chính trong trạng thái STATE. STATE có thể là `shown', `iconified', hoặc `hidden'" -#: ../src/main.c:175 +#: ../src/main.c:163 msgid "STATE" msgstr "TRẠNG-THÁI" -#: ../src/main.c:179 +#: ../src/main.c:164 msgid "Show version information and exit" msgstr "hiển thị thông tin phiên bản rồi thoát" -#: ../src/main.c:180 +#: ../src/main.c:165 msgid "Add a new subscription" msgstr "Thêm một địa chỉ đặt xem dài hạn" -#: ../src/main.c:180 +#: ../src/main.c:165 msgid "uri" msgstr "uri" -#: ../src/main.c:185 +#: ../src/main.c:170 msgid "Print debugging messages of all types" msgstr "Hiển thị ra thông tin để gỡ lỗi cho tất cả các kiểu" -#: ../src/main.c:186 +#: ../src/main.c:171 msgid "Print debugging messages for the cache handling" msgstr "Hiển thị ra thông tin để gỡ lỗi cho bộ tiếp hợp bộ nhớ tạm" -#: ../src/main.c:187 +#: ../src/main.c:172 msgid "Print debugging messages for the configuration handling" msgstr "Hiển thị ra thông tin để gỡ lỗi cho bộ tiếp hợp cấu hình" -#: ../src/main.c:188 +#: ../src/main.c:173 msgid "Print debugging messages of the database handling" msgstr "Hiển thị ra thông tin để gỡ lỗi cho bộ tiếp hợp cơ sở dữ liệu" -#: ../src/main.c:189 +#: ../src/main.c:174 msgid "Print debugging messages of all GUI functions" msgstr "Hiển thị ra thông tin để gỡ lỗi cho tất cả các hàm 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.8/output.xhtml" -msgstr "" -"Cho phép gỡ lỗi biểu diễn HTML. Mỗi khi Liferea biểu diễn kết xuất HTML nó " -"cũng đồng thời đổ đống trang HTML đã tạo vào ~/.liferea_1.8/output.xhtml" +#: ../src/main.c:175 +msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.cache/liferea/output.xhtml" +msgstr "Cho phép gỡ lỗi biểu diễn HTML. Mỗi khi Liferea biểu diễn kết xuất HTML nó cũng đồng thời đổ đống trang HTML đã tạo vào ~/.liferea_1.6/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:176 msgid "Print debugging messages of all network activity" -msgstr "" -"Hiển thị ra thông tin để gỡ lỗi cho tất cả các kết nối mạng đang hoạt động" +msgstr "Hiển thị ra thông tin để gỡ lỗi cho tất cả các kết nối mạng đang hoạt động" -#: ../src/main.c:192 +#: ../src/main.c:177 msgid "Print debugging messages of all parsing functions" msgstr "Hiển thị ra thông tin để gỡ lỗi cho tất cả các hàm phân tích cú pháp" -#: ../src/main.c:193 +#: ../src/main.c:178 msgid "Print debugging messages when a function takes too long to process" -msgstr "" -"Hiển thị ra thông tin để gỡ lỗi khi một hàm xử lý mất quá nhiều thời gian" +msgstr "Hiển thị ra thông tin để gỡ lỗi khi một hàm xử lý mất quá nhiều thời gian" -#: ../src/main.c:194 +#: ../src/main.c:179 msgid "Print debugging messages when entering/leaving functions" -msgstr "Hiển thị ra thông tin để gỡ lỗi khi vào/rời khỏi hàm" +msgstr "Hiển thị ra thông tin để gỡ lỗi khi vào/rời_khỏi hàm" -#: ../src/main.c:195 +#: ../src/main.c:180 msgid "Print debugging messages of the feed update processing" msgstr "Hiển thị ra thông tin để gỡ lỗi cho tiến trình cập nhật feed" -#: ../src/main.c:196 +#: ../src/main.c:181 msgid "Print debugging messages of the search folder matching" msgstr "Hiển thị ra thông tin để gỡ lỗi cho thư mục tìm kiếm hợp" -#: ../src/main.c:197 +#: ../src/main.c:182 msgid "Print verbose debugging messages" msgstr "Hiển thị thông tin gỡ lỗi chi tiết" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:193 ../src/main.c:194 msgid "Print debugging messages for the given topic" msgstr "Hiển thị ra thông tin để gỡ lỗi cho chủ đề đã chỉ ra" -#: ../src/main.c:218 +#: ../src/main.c:201 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, một bộ đọc Feed trên Linux" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" -"Để biết thêm chi tiết, hãy viếng thăm trang chủ http://liferea.sourceforge." -"net/" - -#: ../src/migrate.c:340 -#, 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 "" -"Phiên bản này của Liferea sử dụng định dạng nhớ tạm mới và cần phải chuyển " -"đổi phần bộ nhớ cũ. Nội dung bộ nhớ trong %s đã không được xóa một cách tự " -"động. Làm ơn hãy gỡ bỏ thư mục này đi một cách thủ công một khi bạn đã chắc " -"chắn là mình đã chuyển đổi một cách thành công!" +#: ../src/main.c:202 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "Để biết thêm chi tiết, hãy truy cập trang chủ http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -505,10 +443,8 @@ msgstr "Không thể kết nối đến máy chủ ủy thác" #: ../src/net.c:325 -msgid "" -"A network error occurred, or the other end closed the connection unexpectedly" -msgstr "" -"Mạng xảy ra lỗi, hoặc là một chương trình khác đã đóng kết nối đột xuất" +msgid "A network error occurred, or the other end closed the connection unexpectedly" +msgstr "Mạng xảy ra lỗi, hoặc là một chương trình khác đã đóng kết nối đột xuất" #. http 3xx redirection #: ../src/net.c:328 @@ -517,12 +453,8 @@ #. http 4xx client error #: ../src/net.c:331 -msgid "" -"You are unauthorized to download this feed. Please update your username and " -"password in the feed properties dialog box" -msgstr "" -"Bạn không đủ thẩm quyền để tải về feed này. Hãy cập nhật tài khoản và mật " -"khẩu trong hộp thoại thuộc tính của feed" +msgid "You are unauthorized to download this feed. Please update your username and password in the feed properties dialog box" +msgstr "Bạn không đủ thẩm quyền để tải về feed này. Hãy cập nhật tài khoản và mật khẩu trong hộp thoại thuộc tính của feed" #: ../src/net.c:333 msgid "Payment required" @@ -562,8 +494,7 @@ #: ../src/net.c:347 msgid "Feed not available: Server requested unsupported redirection!" -msgstr "" -"Feed không sẵn sàng: Máy chủ được yêu cầu đã không hỗ trợ chuyển hướng!" +msgstr "Feed không sẵn sàng: Máy chủ được yêu cầu đã không hỗ trợ chuyển hướng!" #: ../src/net.c:349 msgid "Client Error" @@ -648,135 +579,124 @@ msgstr "chưa được đặt" #: ../src/rule.c:181 -#, fuzzy msgid "Feed title" -msgstr "Tên mục" +msgstr "Tiêu đề Feed" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Địa chỉ đặt dài hạn \"%s\" đã được cập nhật từ trước rồi!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format -msgid "" -"The subscription \"%s\" was discontinued. Liferea won't update it anymore!" -msgstr "" -"Địa chỉ đặt xem dài hạn \"%s\" không còn được tiếp tục nữa. Liferea không " -"thể cập nhật thêm nữa!" +msgid "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" +msgstr "Địa chỉ đặt xem dài hạn \"%s\" không còn được tiếp tục nữa. Liferea không thể cập nhật thêm nữa!" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "Đang cập nhật favicon cho \"%s\"" -#: ../src/subscription.c:192 -msgid "" -"There was a problem while reading this subscription. Please check the URL " -"and console output." -msgstr "" -"Ở đây có vấn đề xảy ra trong khi đọc địa chỉ đặt xem dài hạn này. Hãy kiểm " -"tra URL và xem kết xuất của thiết bị cuối." +#: ../src/subscription.c:193 +msgid "There was a problem while reading this subscription. Please check the URL and console output." +msgstr "Ở đây có vấn đề xảy ra trong khi đọc địa chỉ đặt xem dài hạn này. Hãy kiểm tra URL và xem kết xuất của thiết bị cuối." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "Địa chỉ URL của \"%s\" đã thực sự bị thay đổi và đã được cập nhật" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" -msgstr "" -"\"%s\" không còn được tiếp tục nữa. Liferea không thể cập nhật thêm nữa!" +msgstr "\"%s\" không còn được tiếp tục nữa. Liferea không thể cập nhật thêm nữa!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" không thay đổi kích thước kể từ lần cập nhật trước" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "Đang cập nhật \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:258 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Gặp lỗi kho mở tập tin tạm %s để sử dụng cho việc lọc!" -#: ../src/update.c:278 +#: ../src/update.c:281 #, c-format msgid "%s exited with status %d" msgstr "%s đã thoát với trạng thái %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:287 ../src/update.c:288 ../src/update.c:400 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Lỗi: Không thể mở đường ống (pipe) \"%s\"" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:426 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Lỗi: Không thể mở tập tin \"%s\"" -#: ../src/update.c:429 +#: ../src/update.c:432 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Lỗi: Không có tập tin \"%s\"" -#: ../src/vfolder.c:55 +#: ../src/vfolder.c:54 msgid "New Search Folder" msgstr "Thêm thư mục tìm kiếm" -#: ../src/xml.c:451 +#: ../src/xml.c:410 msgid "[There were more errors. Output was truncated!]" msgstr "[Ở đây có nhiều lỗi. Kết xuất đã bị cắt cụt!]" -#: ../src/xml.c:604 +#: ../src/xml.c:563 msgid "XML Parser: Could not parse document:\n" msgstr "XML Parser: Không thể phân tích tài liệu:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "Đính kèm" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d tài liệu đính kèm" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " Bytes" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d tài liệu đính kèm" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "Chọn một tệp tin" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "Đuôi mở rộng Tệp tin .%s" @@ -786,653 +706,667 @@ msgid "Couldn't find pixmap file: %s" msgstr "Không tìm thấy tập tin pixmap: %s" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d mới)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d chưa đọc%s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "Trợ Giúp Theo Chủ Đề" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "Tham khảo nhanh" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "FAQ" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:795 msgid "Liferea is now online" msgstr "Liferea hiện tại đang trực tuyến" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:797 msgid "Work Offline" msgstr "Làm việc ngoại tuyến" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:799 msgid "Liferea is now offline" msgstr "Liferea hiện tại đang ngoại tuyến" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:801 msgid "Work Online" msgstr "Làm việc trực tuyến" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:897 msgid "_Subscriptions" msgstr "Địa chỉ đặt xem dài hạn" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:898 msgid "Update _All" msgstr "Cập nhật _tất cả" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:898 msgid "Updates all subscriptions." msgstr "Cập nhật tất cả các địa chỉ đặt xem dài hạn" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:900 msgid "Mark All As _Read" msgstr "Đánh dấu là tất cả đã đọ_c" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:900 msgid "Marks read every item of every subscription." msgstr "Đánh dấu đọc cho mỗi mục tin của mỗi địa chỉ đặt xem dài hạn." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:902 msgid "_Import Feed List..." -msgstr "Nhập vào danh sách feed..." +msgstr "_Nhập vào danh sách feed..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:902 msgid "Imports an OPML feed list." msgstr "Nhập vào danh sách feed kiểu OPML." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:903 msgid "_Export Feed List..." -msgstr "Xuất ra danh sách feed..." +msgstr "_Xuất ra danh sách feed..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:903 msgid "Exports the feed list as OPML." msgstr "Xuất ra danh sách feed kiểu OPML." -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:904 msgid "_Quit" msgstr "T_hoát" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:906 msgid "_Feed" msgstr "_Feed" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:907 msgid "Remove _All Items" -msgstr "Gỡ bỏ mọi mục tin" +msgstr "Gỡ bỏ _mọi mục tin" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:907 msgid "Removes all items of the currently selected feed." msgstr "Gỡ bỏ tất cả các mục của feed hiện hành đã được chọn." -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:910 msgid "_Item" msgstr "_Mục" +#: ../src/ui/liferea_shell.c:911 +msgid "Previous Item" +msgstr "Mục kế trước" + +#: ../src/ui/liferea_shell.c:913 +msgid "Next Item" +msgstr "Mục kế tiếp" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:918 msgid "_Next Unread Item" -msgstr "Mục chưa đọc kế tiếp" +msgstr "Mục chưa đọc _kế tiếp" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:921 msgid "_View" msgstr "_Trình bày" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:922 ../src/ui/liferea_htmlview.c:653 msgid "_Increase Text Size" -msgstr "Tăng kích thước chữ" +msgstr "Tăn_g kích thước chữ" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:922 msgid "Increases the text size of the item view." msgstr "Tăng kích thước hiển thị các mục." -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:924 ../src/ui/liferea_htmlview.c:654 msgid "_Decrease Text Size" -msgstr "Giảm kích thước chữ" +msgstr "Giả_m kích thước chữ" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:924 msgid "Decreases the text size of the item view." msgstr "Giảm kích thước hiển thị các mục" -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:927 msgid "_Tools" -msgstr "Công cụ" +msgstr "_Công cụ" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:928 msgid "_Update Monitor" -msgstr "Cập nhật bộ theo dõi" +msgstr "_Cập nhật bộ theo dõi" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:928 msgid "Show a list of all feeds currently in the update queue" msgstr "Hiển thị danh sách toàn bộ feed hiện tại đang trong hàng đợi cập nhật" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:930 msgid "_Preferences" msgstr "_Cá nhân hóa" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:930 msgid "Edit Preferences." msgstr "Sửa sở thích riêng." -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:933 msgid "S_earch" msgstr "Tìm _kiếm" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:934 msgid "Search All Feeds..." msgstr "Tìm trong tất cả các Feed..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:934 msgid "Show the search dialog." msgstr "Hiển thị hộp thoại tìm kiếm." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:936 msgid "_Help" msgstr "Trợ g_iúp" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:937 msgid "_Contents" msgstr "_Nội dung" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:937 msgid "View help for this application." msgstr "Hiển thị trợ giúp cho ứng dụng này." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:938 msgid "_Quick Reference" msgstr "_Tham khảo nhanh" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:938 msgid "View a list of all Liferea shortcuts." msgstr "Hiển thị danh sách của các phím tắt dành cho Liferea." -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:940 msgid "_FAQ" msgstr "_FAQ" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:940 msgid "View the FAQ for this application." -msgstr "Hiển thị FAQ cho ứng dụng này." +msgstr "Hiển thị câu hỏi thường gặp (FAQ) của ứng dụng này." -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:941 msgid "_About" msgstr "_Giới thiệu" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:941 msgid "Shows an about dialog." msgstr "Hiển thị hộp thoại giới thiệu chương trình." -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:945 msgid "_Normal View" msgstr "Trình bày _bình thường" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:945 msgid "Set view mode to mail client mode." msgstr "Đặt chế độ trình bày cho chế độ máy khách thư" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:947 msgid "_Wide View" msgstr "Trình bày kiểu _rộng" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:947 msgid "Set view mode to use three vertical panes." msgstr "Đặt chế độ hiển thị để sử dụng cho chế độ 3 bảng đứng" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:949 msgid "_Combined View" msgstr "Trình bày kiểu tổ hợ_p" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:949 msgid "Set view mode to two pane mode." msgstr "Đặt chế độ trình bày cho chế độ hai cửa sổ" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:954 msgid "_Reduced Feed List" -msgstr "Tiết giảm danh sách feed" +msgstr "_Tiết giảm danh sách feed" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:954 msgid "Hide feeds with no unread items." msgstr "Ẩn đi những feed mà không có mục tin nào chưa đọc cả." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:959 msgid "_New Subscription..." msgstr "Thêm một địa chỉ đặt xem dài hạn..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:959 msgid "Adds a subscription to the feed list." msgstr "Thêm địa chỉ đặt xem dài hạn vào danh sách feed." -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:961 ../src/ui/popup_menu.c:320 msgid "New _Folder..." msgstr "Thư _mục mới..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:961 msgid "Adds a folder to the feed list." msgstr "Thêm một thư mục vào danh sách feed." -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:962 ../src/ui/popup_menu.c:323 msgid "New S_earch Folder..." msgstr "Thêm thư mục tìm _kiếm..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:962 msgid "Adds a new search folder to the feed list." msgstr "Thêm một thư mục tìm kiếm mới vào danh sách feed." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:963 msgid "New _Source..." msgstr "Thêm _Nguồn mới..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:963 msgid "Adds a new feed list source." msgstr "Thêm vào một nguồn danh sách feed mới." -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:964 ../src/ui/popup_menu.c:325 msgid "New _News Bin..." msgstr "Thùng rác tin tức mới..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:964 msgid "Adds a new news bin." msgstr "Thêm một thùng rác tin tức mới." -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:968 msgid "_Mark Items Read" -msgstr "Đánh dấu các mục là đã đọc" +msgstr "Đánh dấ_u các mục là đã đọc" -#: ../src/ui/liferea_shell.c:911 -msgid "" -"Marks all items of the selected feed list node / in the item list as read." -msgstr "" -"Đánh dấu tất cả những mục tin của nút feed đã được chọn / trong danh sách " -"mục tin như là đã được đọc." +#: ../src/ui/liferea_shell.c:968 +msgid "Marks all items of the selected feed list node / in the item list as read." +msgstr "Đánh dấu tất cả những mục tin của nút feed đã được chọn / trong danh sách mục tin như là đã được đọc." -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:970 ../src/ui/popup_menu.c:300 msgid "_Update" msgstr "_Cập nhật" -#: ../src/ui/liferea_shell.c:913 -msgid "" -"Updates the selected subscription or all subscriptions of the selected " -"folder." -msgstr "" -"Cập nhật tất cả các địa chỉ đặt dài hạn đã chọn và cả trong các thư mục đã " -"chọn." +#: ../src/ui/liferea_shell.c:970 +msgid "Updates the selected subscription or all subscriptions of the selected folder." +msgstr "Cập nhật tất cả các địa chỉ đặt dài hạn đã chọn và cả trong các thư mục đã chọn." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:975 msgid "_Properties" msgstr "_Thuộc tính" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:975 msgid "Opens the property dialog for the selected subscription." msgstr "Mở hộp thoại thuộc tính cho địa chỉ đặt dài hạn đã được chọn." -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:976 msgid "_Remove" msgstr "_Xóa bỏ" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:976 msgid "Removes the selected subscription." msgstr "Gỡ bỏ những địa chỉ đặt dài hạn đã chọn." -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:980 ../src/ui/popup_menu.c:163 msgid "Toggle _Read Status" msgstr "Bật/Tắt trạng thái đọc" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:980 msgid "Toggles the read status of the selected item." msgstr "Bật/tắt trạng thái đọc của mục tin đã chọn." -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:982 ../src/ui/popup_menu.c:164 msgid "Toggle Item _Flag" msgstr "Bật/Tắt Cờ của mục tin" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:982 msgid "Toggles the flag status of the selected item." msgstr "Bật/tắt trạng thái cờ của mục tin đã chọn." -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:984 msgid "R_emove" msgstr "Gỡ _bỏ" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:984 msgid "Removes the selected item." msgstr "Gỡ bỏ mục đã được chọn." -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" -msgstr "_Mở liên kết trong trình duyệt" - -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." -msgstr "Mở liên kết trong trình duyệt đã được cấu hình sẵn." +#: ../src/ui/liferea_shell.c:986 ../src/ui/popup_menu.c:127 +msgid "Open In _Tab" +msgstr "Mở Trong _Tab" + +#: ../src/ui/liferea_shell.c:986 +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "Mở liên kết trong tab trình duyệt Liferea mới." + +#: ../src/ui/liferea_shell.c:988 ../src/ui/popup_menu.c:128 +msgid "_Open In Browser" +msgstr "_Mở trong trình duyệt" + +#: ../src/ui/liferea_shell.c:988 +msgid "Launches the item's link in the Liferea item pane." +msgstr "Mở liên kết trong bảng mục tin Liferea." + +#: ../src/ui/liferea_shell.c:990 ../src/ui/popup_menu.c:129 +msgid "Open In _External Browser" +msgstr "Mở liên kết trong bộ duyệt _Bên ngoài" + +#: ../src/ui/liferea_shell.c:990 +msgid "Launches the item's link in the configured external browser." +msgstr "Mở liên kết trong trình duyệt bên ngoài đã được cấu hình sẵn." -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:995 ../src/ui/popup_menu.c:193 msgid "_Work Offline" msgstr "_Làm việc ngoại tuyến" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:995 msgid "This option allows you to disable subscription updating." msgstr "Tùy chọn này cho phép bạn tắt việc cập nhật các địa chỉ đặt dài hạn." -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:997 +msgid "_Fullscreen" +msgstr "Chế độ t_oàn màn hình" + +#: ../src/ui/liferea_shell.c:997 +msgid "Browse at full screen" +msgstr "Duyệt toàn màn hình" + +#: ../src/ui/liferea_shell.c:1328 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - một bộ đọc Feed trên Linux" -#: ../src/ui/liferea_shell.c:1246 -msgid "" -"

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

    You can add new subscriptions

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

    " -msgstr "" -"

    Chào mừng các bạn sử dụng Liferea, một chương trình máy tính tập " -"hợp tin tức từ feed.

    Bạn có thể thêm các địa chỉ đặt xem dài hạn " -"

    • Từ trình đơn chính 'Đặt xem dài hạn' -> 'Thêm địa chỉ đặt xem dài " -"hạn mới'
    • Bằng cách thả liên kết vào danh sách đặt xem dài hạn
    • Bằng cách bấm chuột phải vào các liên kết và chọn 'Đặt xem dài hạn' ở " -"trong Liferea

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

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

    You can add new subscriptions

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

    " +msgstr "

    Chào mừng các bạn sử dụng Liferea, một chương trình máy tính tập hợp tin tức từ feed.

    Bạn có thể thêm các địa chỉ đặt xem dài hạn

    • Từ trình đơn chính 'Đặt xem dài hạn' -> 'Thêm địa chỉ đặt xem dài hạn mới'
    • Bằng cách thả liên kết vào danh sách đặt xem dài hạn
    • Bằng cách bấm chuột phải vào các liên kết và chọn 'Đặt xem dài hạn' ở trong Liferea

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Nhập vào tên và mật khẩu cho \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "Nguồn không rõ" -#: ../src/ui/ui_common.c:205 +#: ../src/ui/ui_common.c:211 msgid "All Files" -msgstr "Mọi tập tin" +msgstr "Mọi kiểu tập tin" -#: ../src/ui/feed_list_view.c:341 +#: ../src/ui/feed_list_view.c:338 msgid "Deleting entry" msgstr "Đang xóa mục" -#: ../src/ui/feed_list_view.c:342 +#: ../src/ui/feed_list_view.c:339 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "Bạn có chắc là mình muốn xóa \"%s\" cùng với nội dung của nó?" -#: ../src/ui/feed_list_view.c:342 +#: ../src/ui/feed_list_view.c:339 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Bạn có chắc muốn xóa bỏ\"%s\" không?" -#: ../src/ui/feed_list_view.c:354 +#: ../src/ui/feed_list_view.c:351 msgid "Deletion Confirmation" msgstr "Xác nhận việc xóa" -#: ../src/ui/feed_list_view.c:385 +#: ../src/ui/feed_list_view.c:382 msgid "Liferea is in offline mode. No update possible." msgstr "Liferea đang ở trạng thái ngoại tuyến. Cập nhật là điều không thể." -#: ../src/ui/liferea_htmlview.c:435 -#, c-format -msgid "Download FAILED: \"%s\"" -msgstr "Việc tải về BỊ LỖI: \"%s\"" - -#: ../src/ui/liferea_htmlview.c:437 -msgid "Download finished." -msgstr "Hoàn tất tải về." - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +#: ../src/ui/liferea_htmlview.c:624 +msgid "Open Link In _Tab" msgstr "Mở liên kết trong _Tab" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" -msgstr "Mở liên kết trong trình duyệt" +#: ../src/ui/liferea_htmlview.c:625 +msgid "_Open Link In Browser" +msgstr "_Mở liên kết trong trình duyệt" + +#: ../src/ui/liferea_htmlview.c:626 +msgid "_Open Link In External Browser" +msgstr "_Mở liên kết trong trình duyệt ngoài" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:629 #, c-format msgid "_Bookmark Link at %s" msgstr "Đánh dấu liên kết ở %s" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:633 msgid "_Copy Link Location" msgstr "Sao chép địa chỉ liên kết" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Image Location" msgstr "Sao chép địa chỉ của ảnh" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:638 msgid "S_ave Link As" msgstr "Ghi lại Link với tên" -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:640 msgid "S_ave Image As" msgstr "Ghi lại ảnh với tên" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:643 msgid "_Subscribe..." msgstr "Đặt _dài hạn..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:398 msgid "*** No title ***" msgstr "*** Vô đề ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:661 msgid "Date" msgstr "Ngày tháng" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:675 msgid "Headline" -msgstr "Headline" +msgstr "Tin chính" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:777 ../src/ui/item_list_view.c:798 +#: ../src/ui/item_list_view.c:819 ../src/ui/item_list_view.c:883 +#: ../src/ui/item_list_view.c:968 ../src/ui/item_list_view.c:983 msgid "No item has been selected" msgstr "Không có mục nào được chọn" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:794 ../src/ui/item_list_view.c:815 msgid "This item has no link specified!" msgstr "Mục này chưa chỉ ra đường link!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:871 msgid "You must select a feed to delete its items!" msgstr "Bạn phải chọn một feed để mà xóa bỏ các mục tin của nó!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "Mở mục trong _Tab" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "Mở mục tin trong trình duyệt" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:141 msgid "Copy to News Bin" msgstr "Sao chép vào Thùng rác tin tức" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "Sao chép địa chỉ URL vào Clipboard" +#: ../src/ui/popup_menu.c:155 +#, c-format +msgid "_Bookmark at %s" +msgstr "Đánh dấ_u ở %s" + +#: ../src/ui/popup_menu.c:159 +msgid "Copy Item _Location" +msgstr "Sao chép địa chỉ _Mục tin" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:165 msgid "R_emove Item" -msgstr "Xóa bỏ mục tin" +msgstr "Xóa bỏ mục t_in" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:178 msgid "Open Enclosure..." msgstr "Mở tập tin đính kèm..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:179 msgid "Save As..." msgstr "Ghi lại bằng tên mới..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:180 msgid "Copy Link Location" msgstr "Sao chép địa chỉ liên kết" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:194 msgid "_Update All" -msgstr "Cập nhật tất cả" +msgstr "_Cập nhật tất cả" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:199 msgid "_Show Liferea" msgstr "Hiển thị Liferea" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:302 msgid "_Update Folder" msgstr "Cập nhật thư mục" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:304 msgid "_Mark All As Read" msgstr "Đánh dấu là tất cả đã đọc" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:314 msgid "_New" msgstr "_Mới" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:317 msgid "New _Subscription..." msgstr "Thêm một địa chỉ đặt dài hạn..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:324 msgid "New S_ource..." msgstr "Nguồn mới..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:333 msgid "Sort Feeds" msgstr "Sắp xếp Feed" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:339 msgid "_Rebuild" msgstr "_Xây dụng lại" -#: ../src/ui/popup_menu.c:341 -#, fuzzy +#: ../src/ui/popup_menu.c:351 msgid "Convert To Local Subscriptions..." -msgstr "Thêm một địa chỉ đặt xem dài hạn..." +msgstr "Chuyển thành địa chỉ đặt xem dài hạn Nội bộ..." -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "(Rỗng)" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:87 msgid "GNOME default" msgstr "mặc định GNOME" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:88 msgid "Text below icons" msgstr "Chữ ở dưới biểu tượng" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:89 msgid "Text beside icons" msgstr "Chữ ở bên cạnh biểu tượng" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:90 msgid "Icons only" msgstr "Chỉ có biểu tượng" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:91 msgid "Text only" msgstr "Chỉ có chữ" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:99 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "phút" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "giờ" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "ngày" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:106 msgid "Space" msgstr "Space" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:107 msgid " Space" msgstr " Space" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " Space" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "Chọn thư mục tải về" +#: ../src/ui/preferences_dialog.c:113 +msgid "Normal View" +msgstr "Trình bày bình thường" + +#: ../src/ui/preferences_dialog.c:114 +msgid "Wide View" +msgstr "Trình bày kiểu rộng" + +#: ../src/ui/preferences_dialog.c:115 +msgid "Combined View" +msgstr "Trình bày kiểu tổ hợp" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:500 msgid "Manual" msgstr "Manual" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:515 msgid "Browser default" msgstr "Trình duyệt mặc định" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:518 msgid "Existing window" msgstr "Thoát ra" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:521 msgid "New window" msgstr "Mở cửa sổ mới" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:524 msgid "New tab" msgstr "Tab mới" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:683 msgid "Integrate with the messaging menu (indicator)" msgstr "Tổ hợp với trình đơn thông điệp (bộ chỉ thị)" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:686 msgid "Terminate instead of minimizing to the messaging menu" msgstr "Chấm dứt thay vì thu nhỏ nó vào trong trình đơn thông điệp" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:689 msgid "Start minimized to the messaging menu" msgstr "Khởi đầu ở dạng thu nhỏ vào trình đơn thông điệp" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:789 msgid "Type" msgstr "Kiểu" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:792 msgid "Program" msgstr "Chương trình" +#: ../src/ui/ui_node.c:123 +msgid "(Empty)" +msgstr "(Rỗng)" + +#: ../src/ui/ui_node.c:320 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" +"%s\n" +"Đang xây dụng lại" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." -msgid_plural "" -"The provider of this feed suggests an update interval of %d minutes." +msgid_plural "The provider of this feed suggests an update interval of %d minutes." msgstr[0] "Nơi cung cấp feed này đã gợi ý nhịp cập nhật là mỗi %d phút." #: ../src/ui/subscription_dialog.c:434 msgid "This feed specifies no default update interval." msgstr "Feed này ghi rõ không có nhịp cập nhật mặc định" -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:153 msgid "Untitled" msgstr "Không tên" @@ -1479,44 +1413,33 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/default_source.c:174 -#: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 +#: ../src/fl_sources/default_source.c:145 +#: ../src/fl_sources/google_source.c:273 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" msgstr "Thêm một địa chỉ đặt dài hạn" -#: ../src/fl_sources/google_source.c:116 +#: ../src/fl_sources/google_source.c:115 msgid "Google Reader login failed!" msgstr "Đăng nhập Google Reader gặp lỗi!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:394 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 -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 "" -"Hợp nhất danh sách feed từ tài khoản Google Reader của bạn. Liferea sẽ trình " -"diễn các địa chỉ đặt xem dài hạn Google Reader của bạn, và sẽ đồng bộ hóa " -"danh sách feed và danh sách đang đọc." +#: ../src/fl_sources/google_source.c:395 +msgid "Integrate the feed list of your Google Reader account. Liferea will present your Google Reader subscriptions, and will synchronize your feed list and reading lists." +msgstr "Hợp nhất danh sách feed từ tài khoản Google Reader của bạn. Liferea sẽ trình diễn các địa chỉ đặt xem dài hạn Google Reader của bạn, và sẽ đồng bộ hóa danh sách feed và danh sách đang đọc." -#: ../src/fl_sources/opml_source.c:325 +#: ../src/fl_sources/opml_source.c:326 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:326 -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 "" -"Hợp nhất blogrolls hoặc Planets trong danh sách feed của bạn. Liferea sẽ tự " -"động thêm hoặc gỡ bỏ các feed tương ứng với các thay đổi trong tài liệu " -"nguồn OPML" +#: ../src/fl_sources/opml_source.c:327 +msgid "Integrate blogrolls or Planets in your feed list. Liferea will automatically add and remove feeds according to the changes of the source OPML document" +msgstr "Hợp nhất blogrolls hoặc Planets trong danh sách feed của bạn. Liferea sẽ tự động thêm hoặc gỡ bỏ các feed tương ứng với các thay đổi trong tài liệu nguồn OPML" -#: ../src/fl_sources/opml_source.c:387 +#: ../src/fl_sources/opml_source.c:394 msgid "Choose OPML File" msgstr "Chọn tập tin OPML" @@ -1537,23 +1460,17 @@ #: ../src/fl_sources/node_source.c:412 #, c-format msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" +msgstr "Địa chỉ đặt xem dài hạn '%s' đã chuyển đổi thành công sang kiểu nội bộ!" -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:360 msgid "Tiny Tiny RSS" msgstr "Tiny Tiny RSS" -#: ../src/fl_sources/ttrss_source.c:360 -msgid "" -"Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " -"present your tt-rss subscriptions, and will synchronize your feed list and " -"reading lists." -msgstr "" -"Hợp nhất danh sách feed của tài khoản Tiny Tiny RSS 1.5+ của bạn. Liferea sẽ " -"trình bày các địa chỉ xem dài hạn tt-rss của bạn, và sẽ đồng bộ danh sách " -"feed của bạn và danh sách đang đọc." +#: ../src/fl_sources/ttrss_source.c:361 +msgid "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will present your tt-rss subscriptions, and will synchronize your feed list and reading lists." +msgstr "Hợp nhất danh sách feed của tài khoản Tiny Tiny RSS 1.5+ của bạn. Liferea sẽ trình bày các địa chỉ xem dài hạn tt-rss của bạn, và sẽ đồng bộ danh sách feed của bạn và danh sách đang đọc." -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:119 msgid "Could not parse JSON returned by tt-rss API!" msgstr "Không thể phân tích cú pháp của JSON được trả về từ API tt-rss!" @@ -1571,25 +1488,25 @@ msgid "Visit" msgstr "Thăm" -#: ../src/notification/libnotify.c:171 ../src/notification/libnotify.c:274 +#: ../src/notification/libnotify.c:167 ../src/notification/libnotify.c:263 msgid "Open feed" msgstr "Mở feed" -#: ../src/notification/libnotify.c:174 ../src/notification/libnotify.c:277 +#: ../src/notification/libnotify.c:170 ../src/notification/libnotify.c:266 msgid "Mark all as read" msgstr "Đánh dấu là tất cả đã đọc" -#: ../src/notification/libnotify.c:254 +#: ../src/notification/libnotify.c:247 #, c-format msgid "%s has %d update" msgid_plural "%s has %d updates" msgstr[0] "%s%d cập nhật" -#: ../src/notification/libnotify.c:257 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:249 msgid "Feed Update" msgstr "Cập nhật feed" -#: ../src/notification/libnotify.c:271 +#: ../src/notification/libnotify.c:260 msgid "Show details" msgstr "Hiển thị chi tiết" @@ -1606,12 +1523,8 @@ msgstr "Tài khoả_n:" #: ../glade/auth.ui.h:6 -msgid "" -"Note: The username and password will be saved to your Liferea feedlist " -"file without using encryption." -msgstr "" -"Chú ý: Tài khoản và mật khẩu sẽ được lưu lại trong tập tin lưu danh sách " -"Liferea của bạn mà không được mã hóa gì cả." +msgid "Note: The username and password will be saved to your Liferea feedlist file without using encryption." +msgstr "Chú ý: Tài khoản và mật khẩu sẽ được lưu lại trong tập tin lưu danh sách Liferea của bạn mà không được mã hóa gì cả." #: ../glade/google_source.ui.h:1 msgid "Add Google Reader Account" @@ -1621,8 +1534,7 @@ msgid "Please enter your Google Reader account settings." msgstr "Hãy nhập vào các cài đặt tài khoản Google Reader của bạn." -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "_Mật khẩu" @@ -1646,7 +1558,7 @@ msgid "combined view" msgstr "trình bày kiểu tổ hợp" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "Headlines" @@ -1696,7 +1608,7 @@ msgstr "Chung" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "Nguồn Feed" @@ -1729,26 +1641,16 @@ msgstr "Sử dụng bộ lọc chuyển đổi" #: ../glade/liferea.ui.h:27 ../glade/new_subscription.ui.h:12 -msgid "" -"Liferea can use external filter plugins in order to access feeds and " -"directories in non-supported formats. See the documentation for more " -"information." -msgstr "" -"Liferea có thể sử dụng phần bổ xung dùng để lọc từ bên ngoài cốt để mà truy " -"cập các feed và thư mục mà nó có định dạng không được hỗ trợ. Đọc thêm tài " -"liệu để có thông tin chi tiết." +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 có thể sử dụng phần bổ xung dùng để lọc từ bên ngoài cốt để mà truy cập các feed và thư mục mà nó có định dạng không được hỗ trợ. Đọc thêm tài liệu để có thông tin chi tiết." #: ../glade/liferea.ui.h:28 ../glade/new_subscription.ui.h:13 msgid "Convert _using:" msgstr "Chuyển đổi sử dụng:" #: ../glade/liferea.ui.h:30 -msgid "" -"The cache setting controls if the contents of feeds are saved when Liferea " -"exits. Marked items are always saved to the cache." -msgstr "" -"Cài đặt nhớ tạm điều khiển nếu nội dung của feed được ghi lại khi Liferea " -"thoát ra. Các mục tin được đánh dấu luôn được lưu vào bộ nhớ này." +msgid "The cache setting controls if the contents of feeds are saved when Liferea exits. Marked items are always saved to the cache." +msgstr "Cài đặt nhớ tạm điều khiển nếu nội dung của feed được ghi lại khi Liferea thoát ra. Các mục tin được đánh dấu luôn được lưu vào bộ nhớ này." #: ../glade/liferea.ui.h:31 msgid "_Default cache settings" @@ -1788,9 +1690,7 @@ #: ../glade/liferea.ui.h:42 msgid "Auto-_load item link in configured browser when selecting articles." -msgstr "" -"Tự động tải liên kết mục tin trong trình duyệt đã được cấu hình khi chọn các " -"bài viết." +msgstr "Tự động tải liên kết mục tin trong trình duyệt đã được cấu hình khi chọn các bài viết." #: ../glade/liferea.ui.h:43 msgid "Ignore _comment feeds for this subscription." @@ -1813,479 +1713,490 @@ msgstr "Cao cấp" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Cá nhân hóa Liferea" +msgid "New Folder" +msgstr "Tạo thư mục mới" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "Bộ tiếp hợp bộ nhớ tạm feed" +msgid "_Folder name:" +msgstr "Tên thư mục:" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Số lượng mục tin mặc định cho mỗi feed để ghi lại:" +msgid "Rename" +msgstr "Đổi tên" #: ../glade/liferea.ui.h:51 -msgid "Feed Update Settings" -msgstr "Cài đặt cập nhật feed" +msgid "_New Name:" +msgstr "Tên mới:" #: ../glade/liferea.ui.h:52 -msgid "_Update all subscriptions at startup." -msgstr "Cập nhật mọi địa chỉ đặt xem dài hạn lúc khởi động." +msgid "Search Folder Properties" +msgstr "Thuộc tính thư mục tìm kiếm" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "Nhịp thời gian cập nhật feed mặc định:" +msgid "Search _Name:" +msgstr "Tên tìm kiếm:" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "Tìm những mục tin mà nó phù hợp với tiêu chuẩn sau đây" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -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 "" -"Chú ý: Nên nhớ rằng cần đặt thời gian làm tươi mới cho hợp lý. Thông " -"thường nó gây ra sự lãng phí về băng thông để lấy về các feed nếu tần số này " -"nhiều hơn một lần mỗi giờ" +msgid "A_ny Rule Matches" +msgstr "Bất kỳ quy tắc nào khớp" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Feeds" +msgid "_All Rules Must Match" +msgstr "Tất cả các quy tắc phải khớp" #: ../glade/liferea.ui.h:57 -msgid "Folder Display Settings" -msgstr "Cài đặt hiển thị thư mục" +msgid "Open Enclosure" +msgstr "Mở đính kèm" #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "" -"Hiển thị các mục tin của tất cả các feed con khi thư mục chứa nó được chọn." +msgid "Open an enclosure of type:" +msgstr "Mở các tài liệu đính kèm cho các kiểu sau:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "Ẩn các mục tin đã đọc." +msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. The enclosures URL will be supplied as an argument for this command:" +msgstr "Bạn muốn Liferea làm gì với tài liệu đính kèm này? Xin hãy nhập vào lệnh mà bạn muốn thực hiện ở phía dưới. Những URL tài liệu đính kèm sẽ được áp dụng như là một tham số cho lệnh này:" #: ../glade/liferea.ui.h:60 -msgid "Feed Icons (Favicons)" -msgstr "Biểu tượng Feed (Favicons)" +msgid "_Browse" +msgstr "_Tìm duyệt" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "Cập nhật tất cả favicons ngay bây giờ" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "Thực hiện tự động cho những tài liệu đính kèm giống với cái này kể từ giờ." #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "Thư mục" +msgid "Search All Feeds" +msgstr "Tìm trong tất cả các Feed" #: ../glade/liferea.ui.h:63 -msgid "Reading Headlines" -msgstr "Đang đọc tiêu đề" +msgid "_Search for:" +msgstr "_Tìm kiếm cho:" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "Đọc lướt qua toàn bộ bài viết bằng:" +msgid "Enter a search string Liferea should find either in a items title or in its content." +msgstr "Nhập vào một chuỗi tìm kiếm để Liferea có thể tìm trong tiêu đề hoặc nội dung của mục tin." #: ../glade/liferea.ui.h:65 -msgid "Web Integration" -msgstr "Hợp nhất Web" +msgid "_Advanced..." +msgstr "_Cao cấp..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "Gửi dấu trang tới" +msgid "Starts searching for the specified text in all feeds. The search result will appear in the item list." +msgstr "Bắt đầu tìm kiếm cho chuỗi được chỉ ra trong toàn bộ feed. Kết quả của việc tìm kiếm sẽ xuất hiện trong một danh sách các mục tin." #: ../glade/liferea.ui.h:67 -msgid "Internal Browser Settings" -msgstr "Cài đặt trình duyệt nội tại" +msgid "Update Monitor" +msgstr "Cập nhật bộ theo dõi" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "Mở các liên kết trong cửa sổ của Liferea." +msgid "Pending Requests" +msgstr "Các yêu cầu còn treo" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "_Tắt Javascript." +msgid "Downloading Now" +msgstr "Tải về ngay" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "Bật các phần bổ xung trình duyệt" +msgid "Cancel _All" +msgstr "Hủy bỏ _tất cả" #: ../glade/liferea.ui.h:71 -msgid "External Browser Settings" -msgstr "Cài đặt trình duyệt bên ngoài" +msgid "Create News Bin" +msgstr "Tạo thùng rác tin tức" #: ../glade/liferea.ui.h:72 +msgid "_News Bin Name:" +msgstr "Tên thùng rác tin tức:" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "Giới thiệu" + +#: ../glade/liferea.ui.h:74 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea là chương trình tập hợp tin tức chạy trên nền GTK+" + +#: ../glade/liferea.ui.h:75 +msgid "Liferea Homepage" +msgstr "Trang chủ Liferea" + +#: ../glade/liferea.ui.h:76 +msgid "Advanced Search" +msgstr "Tìm kiếm cấp cao" + +#: ../glade/liferea.ui.h:77 +msgid "_Search Folder..." +msgstr "Thư mục tìm kiếm..." + +#: ../glade/liferea.ui.h:78 +msgid "Create Search Engine Feed" +msgstr "Tạo bộ máy tìm kiếm Feed" + +#: ../glade/liferea.ui.h:79 +msgid "enter any search string you want" +msgstr "nhập vào chuỗi văn bản mà bạn muốn tìm" + +#: ../glade/liferea.ui.h:80 +msgid "Maximal _Number Of Result Items:" +msgstr "Số lượng tối đa mục tin kết quả:" + +#: ../glade/liferea.ui.h:81 +msgid "Note: Liferea will generate a feed subscription which is used to query the search engine results for the specified search string. You can keep this feed permanently and update it like any other subscription." +msgstr "Chú ý: Liferea sẽ tạo ra một địa chỉ đặt xem dài hạn cái mà sẽ được sử dụng để truy vấn bộ máy tìm kiếm cho chuỗi đã chỉ ra. Bạn có thể giữ chúng vĩnh viễn và cập nhật nó như một địa chỉ đặt xem dài hạn." + +#: ../glade/new_subscription.ui.h:9 +msgid "Download / Postprocessing" +msgstr "Tải về / Xử lý sau" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "Chọn nguồn" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "Chọn một kiểu nguồn mà bạn muốn thêm..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "Thêm vào OPML/Planet" + +#: ../glade/opml_source.ui.h:2 +msgid "Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "Hãy chỉ ra một tập tin nội bộ hoặc một địa chỉ URL chỉ đến một danh sách feed OPML hợp lệ." + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "_Vị trí" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "_Chọn tập tin" + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "Thêm tài khoản Tiny Tiny RSS" + +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "Hãy nhập vào các cài đặt tài khoản kiểu tt-rss của bạn." + +#: ../glade/ttrss_source.ui.h:3 +msgid "_Server URL" +msgstr "Địa chỉ URL của máy _phục vụ" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "_Tài khoản" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "Cao cấp..." + +#: ../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 "Nhập vào địa chỉ website để sử dụng cho chương trình tự động phát hiện hay trong trường hợp bạn biết nó rút trích địa chỉ feed." + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Cá nhân hóa Liferea" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "Bộ tiếp hợp bộ nhớ tạm feed" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Số lượng mục tin mặc định cho mỗi feed để ghi lại:" + +#: ../glade/prefs.ui.h:4 +msgid "Feed Update Settings" +msgstr "Cài đặt cập nhật feed" + +#: ../glade/prefs.ui.h:5 +msgid "_Update all subscriptions at startup." +msgstr "Cập nhật mọi địa chỉ đặt xem dài hạn lúc khởi động." + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "Nhịp thời gian cập nhật feed mặc định:" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "Note: Please remember to set a reasonable refresh time. Usually it is a waste of bandwidth to poll feeds more often than each hour." +msgstr "Chú ý: Nên nhớ rằng cần đặt thời gian làm tươi mới cho hợp lý. Thông thường nó gây ra sự lãng phí về băng thông để lấy về các feed nếu tần số này nhiều hơn một lần mỗi giờ" + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Feeds" + +#: ../glade/prefs.ui.h:10 +msgid "Folder Display Settings" +msgstr "Cài đặt hiển thị thư mục" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "Hiển thị các mục tin của tất cả các feed con khi thư mục chứa nó được chọn." + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "Ẩn các mục tin đã đọc." + +#: ../glade/prefs.ui.h:13 +msgid "Feed Icons (Favicons)" +msgstr "Biểu tượng Feed (Favicons)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "Cập nhật tất cả favicons ngay bây giờ" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "Thư mục" + +#: ../glade/prefs.ui.h:16 +msgid "Reading Headlines" +msgstr "Đang đọc tiêu đề" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "Đọc lướt qua toàn bộ bài viết bằng:" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "Chế độ xem Mặc địn_h:" + +#: ../glade/prefs.ui.h:19 +msgid "Web Integration" +msgstr "Hợp nhất Web" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "Gửi dấu trang tới" + +#: ../glade/prefs.ui.h:22 +msgid "Internal Browser Settings" +msgstr "Cài đặt trình duyệt nội tại" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "Mở các liên kết trong cửa sổ của Liferea." + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "_Tắt Javascript." + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "Bật các phần bổ xung trình duyệt" + +#: ../glade/prefs.ui.h:26 +msgid "External Browser Settings" +msgstr "Cài đặt trình duyệt bên ngoài" + +#: ../glade/prefs.ui.h:27 msgid "_Open link in:" msgstr "Mở liên kết trong:" -#: ../glade/liferea.ui.h:74 +#: ../glade/prefs.ui.h:28 +msgid "_Manual:" +msgstr "_Thủ công:" + +#: ../glade/prefs.ui.h:30 #, no-c-format -msgid "" -"_Manual:\n" -"(%s for URL)" -msgstr "" -"_Thủ công:\n" -"(%s cho URL)" +msgid "(%s for URL)" +msgstr "(%s cho URL)" -#: ../glade/liferea.ui.h:76 +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "_Trình duyệt:" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "Trình duyệt" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 msgid "Notification Settings" msgstr "Cài đặt cách thông báo" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "Hiển thị trình đơn chuột phải với các tiêu đề mới." -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." -msgstr "" -"Hiển thị biểu tượng trạng thái trong khu vực thông báo (khay hệ thống)." +msgstr "Hiển thị biểu tượng trạng thái trong khu vực thông báo (khay hệ thống)." -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "Hiển thị số lượng các mục tin mới trên khay đồng hồ." -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "Chấm dứt thay vì thu nhỏ nó vào khay biểu tượng (đồng hồ)." -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "_Bắt đầu ở khay đồng hồ." -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 msgid "Toolbar Settings" msgstr "Cài đặt thanh công cụ" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "Ẩn thanh công cụ." -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "Những nhãn cho nút bấm trên thanh công cụ:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "Máy chủ HTTP Proxy" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "Tự dò tìm (GNOME hoặc môi trường)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "_Không dùng máy chủ ủy thác" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" -msgstr "Cài đặt thủ công:" +msgstr "Cài đặt _thủ công:" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" -msgstr "Cổng proxy:" +msgstr "Cổn_g proxy:" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" -msgstr "Máy chủ proxy:" +msgstr "Má_y chủ proxy:" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" -msgstr "Sử dụng xác thực ủy thác" +msgstr "Dùng xác thực ủy thác" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "Mật khẩu Proxy:" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "Tên tài khoản proxy:" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 msgid "Downloading Enclosures" msgstr "Đang mở các tài liệu đính kèm" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "_Tìm duyệt" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "Ghi các phần tải về tại" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" -msgstr "Tải về sử dụng" +msgstr "Tả_i về sử dụng" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 msgid "Opening Enclosures" msgstr "Đang mở tài liệu đính kèm" -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "Những tài liệu đính kèm" -#: ../glade/liferea.ui.h:104 -msgid "Synchronized with Nearby Hosts" -msgstr "Đồng bộ hóa với Nearby Hosts" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "Bật tính năng đồng bộ hóa mạng LAN cục bộ" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "_Tên dịch vụ" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "Sync" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "Tạo thư mục mới" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "Tên thư mục:" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "Đổi tên" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "Tên mới:" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "Thuộc tính thư mục tìm kiếm" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "Tên tìm kiếm:" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "Tìm những mục tin mà nó phù hợp với tiêu chuẩn sau đây" - -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "Bất kỳ quy tắc nào khớp" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "Tất cả các quy tắc phải khớp" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "Đang tải về tài liệu đính kèm" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "Tải về tài liệu đính kèm cho các kiểu sau:" - -#: ../glade/liferea.ui.h:120 -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 "" -"Bạn muốn Liferea làm gì với tài liệu đính kèm này? Xin hãy nhập vào lệnh mà " -"bạn muốn thực hiện ở phía dưới. Những tài liệu đính kèm đã được tải về sẽ " -"được áp dụng như là một tham số cho lệnh này:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "Chuyển qua URL và không tải về tài liệu đính kèm." - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "" -"Thực hiện tự động cho những tài liệu đính kèm giống với cái này kể từ giờ." - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "Tìm trong tất cả các Feed" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "_Tìm kiếm cho:" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Nhập vào một chuỗi tìm kiếm để Liferea có thể tìm trong tiêu đề hoặc nội " -"dung của mục tin." - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "_Cao cấp..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Bắt đầu tìm kiếm cho chuỗi được chỉ ra trong toàn bộ feed. Kết quả của việc " -"tìm kiếm sẽ xuất hiện trong một danh sách các mục tin." - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "Cập nhật bộ theo dõi" - -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" -msgstr "Các yêu cầu còn treo" - -#: ../glade/liferea.ui.h:130 -msgid "Downloading Now" -msgstr "Tải về ngay" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "Hủy bỏ _tất cả" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "Tạo thùng rác tin tức" - -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "Tên thùng rác tin tức:" - -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "Giới thiệu" - -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"Tác quyền (c) 2003-2012\n" -"Thuộc về Liferea Team\n" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" +msgstr "Phần bổ sung" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea thì tập hợp tin tức cho GTK+" +#~ msgid "" +#~ "Copyright (c) 2003-2012\n" +#~ "The Liferea Team\n" +#~ msgstr "" +#~ "Tác quyền (c) 2003-2012\n" +#~ "Thuộc về Liferea Team\n" -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Trang chủ Liferea" +#~ msgid "Download and view feeds" +#~ msgstr "Tải về và trình bày feed" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "Tìm kiếm cấp cao" - -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "Thư mục tìm kiếm..." +#~ msgid "You may want to validate the feed using" +#~ msgstr "Bạn có lẽ muốn phê chuẩn sự sử dụng feed" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "Tạo bộ máy tìm kiếm Feed" +#~ msgid "bookmark" +#~ msgstr "dấu trang" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "nhập vào chuỗi văn bản mà bạn muốn tìm" +#~ msgid "comments" +#~ msgstr "ghi chú" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "Số lượng tối đa mục tin kết quả:" +#~ msgid "flag" +#~ msgstr "cờ" -#: ../glade/liferea.ui.h:145 -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 "" -"Chú ý: Liferea sẽ tạo ra một địa chỉ đặt xem dài hạn cái mà sẽ được sử dụng " -"để truy vấn bộ máy tìm kiếm cho chuỗi đã chỉ ra. Bạn có thể giữ chúng vĩnh " -"viễn và cập nhật nó như một địa chỉ đặt xem dài hạn." +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "Tải về tài liệu đính kèm GẶP LỖI: \"%s\"" -#: ../glade/new_subscription.ui.h:9 -msgid "Download / Postprocessing" -msgstr "Tải về / Xử lý sau" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "Tải về tài liệu đính kèm đã hoàn tất: \"%s\"" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "Chọn nguồn" +#~ 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 "Phiên bản này của Liferea sử dụng định dạng nhớ tạm mới và cần phải chuyển đổi phần bộ nhớ cũ. Nội dung bộ nhớ trong %s đã không được xóa một cách tự động. Làm ơn hãy gỡ bỏ thư mục này đi một cách thủ công một khi bạn đã chắc chắn là mình đã chuyển đổi một cách thành công!" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "Chọn một kiểu nguồn mà bạn muốn thêm..." +#~ msgid "Jumps to the next unread item. If necessary selects the next feed with unread items." +#~ msgstr "Nhảy tới mục tin chưa đọc kế tiếp. Nếu cần thiết có thể chọn feed kế tiếp với các mục tin chưa được đọc." -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "Thêm vào OPML/Planet" +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "Việc tải về BỊ LỖI: \"%s\"" -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Hãy chỉ ra một tập tin nội bộ hoặc một địa chỉ URL chỉ đến một danh sách " -"feed OPML hợp lệ." +#~ msgid "Download finished." +#~ msgstr "Hoàn tất tải về." -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "_Vị trí" +#~ msgid "Launch Item In _Tab" +#~ msgstr "Mở mục trong _Tab" -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "_Chọn tập tin" +#~ msgid "_Launch Item In Browser" +#~ msgstr "Mở mục tin trong trình duyệt" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "Thêm tài khoản Tiny Tiny RSS" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "Sao chép địa chỉ URL vào Clipboard" -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "Hãy nhập vào các cài đặt tài khoản kiểu tt-rss của bạn." +#~ msgid "Choose download directory" +#~ msgstr "Chọn thư mục tải về" -#: ../glade/ttrss_source.ui.h:3 -msgid "_Server URL" -msgstr "Địa chỉ URL của máy _phục vụ" +#~ msgid "Liferea Sync %s@%s" +#~ msgstr "Liferea Sync %s@%s" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "_Tài khoản" +#~ msgid "Downloading Enclosure" +#~ msgstr "Đang tải về tài liệu đính kèm" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Nhập vào địa chỉ website để sử dụng cho chương trình tự động phát hiện hay " -"trong trường hợp bạn biết nó rút trích địa chỉ feed." +#~ msgid "Sync" +#~ msgstr "Sync" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "Cao cấp..." +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "Đồng bộ hóa với Nearby Hosts" -#~ msgid "You may want to validate the feed using" -#~ msgstr "Bạn có lẽ muốn phê chuẩn sự sử dụng feed" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "Bật tính năng đồng bộ hóa mạng LAN cục bộ" #~ msgid "" -#~ "Jumps to the next unread item. If necessary selects the next feed with " -#~ "unread items." +#~ "_Manual:\n" +#~ "(%s for URL)" #~ msgstr "" -#~ "Nhảy tới mục tin chưa đọc kế tiếp. Nếu cần thiết có thể chọn feed kế tiếp " -#~ "với các mục tin chưa được đọc." +#~ "_Thủ công:\n" +#~ "(%s cho URL)" -#~ msgid "Liferea Sync %s@%s" -#~ msgstr "Liferea Sync %s@%s" +#~ msgid "_Pass URL and do not download enclosure." +#~ msgstr "Chuyển qua URL và không tải về tài liệu đính kèm." + +#~ msgid "_Save downloads in" +#~ msgstr "Ghi các phần tải về tại" + +#~ msgid "_Service Name" +#~ msgstr "_Tên dịch vụ" diff -Nru liferea-1.8.15/po/zh_CN.po liferea-1.10.3/po/zh_CN.po --- liferea-1.8.15/po/zh_CN.po 2013-06-24 22:16:18.000000000 +0200 +++ liferea-1.10.3/po/zh_CN.po 2013-07-31 23:29:12.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: liferea 1.6.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2011-07-12 18:15+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" @@ -18,8 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "Liferea" @@ -32,8 +31,8 @@ msgstr "Lifera Feed 阅读器" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" -msgstr "下载并查看 Feed" +msgid "Read news feeds and blogs" +msgstr "" #: ../xslt/feed.xml.in.h:1 msgid "" @@ -137,38 +136,26 @@ msgstr "创作者" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "标志" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "书签" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "评论" - -#: ../xslt/item.xml.in.h:13 msgid "No comments yet." msgstr "尚无评论。" -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 msgid "Comments" msgstr "评论" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 msgid "Updating..." msgstr "正在更新..." -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "刷新" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "章节" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "部门" @@ -191,12 +178,12 @@ msgid "Default Browser" msgstr "GNOME 默认浏览器" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "浏览器命令失败:%s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "正在启动:%s" @@ -206,7 +193,7 @@ msgid "Authorization Error" msgstr "认证错误" -#: ../src/common.c:63 +#: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "无法创建缓存目录 %s!" @@ -236,73 +223,79 @@ msgid "%b %d %Y" msgstr "%b %d %Y" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "%s 不是有效的附件类型配置文件!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" -msgstr "下载附件失败:%s" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" -msgstr "下载附件完成:%s" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." +msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "无法将 %s 更名为 %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "读取 OPML 文件时发生 XML 错误!无法导入“%s”!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "空白文档!OPML 文档“%s”在导入时不应是空白文件。" -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "“%s”不是有效的 OPML 文档!Liferea 无法导入该文件!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "已导入的 Feed 列表" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "导入 Feed 列表" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "导入" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 #, fuzzy msgid "OPML Files" msgstr "选择 OPML 文件" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "导出 Feed 列表出错!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "Feed 列表已导出!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "导出 Feed 列表" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "导出" @@ -356,113 +349,103 @@ msgstr "无法确定 Feed 类型。" #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "没有未读条目 " -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" msgstr " 状态 STATE 可以是 shown, iconified 或 hidden" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "状态" -#: ../src/main.c:179 +#: ../src/main.c:165 msgid "Show version information and exit" msgstr "显示 Liferea 版本信息并退出" -#: ../src/main.c:180 +#: ../src/main.c:166 #, fuzzy msgid "Add a new subscription" msgstr "新增订阅" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 msgid "Print debugging messages of all types" msgstr "输出所有调试信息" -#: ../src/main.c:186 +#: ../src/main.c:172 msgid "Print debugging messages for the cache handling" msgstr "输出缓存处理的调试信息" -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr "输出配置处理的调试信息" -#: ../src/main.c:188 +#: ../src/main.c:174 msgid "Print debugging messages of the database handling" msgstr "输出缓存处理的调试信息" -#: ../src/main.c:189 +#: ../src/main.c:175 msgid "Print debugging messages of all GUI functions" msgstr "输出所有图形界面的调试信息" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" -"启用 HTML 渲染调试。每当 Liferea 渲染 HTML 都将其转储至 ~/.liferea_1.8/" +"启用 HTML 渲染调试。每当 Liferea 渲染 HTML 都将其转储至 ~/.cache/liferea/" "output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:177 msgid "Print debugging messages of all network activity" msgstr "输出所有网络活动的调试信息" -#: ../src/main.c:192 +#: ../src/main.c:178 msgid "Print debugging messages of all parsing functions" msgstr "输出所有解析函数的调试信息" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "当某函数运行时间过长时输出调试信息" -#: ../src/main.c:194 +#: ../src/main.c:180 msgid "Print debugging messages when entering/leaving functions" msgstr "输出进入或离开函数时的调试信息" -#: ../src/main.c:195 +#: ../src/main.c:181 msgid "Print debugging messages of the feed update processing" msgstr "输出 Feed 更新的调试信息" -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr "输出缓存处理的调试信息" -#: ../src/main.c:197 +#: ../src/main.c:183 msgid "Print verbose debugging messages" msgstr "输出详细调试信息" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 msgid "Print debugging messages for the given topic" msgstr "输出给定主题的调试信息" -#: ../src/main.c:218 +#: ../src/main.c:202 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea,Linux Feed 阅读器" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "更多信息请访问 http://liferea.sourceforge.net/" - -#: ../src/migrate.c:340 -#, 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 "" -"此版本的 Liferea 使用了新的缓存格式,并已将您原有的文件转换为新的格式。%s 中" -"旧的缓存内容没有自动删除,如果您确信转换无误则请手工删除它!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" +msgstr "更多信息请访问 http://lzone.de/liferea/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -628,70 +611,70 @@ msgid "Feed title" msgstr "Feed 标题" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "Feed “%s”已经更新!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "Feed “%s”已失效。Liferea 将不会再更新它。" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" msgstr "正在更新 Feed “%s”的图标" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." 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”已不再更新。Liferea 将不会再更新它!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "“%s”自上次更新后没有改变" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "正在更新“%s”" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "无法读取用于过滤的临时文件 %s!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s 终止,错误代码:%d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "错误:无法开启管道“%s”!" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "错误:无法打开文件“%s”!" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "错误:无此文件“%s”!" @@ -700,54 +683,52 @@ msgid "New Search Folder" msgstr "新建搜索目录" -#: ../src/xml.c:451 +#: ../src/xml.c:424 msgid "[There were more errors. Output was truncated!]" msgstr "[有更多的错误,输出已被截断!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 msgid "XML Parser: Could not parse document:\n" msgstr "XML 解析器:无法解析文档:\n" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" msgstr "附件" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "%d 个附件" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr " 字节" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "KB" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "%d%s" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "%d 个附件" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "选择文件" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, fuzzy, c-format msgid "File Extension .%s" msgstr "文件扩展名。%s" @@ -771,350 +752,388 @@ # msgid_plural "%d new items!" # msgstr[0] "%d 个新条目" # msgstr[1] "%d 个新条目" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d 个新条目)" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d 未读 %s" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "帮助主题" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "快速参考" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "FAQ" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea 现为在线模式。" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 msgid "Work Offline" msgstr "离线浏览" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Lifeare 现为离线模式" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 msgid "Work Online" msgstr "在线浏览" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 msgid "_Subscriptions" msgstr "订阅(_S)" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "更新全部(_A)" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Updates all subscriptions." msgstr "更新全部订阅。" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "全部标记为已读(_R)" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "标记所有订阅项的条目为已读。" -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "导入 Feed 列表(_I)..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "导入 OPML 格式 Feed 列表。" -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "导出 Feed 列表(_E)..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "Exports the feed list as OPML." msgstr "导出 OPML 格式 Feed 列表。" -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 msgid "_Quit" msgstr "退出(_Q)" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 msgid "_Feed" msgstr "_Feed" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Remove _All Items" msgstr "删除所有条目(_A)" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "删除现选定 Feed 的所有条目。" -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 msgid "_Item" msgstr "条目(_I)" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "下一个未读条目(_N)" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "下一个未读条目(_N)" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "视图(_V)" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "增大字号(_I)" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "放大条目显示窗口字体大小。" -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "减小字号(_D)" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "缩小条目显示窗口字体大小。" -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "工具(_T)" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "_Update Monitor" msgstr "更新监视器(_U)" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "显示当前更新队列中的全部 Feed" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "_Preferences" msgstr "首选项(_P)" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 msgid "Edit Preferences." msgstr "编辑首选项。" -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 msgid "S_earch" msgstr "搜索(_E)" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Search All Feeds..." msgstr "搜索所有 Feed..." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 msgid "Show the search dialog." msgstr "显示搜索对话框。" -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "帮助(_H)" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "目录(_C)" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "查看该程序的帮助。" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "快速参考(_Q)" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "查看所有快捷键列表。" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "_FAQ" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "查看该程序的 FAQ。" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "关于(_A)" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "显示关于对话框。" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "_Normal View" msgstr "正常视图(_N)" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "设置查看模式为邮件客户端模式。" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "_Wide View" msgstr "宽视图(_W)" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "设置查看模式以试用三个竖行。" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "_Combined View" msgstr "合并视图(_C)" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "设置查看模式为两栏。" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "减少 Feed 列表(_R)" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "Hide feeds with no unread items." msgstr "隐藏没有未读条目的 Feed。" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "新增订阅(_N)..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a subscription to the feed list." msgstr "新增订阅。" -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "新建目录(_F)..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 msgid "Adds a folder to the feed list." msgstr "向 Feed 列表添加文件夹。" -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 msgid "New S_earch Folder..." msgstr "新建搜索目录(_E)..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 msgid "Adds a new search folder to the feed list." msgstr "为 Feed 列表添加心得搜索文件夹。" -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "New _Source..." msgstr "添加源(_S)..." -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 msgid "Adds a new feed list source." msgstr "添加新的 Feed 列表源。" -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 #, fuzzy msgid "New _News Bin..." msgstr "新目录(_F)..." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 #, fuzzy msgid "Adds a new news bin." msgstr "新增订阅。" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "_Mark Items Read" msgstr "标记为已读(_M)" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "标记所有选定订阅下的所有条目或选定目录下的所有订阅为已读。" -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 msgid "_Update" msgstr "更新(_U)" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "更新选定的订阅项或目录下的所有订阅项目。" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "_Properties" msgstr "属性(_P)" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "开启选定订阅的属性对话框。" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "_Remove" msgstr "删除(_R)" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "删除选定的订阅项。" -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "切换阅读状态(_R)" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "切换选定条目的阅读状态。" -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "切换条目标签(_F)" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "切换选定条目的阅读状态。" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "R_emove" msgstr "删除(_E)" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "删除选定的条目。" -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "在设置浏览器中载入此条目链接。" + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "在浏览器中打开(_L)" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." +msgstr "在设置浏览器中载入此条目链接。" + +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "外部浏览器设置" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." msgstr "在设置浏览器中载入此条目链接。" -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "离线浏览(_W)" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "此选项允许禁用订阅更新。" -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Linux Feed 阅读器" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 #, fuzzy msgid "" "

    Welcome to Liferea, a desktop news aggregator for online news " @@ -1127,12 +1146,12 @@ "阅列表。要订阅一个 Feed,选择 Feed -> 新增订阅。要浏览 Feed 标题,则选中那" "个 Feed,程序会把标题自动载入到右侧的主窗口内。

    " -#: ../src/ui/auth_dialog.c:132 ../glade/auth.ui.h:3 +#: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "输入用户名巨额密码“%s”(%s):" -#: ../src/ui/auth_dialog.c:133 +#: ../src/ui/auth_dialog.c:125 msgid "Unknown source" msgstr "未知来源" @@ -1163,251 +1182,252 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea 处于离线模式,无法更新。" -#: ../src/ui/liferea_htmlview.c:435 -#, fuzzy, c-format -msgid "Download FAILED: \"%s\"" -msgstr "下载附件失败:%s" - -#: ../src/ui/liferea_htmlview.c:437 +#: ../src/ui/liferea_htmlview.c:627 #, fuzzy -msgid "Download finished." -msgstr "下载方式(_D):" - -#: ../src/ui/liferea_htmlview.c:544 -msgid "Launch Link In _Tab" +msgid "Open Link In _Tab" msgstr "在标签中打开链接(_T)" -#: ../src/ui/liferea_htmlview.c:545 -msgid "_Launch Link In Browser" +#: ../src/ui/liferea_htmlview.c:628 +#, fuzzy +msgid "_Open Link In Browser" +msgstr "在浏览器中开启链接(_L)" + +#: ../src/ui/liferea_htmlview.c:629 +#, fuzzy +msgid "_Open Link In External Browser" msgstr "在浏览器中开启链接(_L)" -#: ../src/ui/liferea_htmlview.c:548 ../src/ui/popup_menu.c:143 +#: ../src/ui/liferea_htmlview.c:632 #, c-format msgid "_Bookmark Link at %s" msgstr "在 %s 加入书签(_B)" -#: ../src/ui/liferea_htmlview.c:552 +#: ../src/ui/liferea_htmlview.c:636 msgid "_Copy Link Location" msgstr "复制链接地址(_C)" -#: ../src/ui/liferea_htmlview.c:555 +#: ../src/ui/liferea_htmlview.c:639 #, fuzzy msgid "_Copy Image Location" msgstr "复制链接地址(_C)" -#: ../src/ui/liferea_htmlview.c:557 +#: ../src/ui/liferea_htmlview.c:641 #, fuzzy msgid "S_ave Link As" msgstr "另存为..." -#: ../src/ui/liferea_htmlview.c:559 +#: ../src/ui/liferea_htmlview.c:643 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:562 +#: ../src/ui/liferea_htmlview.c:646 msgid "_Subscribe..." msgstr "订阅(_S)..." -#: ../src/ui/item_list_view.c:333 +#: ../src/ui/item_list_view.c:347 msgid "*** No title ***" msgstr "*** 无标题 ***" -#: ../src/ui/item_list_view.c:578 +#: ../src/ui/item_list_view.c:598 msgid "Date" msgstr "日期" -#: ../src/ui/item_list_view.c:592 +#: ../src/ui/item_list_view.c:612 msgid "Headline" msgstr "标题" -#: ../src/ui/item_list_view.c:728 ../src/ui/item_list_view.c:749 -#: ../src/ui/item_list_view.c:823 ../src/ui/item_list_view.c:920 -#: ../src/ui/item_list_view.c:935 +#: ../src/ui/item_list_view.c:714 ../src/ui/item_list_view.c:735 +#: ../src/ui/item_list_view.c:756 ../src/ui/item_list_view.c:830 +#: ../src/ui/item_list_view.c:915 ../src/ui/item_list_view.c:930 msgid "No item has been selected" msgstr "未选择条目!" -#: ../src/ui/item_list_view.c:745 +#: ../src/ui/item_list_view.c:731 ../src/ui/item_list_view.c:752 msgid "This item has no link specified!" msgstr "此条目没有指定链接!" -#: ../src/ui/item_list_view.c:811 +#: ../src/ui/item_list_view.c:818 msgid "You must select a feed to delete its items!" msgstr "您必须先选择一个 Feed 才能删除条目!" -#: ../src/ui/popup_menu.c:116 -msgid "Launch Item In _Tab" -msgstr "在标签中打开条目(_T)" - -#: ../src/ui/popup_menu.c:117 -msgid "_Launch Item In Browser" -msgstr "在浏览器中打开条目(_L)" - -#: ../src/ui/popup_menu.c:129 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "" -#: ../src/ui/popup_menu.c:147 -msgid "Copy Item _URL to Clipboard" -msgstr "复制条目地址到剪贴板(_U)" +#: ../src/ui/popup_menu.c:156 +#, fuzzy, c-format +msgid "_Bookmark at %s" +msgstr "在 %s 加入书签(_B)" + +#: ../src/ui/popup_menu.c:160 +#, fuzzy +msgid "Copy Item _Location" +msgstr "复制链接地址(_C)" -#: ../src/ui/popup_menu.c:153 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "删除条目(_E)" -#: ../src/ui/popup_menu.c:166 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "开启附件..." -#: ../src/ui/popup_menu.c:167 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "另存为..." -#: ../src/ui/popup_menu.c:168 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "复制链接地址" -#: ../src/ui/popup_menu.c:182 +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "更新全部(_U)" -#: ../src/ui/popup_menu.c:187 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "显示 Liferea (_S)" -#: ../src/ui/popup_menu.c:292 +#: ../src/ui/popup_menu.c:298 msgid "_Update Folder" msgstr "更新目录(_U)" -#: ../src/ui/popup_menu.c:294 +#: ../src/ui/popup_menu.c:300 msgid "_Mark All As Read" msgstr "全部标记为已读(_M)" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:310 msgid "_New" msgstr "新增(_N)" -#: ../src/ui/popup_menu.c:307 +#: ../src/ui/popup_menu.c:313 msgid "New _Subscription..." msgstr "新增订阅(_S)..." -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:320 msgid "New S_ource..." msgstr "新增来源(_O)..." -#: ../src/ui/popup_menu.c:323 +#: ../src/ui/popup_menu.c:329 #, fuzzy msgid "Sort Feeds" msgstr "导入 Feed 列表" -#: ../src/ui/popup_menu.c:329 +#: ../src/ui/popup_menu.c:335 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:341 -#, fuzzy -msgid "Convert To Local Subscriptions..." -msgstr "新增订阅(_N)..." - -#: ../src/ui/ui_node.c:124 -msgid "(Empty)" -msgstr "" - -#: ../src/ui/ui_node.c:321 -#, c-format -msgid "" -"%s\n" -"Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "GNOME 默认" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "文本在图标下方" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "文本在图标旁" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "仅图标" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "仅文本" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "分" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "小时" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "天" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "空格键" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " 空格键" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " 空格键" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "选择下载目录" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "正常视图(_N)" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "宽视图(_W)" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "合并视图(_C)" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "手动" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "浏览器预设" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "现有窗口" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "新窗口" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "新标签" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 #, fuzzy msgid "Terminate instead of minimizing to the messaging menu" msgstr "退出而不是最小化到托盘(_E)。" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "类型" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "程序" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1419,7 +1439,7 @@ msgid "This feed specifies no default update interval." msgstr "此 Feed 未指定默认更新周期。" -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "" @@ -1522,7 +1542,7 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1532,11 +1552,11 @@ msgid "Google Reader login failed!" msgstr "Google Reader 登录失败!" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1567,22 +1587,15 @@ msgid "No feed list source types found!" msgstr "未找到 Feed 列表源类型!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:269 msgid "Source Type" msgstr "来源类型" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 #, fuzzy msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " @@ -1592,7 +1605,7 @@ "集成您 Google Reader 帐号中的 Feed 列表。Liferea 将显示您的 Google Reader 订" "阅,并与之同步 Feed 列表和阅读列表。" -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1658,8 +1671,7 @@ msgid "Please enter your Google Reader account settings." msgstr "请输入您的 Google Reader 帐号设置。" -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 msgid "_Password" msgstr "密码(_P)" @@ -1683,7 +1695,7 @@ msgid "combined view" msgstr "合并视图" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "标题" @@ -1735,7 +1747,7 @@ msgstr "常规" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 #, fuzzy msgid "Feed Source" msgstr "Feed 来源" @@ -1850,480 +1862,539 @@ msgstr "高级" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Liferea 首选项" +msgid "New Folder" +msgstr "新目录" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "目录名称(_F):" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "每个 Feed 默认保存条目数(_N):" +msgid "Rename" +msgstr "重命名" #: ../glade/liferea.ui.h:51 -#, fuzzy -msgid "Feed Update Settings" -msgstr "Feed 更新" +msgid "_New Name:" +msgstr "新名称(_N):" #: ../glade/liferea.ui.h:52 -#, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "更新全部订阅。" +msgid "Search Folder Properties" +msgstr "搜索目录属性" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "默认 Feed 更新周期(_I):" +msgid "Search _Name:" +msgstr "搜索名称(_N):" -#. Feed update interval hint in preference dialog. -#: ../glade/liferea.ui.h:55 -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." +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" msgstr "" -"注意: 请记得输入一个合理的更新时间。通常每小时更新一次只是浪费网络流量。" + +#: ../glade/liferea.ui.h:55 +msgid "A_ny Rule Matches" +msgstr "所有匹配的规则(_N)" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "Feed" +msgid "_All Rules Must Match" +msgstr "必须匹配所有规则(_A)" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "目录显示设置" +msgid "Open Enclosure" +msgstr "开启附件..." #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "当选择目录时,显示所有子 Feed 条目。" +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "下载附件类型:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "隐藏已读条目(_H)。" +#, fuzzy +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"Liferea 应如何处理附件? 请在下面键入您要执行的命令,下载的文件将作为该命令的" +"参数:" #: ../glade/liferea.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "Feed 图标(favicon)" +msgid "_Browse" +msgstr "浏览(_B)" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "立即更新所有 Feed 图标(_U)。" +msgid "_Do this automatically for enclosures like this from now on." +msgstr "从现在开始自动对所有附件执行此次进行的操作(_D)。" #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "目录" +msgid "Search All Feeds" +msgstr "搜索所有 Feed" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "标记未读" +msgid "_Search for:" +msgstr "搜索(_S):" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "浏览文章(_S):" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "输入一个让 Liferea 在条目标题或内容中寻找的搜索字符。" #: ../glade/liferea.ui.h:65 -#, fuzzy -msgid "Web Integration" -msgstr "方位" +msgid "_Advanced..." +msgstr "高级(_A)..." #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "发送书签到(_P)" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "开始在所有 Feed 中搜索该文本,结果会出现在条目列表中。" #: ../glade/liferea.ui.h:67 -#, fuzzy -msgid "Internal Browser Settings" -msgstr "内部浏览器设置" +msgid "Update Monitor" +msgstr "更新监视" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "在 Liferea 的窗口开启链接(_W)。" +#, fuzzy +msgid "Pending Requests" +msgstr "待验证请求" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "禁用 Javascript(_D)。" +#, fuzzy +msgid "Downloading Now" +msgstr "立即下载" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "启用浏览器插件(_E)。" +msgid "Cancel _All" +msgstr "取消全部(_A)" #: ../glade/liferea.ui.h:71 -#, fuzzy -msgid "External Browser Settings" -msgstr "外部浏览器设置" +msgid "Create News Bin" +msgstr "" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "开启链接于(_O):" +msgid "_News Bin Name:" +msgstr "" -#: ../glade/liferea.ui.h:74 -#, no-c-format +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "关于" + +#: ../glade/liferea.ui.h:74 +#, fuzzy +msgid "" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" +msgstr "" +"版权所有 (C) 2003-2009\n" +"Liferea 团队\n" + +#: ../glade/liferea.ui.h:77 +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea 是 GTK+ 新闻搜集器" + +#: ../glade/liferea.ui.h:78 +msgid "Liferea Homepage" +msgstr "Liferea 主页" + +#: ../glade/liferea.ui.h:79 +msgid "Advanced Search" +msgstr "高级搜索" + +#: ../glade/liferea.ui.h:80 +msgid "_Search Folder..." +msgstr "搜索目录(_S)..." + +#: ../glade/liferea.ui.h:81 +msgid "Create Search Engine Feed" +msgstr "创建搜索引擎 Feed" + +#: ../glade/liferea.ui.h:82 +msgid "enter any search string you want" +msgstr "输入您想搜索的字符串" + +#: ../glade/liferea.ui.h:83 +msgid "Maximal _Number Of Result Items:" +msgstr "最大搜索结果数(_N):" + +#: ../glade/liferea.ui.h:84 +#, 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订阅。您可以永久保留此定" +"阅,并如同其他订阅一般更新。" + +#: ../glade/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "下载/预处理" + +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" +msgstr "源选择" + +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "选择您要添加的源类型..." + +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" +msgstr "添加 OPML/Planet" + +#: ../glade/opml_source.ui.h:2 msgid "" -"_Manual:\n" -"(%s for URL)" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "请指定一个本地文件,或指向有效 OPML Feed 列表的 URL。" + +#: ../glade/opml_source.ui.h:3 +msgid "_Location" +msgstr "位置(_L)" + +#: ../glade/opml_source.ui.h:4 +msgid "_Select File" +msgstr "选择文件(_S)" + +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" msgstr "" -"手动(_M):\n" -"(%s 是网址)" -#: ../glade/liferea.ui.h:76 +#: ../glade/ttrss_source.ui.h:2 +#, fuzzy +msgid "Please enter your tt-rss account settings." +msgstr "请输入您的 Google Reader 帐号设置。" + +#: ../glade/ttrss_source.ui.h:3 +#, fuzzy +msgid "_Server URL" +msgstr "服务器端错误" + +#: ../glade/ttrss_source.ui.h:5 +msgid "_Username" +msgstr "用户名(_U)" + +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "高级..." + +#: ../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 "" +"除非您知道确切的 Feed 地址,否则当您输入一个网址时,Liferea 会进行自动 Feed " +"发现。" + +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Liferea 首选项" + +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "" + +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "每个 Feed 默认保存条目数(_N):" + +#: ../glade/prefs.ui.h:4 +#, fuzzy +msgid "Feed Update Settings" +msgstr "Feed 更新" + +#: ../glade/prefs.ui.h:5 +#, fuzzy +msgid "_Update all subscriptions at startup." +msgstr "更新全部订阅。" + +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "默认 Feed 更新周期(_I):" + +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"注意: 请记得输入一个合理的更新时间。通常每小时更新一次只是浪费网络流量。" + +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "Feed" + +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "目录显示设置" + +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "当选择目录时,显示所有子 Feed 条目。" + +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "隐藏已读条目(_H)。" + +#: ../glade/prefs.ui.h:13 +#, fuzzy +msgid "Feed Icons (Favicons)" +msgstr "Feed 图标(favicon)" + +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "立即更新所有 Feed 图标(_U)。" + +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "目录" + +#: ../glade/prefs.ui.h:16 +#, fuzzy +msgid "Reading Headlines" +msgstr "标记未读" + +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "浏览文章(_S):" + +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" +msgstr "" + +#: ../glade/prefs.ui.h:19 +#, fuzzy +msgid "Web Integration" +msgstr "方位" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" +msgstr "发送书签到(_P)" + +#: ../glade/prefs.ui.h:22 +#, fuzzy +msgid "Internal Browser Settings" +msgstr "内部浏览器设置" + +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "在 Liferea 的窗口开启链接(_W)。" + +#: ../glade/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "禁用 Javascript(_D)。" + +#: ../glade/prefs.ui.h:25 +msgid "_Enable browser plugins." +msgstr "启用浏览器插件(_E)。" + +#: ../glade/prefs.ui.h:26 +#, fuzzy +msgid "External Browser Settings" +msgstr "外部浏览器设置" + +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "开启链接于(_O):" + +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "手动" + +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" +msgstr "" + +#: ../glade/prefs.ui.h:31 msgid "_Browser:" msgstr "浏览器(_B):" -#: ../glade/liferea.ui.h:77 +#: ../glade/prefs.ui.h:32 msgid "Browser" msgstr "浏览器" -#: ../glade/liferea.ui.h:78 +#: ../glade/prefs.ui.h:33 #, fuzzy msgid "Notification Settings" msgstr "程序状态通知设置" -#: ../glade/liferea.ui.h:79 +#: ../glade/prefs.ui.h:34 msgid "Show a _popup window with new headlines." msgstr "使用弹出窗口显示新标题(_P)。" -#: ../glade/liferea.ui.h:80 +#: ../glade/prefs.ui.h:35 msgid "Show a status _icon in the notification area (system tray)." msgstr "在程序状态通知区中显示状态图标(系统托盘)(_I)。" -#: ../glade/liferea.ui.h:81 +#: ../glade/prefs.ui.h:36 msgid "Show _number of new items in the tray icon." msgstr "在托盘图标上显示新条目数量。" -#: ../glade/liferea.ui.h:82 +#: ../glade/prefs.ui.h:37 msgid "T_erminate instead of minimizing to tray icon." msgstr "退出而不是最小化到托盘(_E)。" -#: ../glade/liferea.ui.h:83 +#: ../glade/prefs.ui.h:38 msgid "_Start in tray icon." msgstr "启动后最小化到托盘(_S)。" -#: ../glade/liferea.ui.h:84 +#: ../glade/prefs.ui.h:39 #, fuzzy msgid "Toolbar Settings" msgstr "工具栏按钮标签:" -#: ../glade/liferea.ui.h:85 +#: ../glade/prefs.ui.h:40 msgid "_Hide toolbar." msgstr "隐藏工具栏(_H)。" -#: ../glade/liferea.ui.h:86 +#: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" msgstr "工具栏按钮标签:" -#: ../glade/liferea.ui.h:87 +#: ../glade/prefs.ui.h:42 msgid "GUI" msgstr "图形界面" -#: ../glade/liferea.ui.h:88 +#: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:89 +#: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" msgstr "自动检测(GNOME 或环境)(_A)" -#: ../glade/liferea.ui.h:90 +#: ../glade/prefs.ui.h:45 msgid "_No Proxy" msgstr "不使用代理(_N)" -#: ../glade/liferea.ui.h:91 +#: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" msgstr "手工设置(_M):" -#: ../glade/liferea.ui.h:92 +#: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" msgstr "代理服务器端口(_P):" -#: ../glade/liferea.ui.h:93 +#: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" msgstr "代理服务器地址(_H):" -#: ../glade/liferea.ui.h:94 +#: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" msgstr "使用代理服务器认证(_T)" -#: ../glade/liferea.ui.h:95 +#: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" msgstr "代理服务器密码(_W):" -#: ../glade/liferea.ui.h:96 +#: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" msgstr "代理服务器用户名(_U):" -#: ../glade/liferea.ui.h:97 +#: ../glade/prefs.ui.h:52 msgid "Proxy" msgstr "代理服务器" -#: ../glade/liferea.ui.h:98 +#: ../glade/prefs.ui.h:53 #, fuzzy msgid "Downloading Enclosures" msgstr "附件下载中" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "浏览(_B)" - -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "将下载保存于(_S)" - -#: ../glade/liferea.ui.h:101 +#: ../glade/prefs.ui.h:54 msgid "_Download using" msgstr "下载方式(_D):" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:55 #, fuzzy msgid "Opening Enclosures" msgstr "开启附件..." -#: ../glade/liferea.ui.h:103 +#: ../glade/prefs.ui.h:56 msgid "Enclosures" msgstr "附件" -#: ../glade/liferea.ui.h:104 -#, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "已与临近主机同步" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" -msgstr "启用本地 LAN 同步(_E)" - -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "服务名称(_S)" - -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "同步" - -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "新目录" - -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "目录名称(_F):" - -#: ../glade/liferea.ui.h:111 -msgid "Rename" -msgstr "重命名" - -#: ../glade/liferea.ui.h:112 -msgid "_New Name:" -msgstr "新名称(_N):" - -#: ../glade/liferea.ui.h:113 -msgid "Search Folder Properties" -msgstr "搜索目录属性" - -#: ../glade/liferea.ui.h:114 -msgid "Search _Name:" -msgstr "搜索名称(_N):" - -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" -msgstr "所有匹配的规则(_N)" - -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" -msgstr "必须匹配所有规则(_A)" - -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "附件下载中" - -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "下载附件类型:" - -#: ../glade/liferea.ui.h:120 -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 应如何处理附件? 请在下面键入您要执行的命令,下载的文件将作为该命令的" -"参数:" - -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "" - -#: ../glade/liferea.ui.h:122 -msgid "_Do this automatically for enclosures like this from now on." -msgstr "从现在开始自动对所有附件执行此次进行的操作(_D)。" - -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "搜索所有 Feed" - -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "搜索(_S):" - -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "输入一个让 Liferea 在条目标题或内容中寻找的搜索字符。" - -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "高级(_A)..." - -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "开始在所有 Feed 中搜索该文本,结果会出现在条目列表中。" - -#: ../glade/liferea.ui.h:128 -msgid "Update Monitor" -msgstr "更新监视" - -#: ../glade/liferea.ui.h:129 -#, fuzzy -msgid "Pending Requests" -msgstr "待验证请求" - -#: ../glade/liferea.ui.h:130 -#, fuzzy -msgid "Downloading Now" -msgstr "立即下载" - -#: ../glade/liferea.ui.h:131 -msgid "Cancel _All" -msgstr "取消全部(_A)" - -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" -msgstr "" +#~ msgid "Download and view feeds" +#~ msgstr "下载并查看 Feed" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" -msgstr "" +#~ msgid "You may want to validate the feed using" +#~ msgstr "您可能希望使用以下方式验证 Feed:" -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "关于" +#~ msgid "Launch Item In _Tab" +#~ msgstr "在标签中打开条目(_T)" -#: ../glade/liferea.ui.h:135 -#, fuzzy -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" -msgstr "" -"版权所有 (C) 2003-2009\n" -"Liferea 团队\n" +#~ msgid "_Launch Item In Browser" +#~ msgstr "在浏览器中打开条目(_L)" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea 是 GTK+ 新闻搜集器" +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "复制条目地址到剪贴板(_U)" -#: ../glade/liferea.ui.h:139 -msgid "Liferea Homepage" -msgstr "Liferea 主页" +#~ msgid "flag" +#~ msgstr "标志" -#: ../glade/liferea.ui.h:140 -msgid "Advanced Search" -msgstr "高级搜索" +#~ msgid "bookmark" +#~ msgstr "书签" -#: ../glade/liferea.ui.h:141 -msgid "_Search Folder..." -msgstr "搜索目录(_S)..." +#~ msgid "comments" +#~ msgstr "评论" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "创建搜索引擎 Feed" +#~ msgid "Enclosure download FAILED: \"%s\"" +#~ msgstr "下载附件失败:%s" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "输入您想搜索的字符串" +#~ msgid "Enclosure download finished: \"%s\"" +#~ msgstr "下载附件完成:%s" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "最大搜索结果数(_N):" +#~ 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 "" +#~ "此版本的 Liferea 使用了新的缓存格式,并已将您原有的文件转换为新的格式。%s " +#~ "中旧的缓存内容没有自动删除,如果您确信转换无误则请手工删除它!" -#: ../glade/liferea.ui.h:145 #, 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订阅。您可以永久保留此定" -"阅,并如同其他订阅一般更新。" +#~ msgid "Download FAILED: \"%s\"" +#~ msgstr "下载附件失败:%s" -#: ../glade/new_subscription.ui.h:9 #, fuzzy -msgid "Download / Postprocessing" -msgstr "下载/预处理" +#~ msgid "Download finished." +#~ msgstr "下载方式(_D):" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "源选择" +#~ msgid "Choose download directory" +#~ msgstr "选择下载目录" -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "选择您要添加的源类型..." - -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "添加 OPML/Planet" - -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "请指定一个本地文件,或指向有效 OPML Feed 列表的 URL。" - -#: ../glade/opml_source.ui.h:3 -msgid "_Location" -msgstr "位置(_L)" - -#: ../glade/opml_source.ui.h:4 -msgid "_Select File" -msgstr "选择文件(_S)" - -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "手动(_M):\n" +#~ "(%s 是网址)" -#: ../glade/ttrss_source.ui.h:2 -#, fuzzy -msgid "Please enter your tt-rss account settings." -msgstr "请输入您的 Google Reader 帐号设置。" +#~ msgid "_Save downloads in" +#~ msgstr "将下载保存于(_S)" -#: ../glade/ttrss_source.ui.h:3 #, fuzzy -msgid "_Server URL" -msgstr "服务器端错误" +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "已与临近主机同步" -#: ../glade/ttrss_source.ui.h:5 -msgid "_Username" -msgstr "用户名(_U)" +#~ msgid "_Enable Local LAN Synchronization" +#~ msgstr "启用本地 LAN 同步(_E)" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"除非您知道确切的 Feed 地址,否则当您输入一个网址时,Liferea 会进行自动 Feed " -"发现。" +#~ msgid "_Service Name" +#~ msgstr "服务名称(_S)" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "高级..." +#~ msgid "Sync" +#~ msgstr "同步" -#~ msgid "You may want to validate the feed using" -#~ msgstr "您可能希望使用以下方式验证 Feed:" +#~ msgid "Downloading Enclosure" +#~ msgstr "附件下载中" #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " diff -Nru liferea-1.8.15/po/zh_TW.po liferea-1.10.3/po/zh_TW.po --- liferea-1.8.15/po/zh_TW.po 2013-06-24 22:16:18.000000000 +0200 +++ liferea-1.10.3/po/zh_TW.po 2013-07-31 23:29:12.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: liferea\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-24 22:16+0200\n" +"POT-Creation-Date: 2013-01-25 23:54+0100\n" "PO-Revision-Date: 2005-12-11 13:22+0800\n" "Last-Translator: Jim Huang \n" "Language-Team: Chinese/Traditional \n" @@ -18,8 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=0;\n" -#. GTK theme support -#: ../liferea.desktop.in.h:1 ../src/main.c:261 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "" @@ -34,7 +33,7 @@ msgstr "Lifeera 偏好" #: ../liferea.desktop.in.h:4 -msgid "Download and view feeds" +msgid "Read news feeds and blogs" msgstr "" #: ../xslt/feed.xml.in.h:1 @@ -152,41 +151,29 @@ msgstr "創作者" #: ../xslt/item.xml.in.h:10 -msgid "flag" -msgstr "" - -#: ../xslt/item.xml.in.h:11 -msgid "bookmark" -msgstr "" - -#: ../xslt/item.xml.in.h:12 -msgid "comments" -msgstr "說明" - -#: ../xslt/item.xml.in.h:13 #, fuzzy msgid "No comments yet." msgstr "說明" -#: ../xslt/item.xml.in.h:14 +#: ../xslt/item.xml.in.h:11 #, fuzzy msgid "Comments" msgstr "說明" -#: ../xslt/item.xml.in.h:15 +#: ../xslt/item.xml.in.h:12 #, fuzzy msgid "Updating..." msgstr "更新: \"%s\"" -#: ../xslt/item.xml.in.h:16 +#: ../xslt/item.xml.in.h:13 msgid "Refresh" msgstr "" -#: ../xslt/item.xml.in.h:17 +#: ../xslt/item.xml.in.h:14 msgid "Section" msgstr "" -#: ../xslt/item.xml.in.h:18 +#: ../xslt/item.xml.in.h:15 msgid "Department" msgstr "" @@ -211,12 +198,12 @@ msgid "Default Browser" msgstr "瀏覽器" -#: ../src/browser.c:201 ../src/browser.c:221 +#: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" msgstr "瀏覽器指令失敗: %s" -#: ../src/browser.c:224 +#: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" msgstr "啟動: \"%s\"" @@ -227,7 +214,7 @@ msgid "Authorization Error" msgstr "認證" -#: ../src/common.c:63 +#: ../src/common.c:62 #, fuzzy, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "無法建立快取目錄 %s !" @@ -257,73 +244,79 @@ msgid "%b %d %Y" msgstr "" -#: ../src/enclosure.c:175 +#: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "\"%s\" 不是有效的設定檔!" -#: ../src/enclosure.c:274 -#, c-format -msgid "Enclosure download FAILED: \"%s\"" +#: ../src/enclosure.c:288 +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." msgstr "" -#. just saving -#: ../src/enclosure.c:284 +#: ../src/enclosure.c:306 #, c-format -msgid "Enclosure download finished: \"%s\"" +msgid "" +"Command failed: \n" +"\n" +"%s\n" +"\n" +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." msgstr "" -#: ../src/export.c:174 +#: ../src/export.c:177 #, c-format msgid "Error renaming %s to %s\n" msgstr "無法將 %s 更名為 %s\n" -#: ../src/export.c:388 ../src/export.c:390 +#: ../src/export.c:406 ../src/export.c:408 #, fuzzy, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "讀入快取檔案 \"%s\" 時發生 XML 錯誤 ! 無法讀入快取檔案!" -#: ../src/export.c:396 ../src/export.c:398 +#: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "空白文件! OPML \"%s\" 檔案不應是空白檔案。" -#: ../src/export.c:419 ../src/export.c:421 +#: ../src/export.c:437 ../src/export.c:439 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "\"%s\" 不是有效的 OPML 檔案! 無法匯入!" -#: ../src/export.c:440 +#: ../src/export.c:458 msgid "Imported feed list" msgstr "匯入饋流列表" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import Feed List" msgstr "匯入饋流列表" -#: ../src/export.c:452 +#: ../src/export.c:470 msgid "Import" msgstr "匯入" -#: ../src/export.c:452 ../src/export.c:469 ../src/fl_sources/opml_source.c:387 +#: ../src/export.c:470 ../src/export.c:487 ../src/fl_sources/opml_source.c:387 #, fuzzy msgid "OPML Files" msgstr "選擇檔案" -#: ../src/export.c:460 +#: ../src/export.c:478 msgid "Error while exporting feed list!" msgstr "在匯出饋流列表時錯誤!" -#: ../src/export.c:462 +#: ../src/export.c:480 msgid "Feed List exported!" msgstr "饋流列表已匯出!" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export Feed List" msgstr "匯出饋流列表" -#: ../src/export.c:469 +#: ../src/export.c:487 msgid "Export" msgstr "匯出" @@ -377,120 +370,112 @@ msgstr "

    無法找到 RDF 標頭!

    " #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:403 +#: ../src/itemlist.c:404 #, fuzzy msgid "There are no unread items" msgstr "沒有未讀項目 " -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" msgstr "" -#: ../src/main.c:175 +#: ../src/main.c:164 msgid "STATE" msgstr "" -#: ../src/main.c:179 +#: ../src/main.c:165 #, fuzzy msgid "Show version information and exit" msgstr " --version 印出 Liferea 版本編號" -#: ../src/main.c:180 +#: ../src/main.c:166 #, fuzzy msgid "Add a new subscription" msgstr "新增訂閱" -#: ../src/main.c:180 +#: ../src/main.c:166 msgid "uri" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:171 #, fuzzy msgid "Print debugging messages of all types" msgstr " --debug-all 印出所有類別的除錯訊息" -#: ../src/main.c:186 +#: ../src/main.c:172 #, fuzzy msgid "Print debugging messages for the cache handling" msgstr " --debug-cache 印出處理快取時的除錯訊息" -#: ../src/main.c:187 +#: ../src/main.c:173 #, fuzzy msgid "Print debugging messages for the configuration handling" msgstr " --debug-conf 印出設定的除錯訊息" -#: ../src/main.c:188 +#: ../src/main.c:174 #, fuzzy msgid "Print debugging messages of the database handling" msgstr " --debug-cache 印出處理快取時的除錯訊息" -#: ../src/main.c:189 +#: ../src/main.c:175 #, fuzzy msgid "Print debugging messages of all GUI functions" msgstr " --debug-gui 印出所有圖形使用者介面的除錯訊息" -#: ../src/main.c:190 +#: ../src/main.c:176 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.8/output.xhtml" +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" -#: ../src/main.c:191 +#: ../src/main.c:177 #, fuzzy msgid "Print debugging messages of all network activity" msgstr " --debug-all 印出所有類別的除錯訊息" -#: ../src/main.c:192 +#: ../src/main.c:178 #, fuzzy msgid "Print debugging messages of all parsing functions" msgstr " --debug-parsing 印出所有分析功能的除錯訊息" -#: ../src/main.c:193 +#: ../src/main.c:179 msgid "Print debugging messages when a function takes too long to process" msgstr "" -#: ../src/main.c:194 +#: ../src/main.c:180 #, fuzzy msgid "Print debugging messages when entering/leaving functions" msgstr " --debug-trace 印出 entering/leaving 函式除錯訊息" -#: ../src/main.c:195 +#: ../src/main.c:181 #, fuzzy msgid "Print debugging messages of the feed update processing" msgstr " --debug-update 印出饋流升級的錯誤訊息" -#: ../src/main.c:196 +#: ../src/main.c:182 #, fuzzy msgid "Print debugging messages of the search folder matching" msgstr " --debug-cache 印出處理快取時的除錯訊息" -#: ../src/main.c:197 +#: ../src/main.c:183 #, fuzzy msgid "Print verbose debugging messages" msgstr " --debug-verbose 印出繁瑣除錯訊息" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:194 ../src/main.c:195 #, fuzzy msgid "Print debugging messages for the given topic" msgstr " --debug-cache 印出處理快取時的除錯訊息" -#: ../src/main.c:218 +#: ../src/main.c:202 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Lifeera 偏好" -#: ../src/main.c:219 -msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "" - -#: ../src/migrate.c:340 -#, 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!" +#: ../src/main.c:203 +msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" #. Some libsoup transport errors @@ -667,70 +652,70 @@ msgid "Feed title" msgstr "饋流標題" -#: ../src/subscription.c:104 +#: ../src/subscription.c:105 #, fuzzy, c-format msgid "Subscription \"%s\" is already being updated!" msgstr "此饋流 \"%s\" 已經更新!" -#: ../src/subscription.c:109 +#: ../src/subscription.c:110 #, fuzzy, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "饋流 %s 已經失效。Liferea 將不會更新它。" -#: ../src/subscription.c:143 +#: ../src/subscription.c:144 #, fuzzy, c-format msgid "Updating favicon for \"%s\"" msgstr "更新饋流 \"%s\" 的圖示" -#: ../src/subscription.c:192 +#: ../src/subscription.c:193 msgid "" "There was a problem while reading this subscription. Please check the URL " "and console output." 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\" 終止更新。Liferea 將不會更新此饋流!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" 自從最後更新後沒有改變。" -#: ../src/subscription.c:271 +#: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" msgstr "更新: \"%s\"" -#: ../src/update.c:255 +#: ../src/update.c:259 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "當開始暫存檔 %s 以處理過濾時,發生錯誤!" -#: ../src/update.c:278 +#: ../src/update.c:282 #, c-format msgid "%s exited with status %d" msgstr "%s 終止,錯誤代碼: %d" -#: ../src/update.c:284 ../src/update.c:285 ../src/update.c:397 +#: ../src/update.c:288 ../src/update.c:289 ../src/update.c:401 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "錯誤: 無法開啟管道 \"%s\"!" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:423 +#: ../src/update.c:427 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "錯誤: 無法開啟檔案 \"%s\"!" -#: ../src/update.c:429 +#: ../src/update.c:433 #, c-format msgid "Error: There is no file \"%s\"" msgstr "錯誤: 無此檔案 \"%s\"!" @@ -740,60 +725,58 @@ msgid "New Search Folder" msgstr "新目錄" -#: ../src/xml.c:451 +#: ../src/xml.c:424 #, fuzzy msgid "[There were more errors. Output was truncated!]" msgstr "[解析器的錯誤訊息已截去!]" -#: ../src/xml.c:604 +#: ../src/xml.c:577 #, fuzzy msgid "XML Parser: Could not parse document:\n" msgstr "" "xmlReadMemory(): 無法解析文件:\n" "%s%s" -#: ../src/ui/enclosure_list_view.c:159 +#: ../src/ui/enclosure_list_view.c:175 #, fuzzy msgid "Attachments" msgstr "說明" -#. update list title -#: ../src/ui/enclosure_list_view.c:251 -#, c-format -msgid "%d attachment" -msgid_plural "%d attachments" -msgstr[0] "" -msgstr[1] "" - #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:266 +#: ../src/ui/enclosure_list_view.c:272 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:269 +#: ../src/ui/enclosure_list_view.c:275 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:273 +#: ../src/ui/enclosure_list_view.c:279 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:277 +#: ../src/ui/enclosure_list_view.c:283 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:282 +#: ../src/ui/enclosure_list_view.c:288 #, c-format msgid "%d%s" msgstr "" -#. strip GET parameters -#: ../src/ui/enclosure_list_view.c:341 ../src/ui/enclosure_list_view.c:517 -#: ../src/ui/liferea_htmlview.c:459 ../src/ui/subscription_dialog.c:356 +#. update list title +#: ../src/ui/enclosure_list_view.c:321 +#, c-format +msgid "%d attachment" +msgid_plural "%d attachments" +msgstr[0] "" +msgstr[1] "" + +#: ../src/ui/enclosure_list_view.c:377 ../src/ui/subscription_dialog.c:356 msgid "Choose File" msgstr "選擇檔案" -#: ../src/ui/enclosure_list_view.c:404 +#: ../src/ui/enclosure_list_view.c:438 #, c-format msgid "File Extension .%s" msgstr "" @@ -817,384 +800,422 @@ # msgid_plural "%d new items!" # msgstr[0] "%d 個新項目" # msgstr[1] "%d 個新項目" -#: ../src/ui/liferea_shell.c:311 +#: ../src/ui/liferea_shell.c:325 #, fuzzy, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] "%d 個新項目" msgstr[1] "%d 個新項目" -#: ../src/ui/liferea_shell.c:316 +#: ../src/ui/liferea_shell.c:330 #, fuzzy, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "未讀" msgstr[1] "未讀" -#: ../src/ui/liferea_shell.c:690 +#: ../src/ui/liferea_shell.c:716 msgid "Help Topics" msgstr "" -#: ../src/ui/liferea_shell.c:696 +#: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" msgstr "快速參考" -#: ../src/ui/liferea_shell.c:702 +#: ../src/ui/liferea_shell.c:728 msgid "FAQ" msgstr "" -#: ../src/ui/liferea_shell.c:743 +#: ../src/ui/liferea_shell.c:806 msgid "Liferea is now online" msgstr "Liferea 現為線上模式。" -#: ../src/ui/liferea_shell.c:745 +#: ../src/ui/liferea_shell.c:808 #, fuzzy msgid "Work Offline" msgstr "離線瀏覽(_W)" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:810 msgid "Liferea is now offline" msgstr "Lifeare 現為離線模式" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:812 #, fuzzy msgid "Work Online" msgstr "離線瀏覽(_W)" -#: ../src/ui/liferea_shell.c:845 +#: ../src/ui/liferea_shell.c:908 #, fuzzy msgid "_Subscriptions" msgstr "新增訂閱" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 msgid "Update _All" msgstr "更新全部(_A)" -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:909 #, fuzzy msgid "Updates all subscriptions." msgstr "新增訂閱" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Mark All As _Read" msgstr "全部標示為已讀(_R)" -#: ../src/ui/liferea_shell.c:848 +#: ../src/ui/liferea_shell.c:911 msgid "Marks read every item of every subscription." msgstr "標示每個訂閱的所有項目為已讀" -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "_Import Feed List..." msgstr "匯入饋流列表(_I)..." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:913 msgid "Imports an OPML feed list." msgstr "匯入 OPML 格式饋流列表" -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 msgid "_Export Feed List..." msgstr "匯出饋流列表(_E)..." -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:914 #, fuzzy msgid "Exports the feed list as OPML." msgstr "匯出 OPML 格式饋流列表" -#: ../src/ui/liferea_shell.c:852 +#: ../src/ui/liferea_shell.c:915 #, fuzzy msgid "_Quit" msgstr "/離開(_Q)" -#: ../src/ui/liferea_shell.c:854 +#: ../src/ui/liferea_shell.c:917 #, fuzzy msgid "_Feed" msgstr "饋流(_F)" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 #, fuzzy msgid "Remove _All Items" msgstr "移除所有項目(_A)" -#: ../src/ui/liferea_shell.c:855 +#: ../src/ui/liferea_shell.c:918 msgid "Removes all items of the currently selected feed." msgstr "移除現選擇饋流的所有項目。" -#: ../src/ui/liferea_shell.c:858 +#: ../src/ui/liferea_shell.c:921 #, fuzzy msgid "_Item" msgstr "項目(_I)" +#: ../src/ui/liferea_shell.c:922 +msgid "Previous Item" +msgstr "" + +#: ../src/ui/liferea_shell.c:924 +#, fuzzy +msgid "Next Item" +msgstr "下筆未讀項目(_N)" + #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:929 msgid "_Next Unread Item" msgstr "下筆未讀項目(_N)" -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:932 msgid "_View" msgstr "檢視項目(_V)" -#: ../src/ui/liferea_shell.c:865 ../src/ui/liferea_htmlview.c:572 +#: ../src/ui/liferea_shell.c:933 ../src/ui/liferea_htmlview.c:656 msgid "_Increase Text Size" msgstr "放大字型(_I)" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:933 msgid "Increases the text size of the item view." msgstr "放大項目顯示視窗字型大小" -#: ../src/ui/liferea_shell.c:867 ../src/ui/liferea_htmlview.c:573 +#: ../src/ui/liferea_shell.c:935 ../src/ui/liferea_htmlview.c:657 msgid "_Decrease Text Size" msgstr "縮小字型(D)" -#: ../src/ui/liferea_shell.c:867 +#: ../src/ui/liferea_shell.c:935 msgid "Decreases the text size of the item view." msgstr "縮小項目顯示視窗字型大小" -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:938 msgid "_Tools" msgstr "" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 #, fuzzy msgid "_Update Monitor" msgstr "/更新目錄(_U)" -#: ../src/ui/liferea_shell.c:871 +#: ../src/ui/liferea_shell.c:939 msgid "Show a list of all feeds currently in the update queue" msgstr "" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 #, fuzzy msgid "_Preferences" msgstr "偏好設定" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:941 #, fuzzy msgid "Edit Preferences." msgstr "編輯偏好設定。" -#: ../src/ui/liferea_shell.c:876 +#: ../src/ui/liferea_shell.c:944 #, fuzzy msgid "S_earch" msgstr "搜尋" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 #, fuzzy msgid "Search All Feeds..." msgstr "搜尋所有饋流" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:945 #, fuzzy msgid "Show the search dialog." msgstr "顯示或隱藏搜尋視窗" -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:947 msgid "_Help" msgstr "求助(_H)" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "_Contents" msgstr "內容(_C)" -#: ../src/ui/liferea_shell.c:880 +#: ../src/ui/liferea_shell.c:948 msgid "View help for this application." msgstr "" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "_Quick Reference" msgstr "快速參考(_Q)" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:949 msgid "View a list of all Liferea shortcuts." msgstr "檢視所有捷徑的列表" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "_FAQ" msgstr "" -#: ../src/ui/liferea_shell.c:883 +#: ../src/ui/liferea_shell.c:951 msgid "View the FAQ for this application." msgstr "檢視本應用程式的 FAQ 文件" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "_About" msgstr "關於(_A)" -#: ../src/ui/liferea_shell.c:884 +#: ../src/ui/liferea_shell.c:952 msgid "Shows an about dialog." msgstr "顯示關於對話視窗" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 #, fuzzy msgid "_Normal View" msgstr "本地檔案(_L)" -#: ../src/ui/liferea_shell.c:888 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to mail client mode." msgstr "" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 #, fuzzy msgid "_Wide View" msgstr "檢視項目(_V)" -#: ../src/ui/liferea_shell.c:890 +#: ../src/ui/liferea_shell.c:958 msgid "Set view mode to use three vertical panes." msgstr "" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 #, fuzzy msgid "_Combined View" msgstr "啟動摘要模式(_C)" -#: ../src/ui/liferea_shell.c:892 +#: ../src/ui/liferea_shell.c:960 msgid "Set view mode to two pane mode." msgstr "" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 msgid "_Reduced Feed List" msgstr "" -#: ../src/ui/liferea_shell.c:897 +#: ../src/ui/liferea_shell.c:965 #, fuzzy msgid "Hide feeds with no unread items." msgstr "沒有未讀項目 " -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 msgid "_New Subscription..." msgstr "新增訂閱(_N)..." -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:970 #, fuzzy msgid "Adds a subscription to the feed list." msgstr "新增訂閱到餽流列表" -#: ../src/ui/liferea_shell.c:904 ../src/ui/popup_menu.c:310 +#: ../src/ui/liferea_shell.c:972 ../src/ui/popup_menu.c:316 msgid "New _Folder..." msgstr "新目錄(_F)..." -#: ../src/ui/liferea_shell.c:904 +#: ../src/ui/liferea_shell.c:972 #, fuzzy msgid "Adds a folder to the feed list." msgstr "新增目錄到餽流列表中。" -#: ../src/ui/liferea_shell.c:905 ../src/ui/popup_menu.c:313 +#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:319 #, fuzzy msgid "New S_earch Folder..." msgstr "新目錄(_F)..." -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:973 #, fuzzy msgid "Adds a new search folder to the feed list." msgstr "新增目錄到餽流列表中。" -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 #, fuzzy msgid "New _Source..." msgstr "/新增(_N)/新增目錄(_O)" -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:974 #, fuzzy msgid "Adds a new feed list source." msgstr "新增目錄到餽流列表中。" -#: ../src/ui/liferea_shell.c:907 ../src/ui/popup_menu.c:315 +#: ../src/ui/liferea_shell.c:975 ../src/ui/popup_menu.c:321 #, fuzzy msgid "New _News Bin..." msgstr "/新增(_N)/新增目錄(_O)" -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:975 #, fuzzy msgid "Adds a new news bin." msgstr "新增訂閱" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 #, fuzzy msgid "_Mark Items Read" msgstr "全部標示為已讀" -#: ../src/ui/liferea_shell.c:911 +#: ../src/ui/liferea_shell.c:979 #, fuzzy msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "標示所有選擇的項目或目錄下所有的項目為已讀。" -#: ../src/ui/liferea_shell.c:913 ../src/ui/popup_menu.c:290 +#: ../src/ui/liferea_shell.c:981 ../src/ui/popup_menu.c:296 #, fuzzy msgid "_Update" msgstr "/更新(U)" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:981 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "更新選擇的訂閱項目或目錄下的所有訂閱項目。" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 #, fuzzy msgid "_Properties" msgstr "屬性(_P)..." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:986 msgid "Opens the property dialog for the selected subscription." msgstr "開啟選擇訂閱的屬性設定視窗" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 #, fuzzy msgid "_Remove" msgstr "移除所有項目(_A)" -#: ../src/ui/liferea_shell.c:919 +#: ../src/ui/liferea_shell.c:987 msgid "Removes the selected subscription." msgstr "移除選擇的訂閱項目。" -#: ../src/ui/liferea_shell.c:923 ../src/ui/popup_menu.c:151 +#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "切換閱讀狀態(_R)" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:991 msgid "Toggles the read status of the selected item." msgstr "切換選擇項目的閱讀狀態。" -#: ../src/ui/liferea_shell.c:925 ../src/ui/popup_menu.c:152 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "切換項目旗標(_F)" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:993 msgid "Toggles the flag status of the selected item." msgstr "切換選擇項目的狀態。" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 #, fuzzy msgid "R_emove" msgstr "/移除項目(_E)" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:995 msgid "Removes the selected item." msgstr "移除選擇的項目。" -#: ../src/ui/liferea_shell.c:929 -msgid "_Launch In Browser" +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:128 +msgid "Open In _Tab" +msgstr "" + +#: ../src/ui/liferea_shell.c:997 +#, fuzzy +msgid "Launches the item's link in a new Liferea browser tab." +msgstr "在設定瀏覽器中載入此項目連結。" + +#: ../src/ui/liferea_shell.c:999 ../src/ui/popup_menu.c:129 +#, fuzzy +msgid "_Open In Browser" msgstr "載入瀏覽器(_L)" -#: ../src/ui/liferea_shell.c:929 -msgid "Launches the item's link in the configured browser." +#: ../src/ui/liferea_shell.c:999 +#, fuzzy +msgid "Launches the item's link in the Liferea item pane." msgstr "在設定瀏覽器中載入此項目連結。" -#: ../src/ui/liferea_shell.c:934 ../src/ui/popup_menu.c:181 +#: ../src/ui/liferea_shell.c:1001 ../src/ui/popup_menu.c:130 +#, fuzzy +msgid "Open In _External Browser" +msgstr "外部瀏覽器設定" + +#: ../src/ui/liferea_shell.c:1001 +#, fuzzy +msgid "Launches the item's link in the configured external browser." +msgstr "在設定瀏覽器中載入此項目連結。" + +#: ../src/ui/liferea_shell.c:1006 ../src/ui/popup_menu.c:194 msgid "_Work Offline" msgstr "離線瀏覽(_W)" -#: ../src/ui/liferea_shell.c:934 +#: ../src/ui/liferea_shell.c:1006 msgid "This option allows you to disable subscription updating." msgstr "本選項允許你抑制訂閱項目的更新" -#: ../src/ui/liferea_shell.c:1244 +#: ../src/ui/liferea_shell.c:1008 +msgid "_Fullscreen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1008 +msgid "Browse at full screen" +msgstr "" + +#: ../src/ui/liferea_shell.c:1339 #, fuzzy msgid "Liferea - Linux Feed Reader" msgstr "Lifeera 偏好" -#: ../src/ui/liferea_shell.c:1246 +#: ../src/ui/liferea_shell.c:1341 #, fuzzy msgid "" "

    Welcome to Liferea, a desktop news aggregator for online news " @@ -1209,12 +1230,12 @@ "> 新增訂閱;而如果要瀏覽內文,在標題點選後,即會出現在右側窗格。

    Rebuilding" -msgstr "" - -#: ../src/ui/ui_prefs.c:78 +#: ../src/ui/preferences_dialog.c:88 msgid "GNOME default" msgstr "" -#: ../src/ui/ui_prefs.c:79 +#: ../src/ui/preferences_dialog.c:89 msgid "Text below icons" msgstr "" -#: ../src/ui/ui_prefs.c:80 +#: ../src/ui/preferences_dialog.c:90 msgid "Text beside icons" msgstr "" -#: ../src/ui/ui_prefs.c:81 +#: ../src/ui/preferences_dialog.c:91 msgid "Icons only" msgstr "" -#: ../src/ui/ui_prefs.c:82 +#: ../src/ui/preferences_dialog.c:92 msgid "Text only" msgstr "" -#: ../src/ui/ui_prefs.c:90 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:43 #, fuzzy msgid "minutes" msgstr "分鐘。" -#: ../src/ui/ui_prefs.c:91 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "" -#: ../src/ui/ui_prefs.c:92 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:102 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "" -#: ../src/ui/ui_prefs.c:97 +#: ../src/ui/preferences_dialog.c:107 msgid "Space" msgstr "空白" -#: ../src/ui/ui_prefs.c:98 +#: ../src/ui/preferences_dialog.c:108 msgid " Space" msgstr " 空白鍵" -#: ../src/ui/ui_prefs.c:99 +#: ../src/ui/preferences_dialog.c:109 msgid " Space" msgstr " 空白鍵" -#: ../src/ui/ui_prefs.c:420 -msgid "Choose download directory" -msgstr "選擇下載目錄" +#: ../src/ui/preferences_dialog.c:114 +#, fuzzy +msgid "Normal View" +msgstr "本地檔案(_L)" + +#: ../src/ui/preferences_dialog.c:115 +#, fuzzy +msgid "Wide View" +msgstr "檢視項目(_V)" + +#: ../src/ui/preferences_dialog.c:116 +#, fuzzy +msgid "Combined View" +msgstr "啟動摘要模式(_C)" -#: ../src/ui/ui_prefs.c:504 +#: ../src/ui/preferences_dialog.c:499 msgid "Manual" msgstr "手動" -#: ../src/ui/ui_prefs.c:519 +#: ../src/ui/preferences_dialog.c:514 msgid "Browser default" msgstr "瀏覽器預設" -#: ../src/ui/ui_prefs.c:522 +#: ../src/ui/preferences_dialog.c:517 msgid "Existing window" msgstr "現行視窗" -#: ../src/ui/ui_prefs.c:525 +#: ../src/ui/preferences_dialog.c:520 msgid "New window" msgstr "新視窗" -#: ../src/ui/ui_prefs.c:528 +#: ../src/ui/preferences_dialog.c:523 msgid "New tab" msgstr "新分頁" -#: ../src/ui/ui_prefs.c:681 +#: ../src/ui/preferences_dialog.c:682 msgid "Integrate with the messaging menu (indicator)" msgstr "" -#: ../src/ui/ui_prefs.c:684 +#: ../src/ui/preferences_dialog.c:685 msgid "Terminate instead of minimizing to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:687 +#: ../src/ui/preferences_dialog.c:688 msgid "Start minimized to the messaging menu" msgstr "" -#: ../src/ui/ui_prefs.c:792 +#: ../src/ui/preferences_dialog.c:788 msgid "Type" msgstr "型態" -#: ../src/ui/ui_prefs.c:795 +#: ../src/ui/preferences_dialog.c:791 msgid "Program" msgstr "程式" +#: ../src/ui/feed_list_node.c:124 +msgid "(Empty)" +msgstr "" + +#: ../src/ui/feed_list_node.c:321 +#, c-format +msgid "" +"%s\n" +"Rebuilding" +msgstr "" + #: ../src/ui/subscription_dialog.c:430 #, fuzzy, c-format msgid "The provider of this feed suggests an update interval of %d minute." @@ -1520,7 +1537,7 @@ msgid "This feed specifies no default update interval." msgstr "此饋流未指定預設更新頻率" -#: ../src/ui/browser_tabs.c:287 +#: ../src/ui/browser_tabs.c:155 msgid "Untitled" msgstr "未命名" @@ -1627,7 +1644,7 @@ msgid "%b %d %H:%M" msgstr "" -#: ../src/fl_sources/default_source.c:174 +#: ../src/fl_sources/default_source.c:145 #: ../src/fl_sources/google_source.c:274 ../glade/new_subscription.ui.h:1 #: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" @@ -1637,12 +1654,12 @@ msgid "Google Reader login failed!" msgstr "" -#: ../src/fl_sources/google_source.c:391 +#: ../src/fl_sources/google_source.c:383 #, fuzzy msgid "Google Reader" msgstr "饋流快取" -#: ../src/fl_sources/google_source.c:392 +#: ../src/fl_sources/google_source.c:384 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1673,30 +1690,23 @@ msgid "No feed list source types found!" msgstr "" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:269 #, fuzzy msgid "Source Type" msgstr "來源類型:" -#. FIXME: something is not perfect, because if you immediately -#. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:412 -#, c-format -msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "" - -#: ../src/fl_sources/ttrss_source.c:359 +#: ../src/fl_sources/ttrss_source.c:362 msgid "Tiny Tiny RSS" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 +#: ../src/fl_sources/ttrss_source.c:363 msgid "" "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " "present your tt-rss subscriptions, and will synchronize your feed list and " "reading lists." msgstr "" -#: ../src/fl_sources/ttrss_source_feed.c:112 +#: ../src/fl_sources/ttrss_source_feed.c:105 msgid "Could not parse JSON returned by tt-rss API!" msgstr "" @@ -1767,8 +1777,7 @@ msgid "Please enter your Google Reader account settings." msgstr "" -#: ../glade/google_source.ui.h:3 ../glade/liferea.ui.h:107 -#: ../glade/ttrss_source.ui.h:4 +#: ../glade/google_source.ui.h:3 ../glade/ttrss_source.ui.h:4 #, fuzzy msgid "_Password" msgstr "密碼(_P):" @@ -1794,7 +1803,7 @@ msgid "combined view" msgstr "" -#: ../glade/liferea.ui.h:6 +#: ../glade/liferea.ui.h:6 ../glade/prefs.ui.h:21 msgid "Headlines" msgstr "標題" @@ -1846,7 +1855,7 @@ msgstr "一般" #: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 -#: ../glade/simple_subscription.ui.h:2 +#: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "饋流來源" @@ -1963,483 +1972,510 @@ msgstr "" #: ../glade/liferea.ui.h:48 -msgid "Liferea Preferences" -msgstr "Lifeera 偏好" +msgid "New Folder" +msgstr "新目錄" #: ../glade/liferea.ui.h:49 -msgid "Feed Cache Handling" -msgstr "" +msgid "_Folder name:" +msgstr "目錄名稱:(_F)" #: ../glade/liferea.ui.h:50 -msgid "Default _number of items per feed to save:" -msgstr "Liferea 退出時單一饋流最多儲存項目數: (_N)" +#, fuzzy +msgid "Rename" +msgstr "重新命名目錄" #: ../glade/liferea.ui.h:51 #, fuzzy -msgid "Feed Update Settings" -msgstr "饋流快取" +msgid "_New Name:" +msgstr "名稱:(_N)" #: ../glade/liferea.ui.h:52 #, fuzzy -msgid "_Update all subscriptions at startup." -msgstr "新增訂閱" +msgid "Search Folder Properties" +msgstr "虛擬目錄屬性" #: ../glade/liferea.ui.h:53 -msgid "Default Feed Refresh _Interval:" -msgstr "饋流更新週期(_I):" +#, fuzzy +msgid "Search _Name:" +msgstr "饋流名稱(_N):" + +#: ../glade/liferea.ui.h:54 +msgid "Find Items that meet the following criteria" +msgstr "" -#. Feed update interval hint in preference dialog. #: ../glade/liferea.ui.h:55 -#, fuzzy -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." +msgid "A_ny Rule Matches" msgstr "" -"註: 請記得輸入一個合理的更新時間,不建議每 15 分鐘更新一個每日更新的串" -"流! 若停用自動更新請輸入週期為 0 。" #: ../glade/liferea.ui.h:56 -msgid "Feeds" -msgstr "饋流" +msgid "_All Rules Must Match" +msgstr "" #: ../glade/liferea.ui.h:57 #, fuzzy -msgid "Folder Display Settings" -msgstr "饋流顯示設定" +msgid "Open Enclosure" +msgstr "/開啟附件..." #: ../glade/liferea.ui.h:58 -msgid "_Show the items of all child feeds when a folder is selected." -msgstr "當目錄被選取時,顯示所有子饋流項目(_S)" +#, fuzzy +msgid "Open an enclosure of type:" +msgstr "下載附件型態:" #: ../glade/liferea.ui.h:59 -msgid "_Hide read items." -msgstr "隱藏閱讀過的項目(_H)" +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" #: ../glade/liferea.ui.h:60 -#, fuzzy -msgid "Feed Icons (Favicons)" -msgstr "饋流圖示" +msgid "_Browse" +msgstr "瀏覽器(_B):" #: ../glade/liferea.ui.h:61 -msgid "_Update all favicons now" -msgstr "更新所有饋流圖示(_U)" +#, fuzzy +msgid "_Do this automatically for enclosures like this from now on." +msgstr "從現在開始自動替檔案作同樣的處理(_D)" #: ../glade/liferea.ui.h:62 -msgid "Folders" -msgstr "虛擬目錄" +msgid "Search All Feeds" +msgstr "搜尋所有饋流" #: ../glade/liferea.ui.h:63 -#, fuzzy -msgid "Reading Headlines" -msgstr "標題" +msgid "_Search for:" +msgstr "搜尋:(_S)" #: ../glade/liferea.ui.h:64 -msgid "_Skim through articles with:" -msgstr "快速檢閱文章的方式:(_S)" +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" #: ../glade/liferea.ui.h:65 -#, fuzzy -msgid "Web Integration" -msgstr "方位" +msgid "_Advanced..." +msgstr "" #: ../glade/liferea.ui.h:66 -msgid "_Post Bookmarks to" -msgstr "" +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "開始在所有餽流搜尋指定的文字,搜尋結果將會出現在項目列表中。" #: ../glade/liferea.ui.h:67 #, fuzzy -msgid "Internal Browser Settings" -msgstr "內部瀏覽器設定" +msgid "Update Monitor" +msgstr "/更新目錄(_U)" #: ../glade/liferea.ui.h:68 -msgid "Open links in Liferea's _window." -msgstr "在 Liferea 的視窗開啟連結(_W)" +msgid "Pending Requests" +msgstr "" #: ../glade/liferea.ui.h:69 -msgid "_Disable Javascript." -msgstr "停止使用 Javascript (_D)" +#, fuzzy +msgid "Downloading Now" +msgstr "附件下載中" #: ../glade/liferea.ui.h:70 -msgid "_Enable browser plugins." -msgstr "" +#, fuzzy +msgid "Cancel _All" +msgstr "更新全部(_A)" #: ../glade/liferea.ui.h:71 -#, fuzzy -msgid "External Browser Settings" -msgstr "外部瀏覽器設定" +msgid "Create News Bin" +msgstr "" #: ../glade/liferea.ui.h:72 -msgid "_Open link in:" -msgstr "開啟連結於(_O):" +msgid "_News Bin Name:" +msgstr "" + +#: ../glade/liferea.ui.h:73 +msgid "About" +msgstr "關於" #: ../glade/liferea.ui.h:74 -#, no-c-format msgid "" -"_Manual:\n" -"(%s for URL)" +"Copyright (c) 2003-2012\n" +"The Liferea Team\n" msgstr "" -"手動(_M):\n" -"(%s 是網址)" - -#: ../glade/liferea.ui.h:76 -msgid "_Browser:" -msgstr "瀏覽器(_B):" #: ../glade/liferea.ui.h:77 -msgid "Browser" -msgstr "瀏覽器" +msgid "Liferea is a news aggregator for GTK+" +msgstr "Liferea 是 GTK+ 新聞資訊蒐集器" #: ../glade/liferea.ui.h:78 #, fuzzy -msgid "Notification Settings" -msgstr "程式狀態通知區" +msgid "Liferea Homepage" +msgstr "Lifeera 偏好" #: ../glade/liferea.ui.h:79 -msgid "Show a _popup window with new headlines." -msgstr "以跳出視窗顯示新標題" +#, fuzzy +msgid "Advanced Search" +msgstr "Feedster 搜尋" #: ../glade/liferea.ui.h:80 -msgid "Show a status _icon in the notification area (system tray)." -msgstr "在程式狀態通知區中顯示狀態圖示 (亦稱為系統列) (_i)" +#, fuzzy +msgid "_Search Folder..." +msgstr "新目錄(_F)..." #: ../glade/liferea.ui.h:81 -msgid "Show _number of new items in the tray icon." +msgid "Create Search Engine Feed" msgstr "" #: ../glade/liferea.ui.h:82 -msgid "T_erminate instead of minimizing to tray icon." -msgstr "" +msgid "enter any search string you want" +msgstr "輸入您想搜尋的任何字串" #: ../glade/liferea.ui.h:83 -msgid "_Start in tray icon." -msgstr "" +msgid "Maximal _Number Of Result Items:" +msgstr "最大搜尋結果數量:(_N)" #: ../glade/liferea.ui.h:84 -msgid "Toolbar Settings" +#, 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 查詢特定字串的饋流訂閱。您可以永久保留此訂" +"閱,並如同其他訂閱一般更新。" -#: ../glade/liferea.ui.h:85 -msgid "_Hide toolbar." -msgstr "" +#: ../glade/new_subscription.ui.h:9 +#, fuzzy +msgid "Download / Postprocessing" +msgstr "下載方式:(_D)" -#: ../glade/liferea.ui.h:86 -msgid "Toolbar _button labels:" +#: ../glade/node_source.ui.h:1 +msgid "Source Selection" msgstr "" -#: ../glade/liferea.ui.h:87 -msgid "GUI" -msgstr "圖形使用者介面" +#: ../glade/node_source.ui.h:2 +msgid "Select the source type you want to add..." +msgstr "" -#: ../glade/liferea.ui.h:88 -msgid "HTTP Proxy Server" +#: ../glade/opml_source.ui.h:1 +msgid "Add OPML/Planet" msgstr "" -#: ../glade/liferea.ui.h:89 -msgid "_Auto Detect (GNOME or environment)" +#: ../glade/opml_source.ui.h:2 +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." msgstr "" -#: ../glade/liferea.ui.h:90 +#: ../glade/opml_source.ui.h:3 #, fuzzy -msgid "_No Proxy" -msgstr "代理伺服器" +msgid "_Location" +msgstr "/複製連結位址(_C)" -#: ../glade/liferea.ui.h:91 -msgid "_Manual Setting:" -msgstr "" +#: ../glade/opml_source.ui.h:4 +#, fuzzy +msgid "_Select File" +msgstr "選擇檔案..." -#: ../glade/liferea.ui.h:92 -msgid "Proxy _Port:" -msgstr "代理伺服器埠號(_P)" +#: ../glade/ttrss_source.ui.h:1 +msgid "Add Tiny Tiny RSS Account" +msgstr "" -#: ../glade/liferea.ui.h:93 -msgid "Proxy _Host:" -msgstr "代理伺服器位址(_H):" +#: ../glade/ttrss_source.ui.h:2 +msgid "Please enter your tt-rss account settings." +msgstr "" -#: ../glade/liferea.ui.h:94 +#: ../glade/ttrss_source.ui.h:3 #, fuzzy -msgid "Use Proxy Au_thentication" -msgstr "使用代理伺服器認證(_A)" +msgid "_Server URL" +msgstr "伺服器端的錯誤" -#: ../glade/liferea.ui.h:95 -msgid "Proxy Pass_word:" -msgstr "代理伺服器密碼(_W):" +#: ../glade/ttrss_source.ui.h:5 +#, fuzzy +msgid "_Username" +msgstr "使用者名稱:" -#: ../glade/liferea.ui.h:96 -msgid "Proxy _Username:" -msgstr "代理伺服器使用者名稱(_U):" +#: ../glade/simple_subscription.ui.h:2 +msgid "Advanced..." +msgstr "" -#: ../glade/liferea.ui.h:97 -msgid "Proxy" -msgstr "代理伺服器" +#: ../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 "" -#: ../glade/liferea.ui.h:98 -#, fuzzy -msgid "Downloading Enclosures" -msgstr "附件下載中" +#: ../glade/prefs.ui.h:1 +msgid "Liferea Preferences" +msgstr "Lifeera 偏好" -#: ../glade/liferea.ui.h:99 -msgid "_Browse" -msgstr "瀏覽器(_B):" +#: ../glade/prefs.ui.h:2 +msgid "Feed Cache Handling" +msgstr "" -#: ../glade/liferea.ui.h:100 -msgid "_Save downloads in" -msgstr "將下載存於...(_S)" +#: ../glade/prefs.ui.h:3 +msgid "Default _number of items per feed to save:" +msgstr "Liferea 退出時單一饋流最多儲存項目數: (_N)" -#: ../glade/liferea.ui.h:101 -msgid "_Download using" -msgstr "下載方式:(_D)" +#: ../glade/prefs.ui.h:4 +#, fuzzy +msgid "Feed Update Settings" +msgstr "饋流快取" -#: ../glade/liferea.ui.h:102 +#: ../glade/prefs.ui.h:5 #, fuzzy -msgid "Opening Enclosures" -msgstr "/開啟附件..." +msgid "_Update all subscriptions at startup." +msgstr "新增訂閱" -#: ../glade/liferea.ui.h:103 -msgid "Enclosures" -msgstr "附件" +#: ../glade/prefs.ui.h:6 +msgid "Default Feed Refresh _Interval:" +msgstr "饋流更新週期(_I):" -#: ../glade/liferea.ui.h:104 +#. Feed update interval hint in preference dialog. +#: ../glade/prefs.ui.h:8 #, fuzzy -msgid "Synchronized with Nearby Hosts" -msgstr "饋流名稱" - -#: ../glade/liferea.ui.h:105 -msgid "_Enable Local LAN Synchronization" +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 "" +"註: 請記得輸入一個合理的更新時間,不建議每 15 分鐘更新一個每日更新的串" +"流! 若停用自動更新請輸入週期為 0 。" -#: ../glade/liferea.ui.h:106 -msgid "_Service Name" -msgstr "" +#: ../glade/prefs.ui.h:9 +msgid "Feeds" +msgstr "饋流" -#: ../glade/liferea.ui.h:108 -msgid "Sync" -msgstr "" +#: ../glade/prefs.ui.h:10 +#, fuzzy +msgid "Folder Display Settings" +msgstr "饋流顯示設定" -#: ../glade/liferea.ui.h:109 -msgid "New Folder" -msgstr "新目錄" +#: ../glade/prefs.ui.h:11 +msgid "_Show the items of all child feeds when a folder is selected." +msgstr "當目錄被選取時,顯示所有子饋流項目(_S)" -#: ../glade/liferea.ui.h:110 -msgid "_Folder name:" -msgstr "目錄名稱:(_F)" +#: ../glade/prefs.ui.h:12 +msgid "_Hide read items." +msgstr "隱藏閱讀過的項目(_H)" -#: ../glade/liferea.ui.h:111 +#: ../glade/prefs.ui.h:13 #, fuzzy -msgid "Rename" -msgstr "重新命名目錄" +msgid "Feed Icons (Favicons)" +msgstr "饋流圖示" -#: ../glade/liferea.ui.h:112 -#, fuzzy -msgid "_New Name:" -msgstr "名稱:(_N)" +#: ../glade/prefs.ui.h:14 +msgid "_Update all favicons now" +msgstr "更新所有饋流圖示(_U)" -#: ../glade/liferea.ui.h:113 -#, fuzzy -msgid "Search Folder Properties" -msgstr "虛擬目錄屬性" +#: ../glade/prefs.ui.h:15 +msgid "Folders" +msgstr "虛擬目錄" -#: ../glade/liferea.ui.h:114 +#: ../glade/prefs.ui.h:16 #, fuzzy -msgid "Search _Name:" -msgstr "饋流名稱(_N):" +msgid "Reading Headlines" +msgstr "標題" -#: ../glade/liferea.ui.h:115 -msgid "Find Items that meet the following criteria" -msgstr "" +#: ../glade/prefs.ui.h:17 +msgid "_Skim through articles with:" +msgstr "快速檢閱文章的方式:(_S)" -#: ../glade/liferea.ui.h:116 -msgid "A_ny Rule Matches" +#: ../glade/prefs.ui.h:18 +msgid "_Default View Mode:" msgstr "" -#: ../glade/liferea.ui.h:117 -msgid "_All Rules Must Match" +#: ../glade/prefs.ui.h:19 +#, fuzzy +msgid "Web Integration" +msgstr "方位" + +#: ../glade/prefs.ui.h:20 +msgid "_Post Bookmarks to" msgstr "" -#: ../glade/liferea.ui.h:118 -msgid "Downloading Enclosure" -msgstr "附件下載中" +#: ../glade/prefs.ui.h:22 +#, fuzzy +msgid "Internal Browser Settings" +msgstr "內部瀏覽器設定" -#: ../glade/liferea.ui.h:119 -msgid "Downloading an enclosure of type:" -msgstr "下載附件型態:" +#: ../glade/prefs.ui.h:23 +msgid "Open links in Liferea's _window." +msgstr "在 Liferea 的視窗開啟連結(_W)" -#: ../glade/liferea.ui.h:120 -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/prefs.ui.h:24 +msgid "_Disable Javascript." +msgstr "停止使用 Javascript (_D)" -#: ../glade/liferea.ui.h:121 -msgid "_Pass URL and do not download enclosure." -msgstr "" +#: ../glade/prefs.ui.h:25 +#, fuzzy +msgid "_Enable browser plugins." +msgstr "外部瀏覽器設定" -#: ../glade/liferea.ui.h:122 +#: ../glade/prefs.ui.h:26 #, fuzzy -msgid "_Do this automatically for enclosures like this from now on." -msgstr "從現在開始自動替檔案作同樣的處理(_D)" +msgid "External Browser Settings" +msgstr "外部瀏覽器設定" -#: ../glade/liferea.ui.h:123 -msgid "Search All Feeds" -msgstr "搜尋所有饋流" +#: ../glade/prefs.ui.h:27 +msgid "_Open link in:" +msgstr "開啟連結於(_O):" -#: ../glade/liferea.ui.h:124 -msgid "_Search for:" -msgstr "搜尋:(_S)" +#: ../glade/prefs.ui.h:28 +#, fuzzy +msgid "_Manual:" +msgstr "手動" -#: ../glade/liferea.ui.h:125 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." +#: ../glade/prefs.ui.h:30 +#, no-c-format +msgid "(%s for URL)" msgstr "" -#: ../glade/liferea.ui.h:126 -msgid "_Advanced..." -msgstr "" +#: ../glade/prefs.ui.h:31 +msgid "_Browser:" +msgstr "瀏覽器(_B):" -#: ../glade/liferea.ui.h:127 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "開始在所有餽流搜尋指定的文字,搜尋結果將會出現在項目列表中。" +#: ../glade/prefs.ui.h:32 +msgid "Browser" +msgstr "瀏覽器" -#: ../glade/liferea.ui.h:128 +#: ../glade/prefs.ui.h:33 #, fuzzy -msgid "Update Monitor" -msgstr "/更新目錄(_U)" +msgid "Notification Settings" +msgstr "程式狀態通知區" -#: ../glade/liferea.ui.h:129 -msgid "Pending Requests" +#: ../glade/prefs.ui.h:34 +msgid "Show a _popup window with new headlines." +msgstr "以跳出視窗顯示新標題" + +#: ../glade/prefs.ui.h:35 +msgid "Show a status _icon in the notification area (system tray)." +msgstr "在程式狀態通知區中顯示狀態圖示 (亦稱為系統列) (_i)" + +#: ../glade/prefs.ui.h:36 +msgid "Show _number of new items in the tray icon." msgstr "" -#: ../glade/liferea.ui.h:130 -#, fuzzy -msgid "Downloading Now" -msgstr "附件下載中" +#: ../glade/prefs.ui.h:37 +msgid "T_erminate instead of minimizing to tray icon." +msgstr "" -#: ../glade/liferea.ui.h:131 +#: ../glade/prefs.ui.h:38 +msgid "_Start in tray icon." +msgstr "" + +#: ../glade/prefs.ui.h:39 #, fuzzy -msgid "Cancel _All" -msgstr "更新全部(_A)" +msgid "Toolbar Settings" +msgstr "饋流顯示設定" -#: ../glade/liferea.ui.h:132 -msgid "Create News Bin" +#: ../glade/prefs.ui.h:40 +msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.ui.h:133 -msgid "_News Bin Name:" +#: ../glade/prefs.ui.h:41 +msgid "Toolbar _button labels:" msgstr "" -#: ../glade/liferea.ui.h:134 -msgid "About" -msgstr "關於" +#: ../glade/prefs.ui.h:42 +msgid "GUI" +msgstr "圖形使用者介面" -#: ../glade/liferea.ui.h:135 -msgid "" -"Copyright (c) 2003-2012\n" -"The Liferea Team\n" +#: ../glade/prefs.ui.h:43 +msgid "HTTP Proxy Server" msgstr "" -#: ../glade/liferea.ui.h:138 -msgid "Liferea is a news aggregator for GTK+" -msgstr "Liferea 是 GTK+ 新聞資訊蒐集器" +#: ../glade/prefs.ui.h:44 +msgid "_Auto Detect (GNOME or environment)" +msgstr "" -#: ../glade/liferea.ui.h:139 +#: ../glade/prefs.ui.h:45 #, fuzzy -msgid "Liferea Homepage" -msgstr "Lifeera 偏好" +msgid "_No Proxy" +msgstr "代理伺服器" -#: ../glade/liferea.ui.h:140 -#, fuzzy -msgid "Advanced Search" -msgstr "Feedster 搜尋" +#: ../glade/prefs.ui.h:46 +msgid "_Manual Setting:" +msgstr "" + +#: ../glade/prefs.ui.h:47 +msgid "Proxy _Port:" +msgstr "代理伺服器埠號(_P)" -#: ../glade/liferea.ui.h:141 +#: ../glade/prefs.ui.h:48 +msgid "Proxy _Host:" +msgstr "代理伺服器位址(_H):" + +#: ../glade/prefs.ui.h:49 #, fuzzy -msgid "_Search Folder..." -msgstr "新目錄(_F)..." +msgid "Use Proxy Au_thentication" +msgstr "使用代理伺服器認證(_A)" -#: ../glade/liferea.ui.h:142 -msgid "Create Search Engine Feed" -msgstr "" +#: ../glade/prefs.ui.h:50 +msgid "Proxy Pass_word:" +msgstr "代理伺服器密碼(_W):" -#: ../glade/liferea.ui.h:143 -msgid "enter any search string you want" -msgstr "輸入您想搜尋的任何字串" +#: ../glade/prefs.ui.h:51 +msgid "Proxy _Username:" +msgstr "代理伺服器使用者名稱(_U):" -#: ../glade/liferea.ui.h:144 -msgid "Maximal _Number Of Result Items:" -msgstr "最大搜尋結果數量:(_N)" +#: ../glade/prefs.ui.h:52 +msgid "Proxy" +msgstr "代理伺服器" -#: ../glade/liferea.ui.h:145 +#: ../glade/prefs.ui.h:53 #, 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 查詢特定字串的饋流訂閱。您可以永久保留此訂" -"閱,並如同其他訂閱一般更新。" +msgid "Downloading Enclosures" +msgstr "附件下載中" -#: ../glade/new_subscription.ui.h:9 -#, fuzzy -msgid "Download / Postprocessing" +#: ../glade/prefs.ui.h:54 +msgid "_Download using" msgstr "下載方式:(_D)" -#: ../glade/node_source.ui.h:1 -msgid "Source Selection" -msgstr "" - -#: ../glade/node_source.ui.h:2 -msgid "Select the source type you want to add..." -msgstr "" +#: ../glade/prefs.ui.h:55 +#, fuzzy +msgid "Opening Enclosures" +msgstr "/開啟附件..." -#: ../glade/opml_source.ui.h:1 -msgid "Add OPML/Planet" -msgstr "" +#: ../glade/prefs.ui.h:56 +msgid "Enclosures" +msgstr "附件" -#: ../glade/opml_source.ui.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." +#: ../glade/prefs.ui.h:57 +msgid "Plugins" msgstr "" -#: ../glade/opml_source.ui.h:3 #, fuzzy -msgid "_Location" -msgstr "/複製連結位址(_C)" +#~ msgid "Launch Item In _Tab" +#~ msgstr "/開啟瀏覽器項目(_L)" -#: ../glade/opml_source.ui.h:4 #, fuzzy -msgid "_Select File" -msgstr "選擇檔案..." +#~ msgid "_Launch Item In Browser" +#~ msgstr "/開啟瀏覽器項目(_L)" -#: ../glade/ttrss_source.ui.h:1 -msgid "Add Tiny Tiny RSS Account" -msgstr "" +#, fuzzy +#~ msgid "Copy Item _URL to Clipboard" +#~ msgstr "/複製項目的 URL 到剪貼簿(_U)" -#: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." -msgstr "" +#~ msgid "comments" +#~ msgstr "說明" -#: ../glade/ttrss_source.ui.h:3 #, fuzzy -msgid "_Server URL" -msgstr "伺服器端的錯誤" +#~ msgid "Download finished." +#~ msgstr "下載方式:(_D)" -#: ../glade/ttrss_source.ui.h:5 -#, fuzzy -msgid "_Username" -msgstr "使用者名稱:" +#~ msgid "Choose download directory" +#~ msgstr "選擇下載目錄" -#: ../glade/simple_subscription.ui.h:3 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" +#~ msgid "" +#~ "_Manual:\n" +#~ "(%s for URL)" +#~ msgstr "" +#~ "手動(_M):\n" +#~ "(%s 是網址)" -#: ../glade/simple_subscription.ui.h:4 -msgid "Advanced..." -msgstr "" +#~ msgid "_Save downloads in" +#~ msgstr "將下載存於...(_S)" + +#, fuzzy +#~ msgid "Synchronized with Nearby Hosts" +#~ msgstr "饋流名稱" + +#~ msgid "Downloading Enclosure" +#~ msgstr "附件下載中" #~ msgid "" #~ "Jumps to the next unread item. If necessary selects the next feed with " @@ -3056,11 +3092,11 @@ #~ msgid "" #~ "

    Could not determine the feed type. Please check that it is a valid type and listed in the supported " +#~ "\"http://lzone.de/liferea/supported_formats.htm\">supported " #~ "formats.

    " #~ msgstr "" #~ "

    無法偵測饋流類型。請確定為 有效的" -#~ "饋流類型,並為 ,並為 支援的格式

    " #~ msgid "Please do a search first!" diff -Nru liferea-1.8.15/README liferea-1.10.3/README --- liferea-1.8.15/README 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/README 2013-09-05 21:23:19.000000000 +0200 @@ -1,4 +1,4 @@ -This documentation was last updated for Liferea version 1.8 (14.09.2011). +This documentation was last updated for Liferea version 1.10 (31.10.2012). Contents ======== @@ -44,45 +44,10 @@ 2. Installation from Package ============================ -To install Liferea you can either get a package for your Linux distribution -or try to compile and install Liferea from the Source Tarball. The section -tries to give a list of known packages and short hints on how to install those. +Detailed instructions on how to install Liferea on the different distributions can +be found online on our homepage at -Ubuntu/ There are official packages in both Debian and Ubuntu -Debian: - To install Liferea run: - - apt-get install liferea - -RedHat/ For FC 3 and 4 you can install Liferea from the -Fedora: Extras repositories. Just run: - - yum install liferea - - Dag Wieers provides packages for both Fedora which - can be found at http://dag.wieers.com/packages/liferea/. - -SuSE: Since SuSE 10.1 there are official Liferea package. - Older packages can be found at: - - http://ftp.gwdg.de/pub/linux/misc/suser-guru/rpm/packages/Network/liferea/ - -Gentoo: The Gentoo portage tree provides ebuilds for Liferea: - - http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-news/liferea/ - -FreeBSD: There are Liferea packages (built by Hye-Shik Chang) at - - http://www.freshports.org/net/liferea/ - -Fink The Fink project also supports Liferea: - - http://fink.sourceforge.net/pdb/package.php/liferea - -Solaris Since 0.9.2 there are Solaris packages built - be Jeremy Teo. This package was built to work - with the Solaris gtk2,libxml2,gconf2 and - libgtkhtml packages from blastwave.org. + http://liferea.sf.net/install.htm @@ -93,17 +58,45 @@ any problems compiling the packages or from GIT don't hesitate to contact us in IRC (see Support section) to help you with it! + 3.1 Dependencies ---------------- -The library dependencies for Liferea are: +Liferea 1.10+ is to be built against GTK+ 3. If you need to build +for GTK+ 2 please use the most recent 1.8 release. +The compilation and runtime dependencies are: - gtk2, gconf2, libunique, libxml2, libxslt, sqlite3, - libwebkit and libjson-glib - +Mandatory: + + gtk3 + libxml2 + libxslt + sqlite3 + libwebkit3 + libjson-glib + libgirepository1.0 + libpeas + gsettings-desktop-schemas + +Optional: + + -> For normal GTK popup notifications: + libnotify >= 0.3.2 + + -> For Ubuntu indicator support + libnotify >= 0.3.2, + libindicate-0.6 or libindicate-0.7, + libindicate-gtk-0.6 or libindicate-gtk-0.7 + + -> For the keyring support + Python >= 2 + + -> For the media player plugin + Python >= 2 + GStreamer library and codecs -Ensure that you have installed the libraries and there headers. +Ensure that you have installed the libraries and their headers. If you use distribution packages then you usually need to install a package named like the library and one with a suffix "-dev" or "-devel". You need both to compile Liferea. @@ -117,7 +110,7 @@ project homepage (http://liferea.sf.net). After you downloaded it extract it like this: - tar zxvf liferea-1.8.0.tar.gz + tar jxvf liferea-1.10.0.tar.bz2 After unpacking run the standard autotools commands: @@ -149,7 +142,12 @@ 4. Contributing =============== -This section describes how you can contribute to Liferea. +This section describes how you can contribute to Liferea. We currently +try to provide additional help on contributing via OpenHatch.org which +provides help and easy tasks to start contributing. + + http://openhatch.org/+projects/Liferea + 4.1. No Feature Requests! ------------------------- @@ -164,6 +162,7 @@ requests are a constant justification exercise invented to punish developers. Please be kind and do not participate in this. + 4.2. How to Provide Patches --------------------------- @@ -184,6 +183,7 @@ If you are working on some topic feel free to contact us with any question on the mailing list on the IRC channel (see Support section). + 4.3. How to Translate Liferea ----------------------------- @@ -195,7 +195,9 @@ Please do not send translation patches. Those are a lot of work to merge and the bandwidth saving is not that huge! + 4.3.1. Create a New Translation +------------------------------- To create a new translation you must load the translation template, which you can find in the release tarball as "po/liferea.pot", into the translation @@ -204,13 +206,16 @@ 4.3.2. Update an Existing Translation +-------------------------------------- When updating an existing translation please ensure to respect earlier translators work. If the latest translation is only a few months old please contact the latest translator first asking him to review your changes especially if you change already translated literals. + 4.3.3. Providing a Localized Feed List +-------------------------------------- When Liferea starts for the first time it installs a localized feed list if available. If this is not the case for your locale you might want to provide @@ -230,6 +235,7 @@ Once finished post the result OPML file in the mailing list or the SF patch tracker. + 4.4 How to Help With Testing ---------------------------- @@ -241,6 +247,7 @@ time help with bug triaging the SF tracker. Check if you see any of the open bugs on your setup. + 4.4.2. Debugging Crashes ------------------------ diff -Nru liferea-1.8.15/src/auth_activatable.c liferea-1.10.3/src/auth_activatable.c --- liferea-1.8.15/src/auth_activatable.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/auth_activatable.c 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,91 @@ +/* + * @file auth_activatable.c Auth Plugin Type + * + * Copyright (C) 2012 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 "auth_activatable.h" + +/** + * SECTION:liferea_auth_activatable + * @short_description: Interface for activatable extensions providing auth infos + * @see_also: #PeasExtensionSet + * + * #LifereaAuthActivatable is an interface which should be implemented by + * extensions that want to provide a password store + **/ +G_DEFINE_INTERFACE (LifereaAuthActivatable, liferea_auth_activatable, G_TYPE_OBJECT) + +void +liferea_auth_activatable_default_init (LifereaAuthActivatableInterface *iface) +{ + /* No properties yet */ +} + +void +liferea_auth_activatable_activate (LifereaAuthActivatable * activatable) +{ + LifereaAuthActivatableInterface *iface; + + g_return_if_fail (LIFEREA_IS_AUTH_ACTIVATABLE (activatable)); + + iface = LIFEREA_AUTH_ACTIVATABLE_GET_IFACE (activatable); + if (iface->activate) + iface->activate (activatable); +} + +void +liferea_auth_activatable_deactivate (LifereaAuthActivatable * activatable) +{ + LifereaAuthActivatableInterface *iface; + + g_return_if_fail (LIFEREA_IS_AUTH_ACTIVATABLE (activatable)); + + iface = LIFEREA_AUTH_ACTIVATABLE_GET_IFACE (activatable); + if (iface->deactivate) + iface->deactivate (activatable); +} + +void +liferea_auth_activatable_query (LifereaAuthActivatable * activatable, + const gchar *authId) +{ + LifereaAuthActivatableInterface *iface; + + g_return_if_fail (LIFEREA_IS_AUTH_ACTIVATABLE (activatable)); + + iface = LIFEREA_AUTH_ACTIVATABLE_GET_IFACE (activatable); + if (iface->query) + iface->query (activatable, authId); +} + +void +liferea_auth_activatable_store (LifereaAuthActivatable * activatable, + const gchar *authId, + const gchar *username, + const gchar *password) +{ + LifereaAuthActivatableInterface *iface; + + g_return_if_fail (LIFEREA_IS_AUTH_ACTIVATABLE (activatable)); + + iface = LIFEREA_AUTH_ACTIVATABLE_GET_IFACE (activatable); + if (iface->store) + iface->store (activatable, authId, username, password); +} + + diff -Nru liferea-1.8.15/src/auth_activatable.h liferea-1.10.3/src/auth_activatable.h --- liferea-1.8.15/src/auth_activatable.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/auth_activatable.h 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,95 @@ +/* + * @file liferea_auth_activatable.h Shell Plugin Type + * + * Copyright (C) 2012 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 _LIFEREA_AUTH_ACTIVATABLE_H__ +#define _LIFEREA_AUTH_ACTIVATABLE_H__ + +#include + +G_BEGIN_DECLS + +#define LIFEREA_AUTH_ACTIVATABLE_TYPE (liferea_auth_activatable_get_type ()) +#define LIFEREA_AUTH_ACTIVATABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIFEREA_AUTH_ACTIVATABLE_TYPE, LifereaAuthActivatable)) +#define LIFEREA_AUTH_ACTIVATABLE_IFACE(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), LIFEREA_AUTH_ACTIVATABLE_TYPE, LifereaAuthActivatableInterface)) +#define LIFEREA_IS_AUTH_ACTIVATABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIFEREA_AUTH_ACTIVATABLE_TYPE)) +#define LIFEREA_AUTH_ACTIVATABLE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), LIFEREA_AUTH_ACTIVATABLE_TYPE, LifereaAuthActivatableInterface)) + +typedef struct _LifereaAuthActivatable LifereaAuthActivatable; +typedef struct _LifereaAuthActivatableInterface LifereaAuthActivatableInterface; + +struct _LifereaAuthActivatableInterface +{ + GTypeInterface g_iface; + + void (*activate) (LifereaAuthActivatable * activatable); + void (*deactivate) (LifereaAuthActivatable * activatable); + void (*query) (LifereaAuthActivatable * activatable, const gchar *authId); + void (*store) (LifereaAuthActivatable * activatable, const gchar *authId, const gchar *username, const gchar *password); +}; + +GType liferea_auth_activatable_get_type (void) G_GNUC_CONST; + +/** + * liferea_auth_activatable_activate: + * @activatable: A #LifereaAuthActivatable. + * + * Activates the extension. + */ +void liferea_auth_activatable_activate (LifereaAuthActivatable *activatable); + +/** + * liferea_auth_activatable_deactivate: + * @activatable: A #LifereaAuthActivatable. + * + * Deactivates the extension. + */ +void liferea_auth_activatable_deactivate (LifereaAuthActivatable *activatable); + +/** + * liferea_auth_activatable_query: + * @activatable: a #LifereaAuthActivatable. + * @authId: a unique auth info id + * + * Triggers a query for authentication infos for a given subscription. + * Expects triggered plugins to use liferea_auth_info_add() to provide + * any matches. + */ +void liferea_auth_activatable_query (LifereaAuthActivatable *activatable, + const gchar *authId); + +/** + * liferea_auth_activatable_store: + * @activatable: a #LifereaAuthActivatable. + * @authId: a unique auth info id + * @username: the username to store + * @password: the password to store + * + * Triggers a query for authentication infos for a given subscription. + * Expects triggered plugins to use liferea_auth_info_add() to provide + * any matches. + */ +void liferea_auth_activatable_store (LifereaAuthActivatable * activatable, + const gchar *authId, + const gchar *username, + const gchar *password); + +G_END_DECLS + +#endif /* __LIFEREA_AUTH_ACTIVATABLE_H__ */ diff -Nru liferea-1.8.15/src/auth.c liferea-1.10.3/src/auth.c --- liferea-1.8.15/src/auth.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/auth.c 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,125 @@ +/* + * @file auth.c authentication helpers + * + * Copyright (C) 2012 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 "auth.h" +#include "auth_activatable.h" +#include "plugins_engine.h" +#include "subscription.h" + +#include +#include + +// FIXME: This should be a member of some object! +static PeasExtensionSet *extensions = NULL; /**< Plugin management */ +static gint count = 0; /**< Number of active auth plugins */ + +static void +on_extension_added (PeasExtensionSet *extensions, + PeasPluginInfo *info, + PeasExtension *exten, + gpointer user_data) +{ + peas_extension_call (exten, "activate"); + count++; +} + +static void +on_extension_removed (PeasExtensionSet *extensions, + PeasPluginInfo *info, + PeasExtension *exten, + gpointer user_data) +{ + peas_extension_call (exten, "deactivate"); + count--; +} + +static PeasExtensionSet * +liferea_auth_get_extension_set (void) +{ + if (!extensions) { + extensions = peas_extension_set_new (PEAS_ENGINE (liferea_plugins_engine_get_default ()), + LIFEREA_AUTH_ACTIVATABLE_TYPE, NULL); + + g_signal_connect (extensions, "extension-added", G_CALLBACK (on_extension_added), NULL); + g_signal_connect (extensions, "extension-removed", G_CALLBACK (on_extension_removed), NULL); + + peas_extension_set_foreach (extensions, on_extension_added, NULL); + } + + return extensions; +} + +static void +liferea_auth_info_store_foreach (PeasExtensionSet *set, + PeasPluginInfo *info, + PeasExtension *exten, + gpointer user_data) +{ + subscriptionPtr subscription = (subscriptionPtr)user_data; + + g_assert (subscription != NULL); + g_assert (subscription->node != NULL); + g_assert (subscription->updateOptions != NULL); + + liferea_auth_activatable_store (LIFEREA_AUTH_ACTIVATABLE (exten), + subscription->node->id, + subscription->updateOptions->username, + subscription->updateOptions->password); +} + +void +liferea_auth_info_store (gpointer user_data) +{ + peas_extension_set_foreach (liferea_auth_get_extension_set (), + liferea_auth_info_store_foreach, user_data); +} + +void +liferea_auth_info_from_store (const gchar *id, const gchar *username, const gchar *password) +{ + nodePtr node = node_from_id (id); + + g_assert (NULL != node->subscription); + + node->subscription->updateOptions->username = g_strdup (username); + node->subscription->updateOptions->password = g_strdup (password); +} + +static void +liferea_auth_info_query_foreach (PeasExtensionSet *set, + PeasPluginInfo *info, + PeasExtension *exten, + gpointer data) +{ + liferea_auth_activatable_query (LIFEREA_AUTH_ACTIVATABLE (exten), data); +} + +void +liferea_auth_info_query (const gchar *authId) +{ + peas_extension_set_foreach (liferea_auth_get_extension_set (), + liferea_auth_info_query_foreach, (gpointer)authId); +} + +gboolean +liferea_auth_has_active_store (void) +{ + return (count > 0); +} diff -Nru liferea-1.8.15/src/auth.h liferea-1.10.3/src/auth.h --- liferea-1.8.15/src/auth.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/auth.h 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,68 @@ +/* + * @file auth.h authentication helpers + * + * Copyright (C) 2012 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 _AUTH_H +#define _AUTH_H + +#include + +/** + * liferea_auth_has_active_store: + * + * Method to query whether there is an active password store. + * + * @returns TRUE if there is a password store + */ +gboolean liferea_auth_has_active_store (void); + +/** + * liferea_auth_info_from_store: + * + * @param authId a node id + * @param username + * @param password + * + * Allow plugins to provide authentication infos + */ +void liferea_auth_info_from_store (const gchar *authId, const gchar *username, const gchar *password); + +/** + * liferea_auth_info_store: + * + * @param subscription pointer to a subscription + * + * Save given authentication info of a given subscription into password store (if available). + */ +void liferea_auth_info_store (gpointer subscription); + +/** + * liferea_auth_info_query: + * + * Return auth information for a given node. Each extension able to + * supply a user name and password for the given id is to synchronously call + * liferea_auth_info_from_store() to set them. + * + * @param authId a node id + * @param username reference to return username + * @param password reference to return password + */ +void liferea_auth_info_query (const gchar *authId); + +#endif diff -Nru liferea-1.8.15/src/browser.c liferea-1.10.3/src/browser.c --- liferea-1.8.15/src/browser.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/browser.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file browser.c Launching different external browsers * - * Copyright (C) 2003-2010 Lars Lindner + * Copyright (C) 2003-2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -35,32 +35,38 @@ NULL, NULL }, { - /* tested with SeaMonkey 1.0.6 */ - "mozilla", "Mozilla", "mozilla %s", - NULL, "mozilla -remote openURL(%s)", - NULL, "mozilla -remote 'openURL(%s,new-window)'", - NULL, "mozilla -remote 'openURL(%s,new-tab)'" - }, - { /* tested with Firefox 1.5 and 2.0 */ - "firefox", "Firefox","firefox \"%s\"", + "firefox", "Firefox", "firefox \"%s\"", NULL, "firefox -a firefox -remote \"openURL(%s)\"", NULL, "firefox -a firefox -remote 'openURL(%s,new-window)'", NULL, "firefox -a firefox -remote 'openURL(%s,new-tab)'" }, { - "opera", "Opera","opera \"%s\"", + "google-chrome", "Chrome", "google-chrome \"%s\"", + NULL, NULL, + NULL, NULL, + NULL, NULL + }, + { + "opera", "Opera", "opera \"%s\"", "opera \"%s\"", "opera -remote \"openURL(%s)\"", "opera -newwindow \"%s\"", NULL, "opera -newpage \"%s\"", NULL }, { - "epiphany", "Epiphany","epiphany \"%s\"", + "epiphany", "Epiphany", "epiphany \"%s\"", NULL, NULL, "epiphany \"%s\"", NULL, "epiphany -n \"%s\"", NULL }, { + /* tested with SeaMonkey 1.0.6 */ + "mozilla", "Mozilla", "mozilla %s", + NULL, "mozilla -remote openURL(%s)", + NULL, "mozilla -remote 'openURL(%s,new-window)'", + NULL, "mozilla -remote 'openURL(%s,new-tab)'" + }, + { "konqueror", "Konqueror", "kfmclient openURL \"%s\"", NULL, NULL, NULL, NULL, @@ -135,7 +141,7 @@ } g_free (libname); - return cmd?g_strdup (cmd):NULL; + return g_strdup (cmd); } /** diff -Nru liferea-1.8.15/src/browser.h liferea-1.10.3/src/browser.h --- liferea-1.8.15/src/browser.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/browser.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file browser.h Launching different external browsers * - * Copyright (C) 2008 Lars Lindner + * Copyright (C) 2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/browser_history.c liferea-1.10.3/src/browser_history.c --- liferea-1.8.15/src/browser_history.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/browser_history.c 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,106 @@ +/** + * @file browser_history.c managing the URI history + * + * Copyright (C) 2012 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 "browser_history.h" + +browserHistory * +browser_history_new (void) +{ + return (browserHistory *)g_new0 (browserHistory, 1); +} + +void +browser_history_free (browserHistory *history) +{ + GList *iter; + + g_return_if_fail (NULL != history); + iter = history->locations; + while (iter) { + g_free (iter->data); + iter = g_list_next (iter); + } + g_list_free (history->locations); + g_free (history); +} + +gchar * +browser_history_forward (browserHistory *history) +{ + GList *url = history->current; + + url = g_list_next (url); + history->current = url; + + return url->data; +} + +gchar * +browser_history_back (browserHistory *history) +{ + GList *url = history->current; + + url = g_list_previous (url); + history->current = url; + + return url->data; +} + +gboolean +browser_history_can_go_forward (browserHistory *history) +{ + return (NULL != g_list_next (history->current)); +} + +gboolean +browser_history_can_go_back (browserHistory *history) +{ + return (NULL != g_list_previous (history->current)); +} + +void +browser_history_add_location (browserHistory *history, const gchar *url) +{ + GList *iter; + + /* Do not add the same URL twice in a row... */ + if (history->current && + g_str_equal (history->current->data, url)) + return; + + /* If current URL is not at the end of the list, + truncate the rest of the list */ + if (history->locations) { + while (1) { + iter = g_list_last (history->locations); + if (!iter) + break; + if (iter == history->current) + break; + g_free (iter->data); + history->locations = g_list_remove (history->locations, iter->data); + } + } + + history->locations = g_list_append (history->locations, g_strdup (url)); + history->current = g_list_last (history->locations); +} + + diff -Nru liferea-1.8.15/src/browser_history.h liferea-1.10.3/src/browser_history.h --- liferea-1.8.15/src/browser_history.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/browser_history.h 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,91 @@ +/** + * @file browser_history.h managing the URI history + * + * Copyright (C) 2012 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 _BROWSER_HISTORY_H +#define _BROWSER_HISTORY_H + +#include + +/** structure holding all URLs visited in a tab */ +typedef struct browserHistory { + GList *locations; /**< list of all visited URLs */ + GList *current; /**< pointer into locations */ +} browserHistory; + +/** + * Create a new browser history. + * + * @returns the browser history + */ +browserHistory * browser_history_new (void); + +/** + * Dispose of a browser history + * + * @param history the browser history + */ +void browser_history_free (browserHistory *history); + +/** + * Set index of the browser history forward. + * + * @param history the browser history + * + * @returns the new selected URL (not to be free'd!) + */ +gchar * browser_history_forward (browserHistory *history); + +/** + * Set index of the browser history backwards. + * + * @param history the browser history + * + * @returns the new selected URL (not to be free'd!) + */ +gchar * browser_history_back (browserHistory *history); + +/** + * Check whether the history can go forward. + * + * @param history the browser history + * + * @returns TRUE if it can go forward + */ +gboolean browser_history_can_go_forward (browserHistory *history); + +/** + * Check whether the history can go back. + * + * @param history the browser history + * + * @returns TRUE if it can go back + */ +gboolean browser_history_can_go_back (browserHistory *history); + +/** + * Add a URL to the history. + * + * @param history the browser history + * @param url the URL to add + */ +void browser_history_add_location (browserHistory *history, const gchar *url); + +#endif + diff -Nru liferea-1.8.15/src/comments.c liferea-1.10.3/src/comments.c --- liferea-1.8.15/src/comments.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/comments.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file comments.c comment feed handling * - * Copyright (C) 2007-2009 Lars Lindner + * Copyright (C) 2007-2009 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/comments.h liferea-1.10.3/src/comments.h --- liferea-1.8.15/src/comments.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/comments.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file comments.h comment feed handling * - * Copyright (C) 2007-2008 Lars Lindner + * Copyright (C) 2007-2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/common.c liferea-1.10.3/src/common.c --- liferea-1.8.15/src/common.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/common.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file common.c common routines for Liferea * - * Copyright (C) 2003-2010 Lars Lindner + * Copyright (C) 2003-2013 Lars Windolf * Copyright (C) 2004-2006 Nathan J. Conrad * Copyright (C) 2004 Karl Soderstrom * @@ -37,10 +37,9 @@ #include #include "common.h" -#include "feed.h" #include "debug.h" -static gchar *lifereaUserPath = NULL; +static gboolean pathsChecked = FALSE; long common_parse_long (const gchar *str, long def) @@ -67,34 +66,42 @@ } static void -common_init_cache_path (void) +common_init_paths (void) { - gchar *cachePath; + gchar *lifereaCachePath = g_build_filename (g_get_user_cache_dir(), "liferea", NULL); - lifereaUserPath = g_build_filename (g_get_home_dir(), ".liferea_1.8", NULL); - cachePath = g_build_filename (lifereaUserPath, "cache", NULL); + common_check_dir (g_strdup (lifereaCachePath)); + common_check_dir (g_build_filename (lifereaCachePath, "feeds", NULL)); + common_check_dir (g_build_filename (lifereaCachePath, "favicons", NULL)); + common_check_dir (g_build_filename (lifereaCachePath, "plugins", NULL)); - common_check_dir (g_strdup (lifereaUserPath)); - common_check_dir (g_strdup (cachePath)); - common_check_dir (g_build_filename (cachePath, "feeds", NULL)); - common_check_dir (g_build_filename (cachePath, "favicons", NULL)); - common_check_dir (g_build_filename (cachePath, "plugins", NULL)); - common_check_dir (g_build_filename (cachePath, "scripts", NULL)); + common_check_dir (g_build_filename (g_get_user_config_dir(), "liferea", NULL)); + common_check_dir (g_build_filename (g_get_user_data_dir(), "liferea", NULL)); - g_free (cachePath); - /* lifereaUserPath is reused globally */ - /* ensure reasonable default umask */ umask (077); + + g_free (lifereaCachePath); + + pathsChecked = TRUE; +} + +gchar * +common_create_data_filename (const gchar *filename) +{ + if (!pathsChecked) + common_init_paths (); + + return g_build_filename (g_get_user_data_dir (), "liferea", filename, NULL); } -const gchar * -common_get_cache_path (void) -{ - if (!lifereaUserPath) - common_init_cache_path (); - - return lifereaUserPath; +gchar * +common_create_config_filename (const gchar *filename) +{ + if (!pathsChecked) + common_init_paths (); + + return g_build_filename (g_get_user_config_dir (), "liferea", filename, NULL); } gchar * @@ -102,7 +109,12 @@ { gchar *result; - result = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s%s%s%s%s", common_get_cache_path (), + if (!pathsChecked) + common_init_paths (); + + result = g_strdup_printf ("%s%s%s%s%s%s%s", + g_get_user_cache_dir (), + G_DIR_SEPARATOR_S "liferea" G_DIR_SEPARATOR_S, folder ? folder : "", folder ? G_DIR_SEPARATOR_S : "", filename, diff -Nru liferea-1.8.15/src/common.h liferea-1.10.3/src/common.h --- liferea-1.8.15/src/common.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/common.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file common.h common routines * - * Copyright (C) 2003-2011 Lars Lindner + * Copyright (C) 2003-2012 Lars Windolf * Copyright (C) 2004-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -64,21 +64,31 @@ long common_parse_long (const gchar *str, long def); /** - * Returns the cache file storage path. - * Usually: ~/.liferea/ + * Method to build user data file names. * - * @returns the path + * @param filename the user data filename (with extension) + * + * @returns a newly allocated filename string (to be free'd using g_free) + */ +gchar * common_create_data_filename (const gchar *filename); + +/** + * Method to build config file names. + * + * @param filename the cache filename (with extension) + * + * @returns a newly allocated filename string (to be free'd using g_free) */ -const gchar * common_get_cache_path(void); +gchar * common_create_config_filename (const gchar *filename); /** * Method to build cache file names. * * @param folder a subfolder in the cache dir (optional) - * @param filename the cache filename + * @param filename the cache filename (without extension) * @param extension the cache filename extension * - * @returns a newly allocated filename string + * @returns a newly allocated filename string (to be free'd using g_free) */ gchar * common_create_cache_filename(const gchar *folder, const gchar *filename, const gchar *extension); diff -Nru liferea-1.8.15/src/conf.c liferea-1.10.3/src/conf.c --- liferea-1.8.15/src/conf.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/conf.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,8 @@ /** - * @file conf.c Liferea configuration (gconf access) + * @file conf.c Liferea configuration (GSettings access) * - * Copyright (C) 2003-2009 Lars Lindner + * Copyright (C) 2011 Mikel Olasagasti Uranga + * Copyright (C) 2003-2013 Lars Windolf * Copyright (C) 2004,2005 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -19,8 +20,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include #include #include #include @@ -35,93 +34,138 @@ #define MAX_GCONF_PATHLEN 256 -#define PATH "/apps/liferea" +#define LIFEREA_SCHEMA_NAME "net.sf.liferea" +#define DESKTOP_SCHEMA_NAME "org.gnome.desktop.interface" -static GConfClient *client; +static GSettings *settings; +static GSettings *desktop_settings; /* Function prototypes */ -static void conf_proxy_reset_settings_cb(GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data); -static void conf_tray_settings_cb(GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data); -static void conf_toolbar_style_settings_cb(GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data); - -static gboolean -is_gconf_error (GError **err) -{ - if (*err) { - g_warning ("%s\n", (*err)->message); - g_error_free (*err); - *err = NULL; - return TRUE; - } - - return FALSE; -} +static void conf_proxy_reset_settings_cb(GSettings *settings, guint cnxn_id, gchar *key, gpointer user_data); +static void conf_tray_settings_cb(GSettings *settings, guint cnxn_id, gchar *key, gpointer user_data); +static void conf_toolbar_style_settings_cb(GSettings *settings, guint cnxn_id, gchar *key, gpointer user_data); static void -conf_load (void) +conf_ensure_migrated (const gchar *name) { - 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); + gboolean needed = TRUE; + GKeyFile *kf; + gchar **list; + gsize i, n; + + kf = g_key_file_new (); + + g_key_file_load_from_data_dirs (kf, "gsettings-data-convert", + NULL, G_KEY_FILE_NONE, NULL); + list = g_key_file_get_string_list (kf, "State", "converted", &n, NULL); + + if (list) { + for (i = 0; i < n; i++) { + if (strcmp (list[i], name) == 0) { + needed = FALSE; + break; + } + } + g_strfreev (list); + } + + g_key_file_free (kf); + + if (needed) + g_spawn_command_line_sync ("gsettings-data-convert", + NULL, NULL, NULL, NULL); } /* called once on startup */ void conf_init (void) { - /* call g_type_init(), GConf for some reason refuses to do so itself - and we use GConf before initializing GTK which would call g_type_init() itself */ - g_type_init (); - - /* initialize GConf client */ - client = gconf_client_get_default (); - gconf_client_add_dir (client, PATH, GCONF_CLIENT_PRELOAD_NONE, NULL); - gconf_client_add_dir (client, "/apps/liferea/proxy", GCONF_CLIENT_PRELOAD_NONE, NULL); - gconf_client_add_dir (client, "/system/http_proxy", GCONF_CLIENT_PRELOAD_NONE, NULL); - gconf_client_add_dir (client, "/desktop/gnome/interface", GCONF_CLIENT_PRELOAD_NONE, NULL); - - gconf_client_notify_add (client, "/apps/liferea/proxy", conf_proxy_reset_settings_cb, NULL, NULL, NULL); - gconf_client_notify_add (client, "/system/http_proxy", conf_proxy_reset_settings_cb, NULL, NULL, NULL); - gconf_client_notify_add (client, "/desktop/gnome/interface/toolbar_style", conf_toolbar_style_settings_cb, NULL, NULL, NULL); - gconf_client_notify_add (client, SHOW_TRAY_ICON, conf_tray_settings_cb, NULL, NULL, NULL); - + /* ensure we migrated from gconf to gsettings */ + conf_ensure_migrated (LIFEREA_SCHEMA_NAME); + + /* initialize GSettings client */ + settings = g_settings_new (LIFEREA_SCHEMA_NAME); + desktop_settings = g_settings_new(DESKTOP_SCHEMA_NAME); + + g_signal_connect ( + desktop_settings, + "changed::" TOOLBAR_STYLE, + G_CALLBACK (conf_toolbar_style_settings_cb), + NULL + ); + + g_signal_connect ( + settings, + "changed::" SHOW_TRAY_ICON, + G_CALLBACK (conf_tray_settings_cb), + NULL + ); + + g_signal_connect ( + settings, + "changed::" PROXY_DETECT_MODE, + G_CALLBACK (conf_proxy_reset_settings_cb), + NULL + ); + g_signal_connect ( + settings, + "changed::" PROXY_HOST, + G_CALLBACK (conf_proxy_reset_settings_cb), + NULL + ); + g_signal_connect ( + settings, + "changed::" PROXY_PORT, + G_CALLBACK (conf_proxy_reset_settings_cb), + NULL + ); + g_signal_connect ( + settings, + "changed::" PROXY_USEAUTH, + G_CALLBACK (conf_proxy_reset_settings_cb), + NULL + ); + g_signal_connect ( + settings, + "changed::" PROXY_USER, + G_CALLBACK (conf_proxy_reset_settings_cb), + NULL + ); + g_signal_connect ( + settings, + "changed::" PROXY_PASSWD, + G_CALLBACK (conf_proxy_reset_settings_cb), + NULL + ); + /* Load settings into static buffers */ conf_proxy_reset_settings_cb (NULL, 0, NULL, NULL); - - conf_load (); } void conf_deinit (void) { - g_object_unref (client); + g_object_unref (settings); + g_object_unref (desktop_settings); } static void -conf_tray_settings_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data) +conf_tray_settings_cb (GSettings *settings, guint cnxn_id, gchar *key, gpointer user_data) { - GConfValue *value; - - if (entry) { - value = gconf_entry_get_value (entry); - if (value && value->type == GCONF_VALUE_BOOL) - ui_tray_enable (gconf_value_get_bool (value)); + GVariant *gv; + + if (key) { + gv = g_settings_get_value (settings, key); + if (gv && g_variant_get_type(gv) == G_VARIANT_TYPE_BOOLEAN) + ui_tray_enable (g_settings_get_boolean (settings,key)); } } static void -conf_toolbar_style_settings_cb (GConfClient *client, +conf_toolbar_style_settings_cb (GSettings *settings, guint cnxn_id, - GConfEntry *entry, - gpointer user_data) + gchar *key, + gpointer user_data) { gchar *style = conf_get_toolbar_style (); @@ -132,18 +176,16 @@ } static void -conf_proxy_reset_settings_cb (GConfClient *client, +conf_proxy_reset_settings_cb (GSettings *settings, guint cnxn_id, - GConfEntry *entry, + gchar *key, gpointer user_data) { - gchar *proxyname, *proxyusername, *proxypassword, *tmp; - gboolean gnomeUseProxy; - guint proxyport; + gchar *proxyname, *proxyusername, *proxypassword; + gint proxyport; gint proxydetectmode; gboolean proxyuseauth; - xmlURIPtr uri; - + proxyname = NULL; proxyport = 0; proxyusername = NULL; @@ -154,59 +196,7 @@ default: case 0: debug0 (DEBUG_CONF, "proxy auto detect is configured"); - - /* 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 */ - 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) { - 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); - 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 - the following code was derived from SnowNews' setup.c */ - if (g_getenv("http_proxy")) { - /* The pointer returned by getenv must not be altered. - What about mentioning this in the manpage of getenv? */ - debug0 (DEBUG_CONF, "using proxy from environment"); - do { - uri = xmlParseURI (BAD_CAST g_getenv ("http_proxy")); - if (uri == NULL) { - debug0 (DEBUG_CONF, "parsing URI in $http_proxy failed!"); - break; - } - if (uri->server == NULL) { - debug0 (DEBUG_CONF, "could not determine proxy name from $http_proxy!"); - xmlFreeURI (uri); - break; - } - proxyname = g_strdup (uri->server); - proxyport = (uri->port == 0) ? 3128 : uri->port; - if (uri->user) { - tmp = strtok (uri->user, ":"); - tmp = strtok (NULL, ":"); - if (tmp) { - proxyusername = g_strdup (uri->user); - proxypassword = g_strdup (tmp); - } - } - xmlFreeURI (uri); - } while (FALSE); - } - } - if (!proxyname) - debug0 (DEBUG_CONF, "no proxy GNOME of $http_proxy configuration found..."); + /* nothing to do, all done by libproxy inside libsoup */ break; case 1: debug0 (DEBUG_CONF, "proxy is disabled by user"); @@ -224,11 +214,10 @@ } break; } - - debug4 (DEBUG_CONF, "Proxy settings are now %s:%d %s:%s", proxyname != NULL ? proxyname : "NULL", proxyport, + debug4 (DEBUG_CONF, "Manual proxy settings are now %s:%d %s:%s", proxyname != NULL ? proxyname : "NULL", proxyport, proxyusername != NULL ? proxyusername : "NULL", proxypassword != NULL ? proxypassword : "NULL"); - + network_set_proxy (proxyname, proxyport, proxyusername, proxypassword); } @@ -237,115 +226,87 @@ /*----------------------------------------------------------------------*/ void -conf_set_bool_value (const gchar *valuename, gboolean value) +conf_set_bool_value (const gchar *key, gboolean value) { - GError *err = NULL; - GConfValue *gcv; - - g_assert (valuename != NULL); - - gcv = gconf_value_new (GCONF_VALUE_BOOL); - gconf_value_set_bool (gcv, value); - gconf_client_set (client, valuename, gcv, &err); - gconf_value_free (gcv); - is_gconf_error (&err); + g_assert (key != NULL); + g_settings_set_boolean (settings, key, value); } -gboolean -conf_get_bool_value (const gchar *valuename, gboolean *value) +void +conf_set_str_value (const gchar *key, const gchar *value) { - GConfValue *gcv; - - g_assert (valuename != NULL); - - gcv = gconf_client_get (client, valuename, NULL); - if (gcv) { - *value = gconf_value_get_bool (gcv); - gconf_value_free (gcv); - return TRUE; - } else { - *value = FALSE; - return FALSE; - } + g_assert (key != NULL); + g_settings_set_string (settings, key, value); } void -conf_set_str_value (const gchar *valuename, const gchar *value) +conf_set_int_value (const gchar *key, gint value) { - GError *err = NULL; - GConfValue *gcv; - - g_assert (valuename != NULL); - - gcv = gconf_value_new (GCONF_VALUE_STRING); - gconf_value_set_string (gcv, value); - gconf_client_set (client, valuename, gcv, &err); - gconf_value_free (gcv); - is_gconf_error (&err); + g_assert (key != NULL); + debug2 (DEBUG_CONF, "Setting %s to %d", key, value); + g_settings_set_int (settings, key, value); } -gboolean -conf_get_str_value (const gchar *valuename, gchar **value) +gchar * +conf_get_toolbar_style(void) { - GConfValue *gcv; + gchar *style; - g_assert (valuename != NULL); - - gcv = gconf_client_get (client, valuename, NULL); - if (gcv) { - *value = g_strdup (gconf_value_get_string (gcv)); - gconf_value_free (gcv); - return TRUE; - } else { - *value = g_strdup (""); - return FALSE; + conf_get_str_value (TOOLBAR_STYLE, &style); + + /* check if we don't override the toolbar style */ + if (strcmp(style, "") == 0) { + g_free (style); + conf_get_str_value_from_schema (desktop_settings,"toolbar-style", &style); } + return style; } -void -conf_set_int_value (const gchar *valuename, gint value) +gboolean +conf_get_bool_value_from_schema (GSettings *gsettings, const gchar *key, gboolean *value) { - GError *err = NULL; - GConfValue *gcv; - - g_assert (valuename != NULL); - debug2 (DEBUG_CONF, "Setting %s to %d", valuename, value); - gcv = gconf_value_new (GCONF_VALUE_INT); - gconf_value_set_int (gcv, value); - gconf_client_set (client, valuename, gcv, &err); - is_gconf_error (&err); - gconf_value_free (gcv); + g_assert (key != NULL); + + if (gsettings == NULL) + gsettings = settings; + *value = g_settings_get_boolean (gsettings,key); + return *value; } gboolean -conf_get_int_value (const gchar *valuename, gint *value) +conf_get_str_value_from_schema (GSettings *gsettings, const gchar *key, gchar **value) { - GConfValue *gcv; + g_assert (key != NULL); - g_assert (valuename != NULL); - - 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; - } + if (gsettings == NULL) + gsettings = settings; + *value = g_settings_get_string (gsettings, key); + return (NULL != value); } -gchar * -conf_get_toolbar_style(void) +gboolean +conf_get_int_value_from_schema (GSettings *gsettings, const gchar *key, gint *value) { - gchar *style; + g_assert (key != NULL); - conf_get_str_value (TOOLBAR_STYLE, &style); + if (gsettings == NULL) + gsettings = settings; + *value = g_settings_get_int (gsettings,key); + return (NULL != value); +} - /* check if we don't override the toolbar style */ - if (strcmp(style, "") == 0) { - g_free (style); - conf_get_str_value ("/desktop/gnome/interface/toolbar_style", &style); - } - return style; +gboolean +conf_get_default_font_from_schema (const gchar *key, gchar **value) +{ + g_assert (key != NULL); + + if (desktop_settings) + *value = g_strdup (g_settings_get_string (desktop_settings, key)); + return (NULL != value); +} + +void +conf_signal_connect (const gchar *signal, GCallback cb, gpointer data) +{ + g_signal_connect (settings, signal, cb, data); } diff -Nru liferea-1.8.15/src/conf.h liferea-1.10.3/src/conf.h --- liferea-1.8.15/src/conf.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/conf.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,8 @@ /** - * @file conf.h Liferea configuration (gconf access) + * @file conf.h Liferea configuration (GSettings access) * - * Copyright (C) 2003-2009 Lars Lindner + * Copyright (C) 2011 Mikel Olasagasti Uranga + * Copyright (C) 2003-2013 Lars Windolf * Copyright (C) 2004,2005 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -23,71 +24,64 @@ #define _CONF_H #include +#include /* browsing settings */ -#define BROWSE_INSIDE_APPLICATION "/apps/liferea/browse-inside-application" -#define BROWSE_KEY_SETTING "/apps/liferea/browse-key-setting" -#define BROWSER_ID "/apps/liferea/browser_id" -#define BROWSER_PLACE "/apps/liferea/browser_place" -#define BROWSER_COMMAND "/apps/liferea/browser" - -#define DEFAULT_FONT "/desktop/gnome/interface/document_font_name" -#define USER_FONT "/apps/liferea/browser-font" -#define DISABLE_JAVASCRIPT "/apps/liferea/disable-javascript" -#define SOCIAL_BM_SITE "/apps/liferea/social-bm-site" -#define ENABLE_PLUGINS "/apps/liferea/enable-plugins" +#define BROWSE_INSIDE_APPLICATION "browse-inside-application" +#define BROWSE_KEY_SETTING "browse-key-setting" +#define BROWSER_ID "browser-id" +#define BROWSER_PLACE "browser-place" +#define BROWSER_COMMAND "browser" + +#define DEFAULT_VIEW_MODE "default-view-mode" + +#define DEFAULT_FONT "document-font-name" +#define USER_FONT "browser-font" +#define DISABLE_JAVASCRIPT "disable-javascript" +#define SOCIAL_BM_SITE "social-bm-site" +#define ENABLE_PLUGINS "enable-plugins" /* enclosure handling */ -#define ENCLOSURE_DOWNLOAD_TOOL "/apps/liferea/enclosure-download-tool" -#define ENCLOSURE_DOWNLOAD_PATH "/apps/liferea/enclosure-download-path" +#define DOWNLOAD_TOOL "download-tool" /* 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 DEFAULT_MAX_ITEMS "maxitemcount" +#define DEFAULT_UPDATE_INTERVAL "default-update-interval" +#define STARTUP_FEED_ACTION "startup-feed-action" /* folder handling settings */ -#define FOLDER_DISPLAY_MODE "/apps/liferea/folder-display-mode" -#define FOLDER_DISPLAY_HIDE_READ "/apps/liferea/folder-display-hide-read" -#define REDUCED_FEEDLIST "/apps/liferea/reduced-feedlist" +#define FOLDER_DISPLAY_MODE "folder-display-mode" +#define FOLDER_DISPLAY_HIDE_READ "folder-display-hide-read" +#define REDUCED_FEEDLIST "reduced-feedlist" /* GUI settings and persistency values */ -#define SHOW_TRAY_ICON "/apps/liferea/trayicon" -#define SHOW_NEW_COUNT_IN_TRAY "/apps/liferea/trayicon-new-count" -#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 DISABLE_TOOLBAR "/apps/liferea/disable-toolbar" -#define TOOLBAR_STYLE "/apps/liferea/toolbar-style" -#define LAST_WINDOW_X "/apps/liferea/last-window-x" -#define LAST_WINDOW_Y "/apps/liferea/last-window-y" -#define LAST_WINDOW_WIDTH "/apps/liferea/last-window-width" -#define LAST_WINDOW_HEIGHT "/apps/liferea/last-window-height" -#define LAST_WINDOW_MAXIMIZED "/apps/liferea/last-window-maximized" -#define LAST_VPANE_POS "/apps/liferea/last-vpane-pos" -#define LAST_HPANE_POS "/apps/liferea/last-hpane-pos" -#define LAST_WPANE_POS "/apps/liferea/last-wpane-pos" -#define LAST_ZOOMLEVEL "/apps/liferea/last-zoomlevel" +#define SHOW_TRAY_ICON "trayicon" +#define SHOW_NEW_COUNT_IN_TRAY "trayicon-new-count" +#define DONT_MINIMIZE_TO_TRAY "dont-minimize-to-tray" +#define START_IN_TRAY "start-in-tray" +#define SHOW_POPUP_WINDOWS "show-popup-windows" +#define DISABLE_TOOLBAR "disable-toolbar" +#define TOOLBAR_STYLE "toolbar-style" +#define LAST_WINDOW_STATE "last-window-state" +#define LAST_WINDOW_X "last-window-x" +#define LAST_WINDOW_Y "last-window-y" +#define LAST_WINDOW_WIDTH "last-window-width" +#define LAST_WINDOW_HEIGHT "last-window-height" +#define LAST_WINDOW_MAXIMIZED "last-window-maximized" +#define LAST_VPANE_POS "last-vpane-pos" +#define LAST_HPANE_POS "last-hpane-pos" +#define LAST_WPANE_POS "last-wpane-pos" +#define LAST_ZOOMLEVEL "last-zoomlevel" +#define LAST_NODE_SELECTED "last-node-selected" +#define LAST_ITEM_SELECTED "last-item-selected" /* networking settings */ -#define PROXY_DETECT_MODE "/apps/liferea/proxy/detect-mode" -#define PROXY_HOST "/apps/liferea/proxy/host" -#define PROXY_PORT "/apps/liferea/proxy/port" -#define PROXY_USEAUTH "/apps/liferea/proxy/use_authentication" -#define PROXY_USER "/apps/liferea/proxy/authentication_user" -#define PROXY_PASSWD "/apps/liferea/proxy/authentication_password" -#define GNOME_USE_PROXY "/system/http_proxy/use_http_proxy" /* old GNOME proxy enabling key */ -#define GNOME_PROXY_MODE "/system/proxy/mode" /* new GNOME proxy mode key */ -#define GNOME_PROXY_HOST "/system/http_proxy/host" -#define GNOME_PROXY_PORT "/system/http_proxy/port" -#define GNOME_PROXY_USEAUTH "/system/http_proxy/use_authentication" -#define GNOME_PROXY_USER "/system/http_proxy/authentication_user" -#define GNOME_PROXY_PASSWD "/system/http_proxy/authentication_password" - -/* other settings */ -#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" +#define PROXY_DETECT_MODE "proxy-detect-mode" +#define PROXY_HOST "proxy-host" +#define PROXY_PORT "proxy-port" +#define PROXY_USEAUTH "proxy-use-authentication" +#define PROXY_USER "proxy-authentication-user" +#define PROXY_PASSWD "proxy-authentication-password" /* initializing methods */ void conf_init (void); @@ -95,36 +89,43 @@ /* preferences access methods */ +#define conf_get_bool_value(key, value) conf_get_bool_value_from_schema (NULL, key, value) +#define conf_get_str_value(key, value) conf_get_str_value_from_schema (NULL, key, value) +#define conf_get_int_value(key, value) conf_get_int_value_from_schema (NULL, key, value) + /** * Retrieves the value of the given boolean configuration key. * + * @param gsettings gsettings schema to use * @param key the configuration key * @param value the value, if the function returned FALSE it's always FALSE * * @returns TRUE if the configuration key was found */ -gboolean conf_get_bool_value (const gchar *key, gboolean *value); +gboolean conf_get_bool_value_from_schema (GSettings *gsettings, const gchar *key, gboolean *value); /** * Retrieves the value of the given string configuration key. * The string has to be freed by the caller. * + * @param gsettings gsettings schema to use * @param key the configuration key * @param value the value, if the function returned FALSE an empty string * * @returns TRUE if the configuration key was found */ -gboolean conf_get_str_value (const gchar *key, gchar **value); +gboolean conf_get_str_value_from_schema (GSettings *gsettings,const gchar *key, gchar **value); /** * Retrieves the value of the given integer configuration key. * + * @param gsettings gsettings schema to use * @param key the configuration key * @param value the value, if the function returned FALSE it's always 0 * * @returns TRUE if the configuration key was found */ -gboolean conf_get_int_value (const gchar *key, gint *value); +gboolean conf_get_int_value_from_schema (GSettings *gsettings, const gchar *key, gint *value); /** * Sets the value of the given boolean configuration key. @@ -158,4 +159,23 @@ */ gchar * conf_get_toolbar_style (void); +/** + * Get the current system default font from desktop schema + * + * @param key the configuration key + * @param value the value, if the function returned FALSE it's always 0 + * + * @returns TRUE if the configuration key was found +*/ +gboolean conf_get_default_font_from_schema (const gchar *key, gchar **value); + +/** + * Connect to a signal in the default GSettings object + * + * @param signal the signal to connect to + * @param cb callback to invoke when the signal is emitted + * @param data user data to pass to the callback + */ +void conf_signal_connect (const gchar *signal, GCallback cb, gpointer data); + #endif diff -Nru liferea-1.8.15/src/date.c liferea-1.10.3/src/date.c --- liferea-1.8.15/src/date.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/date.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file date.c date formatting routines * - * Copyright (C) 2008-2009 Lars Lindner + * Copyright (C) 2008-2011 Lars Windolf * Copyright (C) 2004-2006 Nathan J. Conrad * * The date formatting was reused from the Evolution code base diff -Nru liferea-1.8.15/src/date.h liferea-1.10.3/src/date.h --- liferea-1.8.15/src/date.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/date.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file date.h date formatting and parsing routines for Liferea * - * Copyright (C) 2008-2009 Lars Lindner + * Copyright (C) 2008-2009 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/db.c liferea-1.10.3/src/db.c --- liferea-1.8.15/src/db.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/db.c 2013-08-02 23:46:10.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file db.c sqlite backend * - * Copyright (C) 2007-2012 Lars Lindner + * Copyright (C) 2007-2012 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -231,10 +231,10 @@ static void db_open (void) { - gchar *filename; - gint res; + gchar *filename; + gint res; - filename = common_create_cache_filename (NULL, "liferea", "db"); + filename = common_create_data_filename ("liferea.db"); debug1 (DEBUG_DB, "Opening DB file %s...", filename); res = sqlite3_open_v2 (filename, &db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL); if (SQLITE_OK != res) @@ -255,7 +255,6 @@ db_init (void) { gint res; - GError *error; debug_enter ("db_init"); @@ -552,18 +551,22 @@ " DELETE FROM items WHERE item_id IN (SELECT id FROM tmp_id LIMIT 1000);" " DROP TABLE tmp_id;" "END;"); - - debug0 (DEBUG_DB, "Checking for search folder items without a feed list node...\n"); - db_exec ("DELETE FROM search_folder_items WHERE parent_node_id NOT IN " - "(SELECT node_id FROM node);"); + debug0 (DEBUG_DB, "Checking for search folder items without a feed list node...\n"); + db_exec ("DELETE FROM search_folder_items WHERE parent_node_id NOT IN " + "(SELECT node_id FROM node);"); + debug0 (DEBUG_DB, "Checking for search folder items without a search folder...\n"); db_exec ("DELETE FROM search_folder_items WHERE node_id NOT IN " - "(SELECT node_id FROM node);"); + "(SELECT node_id FROM node);"); debug0 (DEBUG_DB, "Checking for search folder with comments...\n"); db_exec ("DELETE FROM search_folder_items WHERE comment = 1;"); - + + debug0 (DEBUG_DB, "Checking for subscription metadata without node...\n"); + db_exec ("DELETE FROM subscription_metadata WHERE node_id NOT IN " + "(SELECT node_id FROM node);"); + debug0 (DEBUG_DB, "DB cleanup finished. Continuing startup."); /* 4. Creating triggers (after cleanup so it is not slowed down by triggers) */ @@ -727,22 +730,16 @@ debug_exit ("db_init"); } -static void -db_free_statements (gpointer key, gpointer value, gpointer user_data) -{ - value = NULL; -} - void db_deinit (void) { + debug_enter ("db_deinit"); if (FALSE == sqlite3_get_autocommit (db)) g_warning ("Fatal: DB not in auto-commit mode. This is a bug. Data may be lost!"); if (statements) { - g_hash_table_foreach (statements, db_free_statements, NULL); g_hash_table_destroy (statements); statements = NULL; } @@ -969,17 +966,16 @@ iter = list = vfolder_get_all_with_item_id (item); while (iter) { vfolderPtr vfolder = (vfolderPtr)iter->data; - sqlite3_reset (stmt); sqlite3_bind_text (stmt, 1, vfolder->node->id, -1, SQLITE_TRANSIENT); sqlite3_bind_text (stmt, 2, item->nodeId, -1, SQLITE_TRANSIENT); sqlite3_bind_int (stmt, 3, item->id); - res = sqlite3_step (stmt); + res = sqlite3_step (stmt); if (SQLITE_DONE != res) g_warning ("item add to search folder failed (error code=%d, %s)", res, sqlite3_errmsg (db)); - iter = g_slist_next (iter); + } g_slist_free (list); @@ -992,20 +988,19 @@ iter = list = vfolder_get_all_without_item_id (item); while (iter) { vfolderPtr vfolder = (vfolderPtr)iter->data; + sqlite3_reset (stmt); + sqlite3_bind_text (stmt, 1, vfolder->node->id, -1, SQLITE_TRANSIENT); + sqlite3_bind_int (stmt, 2, item->id); + res = sqlite3_step (stmt); - sqlite3_reset (stmt); - sqlite3_bind_text (stmt, 1, vfolder->node->id, -1, SQLITE_TRANSIENT); - sqlite3_bind_int (stmt, 2, item->id); - res = sqlite3_step (stmt); - - if (SQLITE_DONE != res) + if (SQLITE_DONE != res) g_warning ("item remove from search folder failed (error code=%d, %s)", res, sqlite3_errmsg (db)); + iter = g_slist_next (iter); - iter = g_slist_next (iter); - } + } g_slist_free (list); - - sqlite3_finalize (stmt); + + sqlite3_finalize (stmt); } void @@ -1358,7 +1353,7 @@ stmt = db_get_statement ("searchFolderLoadStmt"); res = sqlite3_bind_text (stmt, 1, id, -1, SQLITE_TRANSIENT); if (SQLITE_OK != res) - g_error ("db_load_metadata: sqlite bind failed (error code %d)!", res); + g_error ("db_search_folder_load: sqlite bind failed (error code %d)!", res); itemSet = g_new0 (struct itemSet, 1); itemSet->nodeId = (gchar *)id; @@ -1451,7 +1446,7 @@ } static GSList * -db_subscription_metadata_load(const gchar *id) +db_subscription_metadata_load (const gchar *id) { GSList *metadata = NULL; sqlite3_stmt *stmt; @@ -1460,7 +1455,7 @@ stmt = db_get_statement ("subscriptionMetadataLoadStmt"); res = sqlite3_bind_text (stmt, 1, id, -1, SQLITE_TRANSIENT); if (SQLITE_OK != res) - g_error ("db_load_metadata: sqlite bind failed (error code %d)!", res); + g_error ("db_subscription_metadata_load: sqlite bind failed (error code %d)!", res); while (sqlite3_step (stmt) == SQLITE_ROW) { metadata = db_metadata_list_append (metadata, sqlite3_column_text(stmt, 0), @@ -1489,10 +1484,9 @@ sqlite3_bind_text (stmt, 4, value, -1, SQLITE_TRANSIENT); res = sqlite3_step (stmt); if (SQLITE_DONE != res) - g_warning ("Update in \"metadata\" table failed (error code=%d, %s)", res, sqlite3_errmsg (db)); + g_warning ("Update in \"subscription_metadata\" table failed (error code=%d, %s)", res, sqlite3_errmsg (db)); sqlite3_finalize (stmt); - } static void @@ -1530,13 +1524,13 @@ res = sqlite3_step (stmt); if (SQLITE_DONE != res) - g_warning ("Could not update subscription info %s in DB (error code %d)!", subscription->node->id, res); - + g_warning ("Could not update subscription info for node id %s in DB (error code %d)!", subscription->node->id, res); + sqlite3_finalize (stmt); db_subscription_metadata_update (subscription); - debug_end_measurement (DEBUG_DB, "subscription_update"); + debug_end_measurement (DEBUG_DB, "subscription update"); } void @@ -1581,11 +1575,11 @@ res = sqlite3_step (stmt); if (SQLITE_DONE != res) - g_warning ("Could not update subscription info %s in DB (error code %d)!", node->id, res); + g_warning ("Could not update node info %s in DB (error code %d)!", node->id, res); sqlite3_finalize (stmt); - - debug_end_measurement (DEBUG_DB, "subscription_update"); + + debug_end_measurement (DEBUG_DB, "node update"); } static gboolean @@ -1626,7 +1620,6 @@ db_node_cleanup (nodePtr root) { sqlite3_stmt *stmt; - gint res; debug0 (DEBUG_DB, "Cleaning node ids..."); diff -Nru liferea-1.8.15/src/db.h liferea-1.10.3/src/db.h --- liferea-1.8.15/src/db.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/db.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file db.h sqlite backend * - * Copyright (C) 2007-2011 Lars Lindner + * Copyright (C) 2007-2011 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/dbus.h liferea-1.10.3/src/dbus.h --- liferea-1.8.15/src/dbus.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/dbus.h 2013-07-31 23:29:12.000000000 +0200 @@ -36,7 +36,7 @@ GObjectClass parent; } LifereaDBusClass; -GType liferea_dbus_get_type(); +GType liferea_dbus_get_type (void); #define LIFEREA_DBUS_TYPE (liferea_dbus_get_type ()) #define LIFEREA_DBUS(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), LIFEREA_DBUS_TYPE, LifereaDBus)) @@ -45,6 +45,6 @@ #define IS_LIFEREA_DBUS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIFEREA_DBUS_TYPE)) #define LIFEREA_DBUS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIFEREA_DBUS_TYPE, LifereaDBusClass)) -LifereaDBus* liferea_dbus_new(); +LifereaDBus* liferea_dbus_new (void); #endif diff -Nru liferea-1.8.15/src/debug.c liferea-1.10.3/src/debug.c --- liferea-1.8.15/src/debug.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/debug.c 2013-07-31 23:29:12.000000000 +0200 @@ -5,7 +5,7 @@ * Copyright (C) 2002 Charles Kerr * * Liferea specific adaptations - * Copyright (C) 2004-2007 Lars Lindner + * Copyright (C) 2004-2012 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,28 +33,52 @@ #include "debug.h" unsigned long debug_level = 0; - -static int depth = 0; - +static GHashTable * t2d = NULL; /**< per thread call tree depth */ static GHashTable *startTimes = NULL; static const char * debug_get_prefix (unsigned long flag) { - if (flag & DEBUG_CACHE) return "CACHE"; - if (flag & DEBUG_CONF) return "CONF"; - if (flag & DEBUG_UPDATE) return "UPDATE"; + if (flag & DEBUG_CACHE) return "CACHE "; + if (flag & DEBUG_CONF) return "CONF "; + if (flag & DEBUG_UPDATE) return "UPDATE "; if (flag & DEBUG_PARSING) return "PARSING"; - if (flag & DEBUG_GUI) return "GUI"; - if (flag & DEBUG_HTML) return "HTML"; - if (flag & DEBUG_TRACE) return "TRACE"; - if (flag & DEBUG_NET) return "NET"; - if (flag & DEBUG_DB) return "DB"; - if (flag & DEBUG_PERF) return "PERF"; + if (flag & DEBUG_GUI) return "GUI "; + if (flag & DEBUG_HTML) return "HTML "; + if (flag & DEBUG_TRACE) return "TRACE "; + if (flag & DEBUG_NET) return "NET "; + if (flag & DEBUG_DB) return "DB "; + if (flag & DEBUG_PERF) return "PERF "; if (flag & DEBUG_VFOLDER) return "VFOLDER"; return ""; } +static void +debug_set_depth (gint newDepth) +{ + const gpointer self = g_thread_self (); + + /* Track per-thread call tree depth */ + if (t2d == NULL) + t2d = g_hash_table_new (g_direct_hash, g_direct_equal); + + if (newDepth < 0) + g_hash_table_insert(t2d, self, GINT_TO_POINTER(0)); + else + g_hash_table_insert(t2d, self, GINT_TO_POINTER(newDepth)); +} + +static gint +debug_get_depth (void) +{ + const gpointer self = g_thread_self (); + + if (!t2d) + return 0; + + return GPOINTER_TO_INT (g_hash_table_lookup (t2d, self)); +} + void debug_start_measurement_func (const char * function) { @@ -85,6 +109,7 @@ GTimeVal *startTime = NULL; GTimeVal endTime; unsigned long duration = 0; + int i; if (!function) return; @@ -104,9 +129,14 @@ (0 == endTime.tv_usec/1000)) return; - g_print ("%s: %s took %01ld,%03lds\n", debug_get_prefix (flags), name, - endTime.tv_sec - startTime->tv_sec, - endTime.tv_usec/1000); + g_print ("%s: ", debug_get_prefix (flags)); + if (debug_level & DEBUG_TRACE) + g_print ("[%p] ", g_thread_self ()); + for (i = 0; i < debug_get_depth (); i++) + g_print (" "); + g_print ("= %s took %01ld,%03lds\n", name, + endTime.tv_sec - startTime->tv_sec, + endTime.tv_usec/1000); duration = (endTime.tv_sec - startTime->tv_sec)*1000 + endTime.tv_usec/1000; if (duration > 250) @@ -126,21 +156,24 @@ const gchar * fmt, ...) { - static GHashTable * t2d = NULL; char timebuf[64]; gchar * string; const gchar * prefix; time_t now_time_t; va_list args; struct tm now_tm; - const gpointer self = g_thread_self (); - - if (t2d == NULL) - t2d = g_hash_table_new (g_direct_hash, g_direct_equal); + gint depth, i; g_return_if_fail (fmt != NULL); - /* get prefix */ + depth = debug_get_depth (); + + if (*fmt == '-') { + debug_set_depth (depth - 1); + depth--; + } + + /* Get prefix */ prefix = debug_get_prefix(flag); va_start (args, fmt); @@ -151,45 +184,28 @@ localtime_r (&now_time_t, &now_tm); strftime (timebuf, sizeof(timebuf), "%H:%M:%S", &now_tm); - if(flag & DEBUG_TRACE) { - const gint old_depth = GPOINTER_TO_INT (g_hash_table_lookup (t2d, self)); - const gint new_depth = old_depth + (*fmt=='+' ? 1 : -1); - - g_hash_table_insert(t2d, - self, - GINT_TO_POINTER(new_depth)); - - if(debug_level & DEBUG_VERBOSE) - printf ("(%15s:%20s)(thread %p)(time %s)(depth %3d) %s: %s\n", - strloc, - function, - self, - timebuf, - new_depth, - prefix, - string); - else - printf ("%s: %s\n", prefix, string); - - - if(*fmt=='-') - --depth; + if(debug_level & DEBUG_VERBOSE) { + printf ("(%15s:%20s)(thread %p)(time %s) %s: %s\n", + strloc, + function, + g_thread_self (), + timebuf, + prefix, + string); } else { - if(debug_level & DEBUG_VERBOSE) - printf ("(%15s:%20s)(thread %p)(time %s) %s: %s\n", - strloc, - function, - self, - timebuf, - prefix, - string); - else - printf ("%s: %s\n", prefix, string); - + g_print ("%s: ", prefix); + if (debug_level & DEBUG_TRACE) + g_print ("[%p] ", g_thread_self ()); + for (i = 0; i < depth; i++) + g_print (" "); + g_print ("%s\n", string); } fflush (NULL); g_free (string); + + if (*fmt == '+') + debug_set_depth (depth + 1); } void diff -Nru liferea-1.8.15/src/debug.h liferea-1.10.3/src/debug.h --- liferea-1.8.15/src/debug.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/debug.h 2013-07-31 23:29:12.000000000 +0200 @@ -5,7 +5,7 @@ * Copyright (C) 2002 Charles Kerr * * Liferea specific adaptions - * Copyright (C) 2004-2007 Lars Lindner + * Copyright (C) 2004-2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/enclosure.c liferea-1.10.3/src/enclosure.c --- liferea-1.8.15/src/enclosure.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/enclosure.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file enclosure.c enclosures/podcast support * - * Copyright (C) 2007-2011 Lars Lindner + * Copyright (C) 2007-2012 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,27 +26,22 @@ #include "debug.h" #include "enclosure.h" #include "xml.h" -#include "ui/ui_prefs.h" // FIXME: remove this! -#include "ui/liferea_shell.h" +#include "ui/preferences_dialog.h" // FIXME: remove this! +#include "ui/ui_common.h" /* Liferea manages a MIME type configuration to allow comfortable enclosure/podcast handling that launches - external applications to play/display the downloaded - content. + external applications to play or download content. The MIME type configuration is saved into a XML file in the cache directory. Enclosure download is currently done using external - tools (wget,curl,gwget...) and is performed by a new - glib thread that first downloads the file and then - starts the configured launcher command in background - and terminates. - - There is also an automatic enclosure downloading - feature that just downloads enclosures but does not - trigger any launcher command. + tools (gwget,kget,steadyflow...) and is performed by + simply passing the URL. All downloads are asynchronous + and download concurrency is considered to be handled + by the invoked tools. */ static GSList *types = NULL; @@ -126,6 +121,34 @@ enclosure->downloaded); } +gchar * +enclosure_get_url (const gchar *str) +{ + enclosurePtr enclosure = enclosure_from_string(str); + gchar *url = NULL; + + if (enclosure) + url = g_strdup (enclosure->url); + + enclosure_free (enclosure); + + return url; +} + +gchar * +enclosure_get_mime (const gchar *str) +{ + enclosurePtr enclosure = enclosure_from_string(str); + gchar *mime = NULL; + + if (enclosure) + mime = g_strdup (enclosure->url); + + enclosure_free (enclosure); + + return mime; +} + void enclosure_free (enclosurePtr enclosure) { @@ -144,7 +167,7 @@ typesLoaded = TRUE; - filename = g_build_filename (common_get_cache_path (), "mime.xml", NULL); + filename = common_create_config_filename ("mime.xml"); if (g_file_test (filename, G_FILE_TEST_EXISTS)) { doc = xmlParseFile (filename); if (!doc) { @@ -164,7 +187,6 @@ etp->mime = xmlGetProp (cur, BAD_CAST"mime"); etp->extension = xmlGetProp (cur, BAD_CAST"extension"); etp->cmd = xmlGetProp (cur, BAD_CAST"cmd"); - etp->remote = xmlStrcmp(BAD_CAST"false", xmlGetProp(cur, BAD_CAST"remote")); etp->permanent = TRUE; types = g_slist_append (types, etp); } @@ -201,7 +223,6 @@ etp = (encTypePtr)iter->data; cur = xmlNewChild (root, NULL, BAD_CAST"type", NULL); xmlNewProp (cur, BAD_CAST"cmd", etp->cmd); - xmlNewProp (cur, BAD_CAST"remote", etp->remote?"true":"false"); if (etp->mime) xmlNewProp (cur, BAD_CAST"mime", etp->mime); if (etp->extension) @@ -211,7 +232,7 @@ xmlDocSetRootElement (doc, root); - filename = g_build_filename (common_get_cache_path (), "mime.xml", NULL); + filename = common_create_config_filename ("mime.xml"); if (-1 == xmlSaveFormatFileEnc (filename, doc, NULL, 1)) g_warning ("Could not save to enclosure type config file!"); g_free (filename); @@ -248,136 +269,46 @@ enclosure_mime_types_save (); } -/** enclosure downloading/launching job parameters */ -typedef struct encJob { - gchar *download; /**< (optional) command to download */ - gchar *run; /**< command to run the downloaded file or the URL with */ - gchar *filename; /**< filename the result is saved to */ -} *encJobPtr; - -static gpointer -enclosure_exec (gpointer data) -{ - encJobPtr ejp = (encJobPtr)data; - GError *error = NULL; - gint status = 0; - gchar *stdout_message = NULL, *stderr_message = NULL; - - /* Download is optional when just passing URLs */ - if (ejp->download) { - debug1 (DEBUG_UPDATE, "running download command \"%s\"", ejp->download); - g_spawn_command_line_sync (ejp->download, &stdout_message, &stderr_message, &status, &error); - } - - if ((error && (0 != error->code)) || !WIFEXITED(status) || WEXITSTATUS(status)) { - g_warning ("Failed to execute command \"%s\", exited: %i, status: %i, stderr: %s, stdout: %s", ejp->download, WIFEXITED(status), WEXITSTATUS(status), stderr_message?:"", stdout_message?:""); - liferea_shell_set_status_bar (_("Enclosure download FAILED: \"%s\""), ejp->filename); - } else { - if (ejp->run) { - /* execute */ - debug1 (DEBUG_UPDATE, "running launch command \"%s\"", ejp->run); - g_spawn_command_line_async (ejp->run, &error); - if (error && (0 != error->code)) - g_warning ("Launch command \"%s\" failed!", ejp->run); - } else { - /* just saving */ - liferea_shell_set_status_bar (_("Enclosure download finished: \"%s\""), ejp->filename); - } - } - if (error) - g_error_free (error); - g_free (stdout_message); - g_free (stderr_message); - g_free (ejp->download); - g_free (ejp->run); - g_free (ejp->filename); - g_free (ejp); - - return NULL; -} - /* etp is optional, if it is missing we are in save mode */ -static void -enclosure_download (encTypePtr type, const gchar *url, gchar *filename) +void +enclosure_download (encTypePtr type, const gchar *url, gboolean interactive) { - enclosureDownloadToolPtr tool; - encJobPtr job; - gchar *filenameQ, *urlQ; + GError *error = NULL; + gchar *cmd, *urlQ; - /* prepare job structure */ - job = g_new0 (struct encJob, 1); - job->filename = filename; - - filenameQ = g_shell_quote (filename); urlQ = g_shell_quote (url); - - tool = prefs_get_download_tool (); - if (tool->niceFilename) - job->download = g_strdup_printf (tool->format, filenameQ, urlQ); - else - job->download = g_strdup_printf (tool->format, urlQ); if (type) { - - /* Argh... If the remote flag is set we do not want to download - the enclosure ourselves but just want to pass the URL - to the configured command */ - - if (type->remote) { - g_free (job->download); - job->download = NULL; + debug2 (DEBUG_UPDATE, "passing URL %s to command %s...", urlQ, type->cmd); + cmd = g_strdup_printf ("%s %s", type->cmd, urlQ); + } else { + const gchar *toolCmd = prefs_get_download_command (); + if(!toolCmd) { + if (interactive) + ui_show_error_box (_("You have not configured a download tool yet! Please do so in the 'Download' tab in Tools/Preferences.")); + return; } - - if (type->remote) - job->run = g_strdup_printf ("%s %s", type->cmd, urlQ); - else - job->run = g_strdup_printf ("%s %s", type->cmd, filenameQ); + + debug2 (DEBUG_UPDATE, "downloading URL %s with %s...", urlQ, toolCmd); + cmd = g_strdup_printf (toolCmd, urlQ); } - g_free (filenameQ); g_free (urlQ); - - if (type && type->remote) { - debug1 (DEBUG_UPDATE, "passing URL %s to command...", url); - } else { - debug2 (DEBUG_UPDATE, "downloading %s to %s...", url, filename); - } /* free now unnecessary stuff */ if (type && !type->permanent) enclosure_mime_type_remove (type); - - g_thread_create (enclosure_exec, job, FALSE, NULL); -} - -/** - * Download an enclosure at "url" and save it to "filename". If - * filename is NULL, then a filename will be automatically generated - * based on the URL. - */ -void -enclosure_save_as_file (encTypePtr type, const gchar *url, const gchar *filename) -{ - gchar *enclosure_download_path; - gchar *download_filename; - g_assert (url != NULL); - - if (!filename) { - /* build filename from last part of URL and make it begin with - the default enclosure save path */ - filename = strrchr(url, '/'); - if (!filename) - filename = url; + /* execute command */ + g_spawn_command_line_async (cmd, &error); + if (error && (0 != error->code)) { + if (interactive) + ui_show_error_box (_("Command failed: \n\n%s\n\n Please check whether the configured download tool is installed and working correctly! You can change it in the 'Download' tab in Tools/Preferences."), cmd); else - filename++; - conf_get_str_value (ENCLOSURE_DOWNLOAD_PATH, &enclosure_download_path); - download_filename = g_build_filename (enclosure_download_path, filename, NULL); - g_strdelimit (download_filename, "?", 0); /* strip GET parameters */ - g_free (enclosure_download_path); - } else { - download_filename = g_strdup (filename); + g_warning ("Command \"%s\" failed!", cmd); } - - enclosure_download (type, url, download_filename); + + if (error) + g_error_free (error); + g_free (cmd); } diff -Nru liferea-1.8.15/src/enclosure.h liferea-1.10.3/src/enclosure.h --- liferea-1.8.15/src/enclosure.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/enclosure.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ -/** +/* * @file enclosure.h enclosure/podcast support * - * Copyright (C) 2007-2011 Lars Lindner + * Copyright (C) 2007-2012 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,12 +21,6 @@ #ifndef _ENCLOSURE_H #define _ENCLOSURE_H -/** structure describing a supported download tool */ -typedef struct enclosureDownloadTool { - const char *format; /**< format string to construct download command */ - gboolean niceFilename; /**< TRUE if format has second %s for output file name */ -} *enclosureDownloadToolPtr; - /** structure describing the preferences for a MIME type or file extension */ typedef struct encType { gchar *mime; /**< either mime or extension is set */ @@ -34,7 +28,6 @@ gchar *cmd; /**< the command to launch the enclosure type */ gboolean permanent; /**< if TRUE definition is deleted after opening and not added to the permanent list of type configs */ - gboolean remote; /**< if TRUE enclosure is to be opened without downloading (pass URL only) */ } *encTypePtr; /** structure describing an enclosure and its states */ @@ -46,6 +39,8 @@ } *enclosurePtr; /** + * enclosure_from_string: (skip) + * * Parses enclosure description. * * @param str the enclosure description @@ -55,6 +50,8 @@ enclosurePtr enclosure_from_string (const gchar *str); /** + * enclosure_values_to_string: + * * Serialize enclosure infos to string. * * @param url the enclosure URL @@ -67,15 +64,39 @@ gchar * enclosure_values_to_string (const gchar *url, const gchar *mime, gssize size, gboolean downloaded); /** + * enclosure_to_string: + * * Serialize enclosure to string. * - * @param encloszre the enclosure + * @param enclosure the enclosure * * @returns new string (to be free'd using g_free) */ gchar * enclosure_to_string (const enclosurePtr enclosure); /** + * enclosure_get_url: + * @str: enclosure string to parse + * + * Get URL from enclosure string + * + * Return value: (transfer full): URL string, free after use + */ +gchar * enclosure_get_url (const gchar *str); + +/** + * enclosure_get_mime: + * @str: enclosure string to parse + * + * Get MIME type from enclosure string + * + * Return value: (transfer full): MIME type string, free after use + */ +gchar * enclosure_get_mime (const gchar *str); + +/** + * enclosure_free: + * * Free all memory associated with the enclosure. * * @oparam enclosure the enclosure @@ -83,6 +104,8 @@ void enclosure_free (enclosurePtr enclosure); /** + * enclosure_mime_types_get: (skip) + * * Returns all configured enclosure types. * * @returns list of encType structures @@ -90,13 +113,17 @@ const GSList const * enclosure_mime_types_get (void); /** + * enclosure_mime_type_add: + * * Adds a new MIME type handling definition. * * @param type the new definition */ void enclosure_mime_type_add (encTypePtr type); -/** +/** + * enclosure_mime_type_remove: + * * Removes an existing MIME type handling definition. * The definition will be free'd by this function. * @@ -105,17 +132,20 @@ void enclosure_mime_type_remove (encTypePtr type); /** + * enclosure_mime_types_save: + * * Save all MIME type definitions. */ void enclosure_mime_types_save (void); -/** +/** + * enclosure_download: + * @type: ULL or pointer to type structure + * @url: valid HTTP URL + * @interactive: TRUE if triggered by user interaction + * * Downloads a given enclosure URL into a file - * - * @param type NULL or pointer to type structure - * @param url valid HTTP URL - * @param filename valid filename */ -void enclosure_save_as_file (encTypePtr type, const gchar *url, const gchar *filename); +void enclosure_download (encTypePtr type, const gchar *url, gboolean interactive); #endif diff -Nru liferea-1.8.15/src/export.c liferea-1.10.3/src/export.c --- liferea-1.8.15/src/export.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/export.c 2013-09-05 21:06:59.000000000 +0200 @@ -2,7 +2,7 @@ * @file export.c OPML feed list import & export * * Copyright (C) 2004-2006 Nathan J. Conrad - * Copyright (C) 2004-2011 Lars Lindner + * Copyright (C) 2004-2012 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,22 +25,24 @@ #include +#include "auth.h" #include "common.h" #include "db.h" #include "debug.h" #include "favicon.h" #include "feedlist.h" #include "folder.h" -#include "vfolder.h" #include "xml.h" -#include "fl_sources/node_source.h" -#include "ui/ui_node.h" +#include "ui/ui_common.h" +#include "ui/feed_list_node.h" struct exportData { gboolean trusted; /**< Include all the extra Liferea-specific tags */ xmlNodePtr cur; }; +static void export_node_children (nodePtr node, xmlNodePtr cur, gboolean trusted); + /* Used for exporting, this adds a folder or feed's node to the XML tree */ static void export_append_node_tag (nodePtr node, gpointer userdata) @@ -50,8 +52,8 @@ xmlNodePtr childNode; gchar *tmp; - // FIXME: use node type capability for this condition - if (!internal && (IS_NODE_SOURCE (node) || IS_VFOLDER (node))) + /* When exporting external OPML do not export every node type... */ + if (!(internal || (NODE_TYPE (node)->capabilities & NODE_CAPABILITY_EXPORT))) return; childNode = xmlNewChild (cur, NULL, BAD_CAST"outline", NULL); @@ -81,6 +83,9 @@ case NODE_VIEW_SORT_BY_STATE: xmlNewProp (childNode, BAD_CAST"sortColumn", BAD_CAST"state"); break; + default: + g_assert_not_reached(); + break; } if (FALSE == node->sortReversed) @@ -88,10 +93,16 @@ 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); + + /* Do not export the default view mode setting to avoid making + it permanent. Do not use node_get_view_mode () here to ensure + that the comparison works as node_get_view_mode () returns + the effective mode! */ + if (NODE_VIEW_MODE_DEFAULT != node->viewMode) { + tmp = g_strdup_printf ("%u", node_get_view_mode(node)); + xmlNewProp (childNode, BAD_CAST"viewMode", BAD_CAST tmp); + g_free (tmp); + } } /* 2. add node type specific stuff */ @@ -99,7 +110,7 @@ /* 3. add children */ if (internal) { - if (ui_node_is_expanded (node->id)) + if (feed_list_node_is_expanded (node->id)) xmlNewProp (childNode, BAD_CAST"expanded", BAD_CAST"true"); else xmlNewProp (childNode, BAD_CAST"collapsed", BAD_CAST"true"); @@ -109,7 +120,7 @@ export_node_children (node, childNode, internal); } -void +static void export_node_children (nodePtr node, xmlNodePtr cur, gboolean trusted) { struct exportData params; @@ -159,7 +170,7 @@ xmlSetDocCompressMode (doc, 0); - if (-1 == xmlSaveFile (backupFilename, doc)) { + if (-1 == xmlSaveFormatFile (backupFilename, doc, TRUE)) { g_warning ("Could not export to OPML file!"); error = TRUE; } @@ -186,7 +197,7 @@ return !error; } -void +static void import_parse_outline (xmlNodePtr cur, nodePtr parentNode, gboolean trusted) { gchar *title, *typeStr, *tmp, *sortStr; @@ -225,6 +236,10 @@ } g_assert (NULL != type); + + /* Check if adding this type is allowed */ + // FIXME: Prevent news bins outside root source + // FIXME: Prevent search folders outside root source /* 2. do general node parsing */ node = node_new (type); @@ -329,11 +344,22 @@ /* 6. do node type specific parsing */ NODE_TYPE (node)->import (node, parentNode, cur, trusted); - - /* 7. update immediately if necessary */ - if (needsUpdate && (NODE_TYPE(node))) { - debug1 (DEBUG_CACHE, "seems to be an import, setting new id: %s and doing first download...", node_get_id(node)); - subscription_update (node->subscription, 0); + + if (node->subscription) { + /* Handle OPML auth info (imported from subscription_import() */ + if(node->subscription->updateOptions->username) { + /* Write to password store (for migration) */ + liferea_auth_info_store (node->subscription); + } else { + /* If no auth options in OPML try to import them from the key store */ + liferea_auth_info_query (node->id); + } + + /* 7. update immediately if necessary */ + if (needsUpdate) { + debug1 (DEBUG_CACHE, "seems to be an import, setting new id: %s and doing first download...", node_get_id(node)); + subscription_update (node->subscription, 0); + } } /* 8. Always update the node info in the DB to ensure a proper @@ -449,7 +475,7 @@ void import_OPML_file (void) { - ui_choose_file(_("Import Feed List"), _("Import"), FALSE, on_import_activate_cb, NULL, NULL, "*.opml", _("OPML Files"), NULL); + ui_choose_file(_("Import Feed List"), _("Import"), FALSE, on_import_activate_cb, NULL, NULL, "*.opml|*.xml", _("OPML Files"), NULL); } static void diff -Nru liferea-1.8.15/src/export.h liferea-1.10.3/src/export.h --- liferea-1.8.15/src/export.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/export.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file export.h OPML feedlist import&export * - * Copyright (C) 2003-2008 Lars Lindner + * Copyright (C) 2003-2012 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,8 @@ #ifndef _EXPORT_H #define _EXPORT_H +#include + #include "node.h" /** @@ -38,17 +40,6 @@ gboolean export_OPML_feedlist(const gchar *filename, nodePtr node, gboolean internal); /** - * Exports the given node children by calling their node type - * specific export methods to add outline tags to the given - * XML node. - * - * @param parentNode the parent node - * @param cur the outline XML node - * @param trusted set to TRUE if the feedlist is being to a trusted source - */ -void export_node_children(nodePtr node, xmlNodePtr cur, gboolean trusted); - -/** * Reads an OPML file and inserts it into the feedlist. * * @param filename path to file that will be read for importing @@ -61,16 +52,6 @@ gboolean import_OPML_feedlist(const gchar *filename, nodePtr parentNode, gboolean showErrors, gboolean trusted); /** - * Parses the given outline XML node and depending on the - * node type attribute calls the node specific import method. - * - * @param cur the outline XML node - * @param parentNode the parent node - * @param trusted set to TRUE if the feedlist is being imported from a trusted source - */ -void import_parse_outline(xmlNodePtr cur, nodePtr parentNode, gboolean trusted); - -/** * Called when user requested dialog to import an OPML file. */ void import_OPML_file (void); diff -Nru liferea-1.8.15/src/favicon.c liferea-1.10.3/src/favicon.c --- liferea-1.8.15/src/favicon.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/favicon.c 2013-07-31 23:29:12.000000000 +0200 @@ -77,7 +77,7 @@ debug_enter("favicon_load_from_cache"); /* try to load a saved favicon */ - filename = common_create_cache_filename("cache" G_DIR_SEPARATOR_S "favicons", id, "png"); + filename = common_create_cache_filename ("favicons", id, "png"); if(0 == stat((const char*)filename, &statinfo)) { pixbuf = gdk_pixbuf_new_from_file(filename, &error); @@ -115,7 +115,7 @@ debug_enter("favicon_remove"); /* try to load a saved favicon */ - filename = common_create_cache_filename( "cache" G_DIR_SEPARATOR_S "favicons", id, "png"); + filename = common_create_cache_filename ("favicons", id, "png"); if(g_file_test(filename, G_FILE_TEST_EXISTS)) { if(0 != unlink(filename)) g_warning ("Removal of %s failed", filename); @@ -146,7 +146,7 @@ if (gdk_pixbuf_loader_close (loader, &err)) { pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); if (pixbuf) { - tmp = common_create_cache_filename ("cache" G_DIR_SEPARATOR_S "favicons", ctxt->id, "png"); + tmp = common_create_cache_filename ("favicons", ctxt->id, "png"); debug2 (DEBUG_UPDATE, "saving favicon %s to file %s", ctxt->id, tmp); if (!gdk_pixbuf_save (pixbuf, tmp, "png", &err, NULL)) { g_warning ("Could not save favicon (id=%s) to file %s!", ctxt->id, tmp); @@ -169,7 +169,7 @@ } if (err) { - g_warning ("%s\n", err->message); + debug1 (DEBUG_UPDATE, "%s", err->message); g_error_free (err); } diff -Nru liferea-1.8.15/src/favicon.h liferea-1.10.3/src/favicon.h --- liferea-1.8.15/src/favicon.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/favicon.h 2013-07-31 23:29:12.000000000 +0200 @@ -44,7 +44,7 @@ void favicon_remove_from_cache(const gchar *id); /** - * Checks wether a given favicon needs to be updated + * Checks whether a given favicon needs to be updated * * @param id the favicon id * @param updateState update state info of the favicon diff -Nru liferea-1.8.15/src/feed.c liferea-1.10.3/src/feed.c --- liferea-1.8.15/src/feed.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/feed.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file feed.c feed node and subscription type * - * Copyright (C) 2003-2011 Lars Lindner + * Copyright (C) 2003-2011 Lars Windolf * Copyright (C) 2004-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -35,11 +35,10 @@ #include "render.h" #include "update.h" #include "xml.h" -#include "ui/auth_dialog.h" #include "ui/icons.h" #include "ui/liferea_shell.h" #include "ui/subscription_dialog.h" -#include "ui/ui_node.h" +#include "ui/feed_list_node.h" #include "notification/notification.h" feedPtr @@ -329,7 +328,7 @@ static void feed_remove (nodePtr node) { - ui_node_remove_node (node); + feed_list_node_remove_node (node); favicon_remove_from_cache (node->id); db_subscription_remove (node->id); @@ -404,7 +403,8 @@ static struct nodeType nti = { NODE_CAPABILITY_SHOW_UNREAD_COUNT | NODE_CAPABILITY_UPDATE | - NODE_CAPABILITY_UPDATE_FAVICON, + NODE_CAPABILITY_UPDATE_FAVICON | + NODE_CAPABILITY_EXPORT, "feed", /* not used, feed format ids are used instead */ NULL, feed_import, diff -Nru liferea-1.8.15/src/feed.h liferea-1.10.3/src/feed.h --- liferea-1.8.15/src/feed.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/feed.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file feed.h common feed handling interface * - * Copyright (C) 2003-2010 Lars Lindner + * Copyright (C) 2003-2010 Lars Windolf * Copyright (C) 2004-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify diff -Nru liferea-1.8.15/src/feedlist.c liferea-1.10.3/src/feedlist.c --- liferea-1.8.15/src/feedlist.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/feedlist.c 2013-10-08 19:36:38.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file feedlist.c subscriptions as an hierarchic tree * - * Copyright (C) 2005-2011 Lars Lindner + * Copyright (C) 2005-2013 Lars Windolf * Copyright (C) 2005-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -21,6 +21,7 @@ #include +#include "comments.h" #include "common.h" #include "conf.h" #include "db.h" @@ -36,7 +37,7 @@ #include "ui/feed_list_view.h" #include "ui/itemview.h" #include "ui/liferea_shell.h" -#include "ui/ui_node.h" +#include "ui/feed_list_node.h" #include "ui/ui_tray.h" #include "fl_sources/node_source.h" @@ -93,6 +94,9 @@ node_free (ROOTNODE); ROOTNODE = NULL; + /* This might also be a good place to get for some other cleanup */ + comments_deinit (); + G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -134,13 +138,13 @@ feedlist_init_node (nodePtr node) { if (node->expanded) - ui_node_set_expansion (node, TRUE); + feed_list_node_set_expansion (node, TRUE); if (node->subscription) db_subscription_load (node->subscription); node_update_counters (node); - ui_node_update (node->id); /* Necessary to initially set folder unread counters */ + feed_list_node_update (node->id); /* Necessary to initially set folder unread counters */ node_foreach_child (node, feedlist_init_node); } @@ -231,6 +235,49 @@ return ROOTNODE; } +nodePtr +feedlist_find_node (nodePtr parent, feedListFindType type, const gchar *str) +{ + GSList *iter; + + g_assert (str); + + iter = parent->children; + while (iter) { + gboolean found = FALSE; + nodePtr result, node = (nodePtr)iter->data; + + /* Check child node */ + switch (type) { + case NODE_BY_URL: + if (node->subscription) + found = g_str_equal (str, subscription_get_source (node->subscription)); + break; + case NODE_BY_ID: + found = g_str_equal (str, node->id); + break; + case FOLDER_BY_TITLE: + if (IS_FOLDER (node)) + found = g_str_equal (str, node->title); + break; + + default: + break; + } + if (found) + return node; + + /* And recurse */ + result = feedlist_find_node (node, type, str); + if (result) + return result; + + iter = g_slist_next (iter); + } + + return NULL; +} + gboolean feedlist_is_writable (void) { @@ -247,7 +294,7 @@ node_update_counters (node); /* update with parent propagation */ if (node->needsUpdate) - ui_node_update (node->id); + feed_list_node_update (node->id); if (node->children) node_foreach_child (node, feedlist_update_node_counters); } @@ -358,7 +405,8 @@ void feedlist_node_imported (nodePtr node) { - ui_node_add (node); + feed_list_node_add (node); + feedlist_schedule_save (); } @@ -369,7 +417,7 @@ g_assert (NULL == node->parent); - if (SELECTED && !IS_FOLDER(SELECTED)) { + if (SELECTED && !IS_FOLDER (SELECTED)) { position = g_slist_index (SELECTED->parent->children, SELECTED); if (position > -1) position++; /* insert after selected child index */ @@ -380,7 +428,7 @@ if (node->subscription) db_subscription_update (node->subscription); - db_node_update(node); + db_node_update (node); feedlist_node_imported (node); @@ -407,7 +455,7 @@ node_remove (node); - ui_node_remove_node (node); + feed_list_node_remove_node (node); node->parent->children = g_slist_remove (node->parent->children, node); diff -Nru liferea-1.8.15/src/feedlist.h liferea-1.10.3/src/feedlist.h --- liferea-1.8.15/src/feedlist.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/feedlist.h 2013-10-07 22:05:14.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file feedlist.h subscriptions as an hierarchic tree * - * Copyright (C) 2005-2008 Lars Lindner + * Copyright (C) 2005-2013 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -119,6 +119,26 @@ */ nodePtr feedlist_get_root (void); +typedef enum { + NODE_BY_URL, + NODE_BY_ID, + FOLDER_BY_TITLE +} feedListFindType; + +/** + * Search trough list of subscriptions for a node matching exactly + * to an criteria defined by the find type and comparison string. + * Searches recursively from a given parent node or the root node. + * Always returns just the first occurence in traversal order. + * + * @param parent parent node to traverse from (or NULL) + * @param type NODE_BY_(URL|FOLDER_TITLE|ID) + * @param str string to compare to + * + * @returns a nodePtr or NULL + */ +nodePtr feedlist_find_node (nodePtr parent, feedListFindType type, const gchar *str); + /** * Adds a new subscription to the feed list. * diff -Nru liferea-1.8.15/src/feed_parser.c liferea-1.10.3/src/feed_parser.c --- liferea-1.8.15/src/feed_parser.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/feed_parser.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file feed_parser.c parsing of different feed formats * - * Copyright (C) 2008-2010 Lars Lindner + * Copyright (C) 2008-2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/feed_parser.h liferea-1.10.3/src/feed_parser.h --- liferea-1.8.15/src/feed_parser.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/feed_parser.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file feed_parser.h parsing of different feed formats * - * Copyright (C) 2008 Lars Lindner + * Copyright (C) 2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,7 +24,6 @@ #include #include "feed.h" -#include "ui/ui_common.h" /* for icon constants needed in parser declarations */ /** Holds all information used on feed parsing time */ typedef struct feedParserCtxt { diff -Nru liferea-1.8.15/src/fl_sources/aol_source.c liferea-1.10.3/src/fl_sources/aol_source.c --- liferea-1.8.15/src/fl_sources/aol_source.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/aol_source.c 2013-08-03 18:34:02.000000000 +0200 @@ -0,0 +1,391 @@ +/** + * @file aol_source.c AOL reader feed list source support + * + * Copyright (C) 2007-2013 Lars Windolf + * Copyright (C) 2008 Arnold Noronha + * Copyright (C) 2011 Peter Oliver + * Copyright (C) 2011 Sergey Snitsaruk + * + * 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 "fl_sources/aol_source.h" + +#include +#include +#include +#include + +#include "common.h" +#include "debug.h" +#include "feedlist.h" +#include "item_state.h" +#include "metadata.h" +#include "node.h" +#include "subscription.h" +#include "update.h" +#include "xml.h" +#include "ui/auth_dialog.h" +#include "ui/liferea_dialog.h" +#include "ui/liferea_htmlview.h" +#include "fl_sources/node_source.h" +#include "fl_sources/opml_source.h" +#include "fl_sources/aol_source_edit.h" +#include "fl_sources/aol_source_opml.h" + +/** default AOL reader subscription list update interval = once a day */ +#define AOL_SOURCE_UPDATE_INTERVAL 60*60*24 + +/** create a AOL source with given node as root */ +static AolSourcePtr +aol_source_new (nodePtr node) +{ + AolSourcePtr source = g_new0 (struct AolSource, 1) ; + source->root = node; + source->actionQueue = g_queue_new (); + source->loginState = AOL_SOURCE_STATE_NONE; + source->lastTimestampMap = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + + return source; +} + +static void +aol_source_free (AolSourcePtr source) +{ + if (!source) + return; + + update_job_cancel_by_owner (source); + + g_free (source->authHeaderValue); + g_queue_free (source->actionQueue) ; + g_hash_table_unref (source->lastTimestampMap); + g_free (source); +} + +void +aol_source_set_state (AolSourcePtr source, gint state) +{ + debug3 (DEBUG_UPDATE, "AOL source '%s' now in state %d (was %d)", source->root->id, state, source->loginState); + source->loginState = state; +} + +static void +aol_source_login_cb (const struct updateResult * const result, gpointer userdata, updateFlags flags) +{ + AolSourcePtr source = (AolSourcePtr) userdata; + gchar *tmp = NULL; + subscriptionPtr subscription = source->root->subscription; + + debug1 (DEBUG_UPDATE, "google login processing... %s", result->data); + + g_assert (!source->authHeaderValue); + + if (result->data && result->httpstatus == 200) + tmp = strstr (result->data, "Auth="); + + if (tmp) { + gchar *ttmp = tmp; + tmp = strchr (tmp, '\n'); + if (tmp) + *tmp = '\0'; + source->authHeaderValue = g_strdup_printf ("GoogleLogin auth=%s", ttmp + 5); + + debug1 (DEBUG_UPDATE, "AOL reader Auth token found: %s", source->authHeaderValue); + + aol_source_set_state (source, AOL_SOURCE_STATE_ACTIVE); + source->authFailures = 0; + + /* now that we are authenticated trigger updating to start data retrieval */ + if (!(flags & AOL_SOURCE_UPDATE_ONLY_LOGIN)) + subscription_update (subscription, flags); + + /* process any edits waiting in queue */ + aol_source_edit_process (source); + + } else { + debug0 (DEBUG_UPDATE, "AOL reader login failed! no Auth token found in result!"); + subscription->node->available = FALSE; + + g_free (subscription->updateError); + subscription->updateError = g_strdup (_("AOL Reader login failed!")); + source->authFailures++; + + if (source->authFailures < AOL_SOURCE_MAX_AUTH_FAILURES) + aol_source_set_state (source, AOL_SOURCE_STATE_NONE); + else + aol_source_set_state (source, AOL_SOURCE_STATE_NO_AUTH); + + auth_dialog_new (subscription, flags); + } +} + +/** + * Perform a login to AOL Reader with OAuth2, if the login completes the + * AolSource will have a valid Auth token and will have loginStatus + * AOL_SOURCE_LOGIN_ACTIVE. + */ +void +aol_source_login (AolSourcePtr source, guint32 flags) +{ + GtkWidget *window; + LifereaHtmlView *htmlview; + + /* There will be session expirations due to OAuth2, FIXME: handle them with refresh token! */ + if (source->loginState != AOL_SOURCE_STATE_NONE) + debug1(DEBUG_UPDATE, "Logging in while login state is %d\n", source->loginState); + + aol_source_set_state (source, AOL_SOURCE_STATE_IN_PROGRESS); + + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_title (GTK_WINDOW (window), _("AOL Reader Login")); + gtk_window_set_default_size (GTK_WINDOW (window), 640, 480); + htmlview = liferea_htmlview_new (FALSE); + + // FIXME: Redirect doesn't work yet + liferea_htmlview_launch_URL_internal (htmlview, "https://api.screenname.aol.com/auth/authorize?client_id=:li1CKi3GIZzVBPyw&scope=reader&response_type=token&redirect_uri=liferea-aol-oauth2://"); + gtk_container_add (GTK_CONTAINER (window), liferea_htmlview_get_widget (htmlview)); + gtk_widget_show_all (window); +} + +/* node source type implementation */ + +static void +aol_source_update (nodePtr node) +{ + AolSourcePtr source = (AolSourcePtr) node->data; + + /* Reset AOL_SOURCE_STATE_NO_AUTH as this is a manual + user interaction and no auto-update so we can query + for credentials again. */ + if (source->loginState == AOL_SOURCE_STATE_NO_AUTH) + aol_source_set_state (source, AOL_SOURCE_STATE_NONE); + + subscription_update (node->subscription, 0); // FIXME: 0 ? +} + +static void +aol_source_auto_update (nodePtr node) +{ + GTimeVal now; + AolSourcePtr source = (AolSourcePtr) node->data; + + if (source->loginState == AOL_SOURCE_STATE_NONE) { + aol_source_update (node); + return; + } + + if (source->loginState == AOL_SOURCE_STATE_IN_PROGRESS) + return; /* the update will start automatically anyway */ + + g_get_current_time (&now); + + /* do daily updates for the feed list and feed updates according to the default interval */ + if (node->subscription->updateState->lastPoll.tv_sec + AOL_SOURCE_UPDATE_INTERVAL <= now.tv_sec) { + subscription_update (node->subscription, 0); + g_get_current_time (&source->lastQuickUpdate); + } + else if (source->lastQuickUpdate.tv_sec + AOL_SOURCE_QUICK_UPDATE_INTERVAL <= now.tv_sec) { + aol_source_opml_quick_update (source); + aol_source_edit_process (source); + g_get_current_time (&source->lastQuickUpdate); + } +} + +static void +aol_source_init (void) { } + +static void aol_source_deinit (void) { } + +static void +aol_source_import_node (nodePtr node) +{ + GSList *iter; + for (iter = node->children; iter; iter = g_slist_next(iter)) { + nodePtr subnode = iter->data; + if (subnode->subscription) + subnode->subscription->type = &aolSourceFeedSubscriptionType; + if (subnode->type->capabilities + & NODE_CAPABILITY_SUBFOLDERS) + aol_source_import_node (subnode); + } +} + +static void +aol_source_import (nodePtr node) +{ + opml_source_import (node); + + node->subscription->type = &aolSourceOpmlSubscriptionType; + if (!node->data) + node->data = (gpointer) aol_source_new (node); + + aol_source_import_node (node); +} + +static void +aol_source_export (nodePtr node) +{ + opml_source_export (node); +} + +static gchar * +aol_source_get_feedlist (nodePtr node) +{ + return opml_source_get_feedlist (node); +} + +static void +aol_source_remove (nodePtr node) +{ + opml_source_remove (node); +} + +static nodePtr +aol_source_add_subscription (nodePtr node, subscriptionPtr subscription) +{ + debug_enter ("aol_source_add_subscription"); + nodePtr child = node_new (feed_get_node_type ()); + + debug0 (DEBUG_UPDATE, "AolSource: Adding a new subscription"); + node_set_data (child, feed_new ()); + + node_set_subscription (child, subscription); + child->subscription->type = &aolSourceFeedSubscriptionType; + + node_set_title (child, _("New Subscription")); + + aol_source_edit_add_subscription (node_source_root_from_node (node)->data, subscription->source); + + debug_exit ("aol_source_add_subscription"); + + return child; +} + +static void +aol_source_remove_node (nodePtr node, nodePtr child) +{ + gchar *src; + AolSourcePtr source = node->data; + + if (child == node) { + feedlist_node_removed (child); + return; + } + + src = g_strdup (child->subscription->source); + + feedlist_node_removed (child); + + /* propagate the removal only if there aren't other copies */ + if (!aol_source_opml_get_node_by_source (source, src)) + aol_source_edit_remove_subscription (source, src); + + g_free (source); +} + +/* GUI callbacks */ + +static void +aol_source_get_account_info (void) +{ + /* We do not need credentials as this will be handled by OAuth2 during login */ + nodePtr node; + subscriptionPtr subscription; + + subscription = subscription_new ("http://reader.aol.com/", NULL, NULL); + node = node_new (node_source_get_node_type ()); + node_set_title (node, "AOL Reader"); + node_source_new (node, aol_source_get_type ()); + node_set_subscription (node, subscription); + subscription->type = &aolSourceOpmlSubscriptionType ; + + node->data = aol_source_new (node); + feedlist_node_added (node); + aol_source_update (node); +} + +static void +aol_source_cleanup (nodePtr node) +{ + AolSourcePtr reader = (AolSourcePtr) node->data; + aol_source_free(reader); + node->data = NULL ; +} + +static void +aol_source_item_set_flag (nodePtr node, itemPtr item, gboolean newStatus) +{ + nodePtr root = node_source_root_from_node (node); + aol_source_edit_mark_starred ((AolSourcePtr)root->data, item->sourceId, node->subscription->source, newStatus); + item_flag_state_changed (item, newStatus); +} + +static void +aol_source_item_mark_read (nodePtr node, itemPtr item, gboolean newStatus) +{ + nodePtr root = node_source_root_from_node (node); + aol_source_edit_mark_read ((AolSourcePtr)root->data, item->sourceId, node->subscription->source, newStatus); + item_read_state_changed (item, newStatus); +} + +/** + * Convert all subscriptions of a google source to local feeds + * + * @param node The node to migrate (not the nodeSource!) + */ +static void +aol_source_convert_to_local (nodePtr node) +{ + AolSourcePtr source = node->data; + + aol_source_set_state (source, AOL_SOURCE_STATE_MIGRATE); +} + +/* node source type definition */ + +static struct nodeSourceType nst = { + .id = "fl_aol", + .name = N_("AOL Reader"), + .description = N_("Integrate the feed list of your AOL Reader account. Liferea will " + "present your AOL Reader subscriptions, and will synchronize your feed list and reading lists."), + .capabilities = NODE_SOURCE_CAPABILITY_DYNAMIC_CREATION | + NODE_SOURCE_CAPABILITY_WRITABLE_FEEDLIST | + NODE_SOURCE_CAPABILITY_ADD_FEED | + NODE_SOURCE_CAPABILITY_ITEM_STATE_SYNC | + NODE_SOURCE_CAPABILITY_CONVERT_TO_LOCAL, + .source_type_init = aol_source_init, + .source_type_deinit = aol_source_deinit, + .source_new = aol_source_get_account_info, + .source_delete = aol_source_remove, + .source_import = aol_source_import, + .source_export = aol_source_export, + .source_get_feedlist = aol_source_get_feedlist, + .source_update = aol_source_update, + .source_auto_update = aol_source_auto_update, + .free = aol_source_cleanup, + .item_set_flag = aol_source_item_set_flag, + .item_mark_read = aol_source_item_mark_read, + .add_folder = NULL, + .add_subscription = aol_source_add_subscription, + .remove_node = aol_source_remove_node, + .convert_to_local = aol_source_convert_to_local +}; + +nodeSourceTypePtr +aol_source_get_type (void) +{ + return &nst; +} diff -Nru liferea-1.8.15/src/fl_sources/aol_source_edit.c liferea-1.10.3/src/fl_sources/aol_source_edit.c --- liferea-1.8.15/src/fl_sources/aol_source_edit.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/aol_source_edit.c 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,487 @@ +/** + * @file aol_source_edit.c AOL reader feed list source syncing support + * + * Copyright (C) 2013 Lars Windolf + * Copyright (C) 2008 Arnold Noronha + * + * 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 "debug.h" +#include "update.h" +#include "subscription.h" +#include "common.h" +#include "feedlist.h" + + +#include "aol_source.h" +#include "aol_source_edit.h" +#include "config.h" +#include +#include +#include +#include "xml.h" + +/** + * A structure to indicate an edit to the Google Reader "database". + * These edits are put in a queue and processed in sequential order + * so that google does not end up processing the requests in an + * unintended order. + */ +typedef struct AolSourceAction { + /** + * The guid of the item to edit. This will be ignored if the + * edit is acting on an subscription rather than an item. + */ + gchar* guid; + + /** + * A MANDATORY feed url to containing the item, or the url of the + * subscription to edit. + */ + gchar* feedUrl; + + /** + * The source type. Currently known types are "feed" and "user". + * "user" sources are used, for example, for items that are links (as + * opposed to posts) in broadcast-friends. The unique id of the source + * is of the form /. + */ + gchar* feedUrlType; + + /** + * A callback function on completion of the edit. + */ + void (*callback) (AolSourcePtr source, struct AolSourceAction* edit, gboolean success); + + /** + * The type of this AolSourceAction. + */ + int actionType ; +} *AolSourceActionPtr ; + +enum { + EDIT_ACTION_MARK_READ, + EDIT_ACTION_MARK_UNREAD, + EDIT_ACTION_TRACKING_MARK_UNREAD, /**< every UNREAD request, should be followed by tracking-kept-unread */ + EDIT_ACTION_MARK_STARRED, + EDIT_ACTION_MARK_UNSTARRED, + EDIT_ACTION_ADD_SUBSCRIPTION, + EDIT_ACTION_REMOVE_SUBSCRIPTION +} ; + + +typedef struct AolSourceAction* editPtr ; + +typedef struct AolSourceActionCtxt { + gchar *nodeId ; + AolSourceActionPtr action; +} *AolSourceActionCtxtPtr; + + +static void aol_source_edit_push (AolSourcePtr source, AolSourceActionPtr action, gboolean head); + + +static AolSourceActionPtr +aol_source_action_new (void) +{ + AolSourceActionPtr action = g_slice_new0 (struct AolSourceAction); + return action; +} + +static void +aol_source_action_free (AolSourceActionPtr action) +{ + g_free (action->guid); + g_free (action->feedUrl); + g_slice_free (struct AolSourceAction, action); +} + +static AolSourceActionCtxtPtr +aol_source_action_context_new(AolSourcePtr source, AolSourceActionPtr action) +{ + AolSourceActionCtxtPtr ctxt = g_slice_new0(struct AolSourceActionCtxt); + ctxt->nodeId = g_strdup(source->root->id); + ctxt->action = action; + return ctxt; +} + +static void +aol_source_action_context_free(AolSourceActionCtxtPtr ctxt) +{ + g_free(ctxt->nodeId); + g_slice_free(struct AolSourceActionCtxt, ctxt); +} + +static void +aol_source_edit_action_complete (const struct updateResult* const result, gpointer userdata, updateFlags flags) +{ + AolSourceActionCtxtPtr editCtxt = (AolSourceActionCtxtPtr) userdata; + nodePtr node = node_from_id (editCtxt->nodeId); + AolSourcePtr source; + AolSourceActionPtr action = editCtxt->action ; + + aol_source_action_context_free (editCtxt); + + if (!node) { + aol_source_action_free (action); + return; /* probably got deleted before this callback */ + } + source = (AolSourcePtr) node->data; + + if (result->data == NULL || !g_str_equal (result->data, "OK")) { + if (action->callback) + (*action->callback) (source, action, FALSE); + debug1 (DEBUG_UPDATE, "The edit action failed with result: %s\n", result->data); + aol_source_action_free (action); + return; /** @todo start a timer for next processing */ + } + + if (action->callback) + action->callback (source, action, TRUE); + + aol_source_action_free (action); + + /* process anything else waiting on the edit queue */ + aol_source_edit_process (source); +} + +/* the following aol_source_api_* functions are simply funtions that + convert a AolSourceActionPtr to a updateRequestPtr */ + +static void +aol_source_api_add_subscription (AolSourceActionPtr action, updateRequestPtr request, const gchar* token) +{ + update_request_set_source (request, AOL_READER_ADD_SUBSCRIPTION_URL); + gchar* s_escaped = g_uri_escape_string (action->feedUrl, NULL, TRUE) ; + gchar* postdata = g_strdup_printf (AOL_READER_ADD_SUBSCRIPTION_POST, s_escaped, token); + g_free (s_escaped); + + debug1 (DEBUG_UPDATE, "aol_source: postdata [%s]", postdata); + request->postdata = postdata ; +} + +static void +aol_source_api_remove_subscription (AolSourceActionPtr action, updateRequestPtr request, const gchar* token) +{ + update_request_set_source (request, AOL_READER_REMOVE_SUBSCRIPTION_URL); + gchar* s_escaped = g_uri_escape_string (action->feedUrl, NULL, TRUE); + g_assert (!request->postdata); + request->postdata = g_strdup_printf (AOL_READER_REMOVE_SUBSCRIPTION_POST, s_escaped, token); + g_free (s_escaped); +} + +static void +aol_source_api_edit_tag (AolSourceActionPtr action, updateRequestPtr request, const gchar*token) +{ + update_request_set_source (request, AOL_READER_EDIT_TAG_URL); + + const gchar* prefix = "feed" ; + gchar* s_escaped = g_uri_escape_string (action->feedUrl, NULL, TRUE); + gchar* a_escaped = NULL ; + gchar* i_escaped = g_uri_escape_string (action->guid, NULL, TRUE); + gchar* postdata = NULL ; + + /* + * If the source of the item is a feed then the source *id* will be of + * the form tag:google.com,2005:reader/feed/http://foo.com/bar + * If the item is a shared link it is of the form + * tag:google.com,2005:reader/user//source/com.google/link + * It is possible that there are items other thank link that has + * the ../user/.. id. The GR API requires the strings after ..:reader/ + * while AolSourceAction only gives me after :reader/feed/ (or + * :reader/user/ as the case might be). I therefore need to guess + * the prefix ('feed/' or 'user/') from just this information. + */ + + if (strstr(action->feedUrl, "://") == NULL) + prefix = "user" ; + + if (action->actionType == EDIT_ACTION_MARK_UNREAD) { + a_escaped = g_uri_escape_string (AOL_READER_TAG_KEPT_UNREAD, NULL, TRUE); + gchar *r_escaped = g_uri_escape_string (AOL_READER_TAG_READ, NULL, TRUE); + postdata = g_strdup_printf (AOL_READER_EDIT_TAG_AR_TAG, i_escaped, prefix, s_escaped, a_escaped, r_escaped, token); + g_free (r_escaped); + } + else if (action->actionType == EDIT_ACTION_MARK_READ) { + a_escaped = g_uri_escape_string (AOL_READER_TAG_READ, NULL, TRUE); + postdata = g_strdup_printf (AOL_READER_EDIT_TAG_ADD_TAG, i_escaped, prefix, s_escaped, a_escaped, token); + } + else if (action->actionType == EDIT_ACTION_TRACKING_MARK_UNREAD) { + a_escaped = g_uri_escape_string (AOL_READER_TAG_TRACKING_KEPT_UNREAD, NULL, TRUE); + postdata = g_strdup_printf (AOL_READER_EDIT_TAG_ADD_TAG, i_escaped, prefix, s_escaped, a_escaped, token); + } + else if (action->actionType == EDIT_ACTION_MARK_STARRED) { + a_escaped = g_uri_escape_string (AOL_READER_TAG_STARRED, NULL, TRUE) ; + postdata = g_strdup_printf ( + AOL_READER_EDIT_TAG_ADD_TAG, i_escaped, prefix, + s_escaped, a_escaped, token); + } + else if (action->actionType == EDIT_ACTION_MARK_UNSTARRED) { + gchar* r_escaped = g_uri_escape_string(AOL_READER_TAG_STARRED, NULL, TRUE); + postdata = g_strdup_printf ( + AOL_READER_EDIT_TAG_REMOVE_TAG, i_escaped, prefix, + s_escaped, r_escaped, token); + } + + else g_assert (FALSE); + + g_free (s_escaped); + g_free (a_escaped); + g_free (i_escaped); + + debug1 (DEBUG_UPDATE, "aol_source: postdata [%s]", postdata); + + + request->postdata = postdata; +} + +static void +aol_source_edit_token_cb (const struct updateResult * const result, gpointer userdata, updateFlags flags) +{ + nodePtr node; + AolSourcePtr source; + const gchar* token; + AolSourceActionPtr action; + updateRequestPtr request; + + if (result->httpstatus != 200 || result->data == NULL) { + /* FIXME: What is the behaviour that should go here? */ + return; + } + + node = node_from_id ((gchar*) userdata); + g_free (userdata); + + if (!node) { + return; + } + source = (AolSourcePtr) node->data; + + + token = result->data; + + if (!source || g_queue_is_empty (source->actionQueue)) + return; + + action = g_queue_peek_head (source->actionQueue); + + request = update_request_new (); + request->updateState = update_state_copy (source->root->subscription->updateState); + request->options = update_options_copy (source->root->subscription->updateOptions) ; + update_request_set_auth_value (request, source->authHeaderValue); + + if (action->actionType == EDIT_ACTION_MARK_READ || + action->actionType == EDIT_ACTION_MARK_UNREAD || + action->actionType == EDIT_ACTION_TRACKING_MARK_UNREAD || + action->actionType == EDIT_ACTION_MARK_STARRED || + action->actionType == EDIT_ACTION_MARK_UNSTARRED) + aol_source_api_edit_tag (action, request, token); + else if (action->actionType == EDIT_ACTION_ADD_SUBSCRIPTION ) + aol_source_api_add_subscription (action, request, token); + else if (action->actionType == EDIT_ACTION_REMOVE_SUBSCRIPTION ) + aol_source_api_remove_subscription (action, request, token) ; + + update_execute_request (source, request, aol_source_edit_action_complete, aol_source_action_context_new(source, action), 0); + + action = g_queue_pop_head (source->actionQueue); +} + +void +aol_source_edit_process (AolSourcePtr source) +{ + updateRequestPtr request; + + g_assert (source); + if (g_queue_is_empty (source->actionQueue)) + return; + + /* + * Google reader has a system of tokens. So first, I need to request a + * token from google, before I can make the actual edit request. The + * code here is the token code, the actual edit commands are in + * aol_source_edit_token_cb + */ + request = update_request_new (); + request->updateState = update_state_copy (source->root->subscription->updateState); + request->options = update_options_copy (source->root->subscription->updateOptions); + request->source = g_strdup (AOL_READER_TOKEN_URL); + update_request_set_auth_value(request, source->authHeaderValue); + + update_execute_request (source, request, aol_source_edit_token_cb, + g_strdup(source->root->id), 0); +} + +static void +aol_source_edit_push_ (AolSourcePtr source, AolSourceActionPtr action, gboolean head) +{ + g_assert (source->actionQueue); + if (head) g_queue_push_head (source->actionQueue, action); + else g_queue_push_tail (source->actionQueue, action); +} + +static void +aol_source_edit_push (AolSourcePtr source, AolSourceActionPtr action, gboolean head) +{ + g_assert (source); + nodePtr root = source->root; + aol_source_edit_push_ (source, action, head); + + /** @todo any flags I should specify? */ + if (source->loginState == AOL_SOURCE_STATE_NONE) + subscription_update(root->subscription, AOL_SOURCE_UPDATE_ONLY_LOGIN); + else if ( source->loginState == AOL_SOURCE_STATE_ACTIVE) + aol_source_edit_process (source); +} + +static void +update_read_state_callback (AolSourcePtr source, AolSourceActionPtr action, gboolean success) +{ + if (success) { + // FIXME: call item_read_state_changed (item, newState); + } else { + debug0 (DEBUG_UPDATE, "Failed to change item state!\n"); + } +} + +void +aol_source_edit_mark_read (AolSourcePtr source, const gchar *guid, const gchar *feedUrl, gboolean newStatus) +{ + AolSourceActionPtr action = aol_source_action_new (); + + action->guid = g_strdup (guid); + action->feedUrl = g_strdup (feedUrl); + action->actionType = newStatus ? EDIT_ACTION_MARK_READ : + EDIT_ACTION_MARK_UNREAD; + action->callback = update_read_state_callback; + + aol_source_edit_push (source, action, FALSE); + + if (newStatus == FALSE) { + /* + * According to the Google Reader API, to mark an item unread, + * I also need to mark it as tracking-kept-unread in a separate + * network call. + */ + action = aol_source_action_new (); + action->guid = g_strdup (guid); + action->feedUrl = g_strdup (feedUrl); + action->actionType = EDIT_ACTION_TRACKING_MARK_UNREAD; + aol_source_edit_push (source, action, FALSE); + } +} + +static void +update_starred_state_callback(AolSourcePtr source, AolSourceActionPtr action, gboolean success) +{ + if (success) { + // FIXME: call item_flag_changed (item, newState); + } else { + debug0 (DEBUG_UPDATE, "Failed to change item state!\n"); + } +} + +void +aol_source_edit_mark_starred (AolSourcePtr source, const gchar *guid, const gchar *feedUrl, gboolean newStatus) +{ + AolSourceActionPtr action = aol_source_action_new (); + + action->guid = g_strdup (guid); + action->feedUrl = g_strdup (feedUrl); + action->actionType = newStatus ? EDIT_ACTION_MARK_STARRED : EDIT_ACTION_MARK_UNSTARRED; + action->callback = update_starred_state_callback; + + aol_source_edit_push (source, action, FALSE); +} + +static void +update_subscription_list_callback(AolSourcePtr source, AolSourceActionPtr action, gboolean success) +{ + if (success) { + /* + * It is possible that Google changed the name of the URL that + * was sent to it. In that case, I need to recover the URL + * from the list. But a node with the old URL has already + * been created. Allow the subscription update call to fix that. + */ + GSList* cur = source->root->children ; + for(; cur; cur = g_slist_next (cur)) { + nodePtr node = (nodePtr) cur->data ; + if (g_str_equal (node->subscription->source, action->feedUrl)) { + subscription_set_source (node->subscription, ""); + feedlist_node_added (node); + } + } + + debug0 (DEBUG_UPDATE, "Subscription list was updated successful\n"); + subscription_update (source->root->subscription, AOL_SOURCE_UPDATE_ONLY_LIST); + } else + debug0 (DEBUG_UPDATE, "Failed to update subscriptions\n"); +} + +void +aol_source_edit_add_subscription (AolSourcePtr source, const gchar* feedUrl) +{ + AolSourceActionPtr action = aol_source_action_new () ; + action->actionType = EDIT_ACTION_ADD_SUBSCRIPTION; + action->feedUrl = g_strdup (feedUrl); + action->callback = update_subscription_list_callback; + aol_source_edit_push (source, action, TRUE); +} + +static void +aol_source_edit_remove_callback (AolSourcePtr source, AolSourceActionPtr action, gboolean success) +{ + if (success) { + /* + * The node was removed from the feedlist, but could have + * returned because of an update before this edit request + * completed. No cleaner way to handle this. + */ + GSList* cur = source->root->children ; + for(; cur; cur = g_slist_next (cur)) { + nodePtr node = (nodePtr) cur->data ; + if (g_str_equal (node->subscription->source, action->feedUrl)) { + feedlist_node_removed (node); + return; + } + } + } else + debug0 (DEBUG_UPDATE, "Failed to remove subscription"); +} + +void aol_source_edit_remove_subscription (AolSourcePtr source, const gchar* feedUrl) +{ + AolSourceActionPtr action = aol_source_action_new (); + action->actionType = EDIT_ACTION_REMOVE_SUBSCRIPTION; + action->feedUrl = g_strdup (feedUrl); + action->callback = aol_source_edit_remove_callback; + aol_source_edit_push (source, action, TRUE); +} + +gboolean aol_source_edit_is_in_queue (AolSourcePtr source, const gchar* guid) +{ + /* this is inefficient, but works for the time being */ + GList *cur = source->actionQueue->head; + for(; cur; cur = g_list_next (cur)) { + AolSourceActionPtr action = cur->data; + if (action->guid && g_str_equal (action->guid, guid)) + return TRUE; + } + return FALSE; +} diff -Nru liferea-1.8.15/src/fl_sources/aol_source_edit.h liferea-1.10.3/src/fl_sources/aol_source_edit.h --- liferea-1.8.15/src/fl_sources/aol_source_edit.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/aol_source_edit.h 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,87 @@ +/** + * @file aol_source_edit.c Google reader feed list source syncing support + * + * Copyright (C) 2013 Lars Windolf + * Copyright (C) 2008 Arnold Noronha + * + * 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 _AOL_SOURCE_EDIT_H +#define _AOL_SOURCE_EDIT_H + +#include "aol_source.h" + +#include + +/** + * Process the waiting edits on the edit queue. Call this if the state of + * the AolSource has changed. + * + * @param source The AolSource whose editQueue should be processed. + */ +void aol_source_edit_process (AolSourcePtr source); + + +/** Edit wrappers */ + +/** + * Mark the given item as read. + * + * @param source The AolSource structure + * @param guid The guid of the item whose status is to be edited + * @param feedUrl The feedUrl of the feed containing the item. + * @param newStatus The new read status of the item (TRUE for read) + */ +void aol_source_edit_mark_read (AolSourcePtr source, const gchar* guid, const gchar* feedUrl, gboolean newStatus); + +/** + * Mark the given item as starred. + * + * @param source The AolSource structure + * @param guid The guid of the item whose status is to be edited + * @param feedUrl The feedUrl of the feed containing the item. + * @param newStatus The new read status of the item (TRUE for read) + */ +void aol_source_edit_mark_starred (AolSourcePtr source, const gchar *guid, const gchar *feedUrl, gboolean newStatus); + + +/** + * Add a subscription to the google source. + * + * @param source The AolSource structure + * @param feedUrl the feed to add + */ +void aol_source_edit_add_subscription (AolSourcePtr source, const gchar* feedUrl); + + +/** + * Remove a subscription from the google source. + * + * @param source The AolSource structure + * @param feedUrl the feed to remove + */ +void aol_source_edit_remove_subscription (AolSourcePtr source, const gchar* feedUrl); + +/** + * See if an item with give guid is being modified + * in the queue. + * + * @param AolSource the AolSource structure + * @param guid the guid of the item + */ +gboolean aol_source_edit_is_in_queue (AolSourcePtr source, const gchar* guid); + +#endif diff -Nru liferea-1.8.15/src/fl_sources/aol_source_feed.c liferea-1.10.3/src/fl_sources/aol_source_feed.c --- liferea-1.8.15/src/fl_sources/aol_source_feed.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/aol_source_feed.c 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,337 @@ +/** + * @file aol_source_feed.c AOL reader feed subscription routines + * + * Copyright (C) 2013 Lars Windolf + * Copyright (C) 2008 Arnold Noronha + * + * 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 "common.h" +#include "debug.h" +#include "xml.h" + +#include "feedlist.h" +#include "aol_source.h" +#include "subscription.h" +#include "node.h" +#include "aol_source_edit.h" +#include "metadata.h" +#include "db.h" +#include "item_state.h" + +/** + * This is identical to xpath_foreach_match, except that it takes the context + * as parameter. + */ +static void +aol_source_xpath_foreach_match (const gchar* expr, xmlXPathContextPtr xpathCtxt, xpathMatchFunc func, gpointer user_data) +{ + xmlXPathObjectPtr xpathObj = NULL; + xpathObj = xmlXPathEval ((xmlChar*)expr, xpathCtxt); + + if (xpathObj && xpathObj->nodesetval && xpathObj->nodesetval->nodeMax) { + int i; + for (i = 0; i < xpathObj->nodesetval->nodeNr; i++) { + (*func) (xpathObj->nodesetval->nodeTab[i], user_data); + xpathObj->nodesetval->nodeTab[i] = NULL ; + } + } + + if (xpathObj) + xmlXPathFreeObject (xpathObj); +} + +void +aol_source_migrate_node(nodePtr node) +{ + /* scan the node for bad ID's, if so, brutally remove the node */ + itemSetPtr itemset = node_get_itemset (node); + GList *iter = itemset->ids; + for (; iter; iter = g_list_next (iter)) { + itemPtr item = item_load (GPOINTER_TO_UINT (iter->data)); + if (item && item->sourceId) { + if (!g_str_has_prefix(item->sourceId, "tag:google.com")) { + debug1(DEBUG_UPDATE, "Item with sourceId [%s] will be deleted.", item->sourceId); + db_item_remove(GPOINTER_TO_UINT(iter->data)); + } + } + if (item) item_unload (item); + } + + /* cleanup */ + itemset_free (itemset); +} + +static void +aol_source_xml_unlink_node (xmlNodePtr node, gpointer data) +{ + xmlUnlinkNode (node); + xmlFreeNode (node); +} + +static void +aol_source_set_orig_source(const xmlNodePtr node, gpointer userdata) +{ + itemPtr item = (itemPtr) userdata ; + xmlChar* value = xmlNodeGetContent (node); + const gchar* prefix1 = "tag:google.com,2005:reader/feed/"; + const gchar* prefix2 = "tag:google.com,2005:reader/user/"; + + debug1(DEBUG_UPDATE, "AolSource: Got %s as id while updating", value); + + if (g_str_has_prefix (value, prefix1) || g_str_has_prefix (value, prefix2)) { + metadata_list_set (&item->metadata, "GoogleBroadcastOrigFeed", value + strlen (prefix1)); + } + xmlFree (value); +} + +static void +aol_source_set_shared_by (xmlNodePtr node, gpointer userdata) +{ + itemPtr item = (itemPtr) userdata; + xmlChar *value = xmlNodeGetContent (node); + xmlChar *apos = strrchr (value, '\''); + gchar *name; + + if (!apos) return; + name = g_strndup (value, apos-value); + + metadata_list_set (&item->metadata, "sharedby", name); + + g_free (name); + xmlFree (value); +} + +static void +aol_source_fix_broadcast_item (xmlNodePtr entry, itemPtr item) +{ + xmlXPathContextPtr xpathCtxt = xmlXPathNewContext (entry->doc) ; + xmlXPathRegisterNs (xpathCtxt, "atom", "http://www.w3.org/2005/Atom"); + xpathCtxt->node = entry; + + aol_source_xpath_foreach_match ("./atom:source/atom:id", xpathCtxt, aol_source_set_orig_source, item); + + /* who is sharing this? */ + aol_source_xpath_foreach_match ("./atom:link[@rel='via']/@title", xpathCtxt, aol_source_set_shared_by, item); + + db_item_update (item); + /* free up xpath related data */ + if (xpathCtxt) xmlXPathFreeContext (xpathCtxt); +} + +static itemPtr +aol_source_load_item_from_sourceid (nodePtr node, gchar *sourceId, GHashTable *cache) +{ + gpointer ret = g_hash_table_lookup (cache, sourceId); + itemSetPtr itemset; + int num = g_hash_table_size (cache); + GList *iter; + itemPtr item = NULL; + + if (ret) return item_load (GPOINTER_TO_UINT (ret)); + + /* skip the top 'num' entries */ + itemset = node_get_itemset (node); + iter = itemset->ids; + while (num--) iter = g_list_next (iter); + + for (; iter; iter = g_list_next (iter)) { + item = item_load (GPOINTER_TO_UINT (iter->data)); + if (item && item->sourceId) { + /* save to cache */ + g_hash_table_insert (cache, g_strdup(item->sourceId), (gpointer) item->id); + if (g_str_equal (item->sourceId, sourceId)) { + itemset_free (itemset); + return item; + } + } + item_unload (item); + } + + g_warning ("Could not find item for %s!", sourceId); + itemset_free (itemset); + return NULL; +} + +static void +aol_source_item_retrieve_status (const xmlNodePtr entry, subscriptionPtr subscription, GHashTable *cache) +{ + AolSourcePtr source = (AolSourcePtr) node_source_root_from_node (subscription->node)->data ; + xmlNodePtr xml; + nodePtr node = subscription->node; + xmlChar *id; + gboolean read = FALSE; + gboolean starred = FALSE; + + xml = entry->children; + g_assert (xml); + g_assert (g_str_equal (xml->name, "id")); + + id = xmlNodeGetContent (xml); + + for (xml = entry->children; xml; xml = xml->next) { + if (g_str_equal (xml->name, "category")) { + xmlChar* label = xmlGetProp (xml, "label"); + if (!label) + continue; + + if (g_str_equal (label, "read")) + read = TRUE; + else if (g_str_equal(label, "starred")) + starred = TRUE; + + xmlFree (label); + } + } + + itemPtr item = aol_source_load_item_from_sourceid (node, id, cache); + if (item && item->sourceId) { + if (g_str_equal (item->sourceId, id) && !aol_source_edit_is_in_queue(source, id)) { + + if (item->readStatus != read) + item_read_state_changed (item, read); + if (item->flagStatus != starred) + item_flag_state_changed (item, starred); + + if (g_str_equal (subscription->source, AOL_READER_BROADCAST_FRIENDS_URL)) + aol_source_fix_broadcast_item (entry, item); + } + } + if (item) item_unload (item) ; + xmlFree (id); +} + +static void +aol_feed_subscription_process_update_result (subscriptionPtr subscription, const struct updateResult* const result, updateFlags flags) +{ + + debug_start_measurement (DEBUG_UPDATE); + + if (result->data) { + updateResultPtr resultCopy; + + /* FIXME: The following is a very dirty hack to edit the feed's + XML before processing it */ + resultCopy = update_result_new () ; + resultCopy->source = g_strdup (result->source); + resultCopy->httpstatus = result->httpstatus; + resultCopy->contentType = g_strdup (result->contentType); + 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, NULL); + xmlXPathContextPtr xpathCtxt = xmlXPathNewContext (doc) ; + xmlXPathRegisterNs (xpathCtxt, "atom", "http://www.w3.org/2005/Atom"); + aol_source_xpath_foreach_match ("/atom:feed/atom:entry/atom:category[@scheme='http://www.google.com/reader/']", xpathCtxt, aol_source_xml_unlink_node, NULL); + + + /* delete the via link for broadcast subscription */ + if (g_str_equal (subscription->source, AOL_READER_BROADCAST_FRIENDS_URL)) + aol_source_xpath_foreach_match ("/atom:feed/atom:entry/atom:link[@rel='via']/@href", xpathCtxt, aol_source_xml_unlink_node, NULL); + + xmlXPathFreeContext (xpathCtxt); + + /* good now we have removed the read and unread labels. */ + + xmlChar *newXml; + int newXmlSize ; + + xmlDocDumpMemory (doc, &newXml, &newXmlSize); + + resultCopy->data = g_strndup ((gchar*) newXml, newXmlSize); + resultCopy->size = newXmlSize; + + xmlFree (newXml); + xmlFreeDoc (doc); + + feed_get_subscription_type ()->process_update_result (subscription, resultCopy, flags); + update_result_free (resultCopy); + } else { + feed_get_subscription_type ()->process_update_result (subscription, result, flags); + return ; + } + + /* FIXME: The following workaround ensure that the code below, + that uses UI callbacks item_*_state_changed(), does not + reset the newCount of the feed list (see SF #2666478) + 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, NULL); + if (doc) { + xmlNodePtr root = xmlDocGetRootElement (doc); + xmlNodePtr entry = root->children ; + GHashTable *cache = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + + while (entry) { + if (!g_str_equal (entry->name, "entry")) { + entry = entry->next; + continue; /* not an entry */ + } + + aol_source_item_retrieve_status (entry, subscription, cache); + entry = entry->next; + } + + g_hash_table_unref (cache); + xmlFreeDoc (doc); + } else { + debug0 (DEBUG_UPDATE, "aol_feed_subscription_process_update_result(): Couldn't parse XML!"); + g_warning ("aol_feed_subscription_process_update_result(): Couldn't parse XML!"); + } + + // FIXME: part 2 of the newCount workaround + feedlist_update_new_item_count (newCount); + + debug_end_measurement (DEBUG_UPDATE, "time taken to update statuses"); +} + +static gboolean +aol_feed_subscription_prepare_update_request (subscriptionPtr subscription, + struct updateRequest *request) +{ + debug0 (DEBUG_UPDATE, "preparing AOL reader feed subscription for update\n"); + AolSourcePtr source = (AolSourcePtr) node_source_root_from_node (subscription->node)->data; + + g_assert(source); + if (source->loginState == AOL_SOURCE_STATE_NONE) { + subscription_update (node_source_root_from_node (subscription->node)->subscription, 0) ; + return FALSE; + } + debug0 (DEBUG_UPDATE, "Setting cookies for a AOL Reader subscription"); + + if (!g_str_equal (request->source, AOL_READER_BROADCAST_FRIENDS_URL)) { + gchar* source_escaped = g_uri_escape_string(request->source, NULL, TRUE); + gchar* newUrl = g_strdup_printf ("http://reader.aol.com/reader/atom/feed/%s", source_escaped); + update_request_set_source (request, newUrl); + g_free (newUrl); + g_free (source_escaped); + } + update_request_set_auth_value (request, source->authHeaderValue); + return TRUE; +} + +struct subscriptionType aolSourceFeedSubscriptionType = { + aol_feed_subscription_prepare_update_request, + aol_feed_subscription_process_update_result +}; + diff -Nru liferea-1.8.15/src/fl_sources/aol_source.h liferea-1.10.3/src/fl_sources/aol_source.h --- liferea-1.8.15/src/fl_sources/aol_source.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/aol_source.h 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,243 @@ +/** + * @file aol_source.h AOL Reader feed list source support + * + * Copyright (C) 2007-2013 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 _AOL_SOURCE_H +#define _AOL_SOURCE_H + +#include "fl_sources/node_source.h" + +/** + * A node source for AOL Reader + */ +typedef struct AolSource { + nodePtr root; /**< the root node in the feed list */ + gchar *authHeaderValue; /**< the authorization token */ + GQueue *actionQueue; + gint loginState; /**< The current login state */ + gint authFailures; /**< Number of authentication failures */ + + /** + * A map from a subscription source to a timestamp when it was last + * updated (provided by remote service). + */ + GHashTable *lastTimestampMap; + + /** + * A timestamp when the last Quick update took place. + */ + GTimeVal lastQuickUpdate; +} *AolSourcePtr; + +enum { + AOL_SOURCE_STATE_NONE = 0, /**< no authentication tried so far */ + AOL_SOURCE_STATE_IN_PROGRESS, /**< authentication in progress */ + AOL_SOURCE_STATE_ACTIVE, /**< authentication succeeded */ + AOL_SOURCE_STATE_NO_AUTH, /**< authentication has failed */ + AOL_SOURCE_STATE_MIGRATE, /**< source will be migrated, do not do anything anymore! */ +}; + +enum { + /** + * Update only the subscription list, and not each node underneath it. + * Note: Uses higher 16 bits to avoid conflict. + */ + AOL_SOURCE_UPDATE_ONLY_LIST = (1<<16), + /** + * Only login, do not do any updates. + */ + AOL_SOURCE_UPDATE_ONLY_LOGIN = (1<<17) +}; + +/** + * Number of auth failures after which we stop bothering the user while + * auto-updating until he manually updates again. + */ +#define AOL_SOURCE_MAX_AUTH_FAILURES 3 + +/** + * AOL API URL's + * In each of the following, the _URL indicates the URL to use, and _POST + * indicates the corresponging postdata to send. + * @see + * However as of now, the GoogleReaderAPI documentation seems outdated, some of + * mark read/unread API does not work as mentioned in the documentation. + */ + +/** + * 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. + */ +#define AOL_READER_LOGIN_URL "https://www.google.com/accounts/ClientLogin" +#define AOL_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. + */ +#define AOL_READER_BROADCAST_FRIENDS_URL "http://www.google.com/reader/atom/user/-/state/com.google/broadcast-friends" + +/** + * Get a list of subscriptions. + */ +#define AOL_READER_SUBSCRIPTION_LIST_URL "http://www.google.com/reader/api/0/subscription/list" + +/** + * Get a token for an edit operation. (@todo A token can actually be used + * for multiple transactions.) + */ +#define AOL_READER_TOKEN_URL "http://www.google.com/reader/api/0/token" + +/** + * Add a subscription + * @param URL The feed URL, or the page URL for feed autodiscovery. + * @param T a token obtained using AOL_READER_TOKEN_URL + */ +#define AOL_READER_ADD_SUBSCRIPTION_URL "http://www.google.com/reader/api/0/subscription/edit?client=liferea" +#define AOL_READER_ADD_SUBSCRIPTION_POST "s=feed%%2F%s&i=null&ac=subscribe&T=%s" + +/** + * Unsubscribe from a subscription. + * @param url The feed URL + * @param T a token obtained using AOL_READER_TOKEN_URL + */ +#define AOL_READER_REMOVE_SUBSCRIPTION_URL "http://www.google.com/reader/api/0/subscription/edit?client=liferea" +#define AOL_READER_REMOVE_SUBSCRIPTION_POST "s=feed%%2F%s&i=null&ac=unsubscribe&T=%s" + +/** + * A list of subscriptions with the unread counters, and the last updated + * timestamps. + */ +#define AOL_READER_UNREAD_COUNTS_URL "http://www.google.com/reader/api/0/unread-count?all=true&client=liferea" + +/** + * Edit the tags associated with an item. The parameters to this _have_ to be + * sent as post data. + */ +#define AOL_READER_EDIT_TAG_URL "http://www.google.com/reader/api/0/edit-tag?client=liferea" + +/** + * Postdata for adding a tag when using AOL_READER_EDIT_TAG_URL. + * @param i The guid of the item. + * @param prefix The prefix to 's'. For normal feeds this will be "feed", for + * links etc, this should be "user". + * @param s The URL of the subscription containing the item. (Note that the + * following string adds the "feed/" prefix to this.) + * @param a The tag to add. + * @param T a token obtained using AOL_READER_TOKEN_URL + */ +#define AOL_READER_EDIT_TAG_ADD_TAG "i=%s&s=%s%%2F%s&a=%s&ac=edit-tags&T=%s&async=true" + +/** + * Postdata for removing a tag, when using AOL_READER_EDIT_TAG_URL. Do + * not use for removing the "read" tag, see AOL_READER_EDIT_TAG_AR_TAG + * for that. + * + * @param i The guid of the item. + * @param prefix The prefix to 's'. @see AOL_READER_EDIT_TAG_ADD_TAG + * @param s The URL of the subscription containing the item. (Note that the + * final value of s is feed + "/" + this string) + * @param r The tag to remove + * @param T a token obtained using AOL_READER_TOKEN_URL + */ +#define AOL_READER_EDIT_TAG_REMOVE_TAG "i=%s&s=%s%%2F%s&r=%s&ac=edit-tags&T=%s&async=true" + +/** + * Postdata for adding a tag, and removing another tag at the same time, + * when using AOL_READER_EDIT_TAG_URL. + * @param i The guid of the item. + * @param prefix The prefix to 's'. @see AOL_READER_EDIT_TAG_ADD_TAG + * @param s The URL of the subscription containing the item. (Note that the + * final value of s is feed + "/" + this string) + * @param a The tag to add. + * @param r The tag to remove + * @param T a token obtained using AOL_READER_TOKEN_URL + */ +#define AOL_READER_EDIT_TAG_AR_TAG "i=%s&s=%s%%2F%s&a=%s&r=%s&ac=edit-tags&T=%s&async=true" + +/** + * Postdata for adding a tag, and removing another tag at the same time, for a + * _link_ item, when using AOL_READER_EDIT_TAG_URL + * @param i The guid of the link (as provided by google) + * @param a The tag to add + * @param r The tag to remove + * @param T a token obtained using AOL_READER_TOKEN_URL + */ +#define AOL_READER_EDIT_TAG_ADD_TAG_FOR_LINK "i=%s&s=user%2F-%2Fsource%2Fcom.google%2Flink&a=%s&r=%s&ac=edit-tags&T=%s&async=true" + +/** A set of tags (states) defined by Google reader */ + +#define AOL_READER_TAG_KEPT_UNREAD "user/-/state/com.google/kept-unread" +#define AOL_READER_TAG_READ "user/-/state/com.google/read" +#define AOL_READER_TAG_TRACKING_KEPT_UNREAD "user/-/state/com.google/tracking-kept-unread" +#define AOL_READER_TAG_STARRED "user/-/state/com.google/starred" + +/** Interval (in seconds) for doing a Quick Update: 10min */ +#define AOL_SOURCE_QUICK_UPDATE_INTERVAL 600 + +/** + * @returns Google Reader source type implementation info. + */ +nodeSourceTypePtr aol_source_get_type (void); + +extern struct subscriptionType aolSourceFeedSubscriptionType; +extern struct subscriptionType aolSourceOpmlSubscriptionType; + +/** + * Find a child node with the given feed source URL. + * + * @param source AolSource + * @param source a feed source URL to search + * + * @returns a node (or NULL) + */ +nodePtr aol_source_get_node_from_source (AolSourcePtr source, const gchar* src); + +/** + * Tries to update the entire source quickly, by updating only those feeds + * which are known to be updated. Suitable for g_timeout_add. This is an + * internal function. + * + * @param data A pointer to a node id of the source. This pointer will + * be g_free'd if the update fails. + * + * @returns FALSE on update failure + */ +gboolean aol_source_quick_update_timeout (gpointer source); + +/** + * Migrate a google source child-node from a Liferea 1.4 style read-only + * google source nodes. + * + * @param node The node to migrate (not the nodeSource!) + */ +void aol_source_migrate_node (nodePtr node); + +/** + * Perform login for the given Google source. + * + * @param source a AolSource + * @param flags network request flags + */ +void aol_source_login (AolSourcePtr source, guint32 flags); + +#endif diff -Nru liferea-1.8.15/src/fl_sources/aol_source_opml.c liferea-1.10.3/src/fl_sources/aol_source_opml.c --- liferea-1.8.15/src/fl_sources/aol_source_opml.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/aol_source_opml.c 2013-08-03 15:01:11.000000000 +0200 @@ -0,0 +1,458 @@ +/** + * @file aol_source_opml.c Google reader OPML handling routines. + * + * Copyright (C) 2008 Arnold Noronha + * Copyright (C) 2011 Peter Oliver + * Copyright (C) 2011 Sergey Snitsaruk + * Copyright (C) 2013 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 "aol_source_opml.h" + +#include +#include +#include + +#include "common.h" +#include "debug.h" +#include "feedlist.h" +#include "folder.h" +#include "metadata.h" +#include "node.h" +#include "subscription.h" +#include "xml.h" + +#include "fl_sources/opml_source.h" +#include "fl_sources/aol_source.h" +#include "fl_sources/aol_source_edit.h" + +/** + * Find a node by the source id. + */ +nodePtr +aol_source_opml_get_node_by_source (AolSourcePtr gsource, const gchar *source) +{ + return aol_source_opml_get_subnode_by_node (gsource->root, source); +} + +/** + * Recursively find a node by the source id. + */ +nodePtr +aol_source_opml_get_subnode_by_node (nodePtr node, const gchar *source) +{ + nodePtr subnode; + nodePtr subsubnode; + GSList *iter = node->children; + for (; iter; iter = g_slist_next (iter)) { + subnode = (nodePtr)iter->data; + if (subnode->subscription + && g_str_equal (subnode->subscription->source, source)) + return subnode; + else if (subnode->type->capabilities + & NODE_CAPABILITY_SUBFOLDERS) { + subsubnode = aol_source_opml_get_subnode_by_node(subnode, source); + if (subnode != NULL) + return subsubnode; + } + } + return NULL; +} + +/** + * Add "broadcast-friends" to the list of subscriptions if required + */ +static void +aol_source_add_broadcast_subscription (AolSourcePtr gsource) +{ + const gchar* title = "Friend's Shared Items"; + GSList * iter = NULL; + nodePtr node; + + for (iter = gsource->root->children; iter; iter = g_slist_next (iter)) { + node = (nodePtr) iter->data ; + if (!node->subscription || !node->subscription->source) + continue; + if (g_str_equal (node->subscription->source, AOL_READER_BROADCAST_FRIENDS_URL)) { + return; + } + } + + /* aha! add it! */ + + node = node_new (feed_get_node_type ()); + node_set_title (node, title); + node_set_data (node, feed_new ()); + + node_set_subscription (node, subscription_new (AOL_READER_BROADCAST_FRIENDS_URL, NULL, NULL)); + node->subscription->type = &aolSourceFeedSubscriptionType; + node_set_parent (node, gsource->root, -1); + feedlist_node_imported (node); + + subscription_update (node->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); + subscription_update_favicon (node->subscription); +} + + +/* subscription list merging functions */ + +static void +aol_source_check_for_removal (nodePtr node, gpointer user_data) +{ + gchar *expr = NULL; + + if (node->subscription && g_str_equal (node->subscription->source, AOL_READER_BROADCAST_FRIENDS_URL)) + return ; + + if (IS_FEED (node)) { + expr = g_strdup_printf ("/object/list[@name='subscriptions']/object/string[@name='id'][. = 'feed/%s']", node->subscription->source); + } else if (IS_FOLDER (node)) { + node_foreach_child_data (node, aol_source_check_for_removal, user_data); + expr = g_strdup_printf ("/object/list[@name='subscriptions']/object/list[@name='categories']/object[string='%s']", node->title); + } else { + g_warning ("google_opml_source_check_for_removal(): This should never happen..."); + return; + } + + if (!xpath_find ((xmlNodePtr)user_data, expr)) { + debug1 (DEBUG_UPDATE, "removing %s...", node_get_title (node)); + feedlist_node_removed (node); + } else { + debug1 (DEBUG_UPDATE, "keeping %s...", node_get_title (node)); + } + g_free (expr); +} + +/* + * Find a node by the name under root or create it. + */ +static nodePtr +aol_source_find_or_create_folder (const gchar *name, nodePtr root) +{ + nodePtr folder = NULL; + GSList *iter_parent; + + /* find a node by the name under root */ + iter_parent = root->children; + while (iter_parent) { + if (g_str_equal (name, node_get_title (iter_parent->data))) { + folder = (nodePtr)iter_parent->data; + break; + } + iter_parent = g_slist_next (iter_parent); + } + + /* if not found, create new folder */ + if (!folder) { + folder = node_new (folder_get_node_type ()); + node_set_title (folder, name); + node_set_parent (folder, root, -1); + feedlist_node_imported (folder); + subscription_update (folder->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); + } + + return folder; +} + +/* + * Check if folder of a node changed in Google Reader and move + * node to the folder with the same name. + */ +static void +aol_source_update_folder (xmlNodePtr match, AolSourcePtr gsource, nodePtr node) +{ + xmlNodePtr xml; + xmlChar *label; + const gchar *ptitle; + nodePtr parent; + + /* check if label of a feed changed */ + parent = node->parent; + ptitle = node_get_title (parent); + xml = xpath_find (match, "./list[@name='categories']/object/string[@name='label']"); + if (xml) { + label = xmlNodeListGetString (xml->doc, xml->xmlChildrenNode, 1); + if (parent == gsource->root || ! g_str_equal (label, ptitle)) { + debug2 (DEBUG_UPDATE, "GSource feed label changed for %s to '%s'", node->id, label); + parent = aol_source_find_or_create_folder ((gchar*)label, gsource->root); + node_reparent (node, parent); + } + xmlFree (label); + } else { + /* if feed has no label and parent is not gsource root, reparent to gsource root */ + if (parent != gsource->root) + node_reparent (node, gsource->root); + } +} + +static void +aol_source_merge_feed (xmlNodePtr match, gpointer user_data) +{ + AolSourcePtr gsource = (AolSourcePtr)user_data; + nodePtr node, parent = NULL, subnode = NULL; + GSList *iter, *iter_sub; + xmlNodePtr xml; + xmlChar *title = NULL, *id = NULL, *label = NULL; + gchar *url = NULL; + + xml = xpath_find (match, "./string[@name='title']"); + if (xml) + title = xmlNodeListGetString (xml->doc, xml->xmlChildrenNode, 1); + + xml = xpath_find (match, "./string[@name='id']"); + if (xml) { + id = xmlNodeListGetString (xml->doc, xml->xmlChildrenNode, 1); + url = g_strdup (id + strlen ("feed/")); + } + + /* Note: ids look like "feed/http://rss.slashdot.org" */ + if (id && title) { + + /* check if node to be merged already exists */ + iter = gsource->root->children; + while (iter) { + node = (nodePtr)iter->data; + if (node->subscription != NULL + && g_str_equal (node->subscription->source, url)) { + node->subscription->type = &aolSourceFeedSubscriptionType; + aol_source_update_folder (match, gsource, node); + goto cleanup; + } else if (node->type->capabilities + & NODE_CAPABILITY_SUBFOLDERS) { + iter_sub = node->children; + while (iter_sub) { + subnode = (nodePtr)iter_sub->data; + if (subnode->subscription != NULL + && g_str_equal (subnode->subscription->source, url)) { + subnode->subscription->type = &aolSourceFeedSubscriptionType; + aol_source_update_folder (match, gsource, subnode); + goto cleanup; + } + iter_sub = g_slist_next (iter_sub); + } + } + iter = g_slist_next (iter); + } + + /* if a new feed contains label, put its node under a folder with the same name */ + xml = xpath_find (match, "./list[@name='categories']/object/string[@name='label']"); + if (xml) { + label = xmlNodeListGetString (xml->doc, xml->xmlChildrenNode, 1); + parent = aol_source_find_or_create_folder ((gchar*)label, gsource->root); + xmlFree (label); + } else { + parent = gsource->root; + } + + g_assert (NULL != parent); + + debug2 (DEBUG_UPDATE, "adding %s (%s)", title, url); + node = node_new (feed_get_node_type ()); + node_set_title (node, title); + node_set_data (node, feed_new ()); + + node_set_subscription (node, subscription_new (url, NULL, NULL)); + node->subscription->type = &aolSourceFeedSubscriptionType; + node_set_parent (node, parent, -1); + feedlist_node_imported (node); + + /** + * @todo mark the ones as read immediately after this is done + * the feed as retrieved by this has the read and unread + * status inherently. + */ + subscription_update (node->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); + subscription_update_favicon (node->subscription); + } else { + g_warning("Unable to parse subscription information from Google"); + } + +cleanup: + xmlFree (id); + xmlFree (title); + g_free (url) ; +} + + +/* OPML subscription type implementation */ + +static void +google_subscription_opml_cb (subscriptionPtr subscription, const struct updateResult * const result, updateFlags flags) +{ + AolSourcePtr gsource = (AolSourcePtr) subscription->node->data; + + if (result->data) { + xmlDocPtr doc = xml_parse (result->data, result->size, NULL); + if(doc) { + xmlNodePtr root = xmlDocGetRootElement (doc); + + /* Go through all existing nodes and remove those whose + URLs are not in new feed list. Also removes those URLs + from the list that have corresponding existing nodes. */ + node_foreach_child_data (subscription->node, aol_source_check_for_removal, (gpointer)root); + node_foreach_child (subscription->node, aol_source_migrate_node); + + opml_source_export (subscription->node); /* save new feed list tree to disk + to ensure correct document in + next step */ + + xpath_foreach_match (root, "/object/list[@name='subscriptions']/object", + aol_source_merge_feed, + (gpointer)gsource); + aol_source_add_broadcast_subscription (gsource) ; + + opml_source_export (subscription->node); /* save new feeds to feed list */ + + subscription->node->available = TRUE; + xmlFreeDoc (doc); + } else { + /** @todo The session seems to have expired */ + g_warning ("Unable to parse OPML list from google, the session might have expired.\n"); + } + } else { + subscription->node->available = FALSE; + debug0 (DEBUG_UPDATE, "google_subscription_opml_cb(): ERROR: failed to get subscription list!\n"); + } + + if (!(flags & AOL_SOURCE_UPDATE_ONLY_LIST)) + node_foreach_child_data (subscription->node, node_update_subscription, GUINT_TO_POINTER (0)); + +} + +/** functions for an efficient updating mechanism */ + +static void +aol_source_opml_quick_update_helper (xmlNodePtr match, gpointer userdata) +{ + AolSourcePtr gsource = (AolSourcePtr) userdata; + xmlNodePtr xmlNode; + xmlChar *id, *newestItemTimestamp; + nodePtr node = NULL; + const gchar *oldNewestItemTimestamp; + + xmlNode = xpath_find (match, "./string[@name='id']"); + id = xmlNodeGetContent (xmlNode); + + if (g_str_has_prefix (id, "feed/")) + node = aol_source_opml_get_node_by_source (gsource, id + strlen ("feed/")); + else if (g_str_has_suffix (id, "broadcast-friends")) + node = aol_source_opml_get_node_by_source (gsource, id); + else { + xmlFree (id); + return; + } + + if (node == NULL) { + xmlFree (id); + return; + } + + xmlNode = xpath_find (match, "./number[@name='newestItemTimestampUsec']"); + newestItemTimestamp = xmlNodeGetContent (xmlNode); + + oldNewestItemTimestamp = g_hash_table_lookup (gsource->lastTimestampMap, node->subscription->source); + + if (!oldNewestItemTimestamp || + (newestItemTimestamp && + !g_str_equal (newestItemTimestamp, oldNewestItemTimestamp))) { + debug3(DEBUG_UPDATE, "AolSource: auto-updating %s " + "[oldtimestamp%s, timestamp %s]", + id, oldNewestItemTimestamp, newestItemTimestamp); + g_hash_table_insert (gsource->lastTimestampMap, + g_strdup (node->subscription->source), + g_strdup (newestItemTimestamp)); + + subscription_update (node->subscription, 0); + } + + xmlFree (newestItemTimestamp); + xmlFree (id); +} + +static void +aol_source_opml_quick_update_cb (const struct updateResult* const result, gpointer userdata, updateFlags flags) +{ + AolSourcePtr gsource = (AolSourcePtr) userdata; + xmlDocPtr doc; + + if (!result->data) { + /* what do I do? */ + debug0 (DEBUG_UPDATE, "AolSource: Unable to get unread counts, this update is aborted."); + return; + } + doc = xml_parse (result->data, result->size, NULL); + if (!doc) { + debug0 (DEBUG_UPDATE, "AolSource: The XML failed to parse, maybe the session has expired. (FIXME)"); + return; + } + + xpath_foreach_match (xmlDocGetRootElement (doc), + "/object/list[@name='unreadcounts']/object", + aol_source_opml_quick_update_helper, gsource); + + xmlFreeDoc (doc); +} + +gboolean +aol_source_opml_quick_update(AolSourcePtr gsource) +{ + updateRequestPtr 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_source (request, AOL_READER_UNREAD_COUNTS_URL); + update_request_set_auth_value(request, gsource->authHeaderValue); + + update_execute_request (gsource, request, aol_source_opml_quick_update_cb, + gsource, 0); + + return TRUE; +} + + +static void +aol_source_opml_subscription_process_update_result (subscriptionPtr subscription, const struct updateResult * const result, updateFlags flags) +{ + google_subscription_opml_cb (subscription, result, flags); +} + +static gboolean +aol_source_opml_subscription_prepare_update_request (subscriptionPtr subscription, struct updateRequest *request) +{ + AolSourcePtr gsource = (AolSourcePtr)subscription->node->data; + + g_assert(gsource); + if (gsource->loginState == AOL_SOURCE_STATE_NONE) { + debug0(DEBUG_UPDATE, "AolSource: login"); + aol_source_login ((AolSourcePtr) subscription->node->data, 0) ; + return FALSE; + } + debug1 (DEBUG_UPDATE, "updating AOL Reader subscription (node id %s)", subscription->node->id); + + update_request_set_source (request, AOL_READER_SUBSCRIPTION_LIST_URL); + + update_request_set_auth_value (request, gsource->authHeaderValue); + + return TRUE; +} + +/* OPML subscription type definition */ + +struct subscriptionType aolSourceOpmlSubscriptionType = { + aol_source_opml_subscription_prepare_update_request, + aol_source_opml_subscription_process_update_result +}; diff -Nru liferea-1.8.15/src/fl_sources/aol_source_opml.h liferea-1.10.3/src/fl_sources/aol_source_opml.h --- liferea-1.8.15/src/fl_sources/aol_source_opml.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/aol_source_opml.h 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,48 @@ +/** + * Copyright (C) 2013 Lars Windolf + * Copyright (C) 2009 Adrian Bunk + * + * 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 "fl_sources/aol_source.h" + +/** + * Find a node by the source id. + * + * @param source the AOL Reader source + * @param source the feed id to find + * + * @returns a node (or NULL) + */ +nodePtr aol_source_opml_get_node_by_source(AolSourcePtr source, + const gchar *src); + +/** + * Recursively find a node by the source id. + * + * @param source the AOL Reader source + * @param source the feed id to find + * + * @returns a node (or NULL) + */ +nodePtr aol_source_opml_get_subnode_by_node(nodePtr node, const gchar *source); + +/** + * Perform a quick update of the AOL Reader source. + * + * @param source the AOL Reader source + */ +gboolean aol_source_opml_quick_update (AolSourcePtr source); diff -Nru liferea-1.8.15/src/fl_sources/default_source.c liferea-1.10.3/src/fl_sources/default_source.c --- liferea-1.8.15/src/fl_sources/default_source.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/default_source.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file default_source.c default static feed list source * - * Copyright (C) 2005-2012 Lars Lindner + * Copyright (C) 2005-2013 Lars Windolf * Copyright (C) 2005-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -35,98 +35,69 @@ #include "fl_sources/node_source.h" /** lock to prevent feed list saving while loading */ -static gboolean feedlistImport = FALSE; +static gboolean feedlistImport = TRUE; static gchar * default_source_source_get_feedlist (nodePtr node) { - return common_create_cache_filename (NULL, "feedlist", "opml"); + return common_create_config_filename ("feedlist.opml"); } static void default_source_import (nodePtr node) { - gchar *filename10; - gchar *filename12; - gchar *filename14; - gchar *filename16; - gchar *filename17; gchar *filename, *backupFilename; gchar *content; gssize length; - migrationMode migration = 0; debug_enter ("default_source_source_import"); - /* start the import */ - feedlistImport = TRUE; + g_assert (TRUE == feedlistImport); - /* 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 ()); - 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 ()); - filename17 = g_strdup_printf ("%s/.liferea_1.7/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 (filename, G_FILE_TEST_EXISTS)) { + if (!import_OPML_feedlist (filename, node, FALSE, TRUE)) + g_error ("Fatal: Feed list import failed! You might want to try to restore\n" + "the feed list file %s from the backup in %s", filename, backupFilename); + + /* upon successful import create a backup copy of the feed list */ + if (g_file_get_contents (filename, &content, &length, NULL)) { + g_file_set_contents (backupFilename, content, length, NULL); + g_free (content); + } + } else { + /* If subscriptions could not be loaded try cache migration + or provide a default feed list */ + + gchar *filename14 = g_strdup_printf ("%s/.liferea_1.4/feedlist.opml", g_get_home_dir ()); + gchar *filename16 = g_strdup_printf ("%s/.liferea_1.6/feedlist.opml", g_get_home_dir ()); + gchar *filename18 = g_strdup_printf ("%s/.liferea_1.8/feedlist.opml", g_get_home_dir ()); - /* Note: Starting with 1.3 migration needs to be done before feed list import... */ - if (g_file_test (filename17, G_FILE_TEST_EXISTS)) { - migration_execute (MIGRATION_FROM_17); + if (g_file_test (filename18, G_FILE_TEST_EXISTS)) { + migration_execute (MIGRATION_FROM_18, node); } else if (g_file_test (filename16, G_FILE_TEST_EXISTS)) { - migration_execute (MIGRATION_FROM_16); + migration_execute (MIGRATION_FROM_16, node); } else if (g_file_test (filename14, G_FILE_TEST_EXISTS)) { - migration_execute (MIGRATION_FROM_14); - } else if (g_file_test (filename12, G_FILE_TEST_EXISTS)) { - /* migration needs to be done after feed list import - so we redirect the feed list OPML file name and - import later */ - g_free (filename); - filename = g_strdup (filename12); - migration = MIGRATION_FROM_12; - } else if (g_file_test (filename10, G_FILE_TEST_EXISTS)) { - /* same as 1.2->1.4: delayed migration... */ + migration_execute (MIGRATION_FROM_14, node); + } else { + gchar *filename = common_get_localized_filename (PACKAGE_DATA_DIR "/" PACKAGE "/opml/feedlist_%s.opml"); + if (!filename) + g_error ("Fatal: No migration possible and no default feedlist found!"); + + if (!import_OPML_feedlist (filename, node, FALSE, TRUE)) + g_error ("Fatal: Feed list import failed!"); g_free (filename); - filename = g_strdup (filename10); - migration = MIGRATION_FROM_10; } - } - - g_free (filename17); - g_free (filename16); - g_free (filename14); - g_free (filename12); - g_free (filename10); - - /* check for default feed list import */ - if (!g_file_test (filename, G_FILE_TEST_EXISTS)) { - /* if there is no feedlist.opml we provide a default feed list */ - g_free (filename); - - filename = common_get_localized_filename (PACKAGE_DATA_DIR "/" PACKAGE "/opml/feedlist_%s.opml"); - - if (!filename) - g_error ("No default feedlist found."); - } - if (!import_OPML_feedlist (filename, node, FALSE, TRUE)) - g_error ("Fatal: Feed list import failed! You might want to try to restore\n" - "the feed list file %s from the backup in %s", filename, backupFilename); - - /* upon successful import create a backup copy of the feed list */ - if (g_file_get_contents (filename, &content, &length, NULL)) { - g_file_set_contents (backupFilename, content, length, NULL); - g_free (content); + g_free (filename18); + g_free (filename16); + g_free (filename14); } g_free (filename); g_free (backupFilename); - - if (migration) - migration_execute (migration); feedlistImport = FALSE; diff -Nru liferea-1.8.15/src/fl_sources/default_source.h liferea-1.10.3/src/fl_sources/default_source.h --- liferea-1.8.15/src/fl_sources/default_source.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/default_source.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file default_source.h default static feedlist provider * - * Copyright (C) 2005 Lars Lindner + * Copyright (C) 2005 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/fl_sources/dummy_source.c liferea-1.10.3/src/fl_sources/dummy_source.c --- liferea-1.8.15/src/fl_sources/dummy_source.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/dummy_source.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file dummy_source.c dummy feed list source * - * Copyright (C) 2006-2010 Lars Lindner + * Copyright (C) 2006-2013 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,7 +48,16 @@ NULL, dummy_source_import, dummy_source_export, - dummy_source_get_feedlist + dummy_source_get_feedlist, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL }; nodeSourceTypePtr dummy_source_get_type(void) { return &nst; } diff -Nru liferea-1.8.15/src/fl_sources/dummy_source.h liferea-1.10.3/src/fl_sources/dummy_source.h --- liferea-1.8.15/src/fl_sources/dummy_source.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/dummy_source.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file dummy_source.h dummy feed list source * - * Copyright (C) 2005-2007 Lars Lindner + * Copyright (C) 2005-2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/fl_sources/google_source.c liferea-1.10.3/src/fl_sources/google_source.c --- liferea-1.8.15/src/fl_sources/google_source.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/google_source.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file google_source.c Google reader feed list source support * - * Copyright (C) 2007-2011 Lars Lindner + * Copyright (C) 2007-2013 Lars Windolf * Copyright (C) 2008 Arnold Noronha * Copyright (C) 2011 Peter Oliver * Copyright (C) 2011 Sergey Snitsaruk @@ -37,13 +37,9 @@ #include "subscription.h" #include "update.h" #include "xml.h" -#include "ui/auth_dialog.h" #include "ui/liferea_dialog.h" -#include "ui/ui_common.h" #include "fl_sources/node_source.h" #include "fl_sources/opml_source.h" -#include "fl_sources/google_source_edit.h" -#include "fl_sources/google_source_opml.h" /** default Google reader subscription list update interval = once a day */ #define GOOGLE_SOURCE_UPDATE_INTERVAL 60*60*24 @@ -53,10 +49,6 @@ google_source_new (nodePtr node) { GoogleSourcePtr source = g_new0 (struct GoogleSource, 1) ; - source->root = node; - source->actionQueue = g_queue_new (); - source->loginState = GOOGLE_SOURCE_STATE_NONE; - source->lastTimestampMap = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); return source; } @@ -64,146 +56,20 @@ static void google_source_free (GoogleSourcePtr gsource) { - if (!gsource) - return; - update_job_cancel_by_owner (gsource); - - g_free (gsource->authHeaderValue); - g_queue_free (gsource->actionQueue) ; - g_hash_table_unref (gsource->lastTimestampMap); g_free (gsource); } -static void -google_source_login_cb (const struct updateResult * const result, gpointer userdata, updateFlags flags) -{ - GoogleSourcePtr gsource = (GoogleSourcePtr) userdata; - gchar *tmp = NULL; - subscriptionPtr subscription = gsource->root->subscription; - - debug1 (DEBUG_UPDATE, "google login processing... %s", result->data); - - g_assert (!gsource->authHeaderValue); - - if (result->data && result->httpstatus == 200) - tmp = strstr (result->data, "Auth="); - - if (tmp) { - gchar *ttmp = tmp; - tmp = strchr (tmp, '\n'); - if (tmp) - *tmp = '\0'; - gsource->authHeaderValue = g_strdup_printf ("GoogleLogin auth=%s", ttmp + 5); - - debug1 (DEBUG_UPDATE, "google reader Auth token found: %s", gsource->authHeaderValue); - - gsource->loginState = GOOGLE_SOURCE_STATE_ACTIVE; - gsource->authFailures = 0; - - /* now that we are authenticated trigger updating to start data retrieval */ - if (!(flags & GOOGLE_SOURCE_UPDATE_ONLY_LOGIN)) - subscription_update (subscription, flags); - - /* process any edits waiting in queue */ - google_source_edit_process (gsource); - - } else { - debug0 (DEBUG_UPDATE, "google reader login failed! no Auth token found in result!"); - subscription->node->available = FALSE; - - g_free (subscription->updateError); - subscription->updateError = g_strdup (_("Google Reader login failed!")); - gsource->authFailures++; - - if (gsource->authFailures < GOOGLE_SOURCE_MAX_AUTH_FAILURES) - gsource->loginState = GOOGLE_SOURCE_STATE_NONE; - else - gsource->loginState = GOOGLE_SOURCE_STATE_NO_AUTH; - - 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 - * GOOGLE_SOURCE_LOGIN_ACTIVE. - */ -void -google_source_login (GoogleSourcePtr gsource, guint32 flags) -{ - gchar *username, *password; - updateRequestPtr request; - subscriptionPtr subscription = gsource->root->subscription; - - if (gsource->loginState != GOOGLE_SOURCE_STATE_NONE) { - /* this should not happen, as of now, we assume the session - * doesn't expire. */ - debug1(DEBUG_UPDATE, "Logging in while login state is %d\n", gsource->loginState); - } - - request = update_request_new (); - - update_request_set_source (request, GOOGLE_READER_LOGIN_URL); - - /* escape user and password as both are passed using an URI */ - username = g_uri_escape_string (subscription->updateOptions->username, NULL, TRUE); - password = g_uri_escape_string (subscription->updateOptions->password, NULL, TRUE); - - request->postdata = g_strdup_printf (GOOGLE_READER_LOGIN_POST, username, password); - request->options = update_options_copy (subscription->updateOptions); - - g_free (username); - g_free (password); - - gsource->loginState = GOOGLE_SOURCE_STATE_IN_PROGRESS ; - - update_execute_request (gsource, request, google_source_login_cb, gsource, flags); -} - /* node source type implementation */ static void google_source_update (nodePtr node) { - GoogleSourcePtr gsource = (GoogleSourcePtr) node->data; - - /* Reset GOOGLE_SOURCE_STATE_NO_AUTH as this is a manual - user interaction and no auto-update so we can query - for credentials again. */ - if (gsource->loginState == GOOGLE_SOURCE_STATE_NO_AUTH) - gsource->loginState = GOOGLE_SOURCE_STATE_NONE; - - subscription_update (node->subscription, 0); // FIXME: 0 ? } static void google_source_auto_update (nodePtr node) { - GTimeVal now; - GoogleSourcePtr gsource = (GoogleSourcePtr) node->data; - - if (gsource->loginState == GOOGLE_SOURCE_STATE_NONE) { - google_source_update (node); - return; - } - - if (gsource->loginState == GOOGLE_SOURCE_STATE_IN_PROGRESS) - return; /* the update will start automatically anyway */ - - g_get_current_time (&now); - - /* do daily updates for the feed list and feed updates according to the default interval */ - if (node->subscription->updateState->lastPoll.tv_sec + GOOGLE_SOURCE_UPDATE_INTERVAL <= now.tv_sec) { - subscription_update (node->subscription, 0); - g_get_current_time (&gsource->lastQuickUpdate); - } - else if (gsource->lastQuickUpdate.tv_sec + GOOGLE_SOURCE_QUICK_UPDATE_INTERVAL <= now.tv_sec) { - google_source_opml_quick_update (gsource); - google_source_edit_process (gsource); - g_get_current_time (&gsource->lastQuickUpdate); - } } static void @@ -221,8 +87,6 @@ GSList *iter; for (iter = node->children; iter; iter = g_slist_next(iter)) { nodePtr subnode = iter->data; - if (subnode->subscription) - subnode->subscription->type = &googleSourceFeedSubscriptionType; if (subnode->type->capabilities & NODE_CAPABILITY_SUBFOLDERS) google_source_import_node (subnode); @@ -234,7 +98,6 @@ { opml_source_import (node); - node->subscription->type = &googleSourceOpmlSubscriptionType; if (!node->data) node->data = (gpointer) google_source_new (node); @@ -259,88 +122,6 @@ opml_source_remove (node); } -static nodePtr -google_source_add_subscription (nodePtr node, subscriptionPtr subscription) -{ - debug_enter ("google_source_add_subscription"); - nodePtr child = node_new (feed_get_node_type ()); - - debug0 (DEBUG_UPDATE, "GoogleSource: Adding a new subscription"); - node_set_data (child, feed_new ()); - - node_set_subscription (child, subscription); - child->subscription->type = &googleSourceFeedSubscriptionType; - - node_set_title (child, _("New Subscription")); - - google_source_edit_add_subscription (node_source_root_from_node (node)->data, subscription->source); - - debug_exit ("google_source_add_subscription"); - - return child; -} - -static void -google_source_remove_node (nodePtr node, nodePtr child) -{ - gchar *source; - GoogleSourcePtr gsource = node->data; - - if (child == node) { - feedlist_node_removed (child); - return; - } - - source = g_strdup (child->subscription->source); - - feedlist_node_removed (child); - - /* propagate the removal only if there aren't other copies */ - if (!google_source_opml_get_node_by_source (gsource, source)) - google_source_edit_remove_subscription (gsource, source); - - g_free (source); -} - -/* GUI callbacks */ - -static void -on_google_source_selected (GtkDialog *dialog, - gint response_id, - gpointer user_data) -{ - nodePtr node; - subscriptionPtr subscription; - - if (response_id == GTK_RESPONSE_OK) { - subscription = subscription_new ("http://www.google.com/reader", NULL, NULL); - subscription->updateOptions->username = g_strdup (gtk_entry_get_text (GTK_ENTRY (liferea_dialog_lookup (GTK_WIDGET(dialog), "userEntry")))); - subscription->updateOptions->password = g_strdup (gtk_entry_get_text (GTK_ENTRY (liferea_dialog_lookup (GTK_WIDGET(dialog), "passwordEntry")))); - subscription->type = &googleSourceOpmlSubscriptionType ; - node = node_new (node_source_get_node_type ()); - node_set_title (node, "Google Reader"); - node_source_new (node, google_source_get_type ()); - node_set_subscription (node, subscription); - node->data = google_source_new (node); - feedlist_node_added (node); - google_source_update (node); - } - - gtk_widget_destroy (GTK_WIDGET (dialog)); -} - -static void -ui_google_source_get_account_info (void) -{ - GtkWidget *dialog; - - dialog = liferea_dialog_new ("google_source.ui", "google_source_dialog"); - - g_signal_connect (G_OBJECT (dialog), "response", - G_CALLBACK (on_google_source_selected), - NULL); -} - static void google_source_cleanup (nodePtr node) { @@ -349,28 +130,6 @@ node->data = NULL ; } -static void -google_source_item_set_flag (nodePtr node, itemPtr item, gboolean newStatus) -{ - const gchar* sourceUrl = metadata_list_get (item->metadata, "GoogleBroadcastOrigFeed"); - if (!sourceUrl) - sourceUrl = node->subscription->source; - nodePtr root = node_source_root_from_node (node); - google_source_edit_mark_starred ((GoogleSourcePtr)root->data, item->sourceId, sourceUrl, newStatus); - item_flag_state_changed (item, newStatus); -} - -static void -google_source_item_mark_read (nodePtr node, itemPtr item, gboolean newStatus) -{ - const gchar* sourceUrl = metadata_list_get(item->metadata, "GoogleBroadcastOrigFeed"); - if (!sourceUrl) - sourceUrl = node->subscription->source; - nodePtr root = node_source_root_from_node (node); - google_source_edit_mark_read ((GoogleSourcePtr)root->data, item->sourceId, sourceUrl, newStatus); - item_read_state_changed (item, newStatus); -} - /** * Convert all subscriptions of a google source to local feeds * @@ -379,9 +138,7 @@ static void google_source_convert_to_local (nodePtr node) { - GoogleSourcePtr gsource = node->data; - - gsource->loginState = GOOGLE_SOURCE_STATE_MIGRATE; + /* Nothing to do when migrating */ } /* node source type definition */ @@ -391,14 +148,10 @@ .name = N_("Google Reader"), .description = N_("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."), - .capabilities = NODE_SOURCE_CAPABILITY_DYNAMIC_CREATION | - NODE_SOURCE_CAPABILITY_WRITABLE_FEEDLIST | - NODE_SOURCE_CAPABILITY_ADD_FEED | - NODE_SOURCE_CAPABILITY_ITEM_STATE_SYNC | - NODE_SOURCE_CAPABILITY_CONVERT_TO_LOCAL, + .capabilities = NODE_SOURCE_CAPABILITY_CONVERT_TO_LOCAL, .source_type_init = google_source_init, .source_type_deinit = google_source_deinit, - .source_new = ui_google_source_get_account_info, + .source_new = NULL, .source_delete = google_source_remove, .source_import = google_source_import, .source_export = google_source_export, @@ -406,11 +159,11 @@ .source_update = google_source_update, .source_auto_update = google_source_auto_update, .free = google_source_cleanup, - .item_set_flag = google_source_item_set_flag, - .item_mark_read = google_source_item_mark_read, + .item_set_flag = NULL, + .item_mark_read = NULL, .add_folder = NULL, - .add_subscription = google_source_add_subscription, - .remove_node = google_source_remove_node, + .add_subscription = NULL, + .remove_node = NULL, .convert_to_local = google_source_convert_to_local }; diff -Nru liferea-1.8.15/src/fl_sources/google_source_edit.c liferea-1.10.3/src/fl_sources/google_source_edit.c --- liferea-1.8.15/src/fl_sources/google_source_edit.c 2013-06-12 22:35:15.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/google_source_edit.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,486 +0,0 @@ -/** - * @file google_source_edit.c Google reader feed list source syncing support - * - * Copyright (C) 2008 Arnold Noronha - * - * 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 "debug.h" -#include "update.h" -#include "subscription.h" -#include "common.h" -#include "feedlist.h" - - -#include "google_source.h" -#include "google_source_edit.h" -#include "config.h" -#include -#include -#include -#include "xml.h" - -/** - * A structure to indicate an edit to the Google Reader "database". - * These edits are put in a queue and processed in sequential order - * so that google does not end up processing the requests in an - * unintended order. - */ -typedef struct GoogleSourceAction { - /** - * The guid of the item to edit. This will be ignored if the - * edit is acting on an subscription rather than an item. - */ - gchar* guid; - - /** - * A MANDATORY feed url to containing the item, or the url of the - * subscription to edit. - */ - gchar* feedUrl; - - /** - * The source type. Currently known types are "feed" and "user". - * "user" sources are used, for example, for items that are links (as - * opposed to posts) in broadcast-friends. The unique id of the source - * is of the form /. - */ - gchar* feedUrlType; - - /** - * A callback function on completion of the edit. - */ - void (*callback) (GoogleSourcePtr gsource, struct GoogleSourceAction* edit, gboolean success); - - /** - * The type of this GoogleSourceAction. - */ - int actionType ; -} *GoogleSourceActionPtr ; - -enum { - EDIT_ACTION_MARK_READ, - EDIT_ACTION_MARK_UNREAD, - EDIT_ACTION_TRACKING_MARK_UNREAD, /**< every UNREAD request, should be followed by tracking-kept-unread */ - EDIT_ACTION_MARK_STARRED, - EDIT_ACTION_MARK_UNSTARRED, - EDIT_ACTION_ADD_SUBSCRIPTION, - EDIT_ACTION_REMOVE_SUBSCRIPTION -} ; - - -typedef struct GoogleSourceAction* editPtr ; - -typedef struct GoogleSourceActionCtxt { - gchar *nodeId ; - GoogleSourceActionPtr action; -} *GoogleSourceActionCtxtPtr; - - -static void google_source_edit_push (GoogleSourcePtr gsource, GoogleSourceActionPtr action, gboolean head); - - -static GoogleSourceActionPtr -google_source_action_new (void) -{ - GoogleSourceActionPtr action = g_slice_new0 (struct GoogleSourceAction); - return action; -} - -static void -google_source_action_free (GoogleSourceActionPtr action) -{ - g_free (action->guid); - g_free (action->feedUrl); - g_slice_free (struct GoogleSourceAction, action); -} - -static GoogleSourceActionCtxtPtr -google_source_action_context_new(GoogleSourcePtr gsource, GoogleSourceActionPtr action) -{ - GoogleSourceActionCtxtPtr ctxt = g_slice_new0(struct GoogleSourceActionCtxt); - ctxt->nodeId = g_strdup(gsource->root->id); - ctxt->action = action; - return ctxt; -} - -static void -google_source_action_context_free(GoogleSourceActionCtxtPtr ctxt) -{ - g_free(ctxt->nodeId); - g_slice_free(struct GoogleSourceActionCtxt, ctxt); -} - -static void -google_source_edit_action_complete (const struct updateResult* const result, gpointer userdata, updateFlags flags) -{ - GoogleSourceActionCtxtPtr editCtxt = (GoogleSourceActionCtxtPtr) userdata; - nodePtr node = node_from_id (editCtxt->nodeId); - GoogleSourcePtr gsource; - GoogleSourceActionPtr action = editCtxt->action ; - - google_source_action_context_free (editCtxt); - - if (!node) { - google_source_action_free (action); - return; /* probably got deleted before this callback */ - } - gsource = (GoogleSourcePtr) node->data; - - if (result->data == NULL || !g_str_equal (result->data, "OK")) { - if (action->callback) - (*action->callback) (gsource, action, FALSE); - debug1 (DEBUG_UPDATE, "The edit action failed with result: %s\n", result->data); - google_source_action_free (action); - return; /** @todo start a timer for next processing */ - } - - if (action->callback) - action->callback (gsource, action, TRUE); - - google_source_action_free (action); - - /* process anything else waiting on the edit queue */ - google_source_edit_process (gsource); -} - -/* the following google_source_api_* functions are simply funtions that - convert a GoogleSourceActionPtr to a updateRequestPtr */ - -static void -google_source_api_add_subscription (GoogleSourceActionPtr action, updateRequestPtr request, const gchar* token) -{ - update_request_set_source (request, GOOGLE_READER_ADD_SUBSCRIPTION_URL); - gchar* s_escaped = g_uri_escape_string (action->feedUrl, NULL, TRUE) ; - gchar* postdata = g_strdup_printf (GOOGLE_READER_ADD_SUBSCRIPTION_POST, s_escaped, token); - g_free (s_escaped); - - debug1 (DEBUG_UPDATE, "google_source: postdata [%s]", postdata); - request->postdata = postdata ; -} - -static void -google_source_api_remove_subscription (GoogleSourceActionPtr action, updateRequestPtr request, const gchar* token) -{ - update_request_set_source (request, GOOGLE_READER_REMOVE_SUBSCRIPTION_URL); - gchar* s_escaped = g_uri_escape_string (action->feedUrl, NULL, TRUE); - g_assert (!request->postdata); - request->postdata = g_strdup_printf (GOOGLE_READER_REMOVE_SUBSCRIPTION_POST, s_escaped, token); - g_free (s_escaped); -} - -static void -google_source_api_edit_tag (GoogleSourceActionPtr action, updateRequestPtr request, const gchar*token) -{ - update_request_set_source (request, GOOGLE_READER_EDIT_TAG_URL); - - const gchar* prefix = "feed" ; - gchar* s_escaped = g_uri_escape_string (action->feedUrl, NULL, TRUE); - gchar* a_escaped = NULL ; - gchar* i_escaped = g_uri_escape_string (action->guid, NULL, TRUE); - gchar* postdata = NULL ; - - /* - * If the source of the item is a feed then the source *id* will be of - * the form tag:google.com,2005:reader/feed/http://foo.com/bar - * If the item is a shared link it is of the form - * tag:google.com,2005:reader/user//source/com.google/link - * It is possible that there are items other thank link that has - * the ../user/.. id. The GR API requires the strings after ..:reader/ - * while GoogleSourceAction only gives me after :reader/feed/ (or - * :reader/user/ as the case might be). I therefore need to guess - * the prefix ('feed/' or 'user/') from just this information. - */ - - if (strstr(action->feedUrl, "://") == NULL) - prefix = "user" ; - - if (action->actionType == EDIT_ACTION_MARK_UNREAD) { - a_escaped = g_uri_escape_string (GOOGLE_READER_TAG_KEPT_UNREAD, NULL, TRUE); - gchar *r_escaped = g_uri_escape_string (GOOGLE_READER_TAG_READ, NULL, TRUE); - postdata = g_strdup_printf (GOOGLE_READER_EDIT_TAG_AR_TAG, i_escaped, prefix, s_escaped, a_escaped, r_escaped, token); - g_free (r_escaped); - } - else if (action->actionType == EDIT_ACTION_MARK_READ) { - a_escaped = g_uri_escape_string (GOOGLE_READER_TAG_READ, NULL, TRUE); - postdata = g_strdup_printf (GOOGLE_READER_EDIT_TAG_ADD_TAG, i_escaped, prefix, s_escaped, a_escaped, token); - } - else if (action->actionType == EDIT_ACTION_TRACKING_MARK_UNREAD) { - a_escaped = g_uri_escape_string (GOOGLE_READER_TAG_TRACKING_KEPT_UNREAD, NULL, TRUE); - postdata = g_strdup_printf (GOOGLE_READER_EDIT_TAG_ADD_TAG, i_escaped, prefix, s_escaped, a_escaped, token); - } - else if (action->actionType == EDIT_ACTION_MARK_STARRED) { - a_escaped = g_uri_escape_string (GOOGLE_READER_TAG_STARRED, NULL, TRUE) ; - postdata = g_strdup_printf ( - GOOGLE_READER_EDIT_TAG_ADD_TAG, i_escaped, prefix, - s_escaped, a_escaped, token); - } - else if (action->actionType == EDIT_ACTION_MARK_UNSTARRED) { - gchar* r_escaped = g_uri_escape_string(GOOGLE_READER_TAG_STARRED, NULL, TRUE); - postdata = g_strdup_printf ( - GOOGLE_READER_EDIT_TAG_REMOVE_TAG, i_escaped, prefix, - s_escaped, r_escaped, token); - } - - else g_assert (FALSE); - - g_free (s_escaped); - g_free (a_escaped); - g_free (i_escaped); - - debug1 (DEBUG_UPDATE, "google_source: postdata [%s]", postdata); - - - request->postdata = postdata; -} - -static void -google_source_edit_token_cb (const struct updateResult * const result, gpointer userdata, updateFlags flags) -{ - nodePtr node; - GoogleSourcePtr gsource; - const gchar* token; - GoogleSourceActionPtr action; - updateRequestPtr request; - - if (result->httpstatus != 200 || result->data == NULL) { - /* FIXME: What is the behaviour that should go here? */ - return; - } - - node = node_from_id ((gchar*) userdata); - g_free (userdata); - - if (!node) { - return; - } - gsource = (GoogleSourcePtr) node->data; - - - token = result->data; - - if (!gsource || g_queue_is_empty (gsource->actionQueue)) - return; - - action = g_queue_peek_head (gsource->actionQueue); - - 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); - - if (action->actionType == EDIT_ACTION_MARK_READ || - action->actionType == EDIT_ACTION_MARK_UNREAD || - action->actionType == EDIT_ACTION_TRACKING_MARK_UNREAD || - action->actionType == EDIT_ACTION_MARK_STARRED || - action->actionType == EDIT_ACTION_MARK_UNSTARRED) - google_source_api_edit_tag (action, request, token); - else if (action->actionType == EDIT_ACTION_ADD_SUBSCRIPTION ) - google_source_api_add_subscription (action, request, token); - else if (action->actionType == EDIT_ACTION_REMOVE_SUBSCRIPTION ) - google_source_api_remove_subscription (action, request, token) ; - - update_execute_request (gsource, request, google_source_edit_action_complete, google_source_action_context_new(gsource, action), 0); - - action = g_queue_pop_head (gsource->actionQueue); -} - -void -google_source_edit_process (GoogleSourcePtr gsource) -{ - updateRequestPtr request; - - g_assert (gsource); - if (g_queue_is_empty (gsource->actionQueue)) - return; - - /* - * Google reader has a system of tokens. So first, I need to request a - * token from google, before I can make the actual edit request. The - * code here is the token code, the actual edit commands are in - * google_source_edit_token_cb - */ - request = update_request_new (); - 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_execute_request (gsource, request, google_source_edit_token_cb, - g_strdup(gsource->root->id), 0); -} - -static void -google_source_edit_push_ (GoogleSourcePtr gsource, GoogleSourceActionPtr action, gboolean head) -{ - g_assert (gsource->actionQueue); - if (head) g_queue_push_head (gsource->actionQueue, action); - else g_queue_push_tail (gsource->actionQueue, action); -} - -static void -google_source_edit_push (GoogleSourcePtr gsource, GoogleSourceActionPtr action, gboolean head) -{ - g_assert (gsource); - nodePtr root = gsource->root; - google_source_edit_push_ (gsource, action, head); - - /** @todo any flags I should specify? */ - if (gsource->loginState == GOOGLE_SOURCE_STATE_NONE) - subscription_update(root->subscription, GOOGLE_SOURCE_UPDATE_ONLY_LOGIN); - else if ( gsource->loginState == GOOGLE_SOURCE_STATE_ACTIVE) - google_source_edit_process (gsource); -} - -static void -update_read_state_callback (GoogleSourcePtr gsource, GoogleSourceActionPtr action, gboolean success) -{ - if (success) { - // FIXME: call item_read_state_changed (item, newState); - } else { - debug0 (DEBUG_UPDATE, "Failed to change item state!\n"); - } -} - -void -google_source_edit_mark_read (GoogleSourcePtr gsource, const gchar *guid, const gchar *feedUrl, gboolean newStatus) -{ - GoogleSourceActionPtr action = google_source_action_new (); - - action->guid = g_strdup (guid); - action->feedUrl = g_strdup (feedUrl); - action->actionType = newStatus ? EDIT_ACTION_MARK_READ : - EDIT_ACTION_MARK_UNREAD; - action->callback = update_read_state_callback; - - google_source_edit_push (gsource, action, FALSE); - - if (newStatus == FALSE) { - /* - * According to the Google Reader API, to mark an item unread, - * I also need to mark it as tracking-kept-unread in a separate - * network call. - */ - action = google_source_action_new (); - action->guid = g_strdup (guid); - action->feedUrl = g_strdup (feedUrl); - action->actionType = EDIT_ACTION_TRACKING_MARK_UNREAD; - google_source_edit_push (gsource, action, FALSE); - } -} - -static void -update_starred_state_callback(GoogleSourcePtr gsource, GoogleSourceActionPtr action, gboolean success) -{ - if (success) { - // FIXME: call item_flag_changed (item, newState); - } else { - debug0 (DEBUG_UPDATE, "Failed to change item state!\n"); - } -} - -void -google_source_edit_mark_starred (GoogleSourcePtr gsource, const gchar *guid, const gchar *feedUrl, gboolean newStatus) -{ - GoogleSourceActionPtr action = google_source_action_new (); - - action->guid = g_strdup (guid); - action->feedUrl = g_strdup (feedUrl); - action->actionType = newStatus ? EDIT_ACTION_MARK_STARRED : EDIT_ACTION_MARK_UNSTARRED; - action->callback = update_starred_state_callback; - - google_source_edit_push (gsource, action, FALSE); -} - -static void -update_subscription_list_callback(GoogleSourcePtr gsource, GoogleSourceActionPtr action, gboolean success) -{ - if (success) { - /* - * It is possible that Google changed the name of the URL that - * was sent to it. In that case, I need to recover the URL - * from the list. But a node with the old URL has already - * been created. Allow the subscription update call to fix that. - */ - GSList* cur = gsource->root->children ; - for(; cur; cur = g_slist_next (cur)) { - nodePtr node = (nodePtr) cur->data ; - if (g_str_equal (node->subscription->source, action->feedUrl)) { - subscription_set_source (node->subscription, ""); - feedlist_node_added (node); - } - } - - debug0 (DEBUG_UPDATE, "Subscription list was updated successful\n"); - subscription_update (gsource->root->subscription, GOOGLE_SOURCE_UPDATE_ONLY_LIST); - } else - debug0 (DEBUG_UPDATE, "Failed to update subscriptions\n"); -} - -void -google_source_edit_add_subscription (GoogleSourcePtr gsource, const gchar* feedUrl) -{ - GoogleSourceActionPtr action = google_source_action_new () ; - action->actionType = EDIT_ACTION_ADD_SUBSCRIPTION; - action->feedUrl = g_strdup (feedUrl); - action->callback = update_subscription_list_callback; - google_source_edit_push (gsource, action, TRUE); -} - -static void -google_source_edit_remove_callback (GoogleSourcePtr gsource, GoogleSourceActionPtr action, gboolean success) -{ - if (success) { - /* - * The node was removed from the feedlist, but could have - * returned because of an update before this edit request - * completed. No cleaner way to handle this. - */ - GSList* cur = gsource->root->children ; - for(; cur; cur = g_slist_next (cur)) { - nodePtr node = (nodePtr) cur->data ; - if (g_str_equal (node->subscription->source, action->feedUrl)) { - feedlist_node_removed (node); - return; - } - } - } else - debug0 (DEBUG_UPDATE, "Failed to remove subscription"); -} - -void google_source_edit_remove_subscription (GoogleSourcePtr gsource, const gchar* feedUrl) -{ - GoogleSourceActionPtr action = google_source_action_new (); - action->actionType = EDIT_ACTION_REMOVE_SUBSCRIPTION; - action->feedUrl = g_strdup (feedUrl); - action->callback = google_source_edit_remove_callback; - google_source_edit_push (gsource, action, TRUE); -} - -gboolean google_source_edit_is_in_queue (GoogleSourcePtr gsource, const gchar* guid) -{ - /* this is inefficient, but works for the time being */ - GList *cur = gsource->actionQueue->head; - for(; cur; cur = g_list_next (cur)) { - GoogleSourceActionPtr action = cur->data; - if (action->guid && g_str_equal (action->guid, guid)) - return TRUE; - } - return FALSE; -} diff -Nru liferea-1.8.15/src/fl_sources/google_source_edit.h liferea-1.10.3/src/fl_sources/google_source_edit.h --- liferea-1.8.15/src/fl_sources/google_source_edit.h 2012-12-11 17:10:01.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/google_source_edit.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,86 +0,0 @@ -/** - * @file google_source_edit.c Google reader feed list source syncing support - * - * Copyright (C) 2008 Arnold Noronha - * - * 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 _GOOGLE_SOURCE_EDIT_H -#define _GOOGLE_SOURCE_EDIT_H - -#include "google_source.h" - -#include - -/** - * Process the waiting edits on the edit queue. Call this if the state of - * the GoogleSource has changed. - * - * @param gsource The GoogleSource whose editQueue should be processed. - */ -void google_source_edit_process (GoogleSourcePtr gsource); - - -/** Edit wrappers */ - -/** - * Mark the given item as read. - * - * @param gsource The GoogleSource structure - * @param guid The guid of the item whose status is to be edited - * @param feedUrl The feedUrl of the feed containing the item. - * @param newStatus The new read status of the item (TRUE for read) - */ -void google_source_edit_mark_read (GoogleSourcePtr gsource, const gchar* guid, const gchar* feedUrl, gboolean newStatus); - -/** - * Mark the given item as starred. - * - * @param gsource The GoogleSource structure - * @param guid The guid of the item whose status is to be edited - * @param feedUrl The feedUrl of the feed containing the item. - * @param newStatus The new read status of the item (TRUE for read) - */ -void google_source_edit_mark_starred (GoogleSourcePtr gsource, const gchar *guid, const gchar *feedUrl, gboolean newStatus); - - -/** - * Add a subscription to the google source. - * - * @param gsource The GoogleSource structure - * @param feedUrl the feed to add - */ -void google_source_edit_add_subscription (GoogleSourcePtr gsource, const gchar* feedUrl); - - -/** - * Remove a subscription from the google source. - * - * @param gsource The GoogleSource structure - * @param feedUrl the feed to remove - */ -void google_source_edit_remove_subscription (GoogleSourcePtr gsource, const gchar* feedUrl); - -/** - * See if an item with give guid is being modified - * in the queue. - * - * @param GoogleSource the GoogleSource structure - * @param guid the guid of the item - */ -gboolean google_source_edit_is_in_queue (GoogleSourcePtr gsource, const gchar* guid); - -#endif diff -Nru liferea-1.8.15/src/fl_sources/google_source_feed.c liferea-1.10.3/src/fl_sources/google_source_feed.c --- liferea-1.8.15/src/fl_sources/google_source_feed.c 2013-06-12 22:35:15.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/google_source_feed.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,336 +0,0 @@ -/** - * @file google_source_feed.c Google reader feed subscription routines - * - * Copyright (C) 2008 Arnold Noronha - * - * 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 "common.h" -#include "debug.h" -#include "xml.h" - -#include "feedlist.h" -#include "google_source.h" -#include "subscription.h" -#include "node.h" -#include "google_source_edit.h" -#include "metadata.h" -#include "db.h" -#include "item_state.h" - -/** - * This is identical to xpath_foreach_match, except that it takes the context - * as parameter. - */ -static void -google_source_xpath_foreach_match (const gchar* expr, xmlXPathContextPtr xpathCtxt, xpathMatchFunc func, gpointer user_data) -{ - xmlXPathObjectPtr xpathObj = NULL; - xpathObj = xmlXPathEval ((xmlChar*)expr, xpathCtxt); - - if (xpathObj && xpathObj->nodesetval && xpathObj->nodesetval->nodeMax) { - int i; - for (i = 0; i < xpathObj->nodesetval->nodeNr; i++) { - (*func) (xpathObj->nodesetval->nodeTab[i], user_data); - xpathObj->nodesetval->nodeTab[i] = NULL ; - } - } - - if (xpathObj) - xmlXPathFreeObject (xpathObj); -} - -void -google_source_migrate_node(nodePtr node) -{ - /* scan the node for bad ID's, if so, brutally remove the node */ - itemSetPtr itemset = node_get_itemset (node); - GList *iter = itemset->ids; - for (; iter; iter = g_list_next (iter)) { - itemPtr item = item_load (GPOINTER_TO_UINT (iter->data)); - if (item && item->sourceId) { - if (!g_str_has_prefix(item->sourceId, "tag:google.com")) { - debug1(DEBUG_UPDATE, "Item with sourceId [%s] will be deleted.", item->sourceId); - db_item_remove(GPOINTER_TO_UINT(iter->data)); - } - } - if (item) item_unload (item); - } - - /* cleanup */ - itemset_free (itemset); -} - -static void -google_source_xml_unlink_node (xmlNodePtr node, gpointer data) -{ - xmlUnlinkNode (node); - xmlFreeNode (node); -} - -static void -google_source_set_orig_source(const xmlNodePtr node, gpointer userdata) -{ - itemPtr item = (itemPtr) userdata ; - xmlChar* value = xmlNodeGetContent (node); - const gchar* prefix1 = "tag:google.com,2005:reader/feed/"; - const gchar* prefix2 = "tag:google.com,2005:reader/user/"; - - debug1(DEBUG_UPDATE, "GoogleSource: Got %s as id while updating", value); - - if (g_str_has_prefix (value, prefix1) || g_str_has_prefix (value, prefix2)) { - metadata_list_set (&item->metadata, "GoogleBroadcastOrigFeed", value + strlen (prefix1)); - } - xmlFree (value); -} - -static void -google_source_set_shared_by (xmlNodePtr node, gpointer userdata) -{ - itemPtr item = (itemPtr) userdata; - xmlChar *value = xmlNodeGetContent (node); - xmlChar *apos = strrchr (value, '\''); - gchar *name; - - if (!apos) return; - name = g_strndup (value, apos-value); - - metadata_list_set (&item->metadata, "sharedby", name); - - g_free (name); - xmlFree (value); -} - -static void -google_source_fix_broadcast_item (xmlNodePtr entry, itemPtr item) -{ - xmlXPathContextPtr xpathCtxt = xmlXPathNewContext (entry->doc) ; - xmlXPathRegisterNs (xpathCtxt, "atom", "http://www.w3.org/2005/Atom"); - xpathCtxt->node = entry; - - google_source_xpath_foreach_match ("./atom:source/atom:id", xpathCtxt, google_source_set_orig_source, item); - - /* who is sharing this? */ - google_source_xpath_foreach_match ("./atom:link[@rel='via']/@title", xpathCtxt, google_source_set_shared_by, item); - - db_item_update (item); - /* free up xpath related data */ - if (xpathCtxt) xmlXPathFreeContext (xpathCtxt); -} - -static itemPtr -google_source_load_item_from_sourceid (nodePtr node, gchar *sourceId, GHashTable *cache) -{ - gpointer ret = g_hash_table_lookup (cache, sourceId); - itemSetPtr itemset; - int num = g_hash_table_size (cache); - GList *iter; - itemPtr item = NULL; - - if (ret) return item_load (GPOINTER_TO_UINT (ret)); - - /* skip the top 'num' entries */ - itemset = node_get_itemset (node); - iter = itemset->ids; - while (num--) iter = g_list_next (iter); - - for (; iter; iter = g_list_next (iter)) { - item = item_load (GPOINTER_TO_UINT (iter->data)); - if (item && item->sourceId) { - /* save to cache */ - g_hash_table_insert (cache, g_strdup(item->sourceId), (gpointer) item->id); - if (g_str_equal (item->sourceId, sourceId)) { - itemset_free (itemset); - return item; - } - } - item_unload (item); - } - - g_warning ("Could not find item for %s!", sourceId); - itemset_free (itemset); - return NULL; -} - -static void -google_source_item_retrieve_status (const xmlNodePtr entry, subscriptionPtr subscription, GHashTable *cache) -{ - GoogleSourcePtr gsource = (GoogleSourcePtr) node_source_root_from_node (subscription->node)->data ; - xmlNodePtr xml; - nodePtr node = subscription->node; - xmlChar *id; - gboolean read = FALSE; - gboolean starred = FALSE; - - xml = entry->children; - g_assert (xml); - g_assert (g_str_equal (xml->name, "id")); - - id = xmlNodeGetContent (xml); - - for (xml = entry->children; xml; xml = xml->next) { - if (g_str_equal (xml->name, "category")) { - xmlChar* label = xmlGetProp (xml, "label"); - if (!label) - continue; - - if (g_str_equal (label, "read")) - read = TRUE; - else if (g_str_equal(label, "starred")) - starred = TRUE; - - xmlFree (label); - } - } - - itemPtr item = google_source_load_item_from_sourceid (node, id, cache); - if (item && item->sourceId) { - if (g_str_equal (item->sourceId, id) && !google_source_edit_is_in_queue(gsource, id)) { - - if (item->readStatus != read) - item_read_state_changed (item, read); - if (item->flagStatus != starred) - item_flag_state_changed (item, starred); - - if (g_str_equal (subscription->source, GOOGLE_READER_BROADCAST_FRIENDS_URL)) - google_source_fix_broadcast_item (entry, item); - } - } - if (item) item_unload (item) ; - xmlFree (id); -} - -static void -google_feed_subscription_process_update_result (subscriptionPtr subscription, const struct updateResult* const result, updateFlags flags) -{ - - debug_start_measurement (DEBUG_UPDATE); - - if (result->data) { - updateResultPtr resultCopy; - - /* FIXME: The following is a very dirty hack to edit the feed's - XML before processing it */ - resultCopy = update_result_new () ; - resultCopy->source = g_strdup (result->source); - resultCopy->httpstatus = result->httpstatus; - resultCopy->contentType = g_strdup (result->contentType); - 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, 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); - - - /* delete the via link for broadcast subscription */ - if (g_str_equal (subscription->source, GOOGLE_READER_BROADCAST_FRIENDS_URL)) - google_source_xpath_foreach_match ("/atom:feed/atom:entry/atom:link[@rel='via']/@href", xpathCtxt, google_source_xml_unlink_node, NULL); - - xmlXPathFreeContext (xpathCtxt); - - /* good now we have removed the read and unread labels. */ - - xmlChar *newXml; - int newXmlSize ; - - xmlDocDumpMemory (doc, &newXml, &newXmlSize); - - resultCopy->data = g_strndup ((gchar*) newXml, newXmlSize); - resultCopy->size = newXmlSize; - - xmlFree (newXml); - xmlFreeDoc (doc); - - feed_get_subscription_type ()->process_update_result (subscription, resultCopy, flags); - update_result_free (resultCopy); - } else { - feed_get_subscription_type ()->process_update_result (subscription, result, flags); - return ; - } - - /* FIXME: The following workaround ensure that the code below, - that uses UI callbacks item_*_state_changed(), does not - reset the newCount of the feed list (see SF #2666478) - 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, NULL); - if (doc) { - xmlNodePtr root = xmlDocGetRootElement (doc); - xmlNodePtr entry = root->children ; - GHashTable *cache = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - - while (entry) { - if (!g_str_equal (entry->name, "entry")) { - entry = entry->next; - continue; /* not an entry */ - } - - google_source_item_retrieve_status (entry, subscription, cache); - entry = entry->next; - } - - g_hash_table_unref (cache); - xmlFreeDoc (doc); - } else { - debug0 (DEBUG_UPDATE, "google_feed_subscription_process_update_result(): Couldn't parse XML!"); - g_warning ("google_feed_subscription_process_update_result(): Couldn't parse XML!"); - } - - // FIXME: part 2 of the newCount workaround - feedlist_update_new_item_count (newCount); - - debug_end_measurement (DEBUG_UPDATE, "time taken to update statuses"); -} - -static gboolean -google_feed_subscription_prepare_update_request (subscriptionPtr subscription, - struct updateRequest *request) -{ - debug0 (DEBUG_UPDATE, "preparing google reader feed subscription for update\n"); - GoogleSourcePtr gsource = (GoogleSourcePtr) node_source_root_from_node (subscription->node)->data; - - g_assert(gsource); - if (gsource->loginState == GOOGLE_SOURCE_STATE_NONE) { - subscription_update (node_source_root_from_node (subscription->node)->subscription, 0) ; - return FALSE; - } - debug0 (DEBUG_UPDATE, "Setting cookies for a Google Reader subscription"); - - if (!g_str_equal (request->source, GOOGLE_READER_BROADCAST_FRIENDS_URL)) { - gchar* source_escaped = g_uri_escape_string(request->source, NULL, TRUE); - gchar* newUrl = g_strdup_printf ("http://www.google.com/reader/atom/feed/%s", source_escaped); - update_request_set_source (request, newUrl); - g_free (newUrl); - g_free (source_escaped); - } - update_request_set_auth_value (request, gsource->authHeaderValue); - return TRUE; -} - -struct subscriptionType googleSourceFeedSubscriptionType = { - google_feed_subscription_prepare_update_request, - google_feed_subscription_process_update_result -}; - diff -Nru liferea-1.8.15/src/fl_sources/google_source.h liferea-1.10.3/src/fl_sources/google_source.h --- liferea-1.8.15/src/fl_sources/google_source.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/google_source.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file google_source.h Google Reader feed list source support * - * Copyright (C) 2007-2012 Lars Lindner + * Copyright (C) 2007-2013 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,222 +23,16 @@ #include "fl_sources/node_source.h" - /** - * A nodeSource specific for Google Reader + * A nodeSource specific for keeping dead Google Reader sources */ typedef struct GoogleSource { - nodePtr root; /**< the root node in the feed list */ - gchar *authHeaderValue; /**< the Google Authorization token */ - GQueue *actionQueue; - gint loginState; /**< The current login state */ - gint authFailures; /**< Number of authentication failures */ - - /** - * A map from a subscription source to a timestamp when it was last - * updated (provided by Google). - */ - GHashTable *lastTimestampMap; - - /** - * A timestamp when the last Quick update took place. - */ - GTimeVal lastQuickUpdate; + /* No data anymore, since this is a dummy only */ } *GoogleSourcePtr; -enum { - GOOGLE_SOURCE_STATE_NONE = 0, /**< no authentication tried so far */ - GOOGLE_SOURCE_STATE_IN_PROGRESS, /**< authentication in progress */ - GOOGLE_SOURCE_STATE_ACTIVE, /**< authentication succeeded */ - GOOGLE_SOURCE_STATE_NO_AUTH, /**< authentication has failed */ - GOOGLE_SOURCE_STATE_MIGRATE, /**< source will be migrated, do not do anything anymore! */ -}; - -enum { - /** - * Update only the subscription list, and not each node underneath it. - * Note: Uses higher 16 bits to avoid conflict. - */ - GOOGLE_SOURCE_UPDATE_ONLY_LIST = (1<<16), - /** - * Only login, do not do any updates. - */ - GOOGLE_SOURCE_UPDATE_ONLY_LOGIN = (1<<17) -}; - -/** - * Number of auth failures after which we stop bothering the user while - * auto-updating until he manually updates again. - */ -#define GOOGLE_SOURCE_MAX_AUTH_FAILURES 3 - -/** - * Google Source API URL's - * In each of the following, the _URL indicates the URL to use, and _POST - * indicates the corresponging postdata to send. - * @see http://code.google.com/p/pyrfeed/wiki/GoogleReaderAPI - * However as of now, the GoogleReaderAPI documentation seems outdated, some of - * mark read/unread API does not work as mentioned in the documentation. - */ - -/** - * 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. - */ -#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. - */ -#define GOOGLE_READER_BROADCAST_FRIENDS_URL "http://www.google.com/reader/atom/user/-/state/com.google/broadcast-friends" - -/** - * Get a list of subscriptions. - */ -#define GOOGLE_READER_SUBSCRIPTION_LIST_URL "http://www.google.com/reader/api/0/subscription/list" - -/** - * Get a token for an edit operation. (@todo A token can actually be used - * for multiple transactions.) - */ -#define GOOGLE_READER_TOKEN_URL "http://www.google.com/reader/api/0/token" - -/** - * Add a subscription - * @param URL The feed URL, or the page URL for feed autodiscovery. - * @param T a token obtained using GOOGLE_READER_TOKEN_URL - */ -#define GOOGLE_READER_ADD_SUBSCRIPTION_URL "http://www.google.com/reader/api/0/subscription/edit?client=liferea" -#define GOOGLE_READER_ADD_SUBSCRIPTION_POST "s=feed%%2F%s&i=null&ac=subscribe&T=%s" - -/** - * Unsubscribe from a subscription. - * @param url The feed URL - * @param T a token obtained using GOOGLE_READER_TOKEN_URL - */ -#define GOOGLE_READER_REMOVE_SUBSCRIPTION_URL "http://www.google.com/reader/api/0/subscription/edit?client=liferea" -#define GOOGLE_READER_REMOVE_SUBSCRIPTION_POST "s=feed%%2F%s&i=null&ac=unsubscribe&T=%s" - -/** - * A list of subscriptions with the unread counters, and the last updated - * timestamps. - */ -#define GOOGLE_READER_UNREAD_COUNTS_URL "http://www.google.com/reader/api/0/unread-count?all=true&client=liferea" - -/** - * Edit the tags associated with an item. The parameters to this _have_ to be - * sent as post data. - */ -#define GOOGLE_READER_EDIT_TAG_URL "http://www.google.com/reader/api/0/edit-tag?client=liferea" - -/** - * Postdata for adding a tag when using GOOGLE_READER_EDIT_TAG_URL. - * @param i The guid of the item. - * @param prefix The prefix to 's'. For normal feeds this will be "feed", for - * links etc, this should be "user". - * @param s The URL of the subscription containing the item. (Note that the - * following string adds the "feed/" prefix to this.) - * @param a The tag to add. - * @param T a token obtained using GOOGLE_READER_TOKEN_URL - */ -#define GOOGLE_READER_EDIT_TAG_ADD_TAG "i=%s&s=%s%%2F%s&a=%s&ac=edit-tags&T=%s&async=true" - -/** - * Postdata for removing a tag, when using GOOGLE_READER_EDIT_TAG_URL. Do - * not use for removing the "read" tag, see GOOGLE_READER_EDIT_TAG_AR_TAG - * for that. - * - * @param i The guid of the item. - * @param prefix The prefix to 's'. @see GOOGLE_READER_EDIT_TAG_ADD_TAG - * @param s The URL of the subscription containing the item. (Note that the - * final value of s is feed + "/" + this string) - * @param r The tag to remove - * @param T a token obtained using GOOGLE_READER_TOKEN_URL - */ -#define GOOGLE_READER_EDIT_TAG_REMOVE_TAG "i=%s&s=%s%%2F%s&r=%s&ac=edit-tags&T=%s&async=true" - -/** - * Postdata for adding a tag, and removing another tag at the same time, - * when using GOOGLE_READER_EDIT_TAG_URL. - * @param i The guid of the item. - * @param prefix The prefix to 's'. @see GOOGLE_READER_EDIT_TAG_ADD_TAG - * @param s The URL of the subscription containing the item. (Note that the - * final value of s is feed + "/" + this string) - * @param a The tag to add. - * @param r The tag to remove - * @param T a token obtained using GOOGLE_READER_TOKEN_URL - */ -#define GOOGLE_READER_EDIT_TAG_AR_TAG "i=%s&s=%s%%2F%s&a=%s&r=%s&ac=edit-tags&T=%s&async=true" - -/** - * Postdata for adding a tag, and removing another tag at the same time, for a - * _link_ item, when using GOOGLE_READER_EDIT_TAG_URL - * @param i The guid of the link (as provided by google) - * @param a The tag to add - * @param r The tag to remove - * @param T a token obtained using GOOGLE_READER_TOKEN_URL - */ -#define GOOGLE_READER_EDIT_TAG_ADD_TAG_FOR_LINK "i=%s&s=user%2F-%2Fsource%2Fcom.google%2Flink&a=%s&r=%s&ac=edit-tags&T=%s&async=true" - -/** A set of tags (states) defined by Google reader */ - -#define GOOGLE_READER_TAG_KEPT_UNREAD "user/-/state/com.google/kept-unread" -#define GOOGLE_READER_TAG_READ "user/-/state/com.google/read" -#define GOOGLE_READER_TAG_TRACKING_KEPT_UNREAD "user/-/state/com.google/tracking-kept-unread" -#define GOOGLE_READER_TAG_STARRED "user/-/state/com.google/starred" - -/** Interval (in seconds) for doing a Quick Update: 10min */ -#define GOOGLE_SOURCE_QUICK_UPDATE_INTERVAL 600 - /** * @returns Google Reader source type implementation info. */ nodeSourceTypePtr google_source_get_type (void); -extern struct subscriptionType googleSourceFeedSubscriptionType; -extern struct subscriptionType googleSourceOpmlSubscriptionType; - -/** - * Find a child node with the given feed source URL. - * - * @param gsource GoogleSource - * @param source a feed source URL to search - * - * @returns a node (or NULL) - */ -nodePtr google_source_get_node_from_source (GoogleSourcePtr gsource, const gchar* source); - -/** - * Tries to update the entire source quickly, by updating only those feeds - * which are known to be updated. Suitable for g_timeout_add. This is an - * internal function. - * - * @param data A pointer to a node id of the source. This pointer will - * be g_free'd if the update fails. - * - * @returns FALSE on update failure - */ -gboolean google_source_quick_update_timeout (gpointer gsource); - -/** - * Migrate a google source child-node from a Liferea 1.4 style read-only - * google source nodes. - * - * @param node The node to migrate (not the nodeSource!) - */ -void google_source_migrate_node (nodePtr node); - -/** - * Perform login for the given Google source. - * - * @param gsource a GoogleSource - * @param flags network request flags - */ -void google_source_login (GoogleSourcePtr gsource, guint32 flags); - #endif diff -Nru liferea-1.8.15/src/fl_sources/google_source_opml.c liferea-1.10.3/src/fl_sources/google_source_opml.c --- liferea-1.8.15/src/fl_sources/google_source_opml.c 2013-06-12 22:35:15.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/google_source_opml.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,457 +0,0 @@ -/** - * @file google_source_opml.c Google reader OPML handling routines. - * - * Copyright (C) 2008 Arnold Noronha - * Copyright (C) 2011 Peter Oliver - * Copyright (C) 2011 Sergey Snitsaruk - * - * 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 "google_source_opml.h" - -#include -#include -#include - -#include "common.h" -#include "debug.h" -#include "feedlist.h" -#include "folder.h" -#include "metadata.h" -#include "node.h" -#include "subscription.h" -#include "xml.h" - -#include "fl_sources/opml_source.h" -#include "fl_sources/google_source.h" -#include "fl_sources/google_source_edit.h" - -/** - * Find a node by the source id. - */ -nodePtr -google_source_opml_get_node_by_source (GoogleSourcePtr gsource, const gchar *source) -{ - return google_source_opml_get_subnode_by_node (gsource->root, source); -} - -/** - * Recursively find a node by the source id. - */ -nodePtr -google_source_opml_get_subnode_by_node (nodePtr node, const gchar *source) -{ - nodePtr subnode; - nodePtr subsubnode; - GSList *iter = node->children; - for (; iter; iter = g_slist_next (iter)) { - subnode = (nodePtr)iter->data; - if (subnode->subscription - && g_str_equal (subnode->subscription->source, source)) - return subnode; - else if (subnode->type->capabilities - & NODE_CAPABILITY_SUBFOLDERS) { - subsubnode = google_source_opml_get_subnode_by_node(subnode, source); - if (subnode != NULL) - return subsubnode; - } - } - return NULL; -} - -/** - * Add "broadcast-friends" to the list of subscriptions if required - */ -static void -google_source_add_broadcast_subscription (GoogleSourcePtr gsource) -{ - const gchar* title = "Friend's Shared Items"; - GSList * iter = NULL; - nodePtr node; - - for (iter = gsource->root->children; iter; iter = g_slist_next (iter)) { - node = (nodePtr) iter->data ; - if (!node->subscription || !node->subscription->source) - continue; - if (g_str_equal (node->subscription->source, GOOGLE_READER_BROADCAST_FRIENDS_URL)) { - return; - } - } - - /* aha! add it! */ - - node = node_new (feed_get_node_type ()); - node_set_title (node, title); - node_set_data (node, feed_new ()); - - node_set_subscription (node, subscription_new (GOOGLE_READER_BROADCAST_FRIENDS_URL, NULL, NULL)); - node->subscription->type = &googleSourceFeedSubscriptionType; - node_set_parent (node, gsource->root, -1); - feedlist_node_imported (node); - - subscription_update (node->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); - subscription_update_favicon (node->subscription); -} - - -/* subscription list merging functions */ - -static void -google_source_check_for_removal (nodePtr node, gpointer user_data) -{ - gchar *expr = NULL; - - if (node->subscription && g_str_equal (node->subscription->source, GOOGLE_READER_BROADCAST_FRIENDS_URL)) - return ; - - if (IS_FEED (node)) { - expr = g_strdup_printf ("/object/list[@name='subscriptions']/object/string[@name='id'][. = 'feed/%s']", node->subscription->source); - } else if (IS_FOLDER (node)) { - node_foreach_child_data (node, google_source_check_for_removal, user_data); - expr = g_strdup_printf ("/object/list[@name='subscriptions']/object/list[@name='categories']/object[string='%s']", node->title); - } else { - g_warning ("google_opml_source_check_for_removal(): This should never happen..."); - return; - } - - if (!xpath_find ((xmlNodePtr)user_data, expr)) { - debug1 (DEBUG_UPDATE, "removing %s...", node_get_title (node)); - feedlist_node_removed (node); - } else { - debug1 (DEBUG_UPDATE, "keeping %s...", node_get_title (node)); - } - g_free (expr); -} - -/* - * Find a node by the name under root or create it. - */ -static nodePtr -google_source_find_or_create_folder (const gchar *name, nodePtr root) -{ - nodePtr folder = NULL; - GSList *iter_parent; - - /* find a node by the name under root */ - iter_parent = root->children; - while (iter_parent) { - if (g_str_equal (name, node_get_title (iter_parent->data))) { - folder = (nodePtr)iter_parent->data; - break; - } - iter_parent = g_slist_next (iter_parent); - } - - /* if not found, create new folder */ - if (!folder) { - folder = node_new (folder_get_node_type ()); - node_set_title (folder, name); - node_set_parent (folder, root, -1); - feedlist_node_imported (folder); - subscription_update (folder->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); - } - - return folder; -} - -/* - * Check if folder of a node changed in Google Reader and move - * node to the folder with the same name. - */ -static void -google_source_update_folder (xmlNodePtr match, GoogleSourcePtr gsource, nodePtr node) -{ - xmlNodePtr xml; - xmlChar *label; - const gchar *ptitle; - nodePtr parent; - - /* check if label of a feed changed */ - parent = node->parent; - ptitle = node_get_title (parent); - xml = xpath_find (match, "./list[@name='categories']/object/string[@name='label']"); - if (xml) { - label = xmlNodeListGetString (xml->doc, xml->xmlChildrenNode, 1); - if (parent == gsource->root || ! g_str_equal (label, ptitle)) { - debug2 (DEBUG_UPDATE, "GSource feed label changed for %s to '%s'", node->id, label); - parent = google_source_find_or_create_folder ((gchar*)label, gsource->root); - node_reparent (node, parent); - } - xmlFree (label); - } else { - /* if feed has no label and parent is not gsource root, reparent to gsource root */ - if (parent != gsource->root) - node_reparent (node, gsource->root); - } -} - -static void -google_source_merge_feed (xmlNodePtr match, gpointer user_data) -{ - GoogleSourcePtr gsource = (GoogleSourcePtr)user_data; - nodePtr node, parent = NULL, subnode = NULL; - GSList *iter, *iter_sub; - xmlNodePtr xml; - xmlChar *title = NULL, *id = NULL, *label = NULL; - gchar *url = NULL; - - xml = xpath_find (match, "./string[@name='title']"); - if (xml) - title = xmlNodeListGetString (xml->doc, xml->xmlChildrenNode, 1); - - xml = xpath_find (match, "./string[@name='id']"); - if (xml) { - id = xmlNodeListGetString (xml->doc, xml->xmlChildrenNode, 1); - url = g_strdup (id + strlen ("feed/")); - } - - /* Note: ids look like "feed/http://rss.slashdot.org" */ - if (id && title) { - - /* check if node to be merged already exists */ - iter = gsource->root->children; - while (iter) { - node = (nodePtr)iter->data; - if (node->subscription != NULL - && g_str_equal (node->subscription->source, url)) { - node->subscription->type = &googleSourceFeedSubscriptionType; - google_source_update_folder (match, gsource, node); - goto cleanup; - } else if (node->type->capabilities - & NODE_CAPABILITY_SUBFOLDERS) { - iter_sub = node->children; - while (iter_sub) { - subnode = (nodePtr)iter_sub->data; - if (subnode->subscription != NULL - && g_str_equal (subnode->subscription->source, url)) { - subnode->subscription->type = &googleSourceFeedSubscriptionType; - google_source_update_folder (match, gsource, subnode); - goto cleanup; - } - iter_sub = g_slist_next (iter_sub); - } - } - iter = g_slist_next (iter); - } - - /* if a new feed contains label, put its node under a folder with the same name */ - xml = xpath_find (match, "./list[@name='categories']/object/string[@name='label']"); - if (xml) { - label = xmlNodeListGetString (xml->doc, xml->xmlChildrenNode, 1); - parent = google_source_find_or_create_folder ((gchar*)label, gsource->root); - xmlFree (label); - } else { - parent = gsource->root; - } - - g_assert (NULL != parent); - - debug2 (DEBUG_UPDATE, "adding %s (%s)", title, url); - node = node_new (feed_get_node_type ()); - node_set_title (node, title); - node_set_data (node, feed_new ()); - - node_set_subscription (node, subscription_new (url, NULL, NULL)); - node->subscription->type = &googleSourceFeedSubscriptionType; - node_set_parent (node, parent, -1); - feedlist_node_imported (node); - - /** - * @todo mark the ones as read immediately after this is done - * the feed as retrieved by this has the read and unread - * status inherently. - */ - subscription_update (node->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); - subscription_update_favicon (node->subscription); - } else { - g_warning("Unable to parse subscription information from Google"); - } - -cleanup: - xmlFree (id); - xmlFree (title); - g_free (url) ; -} - - -/* OPML subscription type implementation */ - -static void -google_subscription_opml_cb (subscriptionPtr subscription, const struct updateResult * const result, updateFlags flags) -{ - GoogleSourcePtr gsource = (GoogleSourcePtr) subscription->node->data; - - if (result->data) { - xmlDocPtr doc = xml_parse (result->data, result->size, NULL); - if(doc) { - xmlNodePtr root = xmlDocGetRootElement (doc); - - /* Go through all existing nodes and remove those whose - URLs are not in new feed list. Also removes those URLs - from the list that have corresponding existing nodes. */ - node_foreach_child_data (subscription->node, google_source_check_for_removal, (gpointer)root); - node_foreach_child (subscription->node, google_source_migrate_node); - - opml_source_export (subscription->node); /* save new feed list tree to disk - to ensure correct document in - next step */ - - xpath_foreach_match (root, "/object/list[@name='subscriptions']/object", - google_source_merge_feed, - (gpointer)gsource); - google_source_add_broadcast_subscription (gsource) ; - - opml_source_export (subscription->node); /* save new feeds to feed list */ - - subscription->node->available = TRUE; - xmlFreeDoc (doc); - } else { - /** @todo The session seems to have expired */ - g_warning ("Unable to parse OPML list from google, the session might have expired.\n"); - } - } else { - subscription->node->available = FALSE; - debug0 (DEBUG_UPDATE, "google_subscription_opml_cb(): ERROR: failed to get subscription list!\n"); - } - - if (!(flags & GOOGLE_SOURCE_UPDATE_ONLY_LIST)) - node_foreach_child_data (subscription->node, node_update_subscription, GUINT_TO_POINTER (0)); - -} - -/** functions for an efficient updating mechanism */ - -static void -google_source_opml_quick_update_helper (xmlNodePtr match, gpointer userdata) -{ - GoogleSourcePtr gsource = (GoogleSourcePtr) userdata; - xmlNodePtr xmlNode; - xmlChar *id, *newestItemTimestamp; - nodePtr node = NULL; - const gchar *oldNewestItemTimestamp; - - xmlNode = xpath_find (match, "./string[@name='id']"); - id = xmlNodeGetContent (xmlNode); - - if (g_str_has_prefix (id, "feed/")) - node = google_source_opml_get_node_by_source (gsource, id + strlen ("feed/")); - else if (g_str_has_suffix (id, "broadcast-friends")) - node = google_source_opml_get_node_by_source (gsource, id); - else { - xmlFree (id); - return; - } - - if (node == NULL) { - xmlFree (id); - return; - } - - xmlNode = xpath_find (match, "./number[@name='newestItemTimestampUsec']"); - newestItemTimestamp = xmlNodeGetContent (xmlNode); - - oldNewestItemTimestamp = g_hash_table_lookup (gsource->lastTimestampMap, node->subscription->source); - - if (!oldNewestItemTimestamp || - (newestItemTimestamp && - !g_str_equal (newestItemTimestamp, oldNewestItemTimestamp))) { - debug3(DEBUG_UPDATE, "GoogleSource: auto-updating %s " - "[oldtimestamp%s, timestamp %s]", - id, oldNewestItemTimestamp, newestItemTimestamp); - g_hash_table_insert (gsource->lastTimestampMap, - g_strdup (node->subscription->source), - g_strdup (newestItemTimestamp)); - - subscription_update (node->subscription, 0); - } - - xmlFree (newestItemTimestamp); - xmlFree (id); -} - -static void -google_source_opml_quick_update_cb (const struct updateResult* const result, gpointer userdata, updateFlags flags) -{ - GoogleSourcePtr gsource = (GoogleSourcePtr) userdata; - xmlDocPtr doc; - - if (!result->data) { - /* what do I do? */ - debug0 (DEBUG_UPDATE, "GoogleSource: Unable to get unread counts, this update is aborted."); - return; - } - 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; - } - - xpath_foreach_match (xmlDocGetRootElement (doc), - "/object/list[@name='unreadcounts']/object", - google_source_opml_quick_update_helper, gsource); - - xmlFreeDoc (doc); -} - -gboolean -google_source_opml_quick_update(GoogleSourcePtr gsource) -{ - updateRequestPtr 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_source (request, GOOGLE_READER_UNREAD_COUNTS_URL); - update_request_set_auth_value(request, gsource->authHeaderValue); - - update_execute_request (gsource, request, google_source_opml_quick_update_cb, - gsource, 0); - - return TRUE; -} - - -static void -google_source_opml_subscription_process_update_result (subscriptionPtr subscription, const struct updateResult * const result, updateFlags flags) -{ - google_subscription_opml_cb (subscription, result, flags); -} - -static gboolean -google_source_opml_subscription_prepare_update_request (subscriptionPtr subscription, struct updateRequest *request) -{ - GoogleSourcePtr gsource = (GoogleSourcePtr)subscription->node->data; - - g_assert(gsource); - if (gsource->loginState == GOOGLE_SOURCE_STATE_NONE) { - debug0(DEBUG_UPDATE, "GoogleSource: login"); - google_source_login ((GoogleSourcePtr) subscription->node->data, 0) ; - return FALSE; - } - debug1 (DEBUG_UPDATE, "updating Google Reader subscription (node id %s)", subscription->node->id); - - update_request_set_source (request, GOOGLE_READER_SUBSCRIPTION_LIST_URL); - - update_request_set_auth_value (request, gsource->authHeaderValue); - - return TRUE; -} - -/* OPML subscription type definition */ - -struct subscriptionType googleSourceOpmlSubscriptionType = { - google_source_opml_subscription_prepare_update_request, - google_source_opml_subscription_process_update_result -}; diff -Nru liferea-1.8.15/src/fl_sources/google_source_opml.h liferea-1.10.3/src/fl_sources/google_source_opml.h --- liferea-1.8.15/src/fl_sources/google_source_opml.h 2012-12-11 17:10:01.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/google_source_opml.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -/** - * Copyright (C) 2009 Adrian Bunk - * - * 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 "fl_sources/google_source.h" - -/** - * Find a node by the source id. - * - * @param gsource the Google Reader source - * @param source the feed id to find - * - * @returns a node (or NULL) - */ -nodePtr google_source_opml_get_node_by_source(GoogleSourcePtr gsource, - const gchar *source); - -/** - * Recursively find a node by the source id. - * - * @param gsource the Google Reader source - * @param source the feed id to find - * - * @returns a node (or NULL) - */ -nodePtr google_source_opml_get_subnode_by_node(nodePtr node, const gchar *source); - -/** - * Perform a quick update of the Google Reader source. - * - * @param gsource the Google Reader source - */ -gboolean google_source_opml_quick_update (GoogleSourcePtr gsource); diff -Nru liferea-1.8.15/src/fl_sources/inoreader_source.c liferea-1.10.3/src/fl_sources/inoreader_source.c --- liferea-1.8.15/src/fl_sources/inoreader_source.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/inoreader_source.c 2013-08-10 00:50:57.000000000 +0200 @@ -0,0 +1,417 @@ +/** + * @file inoreader_source.c Google reader feed list source support + * + * Copyright (C) 2007-2013 Lars Windolf + * Copyright (C) 2008 Arnold Noronha + * Copyright (C) 2011 Peter Oliver + * Copyright (C) 2011 Sergey Snitsaruk + * + * 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 "fl_sources/inoreader_source.h" + +#include +#include +#include +#include + +#include "common.h" +#include "debug.h" +#include "feedlist.h" +#include "item_state.h" +#include "metadata.h" +#include "node.h" +#include "subscription.h" +#include "update.h" +#include "xml.h" +#include "ui/auth_dialog.h" +#include "ui/liferea_dialog.h" +#include "fl_sources/node_source.h" +#include "fl_sources/opml_source.h" +#include "fl_sources/inoreader_source_edit.h" +#include "fl_sources/inoreader_source_feed_list.h" + +/** default reader subscription list update interval = once a day */ +#define INOREADER_SOURCE_UPDATE_INTERVAL 60*60*24 + +/** create a source with given node as root */ +static InoreaderSourcePtr +inoreader_source_new (nodePtr node) +{ + InoreaderSourcePtr source = g_new0 (struct InoreaderSource, 1) ; + source->root = node; + source->actionQueue = g_queue_new (); + source->loginState = INOREADER_SOURCE_STATE_NONE; + source->lastTimestampMap = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + + return source; +} + +static void +inoreader_source_free (InoreaderSourcePtr gsource) +{ + if (!gsource) + return; + + update_job_cancel_by_owner (gsource); + + g_free (gsource->authHeaderValue); + g_queue_free (gsource->actionQueue) ; + g_hash_table_unref (gsource->lastTimestampMap); + g_free (gsource); +} + +static void +inoreader_source_login_cb (const struct updateResult * const result, gpointer userdata, updateFlags flags) +{ + InoreaderSourcePtr gsource = (InoreaderSourcePtr) userdata; + gchar *tmp = NULL; + subscriptionPtr subscription = gsource->root->subscription; + + debug1 (DEBUG_UPDATE, "InoReader login processing... %s", result->data); + + g_assert (!gsource->authHeaderValue); + + if (result->data && result->httpstatus == 200) + tmp = strstr (result->data, "Auth="); + + if (tmp) { + gchar *ttmp = tmp; + tmp = strchr (tmp, '\n'); + if (tmp) + *tmp = '\0'; + gsource->authHeaderValue = g_strdup_printf ("GoogleLogin auth=%s", ttmp + 5); + + debug1 (DEBUG_UPDATE, "InoReader Auth token found: %s", gsource->authHeaderValue); + + gsource->loginState = INOREADER_SOURCE_STATE_ACTIVE; + gsource->authFailures = 0; + + /* now that we are authenticated trigger updating to start data retrieval */ + if (!(flags & INOREADER_SOURCE_UPDATE_ONLY_LOGIN)) + subscription_update (subscription, flags); + + /* process any edits waiting in queue */ + inoreader_source_edit_process (gsource); + + } else { + debug0 (DEBUG_UPDATE, "InoReader login failed! no Auth token found in result!"); + subscription->node->available = FALSE; + + g_free (subscription->updateError); + subscription->updateError = g_strdup (_("InoReader login failed!")); + gsource->authFailures++; + + if (gsource->authFailures < INOREADER_SOURCE_MAX_AUTH_FAILURES) + gsource->loginState = INOREADER_SOURCE_STATE_NONE; + else + gsource->loginState = INOREADER_SOURCE_STATE_NO_AUTH; + + auth_dialog_new (subscription, flags); + } +} + +/** + * Perform a login to Google Reader, if the login completes the + * InoreaderSource will have a valid Auth token and will have loginStatus to + * INOREADER_SOURCE_LOGIN_ACTIVE. + */ +void +inoreader_source_login (InoreaderSourcePtr gsource, guint32 flags) +{ + gchar *username, *password; + updateRequestPtr request; + subscriptionPtr subscription = gsource->root->subscription; + + if (gsource->loginState != INOREADER_SOURCE_STATE_NONE) { + /* this should not happen, as of now, we assume the session + * doesn't expire. */ + debug1(DEBUG_UPDATE, "Logging in while login state is %d\n", gsource->loginState); + } + + request = update_request_new (); + + update_request_set_source (request, INOREADER_LOGIN_URL); + + /* escape user and password as both are passed using an URI */ + username = g_uri_escape_string (subscription->updateOptions->username, NULL, TRUE); + password = g_uri_escape_string (subscription->updateOptions->password, NULL, TRUE); + + request->postdata = g_strdup_printf (INOREADER_LOGIN_POST, username, password); + request->options = update_options_copy (subscription->updateOptions); + + g_free (username); + g_free (password); + + gsource->loginState = INOREADER_SOURCE_STATE_IN_PROGRESS ; + + update_execute_request (gsource, request, inoreader_source_login_cb, gsource, flags); +} + +/* node source type implementation */ + +static void +inoreader_source_update (nodePtr node) +{ + InoreaderSourcePtr gsource = (InoreaderSourcePtr) node->data; + + /* Reset INOREADER_SOURCE_STATE_NO_AUTH as this is a manual + user interaction and no auto-update so we can query + for credentials again. */ + if (gsource->loginState == INOREADER_SOURCE_STATE_NO_AUTH) + gsource->loginState = INOREADER_SOURCE_STATE_NONE; + + subscription_update (node->subscription, 0); // FIXME: 0 ? +} + +static void +inoreader_source_auto_update (nodePtr node) +{ + GTimeVal now; + InoreaderSourcePtr gsource = (InoreaderSourcePtr) node->data; + + if (gsource->loginState == INOREADER_SOURCE_STATE_NONE) { + inoreader_source_update (node); + return; + } + + if (gsource->loginState == INOREADER_SOURCE_STATE_IN_PROGRESS) + return; /* the update will start automatically anyway */ + + g_get_current_time (&now); + + /* do daily updates for the feed list and feed updates according to the default interval */ + if (node->subscription->updateState->lastPoll.tv_sec + INOREADER_SOURCE_UPDATE_INTERVAL <= now.tv_sec) { + subscription_update (node->subscription, 0); + g_get_current_time (&gsource->lastQuickUpdate); + } + else if (gsource->lastQuickUpdate.tv_sec + INOREADER_SOURCE_QUICK_UPDATE_INTERVAL <= now.tv_sec) { + inoreader_source_opml_quick_update (gsource); + inoreader_source_edit_process (gsource); + g_get_current_time (&gsource->lastQuickUpdate); + } +} + +static void +inoreader_source_init (void) +{ + metadata_type_register ("inoreader-feed-id", METADATA_TYPE_TEXT); +} + +static void inoreader_source_deinit (void) { } + +static void +inoreader_source_import_node (nodePtr node) +{ + GSList *iter; + for (iter = node->children; iter; iter = g_slist_next(iter)) { + nodePtr subnode = iter->data; + if (subnode->subscription) + subnode->subscription->type = &inoreaderSourceFeedSubscriptionType; + if (subnode->type->capabilities + & NODE_CAPABILITY_SUBFOLDERS) + inoreader_source_import_node (subnode); + } +} + +static void +inoreader_source_import (nodePtr node) +{ + opml_source_import (node); + + node->subscription->type = &inoreaderSourceOpmlSubscriptionType; + if (!node->data) + node->data = (gpointer) inoreader_source_new (node); + + inoreader_source_import_node (node); +} + +static void +inoreader_source_export (nodePtr node) +{ + opml_source_export (node); +} + +static gchar * +inoreader_source_get_feedlist (nodePtr node) +{ + return opml_source_get_feedlist (node); +} + +static void +inoreader_source_remove (nodePtr node) +{ + opml_source_remove (node); +} + +static nodePtr +inoreader_source_add_subscription (nodePtr node, subscriptionPtr subscription) +{ + debug_enter ("inoreader_source_add_subscription"); + nodePtr child = node_new (feed_get_node_type ()); + + debug0 (DEBUG_UPDATE, "InoreaderSource: Adding a new subscription"); + node_set_data (child, feed_new ()); + + node_set_subscription (child, subscription); + child->subscription->type = &inoreaderSourceFeedSubscriptionType; + + node_set_title (child, _("New Subscription")); + + inoreader_source_edit_add_subscription (node_source_root_from_node (node)->data, subscription->source); + + debug_exit ("inoreader_source_add_subscription"); + + return child; +} + +static void +inoreader_source_remove_node (nodePtr node, nodePtr child) +{ + gchar *source; + InoreaderSourcePtr gsource = node->data; + + if (child == node) { + feedlist_node_removed (child); + return; + } + + source = g_strdup (child->subscription->source); + + feedlist_node_removed (child); + + /* propagate the removal only if there aren't other copies */ + if (!inoreader_source_opml_get_node_by_source (gsource, source)) + inoreader_source_edit_remove_subscription (gsource, source); + + g_free (source); +} + +/* GUI callbacks */ + +static void +on_inoreader_source_selected (GtkDialog *dialog, + gint response_id, + gpointer user_data) +{ + nodePtr node; + subscriptionPtr subscription; + + if (response_id == GTK_RESPONSE_OK) { + subscription = subscription_new ("http://www.inoreader.com/reader", NULL, NULL); + node = node_new (node_source_get_node_type ()); + node_set_title (node, "InoReader"); + node_source_new (node, inoreader_source_get_type ()); + node_set_subscription (node, subscription); + + subscription_set_auth_info (subscription, + gtk_entry_get_text (GTK_ENTRY (liferea_dialog_lookup (GTK_WIDGET(dialog), "userEntry"))), + gtk_entry_get_text (GTK_ENTRY (liferea_dialog_lookup (GTK_WIDGET(dialog), "passwordEntry")))); + + subscription->type = &inoreaderSourceOpmlSubscriptionType ; + + node->data = inoreader_source_new (node); + feedlist_node_added (node); + inoreader_source_update (node); + } + + gtk_widget_destroy (GTK_WIDGET (dialog)); +} + +static void +ui_inoreader_source_get_account_info (void) +{ + GtkWidget *dialog; + + dialog = liferea_dialog_new ("inoreader_source.ui", "inoreader_source_dialog"); + + g_signal_connect (G_OBJECT (dialog), "response", + G_CALLBACK (on_inoreader_source_selected), + NULL); +} + +static void +inoreader_source_cleanup (nodePtr node) +{ + InoreaderSourcePtr reader = (InoreaderSourcePtr) node->data; + inoreader_source_free(reader); + node->data = NULL ; +} + +static void +inoreader_source_item_set_flag (nodePtr node, itemPtr item, gboolean newStatus) +{ + nodePtr root = node_source_root_from_node (node); + inoreader_source_edit_mark_starred ((InoreaderSourcePtr)root->data, item->sourceId, node->subscription->source, newStatus); + item_flag_state_changed (item, newStatus); +} + +static void +inoreader_source_item_mark_read (nodePtr node, itemPtr item, gboolean newStatus) +{ + nodePtr root = node_source_root_from_node (node); + inoreader_source_edit_mark_read ((InoreaderSourcePtr)root->data, item->sourceId, node->subscription->source, newStatus); + item_read_state_changed (item, newStatus); +} + +/** + * Convert all subscriptions of a google source to local feeds + * + * @param node The node to migrate (not the nodeSource!) + */ +static void +inoreader_source_convert_to_local (nodePtr node) +{ + InoreaderSourcePtr gsource = node->data; + + gsource->loginState = INOREADER_SOURCE_STATE_MIGRATE; +} + +/* node source type definition */ + +static struct nodeSourceType nst = { + .id = "fl_inoreader", + .name = N_("InoReader"), + .description = N_("Integrate the feed list of your InoReader account. Liferea will " + "present your InoReader subscriptions, and will synchronize your feed list and reading lists."), + .capabilities = NODE_SOURCE_CAPABILITY_DYNAMIC_CREATION | + NODE_SOURCE_CAPABILITY_WRITABLE_FEEDLIST | + NODE_SOURCE_CAPABILITY_ADD_FEED | + NODE_SOURCE_CAPABILITY_ITEM_STATE_SYNC | + NODE_SOURCE_CAPABILITY_CONVERT_TO_LOCAL, + .source_type_init = inoreader_source_init, + .source_type_deinit = inoreader_source_deinit, + .source_new = ui_inoreader_source_get_account_info, + .source_delete = inoreader_source_remove, + .source_import = inoreader_source_import, + .source_export = inoreader_source_export, + .source_get_feedlist = inoreader_source_get_feedlist, + .source_update = inoreader_source_update, + .source_auto_update = inoreader_source_auto_update, + .free = inoreader_source_cleanup, + .item_set_flag = inoreader_source_item_set_flag, + .item_mark_read = inoreader_source_item_mark_read, + .add_folder = NULL, + .add_subscription = inoreader_source_add_subscription, + .remove_node = inoreader_source_remove_node, + .convert_to_local = inoreader_source_convert_to_local +}; + +nodeSourceTypePtr +inoreader_source_get_type (void) +{ + return &nst; +} diff -Nru liferea-1.8.15/src/fl_sources/inoreader_source_edit.c liferea-1.10.3/src/fl_sources/inoreader_source_edit.c --- liferea-1.8.15/src/fl_sources/inoreader_source_edit.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/inoreader_source_edit.c 2013-08-10 00:34:46.000000000 +0200 @@ -0,0 +1,486 @@ +/** + * @file inoreader_source_edit.c Google reader feed list source syncing support + * + * Copyright (C) 2008 Arnold Noronha + * + * 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 "debug.h" +#include "update.h" +#include "subscription.h" +#include "common.h" +#include "feedlist.h" + + +#include "inoreader_source.h" +#include "inoreader_source_edit.h" +#include "config.h" +#include +#include +#include +#include "xml.h" + +/** + * A structure to indicate an edit to the Google Reader "database". + * These edits are put in a queue and processed in sequential order + * so that google does not end up processing the requests in an + * unintended order. + */ +typedef struct InoreaderSourceAction { + /** + * The guid of the item to edit. This will be ignored if the + * edit is acting on an subscription rather than an item. + */ + gchar* guid; + + /** + * A MANDATORY feed url to containing the item, or the url of the + * subscription to edit. + */ + gchar* feedUrl; + + /** + * The source type. Currently known types are "feed" and "user". + * "user" sources are used, for example, for items that are links (as + * opposed to posts) in broadcast-friends. The unique id of the source + * is of the form /. + */ + gchar* feedUrlType; + + /** + * A callback function on completion of the edit. + */ + void (*callback) (InoreaderSourcePtr gsource, struct InoreaderSourceAction* edit, gboolean success); + + /** + * The type of this InoreaderSourceAction. + */ + int actionType ; +} *InoreaderSourceActionPtr ; + +enum { + EDIT_ACTION_MARK_READ, + EDIT_ACTION_MARK_UNREAD, + EDIT_ACTION_TRACKING_MARK_UNREAD, /**< every UNREAD request, should be followed by tracking-kept-unread */ + EDIT_ACTION_MARK_STARRED, + EDIT_ACTION_MARK_UNSTARRED, + EDIT_ACTION_ADD_SUBSCRIPTION, + EDIT_ACTION_REMOVE_SUBSCRIPTION +} ; + + +typedef struct InoreaderSourceAction* editPtr ; + +typedef struct InoreaderSourceActionCtxt { + gchar *nodeId ; + InoreaderSourceActionPtr action; +} *InoreaderSourceActionCtxtPtr; + + +static void inoreader_source_edit_push (InoreaderSourcePtr gsource, InoreaderSourceActionPtr action, gboolean head); + + +static InoreaderSourceActionPtr +inoreader_source_action_new (void) +{ + InoreaderSourceActionPtr action = g_slice_new0 (struct InoreaderSourceAction); + return action; +} + +static void +inoreader_source_action_free (InoreaderSourceActionPtr action) +{ + g_free (action->guid); + g_free (action->feedUrl); + g_slice_free (struct InoreaderSourceAction, action); +} + +static InoreaderSourceActionCtxtPtr +inoreader_source_action_context_new(InoreaderSourcePtr gsource, InoreaderSourceActionPtr action) +{ + InoreaderSourceActionCtxtPtr ctxt = g_slice_new0(struct InoreaderSourceActionCtxt); + ctxt->nodeId = g_strdup(gsource->root->id); + ctxt->action = action; + return ctxt; +} + +static void +inoreader_source_action_context_free(InoreaderSourceActionCtxtPtr ctxt) +{ + g_free(ctxt->nodeId); + g_slice_free(struct InoreaderSourceActionCtxt, ctxt); +} + +static void +inoreader_source_edit_action_complete (const struct updateResult* const result, gpointer userdata, updateFlags flags) +{ + InoreaderSourceActionCtxtPtr editCtxt = (InoreaderSourceActionCtxtPtr) userdata; + nodePtr node = node_from_id (editCtxt->nodeId); + InoreaderSourcePtr gsource; + InoreaderSourceActionPtr action = editCtxt->action ; + + inoreader_source_action_context_free (editCtxt); + + if (!node) { + inoreader_source_action_free (action); + return; /* probably got deleted before this callback */ + } + gsource = (InoreaderSourcePtr) node->data; + + if (result->data == NULL || !g_str_equal (result->data, "OK")) { + if (action->callback) + (*action->callback) (gsource, action, FALSE); + debug1 (DEBUG_UPDATE, "The edit action failed with result: %s\n", result->data); + inoreader_source_action_free (action); + return; /** @todo start a timer for next processing */ + } + + if (action->callback) + action->callback (gsource, action, TRUE); + + inoreader_source_action_free (action); + + /* process anything else waiting on the edit queue */ + inoreader_source_edit_process (gsource); +} + +/* the following inoreader_source_api_* functions are simply funtions that + convert a InoreaderSourceActionPtr to a updateRequestPtr */ + +static void +inoreader_source_api_add_subscription (InoreaderSourceActionPtr action, updateRequestPtr request, const gchar* token) +{ + update_request_set_source (request, INOREADER_ADD_SUBSCRIPTION_URL); + gchar* s_escaped = g_uri_escape_string (action->feedUrl, NULL, TRUE) ; + gchar* postdata = g_strdup_printf (INOREADER_ADD_SUBSCRIPTION_POST, s_escaped, token); + g_free (s_escaped); + + debug1 (DEBUG_UPDATE, "inoreader_source: postdata [%s]", postdata); + request->postdata = postdata ; +} + +static void +inoreader_source_api_remove_subscription (InoreaderSourceActionPtr action, updateRequestPtr request, const gchar* token) +{ + update_request_set_source (request, INOREADER_REMOVE_SUBSCRIPTION_URL); + gchar* s_escaped = g_uri_escape_string (action->feedUrl, NULL, TRUE); + g_assert (!request->postdata); + request->postdata = g_strdup_printf (INOREADER_REMOVE_SUBSCRIPTION_POST, s_escaped, token); + g_free (s_escaped); +} + +static void +inoreader_source_api_edit_tag (InoreaderSourceActionPtr action, updateRequestPtr request, const gchar*token) +{ + update_request_set_source (request, INOREADER_EDIT_TAG_URL); + + const gchar* prefix = "feed" ; + gchar* s_escaped = g_uri_escape_string (action->feedUrl, NULL, TRUE); + gchar* a_escaped = NULL ; + gchar* i_escaped = g_uri_escape_string (action->guid, NULL, TRUE); + gchar* postdata = NULL ; + + /* + * If the source of the item is a feed then the source *id* will be of + * the form tag:google.com,2005:reader/feed/http://foo.com/bar + * If the item is a shared link it is of the form + * tag:google.com,2005:reader/user//source/com.google/link + * It is possible that there are items other thank link that has + * the ../user/.. id. The GR API requires the strings after ..:reader/ + * while InoreaderSourceAction only gives me after :reader/feed/ (or + * :reader/user/ as the case might be). I therefore need to guess + * the prefix ('feed/' or 'user/') from just this information. + */ + + if (strstr(action->feedUrl, "://") == NULL) + prefix = "user" ; + + if (action->actionType == EDIT_ACTION_MARK_UNREAD) { + a_escaped = g_uri_escape_string (INOREADER_TAG_KEPT_UNREAD, NULL, TRUE); + gchar *r_escaped = g_uri_escape_string (INOREADER_TAG_READ, NULL, TRUE); + postdata = g_strdup_printf (INOREADER_EDIT_TAG_AR_TAG, i_escaped, prefix, s_escaped, a_escaped, r_escaped, token); + g_free (r_escaped); + } + else if (action->actionType == EDIT_ACTION_MARK_READ) { + a_escaped = g_uri_escape_string (INOREADER_TAG_READ, NULL, TRUE); + postdata = g_strdup_printf (INOREADER_EDIT_TAG_ADD_TAG, i_escaped, prefix, s_escaped, a_escaped, token); + } + else if (action->actionType == EDIT_ACTION_TRACKING_MARK_UNREAD) { + a_escaped = g_uri_escape_string (INOREADER_TAG_TRACKING_KEPT_UNREAD, NULL, TRUE); + postdata = g_strdup_printf (INOREADER_EDIT_TAG_ADD_TAG, i_escaped, prefix, s_escaped, a_escaped, token); + } + else if (action->actionType == EDIT_ACTION_MARK_STARRED) { + a_escaped = g_uri_escape_string (INOREADER_TAG_STARRED, NULL, TRUE) ; + postdata = g_strdup_printf ( + INOREADER_EDIT_TAG_ADD_TAG, i_escaped, prefix, + s_escaped, a_escaped, token); + } + else if (action->actionType == EDIT_ACTION_MARK_UNSTARRED) { + gchar* r_escaped = g_uri_escape_string(INOREADER_TAG_STARRED, NULL, TRUE); + postdata = g_strdup_printf ( + INOREADER_EDIT_TAG_REMOVE_TAG, i_escaped, prefix, + s_escaped, r_escaped, token); + } + + else g_assert (FALSE); + + g_free (s_escaped); + g_free (a_escaped); + g_free (i_escaped); + + debug1 (DEBUG_UPDATE, "inoreader_source: postdata [%s]", postdata); + + + request->postdata = postdata; +} + +static void +inoreader_source_edit_token_cb (const struct updateResult * const result, gpointer userdata, updateFlags flags) +{ + nodePtr node; + InoreaderSourcePtr gsource; + const gchar* token; + InoreaderSourceActionPtr action; + updateRequestPtr request; + + if (result->httpstatus != 200 || result->data == NULL) { + /* FIXME: What is the behaviour that should go here? */ + return; + } + + node = node_from_id ((gchar*) userdata); + g_free (userdata); + + if (!node) { + return; + } + gsource = (InoreaderSourcePtr) node->data; + + + token = result->data; + + if (!gsource || g_queue_is_empty (gsource->actionQueue)) + return; + + action = g_queue_peek_head (gsource->actionQueue); + + 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); + + if (action->actionType == EDIT_ACTION_MARK_READ || + action->actionType == EDIT_ACTION_MARK_UNREAD || + action->actionType == EDIT_ACTION_TRACKING_MARK_UNREAD || + action->actionType == EDIT_ACTION_MARK_STARRED || + action->actionType == EDIT_ACTION_MARK_UNSTARRED) + inoreader_source_api_edit_tag (action, request, token); + else if (action->actionType == EDIT_ACTION_ADD_SUBSCRIPTION ) + inoreader_source_api_add_subscription (action, request, token); + else if (action->actionType == EDIT_ACTION_REMOVE_SUBSCRIPTION ) + inoreader_source_api_remove_subscription (action, request, token) ; + + update_execute_request (gsource, request, inoreader_source_edit_action_complete, inoreader_source_action_context_new(gsource, action), 0); + + action = g_queue_pop_head (gsource->actionQueue); +} + +void +inoreader_source_edit_process (InoreaderSourcePtr gsource) +{ + updateRequestPtr request; + + g_assert (gsource); + if (g_queue_is_empty (gsource->actionQueue)) + return; + + /* + * Google reader has a system of tokens. So first, I need to request a + * token from google, before I can make the actual edit request. The + * code here is the token code, the actual edit commands are in + * inoreader_source_edit_token_cb + */ + request = update_request_new (); + request->updateState = update_state_copy (gsource->root->subscription->updateState); + request->options = update_options_copy (gsource->root->subscription->updateOptions); + request->source = g_strdup (INOREADER_TOKEN_URL); + update_request_set_auth_value(request, gsource->authHeaderValue); + + update_execute_request (gsource, request, inoreader_source_edit_token_cb, + g_strdup(gsource->root->id), 0); +} + +static void +inoreader_source_edit_push_ (InoreaderSourcePtr gsource, InoreaderSourceActionPtr action, gboolean head) +{ + g_assert (gsource->actionQueue); + if (head) g_queue_push_head (gsource->actionQueue, action); + else g_queue_push_tail (gsource->actionQueue, action); +} + +static void +inoreader_source_edit_push (InoreaderSourcePtr gsource, InoreaderSourceActionPtr action, gboolean head) +{ + g_assert (gsource); + nodePtr root = gsource->root; + inoreader_source_edit_push_ (gsource, action, head); + + /** @todo any flags I should specify? */ + if (gsource->loginState == INOREADER_SOURCE_STATE_NONE) + subscription_update(root->subscription, INOREADER_SOURCE_UPDATE_ONLY_LOGIN); + else if ( gsource->loginState == INOREADER_SOURCE_STATE_ACTIVE) + inoreader_source_edit_process (gsource); +} + +static void +update_read_state_callback (InoreaderSourcePtr gsource, InoreaderSourceActionPtr action, gboolean success) +{ + if (success) { + // FIXME: call item_read_state_changed (item, newState); + } else { + debug0 (DEBUG_UPDATE, "Failed to change item state!\n"); + } +} + +void +inoreader_source_edit_mark_read (InoreaderSourcePtr gsource, const gchar *guid, const gchar *feedUrl, gboolean newStatus) +{ + InoreaderSourceActionPtr action = inoreader_source_action_new (); + + action->guid = g_strdup (guid); + action->feedUrl = g_strdup (feedUrl); + action->actionType = newStatus ? EDIT_ACTION_MARK_READ : + EDIT_ACTION_MARK_UNREAD; + action->callback = update_read_state_callback; + + inoreader_source_edit_push (gsource, action, FALSE); + + if (newStatus == FALSE) { + /* + * According to the Google Reader API, to mark an item unread, + * I also need to mark it as tracking-kept-unread in a separate + * network call. + */ + action = inoreader_source_action_new (); + action->guid = g_strdup (guid); + action->feedUrl = g_strdup (feedUrl); + action->actionType = EDIT_ACTION_TRACKING_MARK_UNREAD; + inoreader_source_edit_push (gsource, action, FALSE); + } +} + +static void +update_starred_state_callback(InoreaderSourcePtr gsource, InoreaderSourceActionPtr action, gboolean success) +{ + if (success) { + // FIXME: call item_flag_changed (item, newState); + } else { + debug0 (DEBUG_UPDATE, "Failed to change item state!\n"); + } +} + +void +inoreader_source_edit_mark_starred (InoreaderSourcePtr gsource, const gchar *guid, const gchar *feedUrl, gboolean newStatus) +{ + InoreaderSourceActionPtr action = inoreader_source_action_new (); + + action->guid = g_strdup (guid); + action->feedUrl = g_strdup (feedUrl); + action->actionType = newStatus ? EDIT_ACTION_MARK_STARRED : EDIT_ACTION_MARK_UNSTARRED; + action->callback = update_starred_state_callback; + + inoreader_source_edit_push (gsource, action, FALSE); +} + +static void +update_subscription_list_callback(InoreaderSourcePtr gsource, InoreaderSourceActionPtr action, gboolean success) +{ + if (success) { + /* + * It is possible that Google changed the name of the URL that + * was sent to it. In that case, I need to recover the URL + * from the list. But a node with the old URL has already + * been created. Allow the subscription update call to fix that. + */ + GSList* cur = gsource->root->children ; + for(; cur; cur = g_slist_next (cur)) { + nodePtr node = (nodePtr) cur->data ; + if (g_str_equal (node->subscription->source, action->feedUrl)) { + subscription_set_source (node->subscription, ""); + feedlist_node_added (node); + } + } + + debug0 (DEBUG_UPDATE, "Subscription list was updated successful\n"); + subscription_update (gsource->root->subscription, INOREADER_SOURCE_UPDATE_ONLY_LIST); + } else + debug0 (DEBUG_UPDATE, "Failed to update subscriptions\n"); +} + +void +inoreader_source_edit_add_subscription (InoreaderSourcePtr gsource, const gchar* feedUrl) +{ + InoreaderSourceActionPtr action = inoreader_source_action_new () ; + action->actionType = EDIT_ACTION_ADD_SUBSCRIPTION; + action->feedUrl = g_strdup (feedUrl); + action->callback = update_subscription_list_callback; + inoreader_source_edit_push (gsource, action, TRUE); +} + +static void +inoreader_source_edit_remove_callback (InoreaderSourcePtr gsource, InoreaderSourceActionPtr action, gboolean success) +{ + if (success) { + /* + * The node was removed from the feedlist, but could have + * returned because of an update before this edit request + * completed. No cleaner way to handle this. + */ + GSList* cur = gsource->root->children ; + for(; cur; cur = g_slist_next (cur)) { + nodePtr node = (nodePtr) cur->data ; + if (g_str_equal (node->subscription->source, action->feedUrl)) { + feedlist_node_removed (node); + return; + } + } + } else + debug0 (DEBUG_UPDATE, "Failed to remove subscription"); +} + +void inoreader_source_edit_remove_subscription (InoreaderSourcePtr gsource, const gchar* feedUrl) +{ + InoreaderSourceActionPtr action = inoreader_source_action_new (); + action->actionType = EDIT_ACTION_REMOVE_SUBSCRIPTION; + action->feedUrl = g_strdup (feedUrl); + action->callback = inoreader_source_edit_remove_callback; + inoreader_source_edit_push (gsource, action, TRUE); +} + +gboolean inoreader_source_edit_is_in_queue (InoreaderSourcePtr gsource, const gchar* guid) +{ + /* this is inefficient, but works for the time being */ + GList *cur = gsource->actionQueue->head; + for(; cur; cur = g_list_next (cur)) { + InoreaderSourceActionPtr action = cur->data; + if (action->guid && g_str_equal (action->guid, guid)) + return TRUE; + } + return FALSE; +} diff -Nru liferea-1.8.15/src/fl_sources/inoreader_source_edit.h liferea-1.10.3/src/fl_sources/inoreader_source_edit.h --- liferea-1.8.15/src/fl_sources/inoreader_source_edit.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/inoreader_source_edit.h 2013-08-10 00:34:46.000000000 +0200 @@ -0,0 +1,86 @@ +/** + * @file inoreader_source_edit.c Google reader feed list source syncing support + * + * Copyright (C) 2008 Arnold Noronha + * + * 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 _INOREADER_SOURCE_EDIT_H +#define _INOREADER_SOURCE_EDIT_H + +#include "inoreader_source.h" + +#include + +/** + * Process the waiting edits on the edit queue. Call this if the state of + * the InoreaderSource has changed. + * + * @param gsource The InoreaderSource whose editQueue should be processed. + */ +void inoreader_source_edit_process (InoreaderSourcePtr gsource); + + +/** Edit wrappers */ + +/** + * Mark the given item as read. + * + * @param gsource The InoreaderSource structure + * @param guid The guid of the item whose status is to be edited + * @param feedUrl The feedUrl of the feed containing the item. + * @param newStatus The new read status of the item (TRUE for read) + */ +void inoreader_source_edit_mark_read (InoreaderSourcePtr gsource, const gchar* guid, const gchar* feedUrl, gboolean newStatus); + +/** + * Mark the given item as starred. + * + * @param gsource The InoreaderSource structure + * @param guid The guid of the item whose status is to be edited + * @param feedUrl The feedUrl of the feed containing the item. + * @param newStatus The new read status of the item (TRUE for read) + */ +void inoreader_source_edit_mark_starred (InoreaderSourcePtr gsource, const gchar *guid, const gchar *feedUrl, gboolean newStatus); + + +/** + * Add a subscription to the google source. + * + * @param gsource The InoreaderSource structure + * @param feedUrl the feed to add + */ +void inoreader_source_edit_add_subscription (InoreaderSourcePtr gsource, const gchar* feedUrl); + + +/** + * Remove a subscription from the google source. + * + * @param gsource The InoreaderSource structure + * @param feedUrl the feed to remove + */ +void inoreader_source_edit_remove_subscription (InoreaderSourcePtr gsource, const gchar* feedUrl); + +/** + * See if an item with give guid is being modified + * in the queue. + * + * @param InoreaderSource the InoreaderSource structure + * @param guid the guid of the item + */ +gboolean inoreader_source_edit_is_in_queue (InoreaderSourcePtr gsource, const gchar* guid); + +#endif diff -Nru liferea-1.8.15/src/fl_sources/inoreader_source_feed.c liferea-1.10.3/src/fl_sources/inoreader_source_feed.c --- liferea-1.8.15/src/fl_sources/inoreader_source_feed.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/inoreader_source_feed.c 2013-08-10 00:54:10.000000000 +0200 @@ -0,0 +1,299 @@ +/** + * @file inoreader_source_feed.c Google reader feed subscription routines + * + * Copyright (C) 2008 Arnold Noronha + * + * 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 "common.h" +#include "debug.h" +#include "xml.h" + +#include "feedlist.h" +#include "inoreader_source.h" +#include "subscription.h" +#include "node.h" +#include "inoreader_source_edit.h" +#include "metadata.h" +#include "db.h" +#include "item_state.h" + +/** + * This is identical to xpath_foreach_match, except that it takes the context + * as parameter. + */ +static void +inoreader_source_xpath_foreach_match (const gchar* expr, xmlXPathContextPtr xpathCtxt, xpathMatchFunc func, gpointer user_data) +{ + xmlXPathObjectPtr xpathObj = NULL; + xpathObj = xmlXPathEval ((xmlChar*)expr, xpathCtxt); + + if (xpathObj && xpathObj->nodesetval && xpathObj->nodesetval->nodeMax) { + int i; + for (i = 0; i < xpathObj->nodesetval->nodeNr; i++) { + (*func) (xpathObj->nodesetval->nodeTab[i], user_data); + xpathObj->nodesetval->nodeTab[i] = NULL ; + } + } + + if (xpathObj) + xmlXPathFreeObject (xpathObj); +} + +void +inoreader_source_migrate_node(nodePtr node) +{ + /* scan the node for bad ID's, if so, brutally remove the node */ + itemSetPtr itemset = node_get_itemset (node); + GList *iter = itemset->ids; + for (; iter; iter = g_list_next (iter)) { + itemPtr item = item_load (GPOINTER_TO_UINT (iter->data)); + if (item && item->sourceId) { + if (!g_str_has_prefix(item->sourceId, "tag:google.com")) { + debug1(DEBUG_UPDATE, "Item with sourceId [%s] will be deleted.", item->sourceId); + db_item_remove(GPOINTER_TO_UINT(iter->data)); + } + } + if (item) item_unload (item); + } + + /* cleanup */ + itemset_free (itemset); +} + +static void +inoreader_source_xml_unlink_node (xmlNodePtr node, gpointer data) +{ + xmlUnlinkNode (node); + xmlFreeNode (node); +} + +static void +inoreader_source_set_shared_by (xmlNodePtr node, gpointer userdata) +{ + itemPtr item = (itemPtr) userdata; + xmlChar *value = xmlNodeGetContent (node); + xmlChar *apos = strrchr (value, '\''); + gchar *name; + + if (!apos) return; + name = g_strndup (value, apos-value); + + metadata_list_set (&item->metadata, "sharedby", name); + + g_free (name); + xmlFree (value); +} + +static itemPtr +inoreader_source_load_item_from_sourceid (nodePtr node, gchar *sourceId, GHashTable *cache) +{ + gpointer ret = g_hash_table_lookup (cache, sourceId); + itemSetPtr itemset; + int num = g_hash_table_size (cache); + GList *iter; + itemPtr item = NULL; + + if (ret) return item_load (GPOINTER_TO_UINT (ret)); + + /* skip the top 'num' entries */ + itemset = node_get_itemset (node); + iter = itemset->ids; + while (num--) iter = g_list_next (iter); + + for (; iter; iter = g_list_next (iter)) { + item = item_load (GPOINTER_TO_UINT (iter->data)); + if (item && item->sourceId) { + /* save to cache */ + g_hash_table_insert (cache, g_strdup(item->sourceId), (gpointer) item->id); + if (g_str_equal (item->sourceId, sourceId)) { + itemset_free (itemset); + return item; + } + } + item_unload (item); + } + + g_warning ("Could not find item for %s!", sourceId); + itemset_free (itemset); + return NULL; +} + +static void +inoreader_source_item_retrieve_status (const xmlNodePtr entry, subscriptionPtr subscription, GHashTable *cache) +{ + InoreaderSourcePtr gsource = (InoreaderSourcePtr) node_source_root_from_node (subscription->node)->data ; + xmlNodePtr xml; + nodePtr node = subscription->node; + xmlChar *id; + gboolean read = FALSE; + gboolean starred = FALSE; + + xml = entry->children; + g_assert (xml); + + id = xmlNodeGetContent (xml); + + for (xml = entry->children; xml; xml = xml->next) { + if (g_str_equal (xml->name, "category")) { + xmlChar* label = xmlGetProp (xml, "label"); + if (!label) + continue; + + if (g_str_equal (label, "read")) + read = TRUE; + else if (g_str_equal(label, "starred")) + starred = TRUE; + + xmlFree (label); + } + } + + itemPtr item = inoreader_source_load_item_from_sourceid (node, id, cache); + if (item && item->sourceId) { + if (g_str_equal (item->sourceId, id) && !inoreader_source_edit_is_in_queue(gsource, id)) { + + if (item->readStatus != read) + item_read_state_changed (item, read); + if (item->flagStatus != starred) + item_flag_state_changed (item, starred); + } + } + if (item) item_unload (item) ; + xmlFree (id); +} + +static void +google_feed_subscription_process_update_result (subscriptionPtr subscription, const struct updateResult* const result, updateFlags flags) +{ + + debug_start_measurement (DEBUG_UPDATE); + + if (result->data) { + updateResultPtr resultCopy; + + /* FIXME: The following is a very dirty hack to edit the feed's + XML before processing it */ + resultCopy = update_result_new () ; + resultCopy->source = g_strdup (result->source); + resultCopy->httpstatus = result->httpstatus; + resultCopy->contentType = g_strdup (result->contentType); + 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, NULL); + xmlXPathContextPtr xpathCtxt = xmlXPathNewContext (doc) ; + xmlXPathRegisterNs (xpathCtxt, "atom", "http://www.w3.org/2005/Atom"); + inoreader_source_xpath_foreach_match ("/atom:feed/atom:entry/atom:category[@scheme='http://www.inoreader.com/reader/']", xpathCtxt, inoreader_source_xml_unlink_node, NULL); + + + /* delete the via link for broadcast subscription */ + if (g_str_equal (subscription->source, INOREADER_BROADCAST_FRIENDS_URL)) + inoreader_source_xpath_foreach_match ("/atom:feed/atom:entry/atom:link[@rel='via']/@href", xpathCtxt, inoreader_source_xml_unlink_node, NULL); + + xmlXPathFreeContext (xpathCtxt); + + /* good now we have removed the read and unread labels. */ + + xmlChar *newXml; + int newXmlSize ; + + xmlDocDumpMemory (doc, &newXml, &newXmlSize); + + resultCopy->data = g_strndup ((gchar*) newXml, newXmlSize); + resultCopy->size = newXmlSize; + + xmlFree (newXml); + xmlFreeDoc (doc); + + feed_get_subscription_type ()->process_update_result (subscription, resultCopy, flags); + update_result_free (resultCopy); + } else { + feed_get_subscription_type ()->process_update_result (subscription, result, flags); + return ; + } + + /* FIXME: The following workaround ensure that the code below, + that uses UI callbacks item_*_state_changed(), does not + reset the newCount of the feed list (see SF #2666478) + 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, NULL); + if (doc) { + xmlNodePtr root = xmlDocGetRootElement (doc); + xmlNodePtr entry = root->children ; + GHashTable *cache = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + + while (entry) { + if (!g_str_equal (entry->name, "entry")) { + entry = entry->next; + continue; /* not an entry */ + } + + inoreader_source_item_retrieve_status (entry, subscription, cache); + entry = entry->next; + } + + g_hash_table_unref (cache); + xmlFreeDoc (doc); + } else { + debug0 (DEBUG_UPDATE, "google_feed_subscription_process_update_result(): Couldn't parse XML!"); + g_warning ("google_feed_subscription_process_update_result(): Couldn't parse XML!"); + } + + // FIXME: part 2 of the newCount workaround + feedlist_update_new_item_count (newCount); + + debug_end_measurement (DEBUG_UPDATE, "time taken to update statuses"); +} + +static gboolean +google_feed_subscription_prepare_update_request (subscriptionPtr subscription, + struct updateRequest *request) +{ + debug0 (DEBUG_UPDATE, "preparing google reader feed subscription for update\n"); + InoreaderSourcePtr gsource = (InoreaderSourcePtr) node_source_root_from_node (subscription->node)->data; + + g_assert(gsource); + if (gsource->loginState == INOREADER_SOURCE_STATE_NONE) { + subscription_update (node_source_root_from_node (subscription->node)->subscription, 0) ; + return FALSE; + } + debug0 (DEBUG_UPDATE, "Setting cookies for a Google Reader subscription"); + + if (!g_str_equal (request->source, INOREADER_BROADCAST_FRIENDS_URL)) { + gchar* source_escaped = g_uri_escape_string(request->source, NULL, TRUE); + gchar* newUrl = g_strdup_printf ("http://www.inoreader.com/reader/atom/feed/%s", source_escaped); + update_request_set_source (request, newUrl); + g_free (newUrl); + g_free (source_escaped); + } + update_request_set_auth_value (request, gsource->authHeaderValue); + return TRUE; +} + +struct subscriptionType inoreaderSourceFeedSubscriptionType = { + google_feed_subscription_prepare_update_request, + google_feed_subscription_process_update_result +}; + diff -Nru liferea-1.8.15/src/fl_sources/inoreader_source_feed_list.c liferea-1.10.3/src/fl_sources/inoreader_source_feed_list.c --- liferea-1.8.15/src/fl_sources/inoreader_source_feed_list.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/inoreader_source_feed_list.c 2013-08-10 00:48:53.000000000 +0200 @@ -0,0 +1,412 @@ +/** + * @file inoreader_source_feed_list.c Inoreader handling routines. + * + * Copyright (C) 2013 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 "inoreader_source_feed_list.h" + +#include +#include + +#include "common.h" +#include "debug.h" +#include "feedlist.h" +#include "folder.h" +#include "json.h" +#include "metadata.h" +#include "node.h" +#include "subscription.h" +#include "xml.h" // FIXME + +#include "fl_sources/opml_source.h" +#include "fl_sources/inoreader_source.h" +#include "fl_sources/inoreader_source_edit.h" + +/** + * Find a node by the source id. + */ +nodePtr +inoreader_source_opml_get_node_by_source (InoreaderSourcePtr gsource, const gchar *source) +{ + return inoreader_source_opml_get_subnode_by_node (gsource->root, source); +} + +/** + * Recursively find a node by the source id. + */ +nodePtr +inoreader_source_opml_get_subnode_by_node (nodePtr node, const gchar *source) +{ + nodePtr subnode; + nodePtr subsubnode; + GSList *iter = node->children; + for (; iter; iter = g_slist_next (iter)) { + subnode = (nodePtr)iter->data; + if (subnode->subscription + && g_str_equal (subnode->subscription->source, source)) + return subnode; + else if (subnode->type->capabilities + & NODE_CAPABILITY_SUBFOLDERS) { + subsubnode = inoreader_source_opml_get_subnode_by_node(subnode, source); + if (subnode != NULL) + return subsubnode; + } + } + return NULL; +} + +/* subscription list merging functions */ + +static void +inoreader_source_check_for_removal (nodePtr node, gpointer user_data) +{ + gchar *expr = NULL; + + if (node->subscription && g_str_equal (node->subscription->source, INOREADER_BROADCAST_FRIENDS_URL)) + return ; + + if (IS_FEED (node)) { + expr = g_strdup_printf ("/object/list[@name='subscriptions']/object/string[@name='id'][. = 'feed/%s']", node->subscription->source); + } else if (IS_FOLDER (node)) { + node_foreach_child_data (node, inoreader_source_check_for_removal, user_data); + expr = g_strdup_printf ("/object/list[@name='subscriptions']/object/list[@name='categories']/object[string='%s']", node->title); + } else { + g_warning ("google_opml_source_check_for_removal(): This should never happen..."); + return; + } + + if (!xpath_find ((xmlNodePtr)user_data, expr)) { + debug1 (DEBUG_UPDATE, "removing %s...", node_get_title (node)); + feedlist_node_removed (node); + } else { + debug1 (DEBUG_UPDATE, "keeping %s...", node_get_title (node)); + } + g_free (expr); +} + +/* + * Find a node by the name under root or create it. + */ +static nodePtr +inoreader_source_find_or_create_folder (const gchar *name, nodePtr root) +{ + nodePtr folder = NULL; + GSList *iter_parent; + + /* find a node by the name under root */ + iter_parent = root->children; + while (iter_parent) { + if (g_str_equal (name, node_get_title (iter_parent->data))) { + folder = (nodePtr)iter_parent->data; + break; + } + iter_parent = g_slist_next (iter_parent); + } + + /* if not found, create new folder */ + if (!folder) { + folder = node_new (folder_get_node_type ()); + node_set_title (folder, name); + node_set_parent (folder, root, -1); + feedlist_node_imported (folder); + subscription_update (folder->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); + } + + return folder; +} + +/* + * Check if folder of a node changed in Google Reader and move + * node to the folder with the same name. + */ +static void +inoreader_source_update_folder (xmlNodePtr match, InoreaderSourcePtr gsource, nodePtr node) +{ + xmlNodePtr xml; + xmlChar *label; + const gchar *ptitle; + nodePtr parent; + + /* check if label of a feed changed */ + parent = node->parent; + ptitle = node_get_title (parent); + xml = xpath_find (match, "./list[@name='categories']/object/string[@name='label']"); + if (xml) { + label = xmlNodeListGetString (xml->doc, xml->xmlChildrenNode, 1); + if (parent == gsource->root || ! g_str_equal (label, ptitle)) { + debug2 (DEBUG_UPDATE, "GSource feed label changed for %s to '%s'", node->id, label); + parent = inoreader_source_find_or_create_folder ((gchar*)label, gsource->root); + node_reparent (node, parent); + } + xmlFree (label); + } else { + /* if feed has no label and parent is not gsource root, reparent to gsource root */ + if (parent != gsource->root) + node_reparent (node, gsource->root); + } +} + +static void +inoreader_source_merge_feed (InoreaderSourcePtr source, const gchar *url, const gchar *title, const gchar *id) +{ + nodePtr node; + GSList *iter; + + /* check if node to be merged already exists */ + iter = source->root->children; + while (iter) { + node = (nodePtr)iter->data; + if (g_str_equal (node->subscription->source, url)) + return; + iter = g_slist_next (iter); + } + + debug2 (DEBUG_UPDATE, "adding %s (%s)", title, url); + node = node_new (feed_get_node_type ()); + node_set_title (node, title); + node_set_data (node, feed_new ()); + + node_set_subscription (node, subscription_new (url, NULL, NULL)); + node->subscription->type = &inoreaderSourceFeedSubscriptionType; + + /* Save Inoreader feed id which we need to fetch items... */ + node->subscription->metadata = metadata_list_append (node->subscription->metadata, "inoreader-feed-id", id); + db_subscription_update (node->subscription); + + node_set_parent (node, source->root, -1); + feedlist_node_imported (node); + + /** + * @todo mark the ones as read immediately after this is done + * the feed as retrieved by this has the read and unread + * status inherently. + */ + subscription_update (node->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); + subscription_update_favicon (node->subscription); +} + + +/* OPML subscription type implementation */ + +static void +google_subscription_opml_cb (subscriptionPtr subscription, const struct updateResult * const result, updateFlags flags) +{ + InoreaderSourcePtr source = (InoreaderSourcePtr) subscription->node->data; + + // FIXME: the following code is very similar to ttrss! + if (result->data && result->httpstatus == 200) { + JsonParser *parser = json_parser_new (); + + if (json_parser_load_from_data (parser, result->data, -1, NULL)) { + JsonArray *array = json_node_get_array (json_get_node (json_parser_get_root (parser), "subscriptions")); + GList *iter, *elements; + GSList *siter; +g_print(">>> %s\n",result->data); + /* We expect something like this: + + [{"id":"feed\/http:\/\/rss.slashdot.org\/Slashdot\/slashdot", + "title":"Slashdot", + "categories":[], + "firstitemmsec":"1368112925514", + "htmlUrl":"null"}, + ... + + Note that the data doesn't contain an URL. + We recover it from the id field. + */ + elements = iter = json_array_get_elements (array); + /* Add all new nodes we find */ + while (iter) { + JsonNode *node = (JsonNode *)iter->data; + + /* ignore everything without a feed url */ + if (json_get_string (node, "id")) { + inoreader_source_merge_feed (source, + json_get_string (node, "id") + 5, // FIXME: Unescape string! + json_get_string (node, "title"), + json_get_string (node, "id")); + } + iter = g_list_next (iter); + } + g_list_free (elements); + + /* Remove old nodes we cannot find anymore */ + siter = source->root->children; + while (siter) { + nodePtr node = (nodePtr)siter->data; + gboolean found = FALSE; + + elements = iter = json_array_get_elements (array); + while (iter) { + JsonNode *json_node = (JsonNode *)iter->data; + // FIXME: Compare with unescaped string + if (g_str_equal (node->subscription->source, json_get_string (json_node, "id") + 5)) { + debug1 (DEBUG_UPDATE, "node: %s", node->subscription->source); + found = TRUE; + break; + } + iter = g_list_next (iter); + } + g_list_free (elements); + + if (!found) + feedlist_node_removed (node); + + siter = g_slist_next (siter); + } + + opml_source_export (subscription->node); /* save new feeds to feed list */ + subscription->node->available = TRUE; + //return; + } else { + g_warning ("Invalid JSON returned on Inoreader feed list request! >>>%s<<<", result->data); + } + + g_object_unref (parser); + } else { + subscription->node->available = FALSE; + debug0 (DEBUG_UPDATE, "inoreader_subscription_cb(): ERROR: failed to get subscription list!"); + } + + if (!(flags & INOREADER_SOURCE_UPDATE_ONLY_LIST)) + node_foreach_child_data (subscription->node, node_update_subscription, GUINT_TO_POINTER (0)); +} + +/** functions for an efficient updating mechanism */ + +static void +inoreader_source_opml_quick_update_helper (xmlNodePtr match, gpointer userdata) +{ + InoreaderSourcePtr gsource = (InoreaderSourcePtr) userdata; + xmlNodePtr xmlNode; + xmlChar *id, *newestItemTimestamp; + nodePtr node = NULL; + const gchar *oldNewestItemTimestamp; + + xmlNode = xpath_find (match, "./string[@name='id']"); + id = xmlNodeGetContent (xmlNode); + + if (g_str_has_prefix (id, "feed/")) + node = inoreader_source_opml_get_node_by_source (gsource, id + strlen ("feed/")); + else if (g_str_has_suffix (id, "broadcast-friends")) + node = inoreader_source_opml_get_node_by_source (gsource, id); + else { + xmlFree (id); + return; + } + + if (node == NULL) { + xmlFree (id); + return; + } + + xmlNode = xpath_find (match, "./number[@name='newestItemTimestampUsec']"); + newestItemTimestamp = xmlNodeGetContent (xmlNode); + + oldNewestItemTimestamp = g_hash_table_lookup (gsource->lastTimestampMap, node->subscription->source); + + if (!oldNewestItemTimestamp || + (newestItemTimestamp && + !g_str_equal (newestItemTimestamp, oldNewestItemTimestamp))) { + debug3(DEBUG_UPDATE, "InoreaderSource: auto-updating %s " + "[oldtimestamp%s, timestamp %s]", + id, oldNewestItemTimestamp, newestItemTimestamp); + g_hash_table_insert (gsource->lastTimestampMap, + g_strdup (node->subscription->source), + g_strdup (newestItemTimestamp)); + + subscription_update (node->subscription, 0); + } + + xmlFree (newestItemTimestamp); + xmlFree (id); +} + +static void +inoreader_source_opml_quick_update_cb (const struct updateResult* const result, gpointer userdata, updateFlags flags) +{ + InoreaderSourcePtr gsource = (InoreaderSourcePtr) userdata; + xmlDocPtr doc; + + if (!result->data) { + /* what do I do? */ + debug0 (DEBUG_UPDATE, "InoreaderSource: Unable to get unread counts, this update is aborted."); + return; + } + doc = xml_parse (result->data, result->size, NULL); + if (!doc) { + debug0 (DEBUG_UPDATE, "InoreaderSource: The XML failed to parse, maybe the session has expired. (FIXME)"); + return; + } + + xpath_foreach_match (xmlDocGetRootElement (doc), + "/object/list[@name='unreadcounts']/object", + inoreader_source_opml_quick_update_helper, gsource); + + xmlFreeDoc (doc); +} + +gboolean +inoreader_source_opml_quick_update(InoreaderSourcePtr gsource) +{ + updateRequestPtr 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_source (request, INOREADER_UNREAD_COUNTS_URL); + update_request_set_auth_value(request, gsource->authHeaderValue); + + update_execute_request (gsource, request, inoreader_source_opml_quick_update_cb, + gsource, 0); + + return TRUE; +} + + +static void +inoreader_source_opml_subscription_process_update_result (subscriptionPtr subscription, const struct updateResult * const result, updateFlags flags) +{ + google_subscription_opml_cb (subscription, result, flags); +} + +static gboolean +inoreader_source_opml_subscription_prepare_update_request (subscriptionPtr subscription, struct updateRequest *request) +{ + InoreaderSourcePtr gsource = (InoreaderSourcePtr)subscription->node->data; + + g_assert(gsource); + if (gsource->loginState == INOREADER_SOURCE_STATE_NONE) { + debug0(DEBUG_UPDATE, "InoreaderSource: login"); + inoreader_source_login ((InoreaderSourcePtr) subscription->node->data, 0) ; + return FALSE; + } + debug1 (DEBUG_UPDATE, "updating Inoreader subscription (node id %s)", subscription->node->id); + + update_request_set_source (request, INOREADER_SUBSCRIPTION_LIST_URL); + + update_request_set_auth_value (request, gsource->authHeaderValue); + + return TRUE; +} + +/* OPML subscription type definition */ + +struct subscriptionType inoreaderSourceOpmlSubscriptionType = { + inoreader_source_opml_subscription_prepare_update_request, + inoreader_source_opml_subscription_process_update_result +}; diff -Nru liferea-1.8.15/src/fl_sources/inoreader_source_feed_list.h liferea-1.10.3/src/fl_sources/inoreader_source_feed_list.h --- liferea-1.8.15/src/fl_sources/inoreader_source_feed_list.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/inoreader_source_feed_list.h 2013-08-10 00:48:53.000000000 +0200 @@ -0,0 +1,47 @@ +/** + * Copyright (C) 2013 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 "fl_sources/inoreader_source.h" + +/** + * Find a node by the source id. + * + * @param gsource the Google Reader source + * @param source the feed id to find + * + * @returns a node (or NULL) + */ +nodePtr inoreader_source_opml_get_node_by_source(InoreaderSourcePtr gsource, + const gchar *source); + +/** + * Recursively find a node by the source id. + * + * @param gsource the Google Reader source + * @param source the feed id to find + * + * @returns a node (or NULL) + */ +nodePtr inoreader_source_opml_get_subnode_by_node(nodePtr node, const gchar *source); + +/** + * Perform a quick update of the Google Reader source. + * + * @param gsource the Google Reader source + */ +gboolean inoreader_source_opml_quick_update (InoreaderSourcePtr gsource); diff -Nru liferea-1.8.15/src/fl_sources/inoreader_source.h liferea-1.10.3/src/fl_sources/inoreader_source.h --- liferea-1.8.15/src/fl_sources/inoreader_source.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/inoreader_source.h 2013-08-10 00:34:46.000000000 +0200 @@ -0,0 +1,243 @@ +/** + * @file inoreader_source.h Google Reader feed list source support + * + * Copyright (C) 2007-2013 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 _INOREADER_SOURCE_H +#define _INOREADER_SOURCE_H + +#include "fl_sources/node_source.h" + +/** + * A nodeSource specific for Google Reader + */ +typedef struct InoreaderSource { + nodePtr root; /**< the root node in the feed list */ + gchar *authHeaderValue; /**< the Google Authorization token */ + GQueue *actionQueue; + gint loginState; /**< The current login state */ + gint authFailures; /**< Number of authentication failures */ + + /** + * A map from a subscription source to a timestamp when it was last + * updated (provided by Google). + */ + GHashTable *lastTimestampMap; + + /** + * A timestamp when the last Quick update took place. + */ + GTimeVal lastQuickUpdate; +} *InoreaderSourcePtr; + +enum { + INOREADER_SOURCE_STATE_NONE = 0, /**< no authentication tried so far */ + INOREADER_SOURCE_STATE_IN_PROGRESS, /**< authentication in progress */ + INOREADER_SOURCE_STATE_ACTIVE, /**< authentication succeeded */ + INOREADER_SOURCE_STATE_NO_AUTH, /**< authentication has failed */ + INOREADER_SOURCE_STATE_MIGRATE, /**< source will be migrated, do not do anything anymore! */ +}; + +enum { + /** + * Update only the subscription list, and not each node underneath it. + * Note: Uses higher 16 bits to avoid conflict. + */ + INOREADER_SOURCE_UPDATE_ONLY_LIST = (1<<16), + /** + * Only login, do not do any updates. + */ + INOREADER_SOURCE_UPDATE_ONLY_LOGIN = (1<<17) +}; + +/** + * Number of auth failures after which we stop bothering the user while + * auto-updating until he manually updates again. + */ +#define INOREADER_SOURCE_MAX_AUTH_FAILURES 3 + +/** + * Google Source API URL's + * In each of the following, the _URL indicates the URL to use, and _POST + * indicates the corresponging postdata to send. + * @see http://code.google.com/p/pyrfeed/wiki/GoogleReaderAPI + * However as of now, the GoogleReaderAPI documentation seems outdated, some of + * mark read/unread API does not work as mentioned in the documentation. + */ + +/** + * 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. + */ +#define INOREADER_LOGIN_URL "https://www.inoreader.com/accounts/ClientLogin" +#define INOREADER_LOGIN_POST "service=reader&Email=%s&Passwd=%s&source=liferea&continue=http://www.inoreader.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. + */ +#define INOREADER_BROADCAST_FRIENDS_URL "http://www.inoreader.com/reader/atom/user/-/state/com.google/broadcast-friends" + +/** + * Get a list of subscriptions. + */ +#define INOREADER_SUBSCRIPTION_LIST_URL "http://www.inoreader.com/reader/api/0/subscription/list" + +/** + * Get a token for an edit operation. (@todo A token can actually be used + * for multiple transactions.) + */ +#define INOREADER_TOKEN_URL "http://www.inoreader.com/reader/api/0/token" + +/** + * Add a subscription + * @param URL The feed URL, or the page URL for feed autodiscovery. + * @param T a token obtained using INOREADER_TOKEN_URL + */ +#define INOREADER_ADD_SUBSCRIPTION_URL "http://www.inoreader.com/reader/api/0/subscription/edit?client=liferea" +#define INOREADER_ADD_SUBSCRIPTION_POST "s=feed%%2F%s&i=null&ac=subscribe&T=%s" + +/** + * Unsubscribe from a subscription. + * @param url The feed URL + * @param T a token obtained using INOREADER_TOKEN_URL + */ +#define INOREADER_REMOVE_SUBSCRIPTION_URL "http://www.inoreader.com/reader/api/0/subscription/edit?client=liferea" +#define INOREADER_REMOVE_SUBSCRIPTION_POST "s=feed%%2F%s&i=null&ac=unsubscribe&T=%s" + +/** + * A list of subscriptions with the unread counters, and the last updated + * timestamps. + */ +#define INOREADER_UNREAD_COUNTS_URL "http://www.inoreader.com/reader/api/0/unread-count?all=true&client=liferea" + +/** + * Edit the tags associated with an item. The parameters to this _have_ to be + * sent as post data. + */ +#define INOREADER_EDIT_TAG_URL "http://www.inoreader.com/reader/api/0/edit-tag?client=liferea" + +/** + * Postdata for adding a tag when using INOREADER_EDIT_TAG_URL. + * @param i The guid of the item. + * @param prefix The prefix to 's'. For normal feeds this will be "feed", for + * links etc, this should be "user". + * @param s The URL of the subscription containing the item. (Note that the + * following string adds the "feed/" prefix to this.) + * @param a The tag to add. + * @param T a token obtained using INOREADER_TOKEN_URL + */ +#define INOREADER_EDIT_TAG_ADD_TAG "i=%s&s=%s%%2F%s&a=%s&ac=edit-tags&T=%s&async=true" + +/** + * Postdata for removing a tag, when using INOREADER_EDIT_TAG_URL. Do + * not use for removing the "read" tag, see INOREADER_EDIT_TAG_AR_TAG + * for that. + * + * @param i The guid of the item. + * @param prefix The prefix to 's'. @see INOREADER_EDIT_TAG_ADD_TAG + * @param s The URL of the subscription containing the item. (Note that the + * final value of s is feed + "/" + this string) + * @param r The tag to remove + * @param T a token obtained using INOREADER_TOKEN_URL + */ +#define INOREADER_EDIT_TAG_REMOVE_TAG "i=%s&s=%s%%2F%s&r=%s&ac=edit-tags&T=%s&async=true" + +/** + * Postdata for adding a tag, and removing another tag at the same time, + * when using INOREADER_EDIT_TAG_URL. + * @param i The guid of the item. + * @param prefix The prefix to 's'. @see INOREADER_EDIT_TAG_ADD_TAG + * @param s The URL of the subscription containing the item. (Note that the + * final value of s is feed + "/" + this string) + * @param a The tag to add. + * @param r The tag to remove + * @param T a token obtained using INOREADER_TOKEN_URL + */ +#define INOREADER_EDIT_TAG_AR_TAG "i=%s&s=%s%%2F%s&a=%s&r=%s&ac=edit-tags&T=%s&async=true" + +/** + * Postdata for adding a tag, and removing another tag at the same time, for a + * _link_ item, when using INOREADER_EDIT_TAG_URL + * @param i The guid of the link (as provided by google) + * @param a The tag to add + * @param r The tag to remove + * @param T a token obtained using INOREADER_TOKEN_URL + */ +#define INOREADER_EDIT_TAG_ADD_TAG_FOR_LINK "i=%s&s=user%2F-%2Fsource%2Fcom.google%2Flink&a=%s&r=%s&ac=edit-tags&T=%s&async=true" + +/** A set of tags (states) defined by Google reader */ + +#define INOREADER_TAG_KEPT_UNREAD "user/-/state/com.google/kept-unread" +#define INOREADER_TAG_READ "user/-/state/com.google/read" +#define INOREADER_TAG_TRACKING_KEPT_UNREAD "user/-/state/com.google/tracking-kept-unread" +#define INOREADER_TAG_STARRED "user/-/state/com.google/starred" + +/** Interval (in seconds) for doing a Quick Update: 10min */ +#define INOREADER_SOURCE_QUICK_UPDATE_INTERVAL 600 + +/** + * @returns Google Reader source type implementation info. + */ +nodeSourceTypePtr inoreader_source_get_type (void); + +extern struct subscriptionType inoreaderSourceFeedSubscriptionType; +extern struct subscriptionType inoreaderSourceOpmlSubscriptionType; + +/** + * Find a child node with the given feed source URL. + * + * @param gsource InoreaderSource + * @param source a feed source URL to search + * + * @returns a node (or NULL) + */ +nodePtr inoreader_source_get_node_from_source (InoreaderSourcePtr gsource, const gchar* source); + +/** + * Tries to update the entire source quickly, by updating only those feeds + * which are known to be updated. Suitable for g_timeout_add. This is an + * internal function. + * + * @param data A pointer to a node id of the source. This pointer will + * be g_free'd if the update fails. + * + * @returns FALSE on update failure + */ +gboolean inoreader_source_quick_update_timeout (gpointer gsource); + +/** + * Migrate a google source child-node from a Liferea 1.4 style read-only + * google source nodes. + * + * @param node The node to migrate (not the nodeSource!) + */ +void inoreader_source_migrate_node (nodePtr node); + +/** + * Perform login for the given Google source. + * + * @param gsource a InoreaderSource + * @param flags network request flags + */ +void inoreader_source_login (InoreaderSourcePtr gsource, guint32 flags); + +#endif diff -Nru liferea-1.8.15/src/fl_sources/json_api_mapper.c liferea-1.10.3/src/fl_sources/json_api_mapper.c --- liferea-1.8.15/src/fl_sources/json_api_mapper.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/json_api_mapper.c 2013-08-10 00:08:40.000000000 +0200 @@ -0,0 +1,163 @@ +/** + * @file json_api_mapper.c data mapper for JSON APIs + * + * Copyright (C) 2013 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 "json_api_mapper.h" + +#include + +#include "debug.h" +#include "item.h" +#include "json.h" +#include "metadata.h" +#include "xml.h" + +JsonNode * +json_api_get_node (JsonNode *parent, const gchar *mapping) +{ + JsonNode *node = parent; + gchar **step; + gchar **steps = g_strsplit (g_strdup (mapping), "/", 0); + + step = steps; + if (!*step) + return node; + + while (*(step + 1) && node) { + node = json_get_node (node, *step); + step++; + } + + g_strfreev (steps); + + return node; +} + +const gchar * +json_api_get_string (JsonNode *parent, const gchar *mapping) +{ + JsonNode *node = json_api_get_node (parent, mapping); + const gchar *field; + + if (!node || !*mapping) + return; + + field = strrchr (mapping, '/'); + if (!field) + field = mapping; + else + field++; + + return json_get_string (node, field); +} + +gint +json_api_get_int (JsonNode *parent, const gchar *mapping) +{ + JsonNode *node = json_api_get_node (parent, mapping); + const gchar *field; + + if (!node || !*mapping) + return; + + field = strrchr (mapping, '/'); + if (!field) + field = mapping; + else + field++; + + return json_get_int (node, field); +} + +gboolean +json_api_get_bool (JsonNode *parent, const gchar *mapping) +{ + JsonNode *node = json_api_get_node (parent, mapping); + const gchar *field; + + if (!node || !*mapping) + return; + + field = strrchr (mapping, '/'); + if (!field) + field = mapping; + else + field++; + + return json_get_bool (node, field); +} + +GList * +json_api_get_items (const gchar *json, const gchar *root, jsonApiMapping *mapping) +{ + GList *items = NULL; + JsonParser *parser = json_parser_new (); + + if (json_parser_load_from_data (parser, json, -1, NULL)) { + JsonArray *array = json_node_get_array (json_get_node (json_parser_get_root (parser), root)); + GList *elements = json_array_get_elements (array); + GList *iter = elements; + + while (iter) { + JsonNode *node = (JsonNode *)iter->data; + itemPtr item = item_new (); + + /* Parse default feeds */ + item_set_id (item, json_api_get_string (node, mapping->id)); + item_set_title (item, json_api_get_string (node, mapping->title)); + item_set_source (item, json_api_get_string (node, mapping->link)); + + item->time = json_api_get_int (node, mapping->updated); + item->readStatus = json_api_get_bool (node, mapping->read); + item->flagStatus = json_api_get_bool (node, mapping->flag); + + if (mapping->negateRead) + item->readStatus = !item->readStatus; + + /* Handling encoded content */ + const gchar *content; + gchar *xhtml; + + content = json_api_get_string (node, mapping->description); + if (mapping->xhtml) { + xhtml = xhtml_extract_from_string (content, NULL); + item_set_description (item, xhtml); + xmlFree (xhtml); + } else { + item_set_description (item, content); + } + + /* Optional meta data */ + const gchar *tmp = json_api_get_string (node, mapping->author); + if (tmp) + item->metadata = metadata_list_append (item->metadata, "author", tmp); + + items = g_list_append (items, (gpointer)item); + + iter = g_list_next (iter); + } + + g_list_free (elements); + g_object_unref (parser); + } else { + debug1 (DEBUG_PARSING, "Could not pass JSON \"%s\"", json); + } + + return items; +} diff -Nru liferea-1.8.15/src/fl_sources/json_api_mapper.h liferea-1.10.3/src/fl_sources/json_api_mapper.h --- liferea-1.8.15/src/fl_sources/json_api_mapper.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/json_api_mapper.h 2013-08-10 00:05:19.000000000 +0200 @@ -0,0 +1,50 @@ +/** + * @file json_api_mapper.h data mapper for JSON APIs + * + * Copyright (C) 2013 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 _JSON_API_MAPPER_H +#define _JSON_API_MAPPER_H + +#include "item.h" + +typedef struct jsonApiMapping { + const gchar *id; /**< list of location steps to id field */ + const gchar *title; /**< list of location steps to title field */ + const gchar *link; /**< list of location steps to link field */ + const gchar *description; /**< list of location steps to description field */ + const gchar *updated; /**< list of location steps to updated field */ + const gchar *author; /**< list of location steps to author field */ + const gchar *read; /**< list of location steps to read field */ + const gchar *flag; /**< list of location steps to flagged/marked/starred field */ + gboolean negateRead; /**< TRUE if read status is to be negated (i.e. is "unread flag") */ + gboolean xhtml; /**< TRUE if description field is XHTML */ +} jsonApiMapping; + +/** + * Extracts all items from a JSON document. + * + * @param json the JSON document to parse + * @param root the name of the root node (e.g. "items") + * @param mapping hash table defining location steps and logic + * + * @returns a list of items (all to be freed with item_free()) or NULL + */ +GList * json_api_get_items (const gchar *json, const gchar *root, jsonApiMapping *mapping); + +#endif diff -Nru liferea-1.8.15/src/fl_sources/Makefile.am liferea-1.10.3/src/fl_sources/Makefile.am --- liferea-1.8.15/src/fl_sources/Makefile.am 2012-12-11 17:10:01.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/Makefile.am 2013-08-10 00:47:16.000000000 +0200 @@ -9,13 +9,27 @@ noinst_LIBRARIES = libliflsources.a libliflsources_a_SOURCES = node_source.c node_source.h \ + aol_source.c aol_source.h \ + aol_source_edit.c aol_source_edit.h \ + aol_source_feed.c \ + aol_source_opml.c aol_source_opml.h \ default_source.c default_source.h \ dummy_source.c dummy_source.h \ google_source.c google_source.h \ - google_source_edit.c google_source_edit.h \ - google_source_feed.c \ - google_source_opml.c google_source_opml.h \ + inoreader_source.c inoreader_source.h \ + inoreader_source_edit.c inoreader_source_edit.h \ + inoreader_source_feed.c \ + inoreader_source_feed_list.c inoreader_source_feed_list.h \ + json_api_mapper.c json_api_mapper.h \ opml_source.c opml_source.h \ + reedah_source.c reedah_source.h \ + reedah_source_edit.c reedah_source_edit.h \ + reedah_source_feed.c \ + reedah_source_feed_list.c reedah_source_feed_list.h \ + theoldreader_source.c theoldreader_source.h \ + theoldreader_source_edit.c theoldreader_source_edit.h \ + theoldreader_source_feed.c \ + theoldreader_source_feed_list.c theoldreader_source_feed_list.h \ ttrss_source.c ttrss_source.h \ ttrss_source_feed.c \ ttrss_source_feed_list.c ttrss_source_feed_list.h diff -Nru liferea-1.8.15/src/fl_sources/Makefile.in liferea-1.10.3/src/fl_sources/Makefile.in --- liferea-1.8.15/src/fl_sources/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/Makefile.in 2013-10-08 20:14:32.000000000 +0200 @@ -55,13 +55,27 @@ libliflsources_a_AR = $(AR) $(ARFLAGS) libliflsources_a_LIBADD = am_libliflsources_a_OBJECTS = libliflsources_a-node_source.$(OBJEXT) \ + libliflsources_a-aol_source.$(OBJEXT) \ + libliflsources_a-aol_source_edit.$(OBJEXT) \ + libliflsources_a-aol_source_feed.$(OBJEXT) \ + libliflsources_a-aol_source_opml.$(OBJEXT) \ libliflsources_a-default_source.$(OBJEXT) \ libliflsources_a-dummy_source.$(OBJEXT) \ libliflsources_a-google_source.$(OBJEXT) \ - libliflsources_a-google_source_edit.$(OBJEXT) \ - libliflsources_a-google_source_feed.$(OBJEXT) \ - libliflsources_a-google_source_opml.$(OBJEXT) \ + libliflsources_a-inoreader_source.$(OBJEXT) \ + libliflsources_a-inoreader_source_edit.$(OBJEXT) \ + libliflsources_a-inoreader_source_feed.$(OBJEXT) \ + libliflsources_a-inoreader_source_feed_list.$(OBJEXT) \ + libliflsources_a-json_api_mapper.$(OBJEXT) \ libliflsources_a-opml_source.$(OBJEXT) \ + libliflsources_a-reedah_source.$(OBJEXT) \ + libliflsources_a-reedah_source_edit.$(OBJEXT) \ + libliflsources_a-reedah_source_feed.$(OBJEXT) \ + libliflsources_a-reedah_source_feed_list.$(OBJEXT) \ + libliflsources_a-theoldreader_source.$(OBJEXT) \ + libliflsources_a-theoldreader_source_edit.$(OBJEXT) \ + libliflsources_a-theoldreader_source_feed.$(OBJEXT) \ + libliflsources_a-theoldreader_source_feed_list.$(OBJEXT) \ libliflsources_a-ttrss_source.$(OBJEXT) \ libliflsources_a-ttrss_source_feed.$(OBJEXT) \ libliflsources_a-ttrss_source_feed_list.$(OBJEXT) @@ -126,13 +140,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -148,6 +161,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -194,8 +215,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -224,6 +243,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -263,13 +283,27 @@ noinst_LIBRARIES = libliflsources.a libliflsources_a_SOURCES = node_source.c node_source.h \ + aol_source.c aol_source.h \ + aol_source_edit.c aol_source_edit.h \ + aol_source_feed.c \ + aol_source_opml.c aol_source_opml.h \ default_source.c default_source.h \ dummy_source.c dummy_source.h \ google_source.c google_source.h \ - google_source_edit.c google_source_edit.h \ - google_source_feed.c \ - google_source_opml.c google_source_opml.h \ + inoreader_source.c inoreader_source.h \ + inoreader_source_edit.c inoreader_source_edit.h \ + inoreader_source_feed.c \ + inoreader_source_feed_list.c inoreader_source_feed_list.h \ + json_api_mapper.c json_api_mapper.h \ opml_source.c opml_source.h \ + reedah_source.c reedah_source.h \ + reedah_source_edit.c reedah_source_edit.h \ + reedah_source_feed.c \ + reedah_source_feed_list.c reedah_source_feed_list.h \ + theoldreader_source.c theoldreader_source.h \ + theoldreader_source_edit.c theoldreader_source_edit.h \ + theoldreader_source_feed.c \ + theoldreader_source_feed_list.c theoldreader_source_feed_list.h \ ttrss_source.c ttrss_source.h \ ttrss_source_feed.c \ ttrss_source_feed_list.c ttrss_source_feed_list.h @@ -323,14 +357,28 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-aol_source.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-aol_source_edit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-aol_source_feed.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-aol_source_opml.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-default_source.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-dummy_source.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-google_source.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-google_source_edit.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-google_source_feed.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-google_source_opml.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-inoreader_source.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-inoreader_source_edit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-inoreader_source_feed.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-inoreader_source_feed_list.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-json_api_mapper.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-node_source.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-opml_source.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-reedah_source.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-reedah_source_edit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-reedah_source_feed.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-reedah_source_feed_list.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-theoldreader_source.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-theoldreader_source_edit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-theoldreader_source_feed.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-theoldreader_source_feed_list.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-ttrss_source.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-ttrss_source_feed.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-ttrss_source_feed_list.Po@am__quote@ @@ -370,6 +418,62 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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-aol_source.o: aol_source.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-aol_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-aol_source.Tpo -c -o libliflsources_a-aol_source.o `test -f 'aol_source.c' || echo '$(srcdir)/'`aol_source.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-aol_source.Tpo $(DEPDIR)/libliflsources_a-aol_source.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='aol_source.c' object='libliflsources_a-aol_source.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-aol_source.o `test -f 'aol_source.c' || echo '$(srcdir)/'`aol_source.c + +libliflsources_a-aol_source.obj: aol_source.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-aol_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-aol_source.Tpo -c -o libliflsources_a-aol_source.obj `if test -f 'aol_source.c'; then $(CYGPATH_W) 'aol_source.c'; else $(CYGPATH_W) '$(srcdir)/aol_source.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-aol_source.Tpo $(DEPDIR)/libliflsources_a-aol_source.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='aol_source.c' object='libliflsources_a-aol_source.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-aol_source.obj `if test -f 'aol_source.c'; then $(CYGPATH_W) 'aol_source.c'; else $(CYGPATH_W) '$(srcdir)/aol_source.c'; fi` + +libliflsources_a-aol_source_edit.o: aol_source_edit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-aol_source_edit.o -MD -MP -MF $(DEPDIR)/libliflsources_a-aol_source_edit.Tpo -c -o libliflsources_a-aol_source_edit.o `test -f 'aol_source_edit.c' || echo '$(srcdir)/'`aol_source_edit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-aol_source_edit.Tpo $(DEPDIR)/libliflsources_a-aol_source_edit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='aol_source_edit.c' object='libliflsources_a-aol_source_edit.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-aol_source_edit.o `test -f 'aol_source_edit.c' || echo '$(srcdir)/'`aol_source_edit.c + +libliflsources_a-aol_source_edit.obj: aol_source_edit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-aol_source_edit.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-aol_source_edit.Tpo -c -o libliflsources_a-aol_source_edit.obj `if test -f 'aol_source_edit.c'; then $(CYGPATH_W) 'aol_source_edit.c'; else $(CYGPATH_W) '$(srcdir)/aol_source_edit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-aol_source_edit.Tpo $(DEPDIR)/libliflsources_a-aol_source_edit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='aol_source_edit.c' object='libliflsources_a-aol_source_edit.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-aol_source_edit.obj `if test -f 'aol_source_edit.c'; then $(CYGPATH_W) 'aol_source_edit.c'; else $(CYGPATH_W) '$(srcdir)/aol_source_edit.c'; fi` + +libliflsources_a-aol_source_feed.o: aol_source_feed.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-aol_source_feed.o -MD -MP -MF $(DEPDIR)/libliflsources_a-aol_source_feed.Tpo -c -o libliflsources_a-aol_source_feed.o `test -f 'aol_source_feed.c' || echo '$(srcdir)/'`aol_source_feed.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-aol_source_feed.Tpo $(DEPDIR)/libliflsources_a-aol_source_feed.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='aol_source_feed.c' object='libliflsources_a-aol_source_feed.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-aol_source_feed.o `test -f 'aol_source_feed.c' || echo '$(srcdir)/'`aol_source_feed.c + +libliflsources_a-aol_source_feed.obj: aol_source_feed.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-aol_source_feed.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-aol_source_feed.Tpo -c -o libliflsources_a-aol_source_feed.obj `if test -f 'aol_source_feed.c'; then $(CYGPATH_W) 'aol_source_feed.c'; else $(CYGPATH_W) '$(srcdir)/aol_source_feed.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-aol_source_feed.Tpo $(DEPDIR)/libliflsources_a-aol_source_feed.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='aol_source_feed.c' object='libliflsources_a-aol_source_feed.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-aol_source_feed.obj `if test -f 'aol_source_feed.c'; then $(CYGPATH_W) 'aol_source_feed.c'; else $(CYGPATH_W) '$(srcdir)/aol_source_feed.c'; fi` + +libliflsources_a-aol_source_opml.o: aol_source_opml.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-aol_source_opml.o -MD -MP -MF $(DEPDIR)/libliflsources_a-aol_source_opml.Tpo -c -o libliflsources_a-aol_source_opml.o `test -f 'aol_source_opml.c' || echo '$(srcdir)/'`aol_source_opml.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-aol_source_opml.Tpo $(DEPDIR)/libliflsources_a-aol_source_opml.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='aol_source_opml.c' object='libliflsources_a-aol_source_opml.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-aol_source_opml.o `test -f 'aol_source_opml.c' || echo '$(srcdir)/'`aol_source_opml.c + +libliflsources_a-aol_source_opml.obj: aol_source_opml.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-aol_source_opml.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-aol_source_opml.Tpo -c -o libliflsources_a-aol_source_opml.obj `if test -f 'aol_source_opml.c'; then $(CYGPATH_W) 'aol_source_opml.c'; else $(CYGPATH_W) '$(srcdir)/aol_source_opml.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-aol_source_opml.Tpo $(DEPDIR)/libliflsources_a-aol_source_opml.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='aol_source_opml.c' object='libliflsources_a-aol_source_opml.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-aol_source_opml.obj `if test -f 'aol_source_opml.c'; then $(CYGPATH_W) 'aol_source_opml.c'; else $(CYGPATH_W) '$(srcdir)/aol_source_opml.c'; fi` + libliflsources_a-default_source.o: default_source.c @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 @@ -412,47 +516,75 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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@ $(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 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google_source_edit.c' object='libliflsources_a-google_source_edit.o' libtool=no @AMDEPBACKSLASH@ +libliflsources_a-inoreader_source.o: inoreader_source.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-inoreader_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-inoreader_source.Tpo -c -o libliflsources_a-inoreader_source.o `test -f 'inoreader_source.c' || echo '$(srcdir)/'`inoreader_source.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-inoreader_source.Tpo $(DEPDIR)/libliflsources_a-inoreader_source.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='inoreader_source.c' object='libliflsources_a-inoreader_source.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-inoreader_source.o `test -f 'inoreader_source.c' || echo '$(srcdir)/'`inoreader_source.c + +libliflsources_a-inoreader_source.obj: inoreader_source.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-inoreader_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-inoreader_source.Tpo -c -o libliflsources_a-inoreader_source.obj `if test -f 'inoreader_source.c'; then $(CYGPATH_W) 'inoreader_source.c'; else $(CYGPATH_W) '$(srcdir)/inoreader_source.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-inoreader_source.Tpo $(DEPDIR)/libliflsources_a-inoreader_source.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='inoreader_source.c' object='libliflsources_a-inoreader_source.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-inoreader_source.obj `if test -f 'inoreader_source.c'; then $(CYGPATH_W) 'inoreader_source.c'; else $(CYGPATH_W) '$(srcdir)/inoreader_source.c'; fi` + +libliflsources_a-inoreader_source_edit.o: inoreader_source_edit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-inoreader_source_edit.o -MD -MP -MF $(DEPDIR)/libliflsources_a-inoreader_source_edit.Tpo -c -o libliflsources_a-inoreader_source_edit.o `test -f 'inoreader_source_edit.c' || echo '$(srcdir)/'`inoreader_source_edit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-inoreader_source_edit.Tpo $(DEPDIR)/libliflsources_a-inoreader_source_edit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='inoreader_source_edit.c' object='libliflsources_a-inoreader_source_edit.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-inoreader_source_edit.o `test -f 'inoreader_source_edit.c' || echo '$(srcdir)/'`inoreader_source_edit.c + +libliflsources_a-inoreader_source_edit.obj: inoreader_source_edit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-inoreader_source_edit.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-inoreader_source_edit.Tpo -c -o libliflsources_a-inoreader_source_edit.obj `if test -f 'inoreader_source_edit.c'; then $(CYGPATH_W) 'inoreader_source_edit.c'; else $(CYGPATH_W) '$(srcdir)/inoreader_source_edit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-inoreader_source_edit.Tpo $(DEPDIR)/libliflsources_a-inoreader_source_edit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='inoreader_source_edit.c' object='libliflsources_a-inoreader_source_edit.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-inoreader_source_edit.obj `if test -f 'inoreader_source_edit.c'; then $(CYGPATH_W) 'inoreader_source_edit.c'; else $(CYGPATH_W) '$(srcdir)/inoreader_source_edit.c'; fi` + +libliflsources_a-inoreader_source_feed.o: inoreader_source_feed.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-inoreader_source_feed.o -MD -MP -MF $(DEPDIR)/libliflsources_a-inoreader_source_feed.Tpo -c -o libliflsources_a-inoreader_source_feed.o `test -f 'inoreader_source_feed.c' || echo '$(srcdir)/'`inoreader_source_feed.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-inoreader_source_feed.Tpo $(DEPDIR)/libliflsources_a-inoreader_source_feed.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='inoreader_source_feed.c' object='libliflsources_a-inoreader_source_feed.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-inoreader_source_feed.o `test -f 'inoreader_source_feed.c' || echo '$(srcdir)/'`inoreader_source_feed.c -libliflsources_a-google_source_edit.obj: google_source_edit.c -@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 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google_source_edit.c' object='libliflsources_a-google_source_edit.obj' libtool=no @AMDEPBACKSLASH@ +libliflsources_a-inoreader_source_feed.obj: inoreader_source_feed.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-inoreader_source_feed.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-inoreader_source_feed.Tpo -c -o libliflsources_a-inoreader_source_feed.obj `if test -f 'inoreader_source_feed.c'; then $(CYGPATH_W) 'inoreader_source_feed.c'; else $(CYGPATH_W) '$(srcdir)/inoreader_source_feed.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-inoreader_source_feed.Tpo $(DEPDIR)/libliflsources_a-inoreader_source_feed.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='inoreader_source_feed.c' object='libliflsources_a-inoreader_source_feed.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-inoreader_source_feed.obj `if test -f 'inoreader_source_feed.c'; then $(CYGPATH_W) 'inoreader_source_feed.c'; else $(CYGPATH_W) '$(srcdir)/inoreader_source_feed.c'; fi` -libliflsources_a-google_source_feed.o: google_source_feed.c -@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 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google_source_feed.c' object='libliflsources_a-google_source_feed.o' libtool=no @AMDEPBACKSLASH@ +libliflsources_a-inoreader_source_feed_list.o: inoreader_source_feed_list.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-inoreader_source_feed_list.o -MD -MP -MF $(DEPDIR)/libliflsources_a-inoreader_source_feed_list.Tpo -c -o libliflsources_a-inoreader_source_feed_list.o `test -f 'inoreader_source_feed_list.c' || echo '$(srcdir)/'`inoreader_source_feed_list.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-inoreader_source_feed_list.Tpo $(DEPDIR)/libliflsources_a-inoreader_source_feed_list.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='inoreader_source_feed_list.c' object='libliflsources_a-inoreader_source_feed_list.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-inoreader_source_feed_list.o `test -f 'inoreader_source_feed_list.c' || echo '$(srcdir)/'`inoreader_source_feed_list.c -libliflsources_a-google_source_feed.obj: google_source_feed.c -@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 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google_source_feed.c' object='libliflsources_a-google_source_feed.obj' libtool=no @AMDEPBACKSLASH@ +libliflsources_a-inoreader_source_feed_list.obj: inoreader_source_feed_list.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-inoreader_source_feed_list.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-inoreader_source_feed_list.Tpo -c -o libliflsources_a-inoreader_source_feed_list.obj `if test -f 'inoreader_source_feed_list.c'; then $(CYGPATH_W) 'inoreader_source_feed_list.c'; else $(CYGPATH_W) '$(srcdir)/inoreader_source_feed_list.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-inoreader_source_feed_list.Tpo $(DEPDIR)/libliflsources_a-inoreader_source_feed_list.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='inoreader_source_feed_list.c' object='libliflsources_a-inoreader_source_feed_list.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-inoreader_source_feed_list.obj `if test -f 'inoreader_source_feed_list.c'; then $(CYGPATH_W) 'inoreader_source_feed_list.c'; else $(CYGPATH_W) '$(srcdir)/inoreader_source_feed_list.c'; fi` -libliflsources_a-google_source_opml.o: google_source_opml.c -@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 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google_source_opml.c' object='libliflsources_a-google_source_opml.o' libtool=no @AMDEPBACKSLASH@ +libliflsources_a-json_api_mapper.o: json_api_mapper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-json_api_mapper.o -MD -MP -MF $(DEPDIR)/libliflsources_a-json_api_mapper.Tpo -c -o libliflsources_a-json_api_mapper.o `test -f 'json_api_mapper.c' || echo '$(srcdir)/'`json_api_mapper.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-json_api_mapper.Tpo $(DEPDIR)/libliflsources_a-json_api_mapper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='json_api_mapper.c' object='libliflsources_a-json_api_mapper.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-json_api_mapper.o `test -f 'json_api_mapper.c' || echo '$(srcdir)/'`json_api_mapper.c -libliflsources_a-google_source_opml.obj: google_source_opml.c -@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 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google_source_opml.c' object='libliflsources_a-google_source_opml.obj' libtool=no @AMDEPBACKSLASH@ +libliflsources_a-json_api_mapper.obj: json_api_mapper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-json_api_mapper.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-json_api_mapper.Tpo -c -o libliflsources_a-json_api_mapper.obj `if test -f 'json_api_mapper.c'; then $(CYGPATH_W) 'json_api_mapper.c'; else $(CYGPATH_W) '$(srcdir)/json_api_mapper.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-json_api_mapper.Tpo $(DEPDIR)/libliflsources_a-json_api_mapper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='json_api_mapper.c' object='libliflsources_a-json_api_mapper.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-json_api_mapper.obj `if test -f 'json_api_mapper.c'; then $(CYGPATH_W) 'json_api_mapper.c'; else $(CYGPATH_W) '$(srcdir)/json_api_mapper.c'; fi` libliflsources_a-opml_source.o: opml_source.c @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 @@ -468,6 +600,118 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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-reedah_source.o: reedah_source.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-reedah_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-reedah_source.Tpo -c -o libliflsources_a-reedah_source.o `test -f 'reedah_source.c' || echo '$(srcdir)/'`reedah_source.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-reedah_source.Tpo $(DEPDIR)/libliflsources_a-reedah_source.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reedah_source.c' object='libliflsources_a-reedah_source.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-reedah_source.o `test -f 'reedah_source.c' || echo '$(srcdir)/'`reedah_source.c + +libliflsources_a-reedah_source.obj: reedah_source.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-reedah_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-reedah_source.Tpo -c -o libliflsources_a-reedah_source.obj `if test -f 'reedah_source.c'; then $(CYGPATH_W) 'reedah_source.c'; else $(CYGPATH_W) '$(srcdir)/reedah_source.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-reedah_source.Tpo $(DEPDIR)/libliflsources_a-reedah_source.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reedah_source.c' object='libliflsources_a-reedah_source.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-reedah_source.obj `if test -f 'reedah_source.c'; then $(CYGPATH_W) 'reedah_source.c'; else $(CYGPATH_W) '$(srcdir)/reedah_source.c'; fi` + +libliflsources_a-reedah_source_edit.o: reedah_source_edit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-reedah_source_edit.o -MD -MP -MF $(DEPDIR)/libliflsources_a-reedah_source_edit.Tpo -c -o libliflsources_a-reedah_source_edit.o `test -f 'reedah_source_edit.c' || echo '$(srcdir)/'`reedah_source_edit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-reedah_source_edit.Tpo $(DEPDIR)/libliflsources_a-reedah_source_edit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reedah_source_edit.c' object='libliflsources_a-reedah_source_edit.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-reedah_source_edit.o `test -f 'reedah_source_edit.c' || echo '$(srcdir)/'`reedah_source_edit.c + +libliflsources_a-reedah_source_edit.obj: reedah_source_edit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-reedah_source_edit.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-reedah_source_edit.Tpo -c -o libliflsources_a-reedah_source_edit.obj `if test -f 'reedah_source_edit.c'; then $(CYGPATH_W) 'reedah_source_edit.c'; else $(CYGPATH_W) '$(srcdir)/reedah_source_edit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-reedah_source_edit.Tpo $(DEPDIR)/libliflsources_a-reedah_source_edit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reedah_source_edit.c' object='libliflsources_a-reedah_source_edit.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-reedah_source_edit.obj `if test -f 'reedah_source_edit.c'; then $(CYGPATH_W) 'reedah_source_edit.c'; else $(CYGPATH_W) '$(srcdir)/reedah_source_edit.c'; fi` + +libliflsources_a-reedah_source_feed.o: reedah_source_feed.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-reedah_source_feed.o -MD -MP -MF $(DEPDIR)/libliflsources_a-reedah_source_feed.Tpo -c -o libliflsources_a-reedah_source_feed.o `test -f 'reedah_source_feed.c' || echo '$(srcdir)/'`reedah_source_feed.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-reedah_source_feed.Tpo $(DEPDIR)/libliflsources_a-reedah_source_feed.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reedah_source_feed.c' object='libliflsources_a-reedah_source_feed.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-reedah_source_feed.o `test -f 'reedah_source_feed.c' || echo '$(srcdir)/'`reedah_source_feed.c + +libliflsources_a-reedah_source_feed.obj: reedah_source_feed.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-reedah_source_feed.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-reedah_source_feed.Tpo -c -o libliflsources_a-reedah_source_feed.obj `if test -f 'reedah_source_feed.c'; then $(CYGPATH_W) 'reedah_source_feed.c'; else $(CYGPATH_W) '$(srcdir)/reedah_source_feed.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-reedah_source_feed.Tpo $(DEPDIR)/libliflsources_a-reedah_source_feed.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reedah_source_feed.c' object='libliflsources_a-reedah_source_feed.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-reedah_source_feed.obj `if test -f 'reedah_source_feed.c'; then $(CYGPATH_W) 'reedah_source_feed.c'; else $(CYGPATH_W) '$(srcdir)/reedah_source_feed.c'; fi` + +libliflsources_a-reedah_source_feed_list.o: reedah_source_feed_list.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-reedah_source_feed_list.o -MD -MP -MF $(DEPDIR)/libliflsources_a-reedah_source_feed_list.Tpo -c -o libliflsources_a-reedah_source_feed_list.o `test -f 'reedah_source_feed_list.c' || echo '$(srcdir)/'`reedah_source_feed_list.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-reedah_source_feed_list.Tpo $(DEPDIR)/libliflsources_a-reedah_source_feed_list.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reedah_source_feed_list.c' object='libliflsources_a-reedah_source_feed_list.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-reedah_source_feed_list.o `test -f 'reedah_source_feed_list.c' || echo '$(srcdir)/'`reedah_source_feed_list.c + +libliflsources_a-reedah_source_feed_list.obj: reedah_source_feed_list.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-reedah_source_feed_list.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-reedah_source_feed_list.Tpo -c -o libliflsources_a-reedah_source_feed_list.obj `if test -f 'reedah_source_feed_list.c'; then $(CYGPATH_W) 'reedah_source_feed_list.c'; else $(CYGPATH_W) '$(srcdir)/reedah_source_feed_list.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-reedah_source_feed_list.Tpo $(DEPDIR)/libliflsources_a-reedah_source_feed_list.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reedah_source_feed_list.c' object='libliflsources_a-reedah_source_feed_list.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-reedah_source_feed_list.obj `if test -f 'reedah_source_feed_list.c'; then $(CYGPATH_W) 'reedah_source_feed_list.c'; else $(CYGPATH_W) '$(srcdir)/reedah_source_feed_list.c'; fi` + +libliflsources_a-theoldreader_source.o: theoldreader_source.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-theoldreader_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-theoldreader_source.Tpo -c -o libliflsources_a-theoldreader_source.o `test -f 'theoldreader_source.c' || echo '$(srcdir)/'`theoldreader_source.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-theoldreader_source.Tpo $(DEPDIR)/libliflsources_a-theoldreader_source.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='theoldreader_source.c' object='libliflsources_a-theoldreader_source.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-theoldreader_source.o `test -f 'theoldreader_source.c' || echo '$(srcdir)/'`theoldreader_source.c + +libliflsources_a-theoldreader_source.obj: theoldreader_source.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-theoldreader_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-theoldreader_source.Tpo -c -o libliflsources_a-theoldreader_source.obj `if test -f 'theoldreader_source.c'; then $(CYGPATH_W) 'theoldreader_source.c'; else $(CYGPATH_W) '$(srcdir)/theoldreader_source.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-theoldreader_source.Tpo $(DEPDIR)/libliflsources_a-theoldreader_source.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='theoldreader_source.c' object='libliflsources_a-theoldreader_source.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-theoldreader_source.obj `if test -f 'theoldreader_source.c'; then $(CYGPATH_W) 'theoldreader_source.c'; else $(CYGPATH_W) '$(srcdir)/theoldreader_source.c'; fi` + +libliflsources_a-theoldreader_source_edit.o: theoldreader_source_edit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-theoldreader_source_edit.o -MD -MP -MF $(DEPDIR)/libliflsources_a-theoldreader_source_edit.Tpo -c -o libliflsources_a-theoldreader_source_edit.o `test -f 'theoldreader_source_edit.c' || echo '$(srcdir)/'`theoldreader_source_edit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-theoldreader_source_edit.Tpo $(DEPDIR)/libliflsources_a-theoldreader_source_edit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='theoldreader_source_edit.c' object='libliflsources_a-theoldreader_source_edit.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-theoldreader_source_edit.o `test -f 'theoldreader_source_edit.c' || echo '$(srcdir)/'`theoldreader_source_edit.c + +libliflsources_a-theoldreader_source_edit.obj: theoldreader_source_edit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-theoldreader_source_edit.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-theoldreader_source_edit.Tpo -c -o libliflsources_a-theoldreader_source_edit.obj `if test -f 'theoldreader_source_edit.c'; then $(CYGPATH_W) 'theoldreader_source_edit.c'; else $(CYGPATH_W) '$(srcdir)/theoldreader_source_edit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-theoldreader_source_edit.Tpo $(DEPDIR)/libliflsources_a-theoldreader_source_edit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='theoldreader_source_edit.c' object='libliflsources_a-theoldreader_source_edit.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-theoldreader_source_edit.obj `if test -f 'theoldreader_source_edit.c'; then $(CYGPATH_W) 'theoldreader_source_edit.c'; else $(CYGPATH_W) '$(srcdir)/theoldreader_source_edit.c'; fi` + +libliflsources_a-theoldreader_source_feed.o: theoldreader_source_feed.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-theoldreader_source_feed.o -MD -MP -MF $(DEPDIR)/libliflsources_a-theoldreader_source_feed.Tpo -c -o libliflsources_a-theoldreader_source_feed.o `test -f 'theoldreader_source_feed.c' || echo '$(srcdir)/'`theoldreader_source_feed.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-theoldreader_source_feed.Tpo $(DEPDIR)/libliflsources_a-theoldreader_source_feed.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='theoldreader_source_feed.c' object='libliflsources_a-theoldreader_source_feed.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-theoldreader_source_feed.o `test -f 'theoldreader_source_feed.c' || echo '$(srcdir)/'`theoldreader_source_feed.c + +libliflsources_a-theoldreader_source_feed.obj: theoldreader_source_feed.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-theoldreader_source_feed.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-theoldreader_source_feed.Tpo -c -o libliflsources_a-theoldreader_source_feed.obj `if test -f 'theoldreader_source_feed.c'; then $(CYGPATH_W) 'theoldreader_source_feed.c'; else $(CYGPATH_W) '$(srcdir)/theoldreader_source_feed.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-theoldreader_source_feed.Tpo $(DEPDIR)/libliflsources_a-theoldreader_source_feed.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='theoldreader_source_feed.c' object='libliflsources_a-theoldreader_source_feed.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-theoldreader_source_feed.obj `if test -f 'theoldreader_source_feed.c'; then $(CYGPATH_W) 'theoldreader_source_feed.c'; else $(CYGPATH_W) '$(srcdir)/theoldreader_source_feed.c'; fi` + +libliflsources_a-theoldreader_source_feed_list.o: theoldreader_source_feed_list.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-theoldreader_source_feed_list.o -MD -MP -MF $(DEPDIR)/libliflsources_a-theoldreader_source_feed_list.Tpo -c -o libliflsources_a-theoldreader_source_feed_list.o `test -f 'theoldreader_source_feed_list.c' || echo '$(srcdir)/'`theoldreader_source_feed_list.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-theoldreader_source_feed_list.Tpo $(DEPDIR)/libliflsources_a-theoldreader_source_feed_list.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='theoldreader_source_feed_list.c' object='libliflsources_a-theoldreader_source_feed_list.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-theoldreader_source_feed_list.o `test -f 'theoldreader_source_feed_list.c' || echo '$(srcdir)/'`theoldreader_source_feed_list.c + +libliflsources_a-theoldreader_source_feed_list.obj: theoldreader_source_feed_list.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-theoldreader_source_feed_list.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-theoldreader_source_feed_list.Tpo -c -o libliflsources_a-theoldreader_source_feed_list.obj `if test -f 'theoldreader_source_feed_list.c'; then $(CYGPATH_W) 'theoldreader_source_feed_list.c'; else $(CYGPATH_W) '$(srcdir)/theoldreader_source_feed_list.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-theoldreader_source_feed_list.Tpo $(DEPDIR)/libliflsources_a-theoldreader_source_feed_list.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='theoldreader_source_feed_list.c' object='libliflsources_a-theoldreader_source_feed_list.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-theoldreader_source_feed_list.obj `if test -f 'theoldreader_source_feed_list.c'; then $(CYGPATH_W) 'theoldreader_source_feed_list.c'; else $(CYGPATH_W) '$(srcdir)/theoldreader_source_feed_list.c'; fi` + libliflsources_a-ttrss_source.o: ttrss_source.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-ttrss_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-ttrss_source.Tpo -c -o libliflsources_a-ttrss_source.o `test -f 'ttrss_source.c' || echo '$(srcdir)/'`ttrss_source.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-ttrss_source.Tpo $(DEPDIR)/libliflsources_a-ttrss_source.Po diff -Nru liferea-1.8.15/src/fl_sources/node_source.c liferea-1.10.3/src/fl_sources/node_source.c --- liferea-1.8.15/src/fl_sources/node_source.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/node_source.c 2013-10-08 19:10:14.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file node_source.c generic node source provider implementation * - * Copyright (C) 2005-2010 Lars Lindner + * Copyright (C) 2005-2013 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,11 +36,15 @@ #include "ui/icons.h" #include "ui/liferea_dialog.h" #include "ui/ui_common.h" -#include "ui/ui_node.h" +#include "ui/feed_list_node.h" +#include "fl_sources/aol_source.h" #include "fl_sources/default_source.h" #include "fl_sources/dummy_source.h" #include "fl_sources/google_source.h" +#include "fl_sources/inoreader_source.h" #include "fl_sources/opml_source.h" +#include "fl_sources/reedah_source.h" +#include "fl_sources/theoldreader_source.h" #include "fl_sources/ttrss_source.h" static GSList *nodeSourceTypes = NULL; @@ -91,11 +95,15 @@ debug_enter ("node_source_setup_root"); /* we need to register all source types once before doing anything... */ + //node_source_type_register (aol_source_get_type ()); node_source_type_register (default_source_get_type ()); node_source_type_register (dummy_source_get_type ()); node_source_type_register (opml_source_get_type ()); node_source_type_register (google_source_get_type ()); +// node_source_type_register (inoreader_source_get_type ()); + node_source_type_register (reedah_source_get_type ()); node_source_type_register (ttrss_source_get_type ()); + node_source_type_register (theoldreader_source_get_type ()); type = node_source_type_find (NULL, NODE_SOURCE_CAPABILITY_IS_ROOT); if (!type) @@ -225,7 +233,7 @@ } static gboolean -ui_node_source_type_dialog (void) +feed_list_node_source_type_dialog (void) { GSList *iter = nodeSourceTypes; GtkWidget *dialog, *treeview; @@ -422,7 +430,7 @@ if (NULL != NODE_SOURCE_TYPE (node)->source_delete) NODE_SOURCE_TYPE (node)->source_delete (node); - ui_node_remove_node (node); + feed_list_node_remove_node (node); } static void @@ -465,8 +473,8 @@ nodeType->update_counters = folder_get_node_type()->update_counters; nodeType->remove = node_source_remove; nodeType->render = node_default_render; - nodeType->request_add = ui_node_source_type_dialog; - nodeType->request_properties = ui_node_rename; + nodeType->request_add = feed_list_node_source_type_dialog; + nodeType->request_properties = feed_list_node_rename; nodeType->free = node_source_free; } diff -Nru liferea-1.8.15/src/fl_sources/node_source.h liferea-1.10.3/src/fl_sources/node_source.h --- liferea-1.8.15/src/fl_sources/node_source.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/node_source.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file node_source.h generic node source interface * - * Copyright (C) 2005-2012 Lars Lindner + * Copyright (C) 2005-2013 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/fl_sources/opml_source.c liferea-1.10.3/src/fl_sources/opml_source.c --- liferea-1.8.15/src/fl_sources/opml_source.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/opml_source.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file opml_source.c OPML Planet/Blogroll feed list source * - * Copyright (C) 2006-2010 Lars Lindner + * Copyright (C) 2006-2013 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,6 +33,7 @@ #include "xml.h" #include "ui/icons.h" #include "ui/liferea_dialog.h" +#include "ui/ui_common.h" /** default OPML update interval = once a day */ #define OPML_SOURCE_UPDATE_INTERVAL 60*60*24 @@ -228,7 +229,7 @@ gchar * opml_source_get_feedlist (nodePtr node) { - return common_create_cache_filename ("cache" G_DIR_SEPARATOR_S "plugins", node->id, "opml"); + return common_create_cache_filename ("plugins", node->id, "opml"); } void @@ -336,7 +337,13 @@ opml_source_get_feedlist, opml_source_update, opml_source_auto_update, - NULL /* free */ + NULL, /* free */ + NULL, /* item_set_flag */ + NULL, /* item_mark_read */ + NULL, /* add_folder */ + NULL, /* add_subscription */ + NULL, /* remove */ + NULL /* convert_to_local */ }; nodeSourceTypePtr @@ -384,7 +391,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, "*.opml", _("OPML Files"), user_data); + ui_choose_file (_("Choose OPML File"), GTK_STOCK_OPEN, FALSE, on_opml_file_selected, NULL, NULL, "*.opml|*.xml", _("OPML Files"), user_data); } static void diff -Nru liferea-1.8.15/src/fl_sources/opml_source.h liferea-1.10.3/src/fl_sources/opml_source.h --- liferea-1.8.15/src/fl_sources/opml_source.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/opml_source.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file opml_source.h OPML Planet/Blogroll feed list provider * - * Copyright (C) 2005-2009 Lars Lindner + * Copyright (C) 2005-2009 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/fl_sources/reedah_source.c liferea-1.10.3/src/fl_sources/reedah_source.c --- liferea-1.8.15/src/fl_sources/reedah_source.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/reedah_source.c 2013-08-10 00:21:54.000000000 +0200 @@ -0,0 +1,417 @@ +/** + * @file reedah_source.c Google reader feed list source support + * + * Copyright (C) 2007-2013 Lars Windolf + * Copyright (C) 2008 Arnold Noronha + * Copyright (C) 2011 Peter Oliver + * Copyright (C) 2011 Sergey Snitsaruk + * + * 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 "fl_sources/reedah_source.h" + +#include +#include +#include +#include + +#include "common.h" +#include "debug.h" +#include "feedlist.h" +#include "item_state.h" +#include "metadata.h" +#include "node.h" +#include "subscription.h" +#include "update.h" +#include "xml.h" +#include "ui/auth_dialog.h" +#include "ui/liferea_dialog.h" +#include "fl_sources/node_source.h" +#include "fl_sources/opml_source.h" +#include "fl_sources/reedah_source_edit.h" +#include "fl_sources/reedah_source_feed_list.h" + +/** default Google reader subscription list update interval = once a day */ +#define REEDAH_SOURCE_UPDATE_INTERVAL 60*60*24 + +/** create a google source with given node as root */ +static ReedahSourcePtr +reedah_source_new (nodePtr node) +{ + ReedahSourcePtr source = g_new0 (struct ReedahSource, 1) ; + source->root = node; + source->actionQueue = g_queue_new (); + source->loginState = REEDAH_SOURCE_STATE_NONE; + source->lastTimestampMap = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + + return source; +} + +static void +reedah_source_free (ReedahSourcePtr gsource) +{ + if (!gsource) + return; + + update_job_cancel_by_owner (gsource); + + g_free (gsource->authHeaderValue); + g_queue_free (gsource->actionQueue) ; + g_hash_table_unref (gsource->lastTimestampMap); + g_free (gsource); +} + +static void +reedah_source_login_cb (const struct updateResult * const result, gpointer userdata, updateFlags flags) +{ + ReedahSourcePtr gsource = (ReedahSourcePtr) userdata; + gchar *tmp = NULL; + subscriptionPtr subscription = gsource->root->subscription; + + debug1 (DEBUG_UPDATE, "Reedah login processing... %s", result->data); + + g_assert (!gsource->authHeaderValue); + + if (result->data && result->httpstatus == 200) + tmp = strstr (result->data, "Auth="); + + if (tmp) { + gchar *ttmp = tmp; + tmp = strchr (tmp, '\n'); + if (tmp) + *tmp = '\0'; + gsource->authHeaderValue = g_strdup_printf ("GoogleLogin auth=%s", ttmp + 5); + + debug1 (DEBUG_UPDATE, "Reedah Auth token found: %s", gsource->authHeaderValue); + + gsource->loginState = REEDAH_SOURCE_STATE_ACTIVE; + gsource->authFailures = 0; + + /* now that we are authenticated trigger updating to start data retrieval */ + if (!(flags & REEDAH_SOURCE_UPDATE_ONLY_LOGIN)) + subscription_update (subscription, flags); + + /* process any edits waiting in queue */ + reedah_source_edit_process (gsource); + + } else { + debug0 (DEBUG_UPDATE, "google reader login failed! no Auth token found in result!"); + subscription->node->available = FALSE; + + g_free (subscription->updateError); + subscription->updateError = g_strdup (_("Reedah login failed!")); + gsource->authFailures++; + + if (gsource->authFailures < REEDAH_SOURCE_MAX_AUTH_FAILURES) + gsource->loginState = REEDAH_SOURCE_STATE_NONE; + else + gsource->loginState = REEDAH_SOURCE_STATE_NO_AUTH; + + auth_dialog_new (subscription, flags); + } +} + +/** + * Perform a login to Google Reader, if the login completes the + * ReedahSource will have a valid Auth token and will have loginStatus to + * REEDAH_SOURCE_LOGIN_ACTIVE. + */ +void +reedah_source_login (ReedahSourcePtr gsource, guint32 flags) +{ + gchar *username, *password; + updateRequestPtr request; + subscriptionPtr subscription = gsource->root->subscription; + + if (gsource->loginState != REEDAH_SOURCE_STATE_NONE) { + /* this should not happen, as of now, we assume the session + * doesn't expire. */ + debug1(DEBUG_UPDATE, "Logging in while login state is %d\n", gsource->loginState); + } + + request = update_request_new (); + + update_request_set_source (request, REEDAH_READER_LOGIN_URL); + + /* escape user and password as both are passed using an URI */ + username = g_uri_escape_string (subscription->updateOptions->username, NULL, TRUE); + password = g_uri_escape_string (subscription->updateOptions->password, NULL, TRUE); + + request->postdata = g_strdup_printf (REEDAH_READER_LOGIN_POST, username, password); + request->options = update_options_copy (subscription->updateOptions); + + g_free (username); + g_free (password); + + gsource->loginState = REEDAH_SOURCE_STATE_IN_PROGRESS ; + + update_execute_request (gsource, request, reedah_source_login_cb, gsource, flags); +} + +/* node source type implementation */ + +static void +reedah_source_update (nodePtr node) +{ + ReedahSourcePtr gsource = (ReedahSourcePtr) node->data; + + /* Reset REEDAH_SOURCE_STATE_NO_AUTH as this is a manual + user interaction and no auto-update so we can query + for credentials again. */ + if (gsource->loginState == REEDAH_SOURCE_STATE_NO_AUTH) + gsource->loginState = REEDAH_SOURCE_STATE_NONE; + + subscription_update (node->subscription, 0); // FIXME: 0 ? +} + +static void +reedah_source_auto_update (nodePtr node) +{ + GTimeVal now; + ReedahSourcePtr gsource = (ReedahSourcePtr) node->data; + + if (gsource->loginState == REEDAH_SOURCE_STATE_NONE) { + reedah_source_update (node); + return; + } + + if (gsource->loginState == REEDAH_SOURCE_STATE_IN_PROGRESS) + return; /* the update will start automatically anyway */ + + g_get_current_time (&now); + + /* do daily updates for the feed list and feed updates according to the default interval */ + if (node->subscription->updateState->lastPoll.tv_sec + REEDAH_SOURCE_UPDATE_INTERVAL <= now.tv_sec) { + subscription_update (node->subscription, 0); + g_get_current_time (&gsource->lastQuickUpdate); + } + else if (gsource->lastQuickUpdate.tv_sec + REEDAH_SOURCE_QUICK_UPDATE_INTERVAL <= now.tv_sec) { + reedah_source_opml_quick_update (gsource); + reedah_source_edit_process (gsource); + g_get_current_time (&gsource->lastQuickUpdate); + } +} + +static void +reedah_source_init (void) +{ + metadata_type_register ("reedah-feed-id", METADATA_TYPE_TEXT); +} + +static void reedah_source_deinit (void) { } + +static void +reedah_source_import_node (nodePtr node) +{ + GSList *iter; + for (iter = node->children; iter; iter = g_slist_next(iter)) { + nodePtr subnode = iter->data; + if (subnode->subscription) + subnode->subscription->type = &reedahSourceFeedSubscriptionType; + if (subnode->type->capabilities + & NODE_CAPABILITY_SUBFOLDERS) + reedah_source_import_node (subnode); + } +} + +static void +reedah_source_import (nodePtr node) +{ + opml_source_import (node); + + node->subscription->type = &reedahSourceOpmlSubscriptionType; + if (!node->data) + node->data = (gpointer) reedah_source_new (node); + + reedah_source_import_node (node); +} + +static void +reedah_source_export (nodePtr node) +{ + opml_source_export (node); +} + +static gchar * +reedah_source_get_feedlist (nodePtr node) +{ + return opml_source_get_feedlist (node); +} + +static void +reedah_source_remove (nodePtr node) +{ + opml_source_remove (node); +} + +static nodePtr +reedah_source_add_subscription (nodePtr node, subscriptionPtr subscription) +{ + debug_enter ("reedah_source_add_subscription"); + nodePtr child = node_new (feed_get_node_type ()); + + debug0 (DEBUG_UPDATE, "ReedahSource: Adding a new subscription"); + node_set_data (child, feed_new ()); + + node_set_subscription (child, subscription); + child->subscription->type = &reedahSourceFeedSubscriptionType; + + node_set_title (child, _("New Subscription")); + + reedah_source_edit_add_subscription (node_source_root_from_node (node)->data, subscription->source); + + debug_exit ("reedah_source_add_subscription"); + + return child; +} + +static void +reedah_source_remove_node (nodePtr node, nodePtr child) +{ + gchar *source; + ReedahSourcePtr gsource = node->data; + + if (child == node) { + feedlist_node_removed (child); + return; + } + + source = g_strdup (child->subscription->source); + + feedlist_node_removed (child); + + /* propagate the removal only if there aren't other copies */ + if (!reedah_source_opml_get_node_by_source (gsource, source)) + reedah_source_edit_remove_subscription (gsource, source); + + g_free (source); +} + +/* GUI callbacks */ + +static void +on_reedah_source_selected (GtkDialog *dialog, + gint response_id, + gpointer user_data) +{ + nodePtr node; + subscriptionPtr subscription; + + if (response_id == GTK_RESPONSE_OK) { + subscription = subscription_new ("http://www.reedah.com/reader", NULL, NULL); + node = node_new (node_source_get_node_type ()); + node_set_title (node, "Reedah"); + node_source_new (node, reedah_source_get_type ()); + node_set_subscription (node, subscription); + + subscription_set_auth_info (subscription, + gtk_entry_get_text (GTK_ENTRY (liferea_dialog_lookup (GTK_WIDGET(dialog), "userEntry"))), + gtk_entry_get_text (GTK_ENTRY (liferea_dialog_lookup (GTK_WIDGET(dialog), "passwordEntry")))); + + subscription->type = &reedahSourceOpmlSubscriptionType ; + + node->data = reedah_source_new (node); + feedlist_node_added (node); + reedah_source_update (node); + } + + gtk_widget_destroy (GTK_WIDGET (dialog)); +} + +static void +ui_reedah_source_get_account_info (void) +{ + GtkWidget *dialog; + + dialog = liferea_dialog_new ("reedah_source.ui", "reedah_source_dialog"); + + g_signal_connect (G_OBJECT (dialog), "response", + G_CALLBACK (on_reedah_source_selected), + NULL); +} + +static void +reedah_source_cleanup (nodePtr node) +{ + ReedahSourcePtr reader = (ReedahSourcePtr) node->data; + reedah_source_free(reader); + node->data = NULL ; +} + +static void +reedah_source_item_set_flag (nodePtr node, itemPtr item, gboolean newStatus) +{ + nodePtr root = node_source_root_from_node (node); + reedah_source_edit_mark_starred ((ReedahSourcePtr)root->data, item->sourceId, node->subscription->source, newStatus); + item_flag_state_changed (item, newStatus); +} + +static void +reedah_source_item_mark_read (nodePtr node, itemPtr item, gboolean newStatus) +{ + nodePtr root = node_source_root_from_node (node); + reedah_source_edit_mark_read ((ReedahSourcePtr)root->data, item->sourceId, node->subscription->source, newStatus); + item_read_state_changed (item, newStatus); +} + +/** + * Convert all subscriptions of a google source to local feeds + * + * @param node The node to migrate (not the nodeSource!) + */ +static void +reedah_source_convert_to_local (nodePtr node) +{ + ReedahSourcePtr gsource = node->data; + + gsource->loginState = REEDAH_SOURCE_STATE_MIGRATE; +} + +/* node source type definition */ + +static struct nodeSourceType nst = { + .id = "fl_reedah", + .name = N_("Reedah"), + .description = N_("Integrate the feed list of your Reedah account. Liferea will " + "present your Reedah subscriptions, and will synchronize your feed list and reading lists."), + .capabilities = NODE_SOURCE_CAPABILITY_DYNAMIC_CREATION | + NODE_SOURCE_CAPABILITY_WRITABLE_FEEDLIST | + NODE_SOURCE_CAPABILITY_ADD_FEED | + NODE_SOURCE_CAPABILITY_ITEM_STATE_SYNC | + NODE_SOURCE_CAPABILITY_CONVERT_TO_LOCAL, + .source_type_init = reedah_source_init, + .source_type_deinit = reedah_source_deinit, + .source_new = ui_reedah_source_get_account_info, + .source_delete = reedah_source_remove, + .source_import = reedah_source_import, + .source_export = reedah_source_export, + .source_get_feedlist = reedah_source_get_feedlist, + .source_update = reedah_source_update, + .source_auto_update = reedah_source_auto_update, + .free = reedah_source_cleanup, + .item_set_flag = reedah_source_item_set_flag, + .item_mark_read = reedah_source_item_mark_read, + .add_folder = NULL, + .add_subscription = reedah_source_add_subscription, + .remove_node = reedah_source_remove_node, + .convert_to_local = reedah_source_convert_to_local +}; + +nodeSourceTypePtr +reedah_source_get_type (void) +{ + return &nst; +} diff -Nru liferea-1.8.15/src/fl_sources/reedah_source_edit.c liferea-1.10.3/src/fl_sources/reedah_source_edit.c --- liferea-1.8.15/src/fl_sources/reedah_source_edit.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/reedah_source_edit.c 2013-08-10 00:21:54.000000000 +0200 @@ -0,0 +1,486 @@ +/** + * @file reedah_source_edit.c Google reader feed list source syncing support + * + * Copyright (C) 2008 Arnold Noronha + * + * 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 "debug.h" +#include "update.h" +#include "subscription.h" +#include "common.h" +#include "feedlist.h" + + +#include "reedah_source.h" +#include "reedah_source_edit.h" +#include "config.h" +#include +#include +#include +#include "xml.h" + +/** + * A structure to indicate an edit to the Google Reader "database". + * These edits are put in a queue and processed in sequential order + * so that google does not end up processing the requests in an + * unintended order. + */ +typedef struct ReedahSourceAction { + /** + * The guid of the item to edit. This will be ignored if the + * edit is acting on an subscription rather than an item. + */ + gchar* guid; + + /** + * A MANDATORY feed url to containing the item, or the url of the + * subscription to edit. + */ + gchar* feedUrl; + + /** + * The source type. Currently known types are "feed" and "user". + * "user" sources are used, for example, for items that are links (as + * opposed to posts) in broadcast-friends. The unique id of the source + * is of the form /. + */ + gchar* feedUrlType; + + /** + * A callback function on completion of the edit. + */ + void (*callback) (ReedahSourcePtr gsource, struct ReedahSourceAction* edit, gboolean success); + + /** + * The type of this ReedahSourceAction. + */ + int actionType ; +} *ReedahSourceActionPtr ; + +enum { + EDIT_ACTION_MARK_READ, + EDIT_ACTION_MARK_UNREAD, + EDIT_ACTION_TRACKING_MARK_UNREAD, /**< every UNREAD request, should be followed by tracking-kept-unread */ + EDIT_ACTION_MARK_STARRED, + EDIT_ACTION_MARK_UNSTARRED, + EDIT_ACTION_ADD_SUBSCRIPTION, + EDIT_ACTION_REMOVE_SUBSCRIPTION +} ; + + +typedef struct ReedahSourceAction* editPtr ; + +typedef struct ReedahSourceActionCtxt { + gchar *nodeId ; + ReedahSourceActionPtr action; +} *ReedahSourceActionCtxtPtr; + + +static void reedah_source_edit_push (ReedahSourcePtr gsource, ReedahSourceActionPtr action, gboolean head); + + +static ReedahSourceActionPtr +reedah_source_action_new (void) +{ + ReedahSourceActionPtr action = g_slice_new0 (struct ReedahSourceAction); + return action; +} + +static void +reedah_source_action_free (ReedahSourceActionPtr action) +{ + g_free (action->guid); + g_free (action->feedUrl); + g_slice_free (struct ReedahSourceAction, action); +} + +static ReedahSourceActionCtxtPtr +reedah_source_action_context_new(ReedahSourcePtr gsource, ReedahSourceActionPtr action) +{ + ReedahSourceActionCtxtPtr ctxt = g_slice_new0(struct ReedahSourceActionCtxt); + ctxt->nodeId = g_strdup(gsource->root->id); + ctxt->action = action; + return ctxt; +} + +static void +reedah_source_action_context_free(ReedahSourceActionCtxtPtr ctxt) +{ + g_free(ctxt->nodeId); + g_slice_free(struct ReedahSourceActionCtxt, ctxt); +} + +static void +reedah_source_edit_action_complete (const struct updateResult* const result, gpointer userdata, updateFlags flags) +{ + ReedahSourceActionCtxtPtr editCtxt = (ReedahSourceActionCtxtPtr) userdata; + nodePtr node = node_from_id (editCtxt->nodeId); + ReedahSourcePtr gsource; + ReedahSourceActionPtr action = editCtxt->action ; + + reedah_source_action_context_free (editCtxt); + + if (!node) { + reedah_source_action_free (action); + return; /* probably got deleted before this callback */ + } + gsource = (ReedahSourcePtr) node->data; + + if (result->data == NULL || !g_str_equal (result->data, "OK")) { + if (action->callback) + (*action->callback) (gsource, action, FALSE); + debug1 (DEBUG_UPDATE, "The edit action failed with result: %s\n", result->data); + reedah_source_action_free (action); + return; /** @todo start a timer for next processing */ + } + + if (action->callback) + action->callback (gsource, action, TRUE); + + reedah_source_action_free (action); + + /* process anything else waiting on the edit queue */ + reedah_source_edit_process (gsource); +} + +/* the following reedah_source_api_* functions are simply funtions that + convert a ReedahSourceActionPtr to a updateRequestPtr */ + +static void +reedah_source_api_add_subscription (ReedahSourceActionPtr action, updateRequestPtr request, const gchar* token) +{ + update_request_set_source (request, REEDAH_READER_ADD_SUBSCRIPTION_URL); + gchar* s_escaped = g_uri_escape_string (action->feedUrl, NULL, TRUE) ; + gchar* postdata = g_strdup_printf (REEDAH_READER_ADD_SUBSCRIPTION_POST, s_escaped, token); + g_free (s_escaped); + + debug1 (DEBUG_UPDATE, "reedah_source: postdata [%s]", postdata); + request->postdata = postdata ; +} + +static void +reedah_source_api_remove_subscription (ReedahSourceActionPtr action, updateRequestPtr request, const gchar* token) +{ + update_request_set_source (request, REEDAH_READER_REMOVE_SUBSCRIPTION_URL); + gchar* s_escaped = g_uri_escape_string (action->feedUrl, NULL, TRUE); + g_assert (!request->postdata); + request->postdata = g_strdup_printf (REEDAH_READER_REMOVE_SUBSCRIPTION_POST, s_escaped, token); + g_free (s_escaped); +} + +static void +reedah_source_api_edit_tag (ReedahSourceActionPtr action, updateRequestPtr request, const gchar*token) +{ + update_request_set_source (request, REEDAH_READER_EDIT_TAG_URL); + + const gchar* prefix = "feed" ; + gchar* s_escaped = g_uri_escape_string (action->feedUrl, NULL, TRUE); + gchar* a_escaped = NULL ; + gchar* i_escaped = g_uri_escape_string (action->guid, NULL, TRUE); + gchar* postdata = NULL ; + + /* + * If the source of the item is a feed then the source *id* will be of + * the form tag:google.com,2005:reader/feed/http://foo.com/bar + * If the item is a shared link it is of the form + * tag:google.com,2005:reader/user//source/com.google/link + * It is possible that there are items other thank link that has + * the ../user/.. id. The GR API requires the strings after ..:reader/ + * while ReedahSourceAction only gives me after :reader/feed/ (or + * :reader/user/ as the case might be). I therefore need to guess + * the prefix ('feed/' or 'user/') from just this information. + */ + + if (strstr(action->feedUrl, "://") == NULL) + prefix = "user" ; + + if (action->actionType == EDIT_ACTION_MARK_UNREAD) { + a_escaped = g_uri_escape_string (REEDAH_READER_TAG_KEPT_UNREAD, NULL, TRUE); + gchar *r_escaped = g_uri_escape_string (REEDAH_READER_TAG_READ, NULL, TRUE); + postdata = g_strdup_printf (REEDAH_READER_EDIT_TAG_AR_TAG, i_escaped, prefix, s_escaped, a_escaped, r_escaped, token); + g_free (r_escaped); + } + else if (action->actionType == EDIT_ACTION_MARK_READ) { + a_escaped = g_uri_escape_string (REEDAH_READER_TAG_READ, NULL, TRUE); + postdata = g_strdup_printf (REEDAH_READER_EDIT_TAG_ADD_TAG, i_escaped, prefix, s_escaped, a_escaped, token); + } + else if (action->actionType == EDIT_ACTION_TRACKING_MARK_UNREAD) { + a_escaped = g_uri_escape_string (REEDAH_READER_TAG_TRACKING_KEPT_UNREAD, NULL, TRUE); + postdata = g_strdup_printf (REEDAH_READER_EDIT_TAG_ADD_TAG, i_escaped, prefix, s_escaped, a_escaped, token); + } + else if (action->actionType == EDIT_ACTION_MARK_STARRED) { + a_escaped = g_uri_escape_string (REEDAH_READER_TAG_STARRED, NULL, TRUE) ; + postdata = g_strdup_printf ( + REEDAH_READER_EDIT_TAG_ADD_TAG, i_escaped, prefix, + s_escaped, a_escaped, token); + } + else if (action->actionType == EDIT_ACTION_MARK_UNSTARRED) { + gchar* r_escaped = g_uri_escape_string(REEDAH_READER_TAG_STARRED, NULL, TRUE); + postdata = g_strdup_printf ( + REEDAH_READER_EDIT_TAG_REMOVE_TAG, i_escaped, prefix, + s_escaped, r_escaped, token); + } + + else g_assert (FALSE); + + g_free (s_escaped); + g_free (a_escaped); + g_free (i_escaped); + + debug1 (DEBUG_UPDATE, "reedah_source: postdata [%s]", postdata); + + + request->postdata = postdata; +} + +static void +reedah_source_edit_token_cb (const struct updateResult * const result, gpointer userdata, updateFlags flags) +{ + nodePtr node; + ReedahSourcePtr gsource; + const gchar* token; + ReedahSourceActionPtr action; + updateRequestPtr request; + + if (result->httpstatus != 200 || result->data == NULL) { + /* FIXME: What is the behaviour that should go here? */ + return; + } + + node = node_from_id ((gchar*) userdata); + g_free (userdata); + + if (!node) { + return; + } + gsource = (ReedahSourcePtr) node->data; + + + token = result->data; + + if (!gsource || g_queue_is_empty (gsource->actionQueue)) + return; + + action = g_queue_peek_head (gsource->actionQueue); + + 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); + + if (action->actionType == EDIT_ACTION_MARK_READ || + action->actionType == EDIT_ACTION_MARK_UNREAD || + action->actionType == EDIT_ACTION_TRACKING_MARK_UNREAD || + action->actionType == EDIT_ACTION_MARK_STARRED || + action->actionType == EDIT_ACTION_MARK_UNSTARRED) + reedah_source_api_edit_tag (action, request, token); + else if (action->actionType == EDIT_ACTION_ADD_SUBSCRIPTION ) + reedah_source_api_add_subscription (action, request, token); + else if (action->actionType == EDIT_ACTION_REMOVE_SUBSCRIPTION ) + reedah_source_api_remove_subscription (action, request, token) ; + + update_execute_request (gsource, request, reedah_source_edit_action_complete, reedah_source_action_context_new(gsource, action), 0); + + action = g_queue_pop_head (gsource->actionQueue); +} + +void +reedah_source_edit_process (ReedahSourcePtr gsource) +{ + updateRequestPtr request; + + g_assert (gsource); + if (g_queue_is_empty (gsource->actionQueue)) + return; + + /* + * Google reader has a system of tokens. So first, I need to request a + * token from google, before I can make the actual edit request. The + * code here is the token code, the actual edit commands are in + * reedah_source_edit_token_cb + */ + request = update_request_new (); + request->updateState = update_state_copy (gsource->root->subscription->updateState); + request->options = update_options_copy (gsource->root->subscription->updateOptions); + request->source = g_strdup (REEDAH_READER_TOKEN_URL); + update_request_set_auth_value(request, gsource->authHeaderValue); + + update_execute_request (gsource, request, reedah_source_edit_token_cb, + g_strdup(gsource->root->id), 0); +} + +static void +reedah_source_edit_push_ (ReedahSourcePtr gsource, ReedahSourceActionPtr action, gboolean head) +{ + g_assert (gsource->actionQueue); + if (head) g_queue_push_head (gsource->actionQueue, action); + else g_queue_push_tail (gsource->actionQueue, action); +} + +static void +reedah_source_edit_push (ReedahSourcePtr gsource, ReedahSourceActionPtr action, gboolean head) +{ + g_assert (gsource); + nodePtr root = gsource->root; + reedah_source_edit_push_ (gsource, action, head); + + /** @todo any flags I should specify? */ + if (gsource->loginState == REEDAH_SOURCE_STATE_NONE) + subscription_update(root->subscription, REEDAH_SOURCE_UPDATE_ONLY_LOGIN); + else if ( gsource->loginState == REEDAH_SOURCE_STATE_ACTIVE) + reedah_source_edit_process (gsource); +} + +static void +update_read_state_callback (ReedahSourcePtr gsource, ReedahSourceActionPtr action, gboolean success) +{ + if (success) { + // FIXME: call item_read_state_changed (item, newState); + } else { + debug0 (DEBUG_UPDATE, "Failed to change item state!\n"); + } +} + +void +reedah_source_edit_mark_read (ReedahSourcePtr gsource, const gchar *guid, const gchar *feedUrl, gboolean newStatus) +{ + ReedahSourceActionPtr action = reedah_source_action_new (); + + action->guid = g_strdup (guid); + action->feedUrl = g_strdup (feedUrl); + action->actionType = newStatus ? EDIT_ACTION_MARK_READ : + EDIT_ACTION_MARK_UNREAD; + action->callback = update_read_state_callback; + + reedah_source_edit_push (gsource, action, FALSE); + + if (newStatus == FALSE) { + /* + * According to the Google Reader API, to mark an item unread, + * I also need to mark it as tracking-kept-unread in a separate + * network call. + */ + action = reedah_source_action_new (); + action->guid = g_strdup (guid); + action->feedUrl = g_strdup (feedUrl); + action->actionType = EDIT_ACTION_TRACKING_MARK_UNREAD; + reedah_source_edit_push (gsource, action, FALSE); + } +} + +static void +update_starred_state_callback(ReedahSourcePtr gsource, ReedahSourceActionPtr action, gboolean success) +{ + if (success) { + // FIXME: call item_flag_changed (item, newState); + } else { + debug0 (DEBUG_UPDATE, "Failed to change item state!\n"); + } +} + +void +reedah_source_edit_mark_starred (ReedahSourcePtr gsource, const gchar *guid, const gchar *feedUrl, gboolean newStatus) +{ + ReedahSourceActionPtr action = reedah_source_action_new (); + + action->guid = g_strdup (guid); + action->feedUrl = g_strdup (feedUrl); + action->actionType = newStatus ? EDIT_ACTION_MARK_STARRED : EDIT_ACTION_MARK_UNSTARRED; + action->callback = update_starred_state_callback; + + reedah_source_edit_push (gsource, action, FALSE); +} + +static void +update_subscription_list_callback(ReedahSourcePtr gsource, ReedahSourceActionPtr action, gboolean success) +{ + if (success) { + /* + * It is possible that Google changed the name of the URL that + * was sent to it. In that case, I need to recover the URL + * from the list. But a node with the old URL has already + * been created. Allow the subscription update call to fix that. + */ + GSList* cur = gsource->root->children ; + for(; cur; cur = g_slist_next (cur)) { + nodePtr node = (nodePtr) cur->data ; + if (g_str_equal (node->subscription->source, action->feedUrl)) { + subscription_set_source (node->subscription, ""); + feedlist_node_added (node); + } + } + + debug0 (DEBUG_UPDATE, "Subscription list was updated successful\n"); + subscription_update (gsource->root->subscription, REEDAH_SOURCE_UPDATE_ONLY_LIST); + } else + debug0 (DEBUG_UPDATE, "Failed to update subscriptions\n"); +} + +void +reedah_source_edit_add_subscription (ReedahSourcePtr gsource, const gchar* feedUrl) +{ + ReedahSourceActionPtr action = reedah_source_action_new () ; + action->actionType = EDIT_ACTION_ADD_SUBSCRIPTION; + action->feedUrl = g_strdup (feedUrl); + action->callback = update_subscription_list_callback; + reedah_source_edit_push (gsource, action, TRUE); +} + +static void +reedah_source_edit_remove_callback (ReedahSourcePtr gsource, ReedahSourceActionPtr action, gboolean success) +{ + if (success) { + /* + * The node was removed from the feedlist, but could have + * returned because of an update before this edit request + * completed. No cleaner way to handle this. + */ + GSList* cur = gsource->root->children ; + for(; cur; cur = g_slist_next (cur)) { + nodePtr node = (nodePtr) cur->data ; + if (g_str_equal (node->subscription->source, action->feedUrl)) { + feedlist_node_removed (node); + return; + } + } + } else + debug0 (DEBUG_UPDATE, "Failed to remove subscription"); +} + +void reedah_source_edit_remove_subscription (ReedahSourcePtr gsource, const gchar* feedUrl) +{ + ReedahSourceActionPtr action = reedah_source_action_new (); + action->actionType = EDIT_ACTION_REMOVE_SUBSCRIPTION; + action->feedUrl = g_strdup (feedUrl); + action->callback = reedah_source_edit_remove_callback; + reedah_source_edit_push (gsource, action, TRUE); +} + +gboolean reedah_source_edit_is_in_queue (ReedahSourcePtr gsource, const gchar* guid) +{ + /* this is inefficient, but works for the time being */ + GList *cur = gsource->actionQueue->head; + for(; cur; cur = g_list_next (cur)) { + ReedahSourceActionPtr action = cur->data; + if (action->guid && g_str_equal (action->guid, guid)) + return TRUE; + } + return FALSE; +} diff -Nru liferea-1.8.15/src/fl_sources/reedah_source_edit.h liferea-1.10.3/src/fl_sources/reedah_source_edit.h --- liferea-1.8.15/src/fl_sources/reedah_source_edit.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/reedah_source_edit.h 2013-08-10 00:21:54.000000000 +0200 @@ -0,0 +1,86 @@ +/** + * @file reedah_source_edit.c Google reader feed list source syncing support + * + * Copyright (C) 2008 Arnold Noronha + * + * 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 _REEDAH_SOURCE_EDIT_H +#define _REEDAH_SOURCE_EDIT_H + +#include "reedah_source.h" + +#include + +/** + * Process the waiting edits on the edit queue. Call this if the state of + * the ReedahSource has changed. + * + * @param gsource The ReedahSource whose editQueue should be processed. + */ +void reedah_source_edit_process (ReedahSourcePtr gsource); + + +/** Edit wrappers */ + +/** + * Mark the given item as read. + * + * @param gsource The ReedahSource structure + * @param guid The guid of the item whose status is to be edited + * @param feedUrl The feedUrl of the feed containing the item. + * @param newStatus The new read status of the item (TRUE for read) + */ +void reedah_source_edit_mark_read (ReedahSourcePtr gsource, const gchar* guid, const gchar* feedUrl, gboolean newStatus); + +/** + * Mark the given item as starred. + * + * @param gsource The ReedahSource structure + * @param guid The guid of the item whose status is to be edited + * @param feedUrl The feedUrl of the feed containing the item. + * @param newStatus The new read status of the item (TRUE for read) + */ +void reedah_source_edit_mark_starred (ReedahSourcePtr gsource, const gchar *guid, const gchar *feedUrl, gboolean newStatus); + + +/** + * Add a subscription to the google source. + * + * @param gsource The ReedahSource structure + * @param feedUrl the feed to add + */ +void reedah_source_edit_add_subscription (ReedahSourcePtr gsource, const gchar* feedUrl); + + +/** + * Remove a subscription from the google source. + * + * @param gsource The ReedahSource structure + * @param feedUrl the feed to remove + */ +void reedah_source_edit_remove_subscription (ReedahSourcePtr gsource, const gchar* feedUrl); + +/** + * See if an item with give guid is being modified + * in the queue. + * + * @param ReedahSource the ReedahSource structure + * @param guid the guid of the item + */ +gboolean reedah_source_edit_is_in_queue (ReedahSourcePtr gsource, const gchar* guid); + +#endif diff -Nru liferea-1.8.15/src/fl_sources/reedah_source_feed.c liferea-1.10.3/src/fl_sources/reedah_source_feed.c --- liferea-1.8.15/src/fl_sources/reedah_source_feed.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/reedah_source_feed.c 2013-08-10 00:21:54.000000000 +0200 @@ -0,0 +1,237 @@ +/** + * @file theoldreader_source_feed.c TheOldReader feed subscription routines + * + * Copyright (C) 2013 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 "common.h" +#include "debug.h" +#include "db.h" +#include "feedlist.h" +#include "item_state.h" +#include "json.h" +#include "json_api_mapper.h" +#include "metadata.h" +#include "node.h" +#include "reedah_source_edit.h" +#include "reedah_source.h" +#include "subscription.h" +#include "xml.h" + +void +reedah_source_migrate_node (nodePtr node) +{ + /* scan the node for bad ID's, if so, brutally remove the node */ + itemSetPtr itemset = node_get_itemset (node); + GList *iter = itemset->ids; + for (; iter; iter = g_list_next (iter)) { + itemPtr item = item_load (GPOINTER_TO_UINT (iter->data)); + if (item && item->sourceId) { + if (!g_str_has_prefix(item->sourceId, "tag:google.com")) { + debug1(DEBUG_UPDATE, "Item with sourceId [%s] will be deleted.", item->sourceId); + db_item_remove(GPOINTER_TO_UINT(iter->data)); + } + } + if (item) item_unload (item); + } + + /* cleanup */ + itemset_free (itemset); +} + +static itemPtr +reedah_source_load_item_from_sourceid (nodePtr node, gchar *sourceId, GHashTable *cache) +{ + gpointer ret = g_hash_table_lookup (cache, sourceId); + itemSetPtr itemset; + int num = g_hash_table_size (cache); + GList *iter; + itemPtr item = NULL; + + if (ret) + return item_load (GPOINTER_TO_UINT (ret)); + + /* skip the top 'num' entries */ + itemset = node_get_itemset (node); + iter = itemset->ids; + while (num--) iter = g_list_next (iter); + + for (; iter; iter = g_list_next (iter)) { + item = item_load (GPOINTER_TO_UINT (iter->data)); + if (item && item->sourceId) { + /* save to cache */ + g_hash_table_insert (cache, g_strdup(item->sourceId), (gpointer) item->id); + if (g_str_equal (item->sourceId, sourceId)) { + itemset_free (itemset); + return item; + } + } + item_unload (item); + } + + g_warning ("Could not find item for %s!", sourceId); + itemset_free (itemset); + return NULL; +} + +static void +reedah_source_item_retrieve_status (const xmlNodePtr entry, subscriptionPtr subscription, GHashTable *cache) +{ + ReedahSourcePtr gsource = (ReedahSourcePtr) node_source_root_from_node (subscription->node)->data ; + xmlNodePtr xml; + nodePtr node = subscription->node; + xmlChar *id; + gboolean read = FALSE; + gboolean starred = FALSE; + + xml = entry->children; + g_assert (xml); + g_assert (g_str_equal (xml->name, "id")); + + id = xmlNodeGetContent (xml); + + for (xml = entry->children; xml; xml = xml->next) { + if (g_str_equal (xml->name, "category")) { + xmlChar* label = xmlGetProp (xml, "label"); + if (!label) + continue; + + if (g_str_equal (label, "read")) + read = TRUE; + else if (g_str_equal(label, "starred")) + starred = TRUE; + + xmlFree (label); + } + } + + itemPtr item = reedah_source_load_item_from_sourceid (node, id, cache); + if (item && item->sourceId) { + if (g_str_equal (item->sourceId, id) && !reedah_source_edit_is_in_queue(gsource, id)) { + + if (item->readStatus != read) + item_read_state_changed (item, read); + if (item->flagStatus != starred) + item_flag_state_changed (item, starred); + } + } + if (item) + item_unload (item); + xmlFree (id); +} + +static void +reedah_feed_subscription_process_update_result (subscriptionPtr subscription, const struct updateResult* const result, updateFlags flags) +{ + if (result->data && result->httpstatus == 200) { + GList *items = NULL; + jsonApiMapping mapping; + + /* + We expect to get something like this + + [{"crawlTimeMsec":"1375821312282", + "id"::"tag:google.com,reader:2005\/item\/4ee371db36f84de2", + "categories":["user\/15724899091976567759\/state\/com.google\/reading-list", + "user\/15724899091976567759\/state\/com.google\/fresh"], + "title":"Firefox 23 Arrives With New Logo, Mixed Content Blocker, and Network Monitor", + "published":1375813680, + "updated":1375821312, + "alternate":[{"href":"http://rss.slashdot.org/~r/Slashdot/slashdot/~3/Q4450FchLQo/story01.htm","type":"text/html"}], + "canonical":[{"href":"http://slashdot.feedsportal.com/c/35028/f/647410/s/2fa2b59c/sc[...]", "type":"text/html"}], + "summary":{"direction":"ltr","content":"An anonymous reader writes [...]"}, + "author":"Soulskill", + "origin":{"streamId":"feed/http://rss.slashdot.org/Slashdot/slashdot","title":"Slashdot", + "htmlurl":"http://slashdot.org/" + }, + + [...] + */ + + mapping.id = "id"; + mapping.title = "title"; + mapping.link = "canonical/href"; // FIXME: doesn't work as array needs to be traversed + mapping.description = "summary/content"; + mapping.updated = "updated"; + mapping.author = "author"; + mapping.read = "unread"; + mapping.flag = "marked"; + + mapping.xhtml = TRUE; + mapping.negateRead = TRUE; + + items = json_api_get_items (result->data, "items", &mapping); + + /* merge against feed cache */ + if (items) { + itemSetPtr itemSet = node_get_itemset (subscription->node); + gint newCount = itemset_merge_items (itemSet, items, TRUE /* feed valid */, FALSE /* markAsRead */); + itemlist_merge_itemset (itemSet); + itemset_free (itemSet); + + feedlist_node_was_updated (subscription->node, newCount); + subscription->node->available = TRUE; + } else { + subscription->node->available = FALSE; + g_string_append (((feedPtr)subscription->node->data)->parseErrors, _("Could not parse JSON returned by Reedah API!")); + } + } else { + subscription->node->available = FALSE; + } +} + +static gboolean +reedah_feed_subscription_prepare_update_request (subscriptionPtr subscription, + struct updateRequest *request) +{ + debug0 (DEBUG_UPDATE, "preparing Reedah feed subscription for update\n"); + ReedahSourcePtr gsource = (ReedahSourcePtr) node_source_root_from_node (subscription->node)->data; + + g_assert(gsource); + if (gsource->loginState == REEDAH_SOURCE_STATE_NONE) { + subscription_update (node_source_root_from_node (subscription->node)->subscription, 0) ; + return FALSE; + } + + if (!metadata_list_get (subscription->metadata, "reedah-feed-id")) { + g_warning ("Skipping Reedah feed '%s' (%s) without id!", subscription->source, subscription->node->id); + return FALSE; + } + + debug0 (DEBUG_UPDATE, "Setting cookies for a Reedah subscription"); + gchar* source_escaped = g_uri_escape_string(metadata_list_get (subscription->metadata, "reedah-feed-id"), NULL, TRUE); + // FIXME: move to .h + // FIXME: do not use 30 + gchar* newUrl = g_strdup_printf ("http://www.reedah.com/reader/api/0/stream/contents/%s?client=liferea&n=30", source_escaped); + update_request_set_source (request, newUrl); + g_free (newUrl); + g_free (source_escaped); + + update_request_set_auth_value (request, gsource->authHeaderValue); + return TRUE; +} + +struct subscriptionType reedahSourceFeedSubscriptionType = { + reedah_feed_subscription_prepare_update_request, + reedah_feed_subscription_process_update_result +}; + diff -Nru liferea-1.8.15/src/fl_sources/reedah_source_feed_list.c liferea-1.10.3/src/fl_sources/reedah_source_feed_list.c --- liferea-1.8.15/src/fl_sources/reedah_source_feed_list.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/reedah_source_feed_list.c 2013-08-10 00:21:54.000000000 +0200 @@ -0,0 +1,412 @@ +/** + * @file reedah_source_feed_list.c Reedah handling routines. + * + * Copyright (C) 2013 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 "reedah_source_feed_list.h" + +#include +#include + +#include "common.h" +#include "debug.h" +#include "feedlist.h" +#include "folder.h" +#include "json.h" +#include "metadata.h" +#include "node.h" +#include "subscription.h" +#include "xml.h" // FIXME + +#include "fl_sources/opml_source.h" +#include "fl_sources/reedah_source.h" +#include "fl_sources/reedah_source_edit.h" + +/** + * Find a node by the source id. + */ +nodePtr +reedah_source_opml_get_node_by_source (ReedahSourcePtr gsource, const gchar *source) +{ + return reedah_source_opml_get_subnode_by_node (gsource->root, source); +} + +/** + * Recursively find a node by the source id. + */ +nodePtr +reedah_source_opml_get_subnode_by_node (nodePtr node, const gchar *source) +{ + nodePtr subnode; + nodePtr subsubnode; + GSList *iter = node->children; + for (; iter; iter = g_slist_next (iter)) { + subnode = (nodePtr)iter->data; + if (subnode->subscription + && g_str_equal (subnode->subscription->source, source)) + return subnode; + else if (subnode->type->capabilities + & NODE_CAPABILITY_SUBFOLDERS) { + subsubnode = reedah_source_opml_get_subnode_by_node(subnode, source); + if (subnode != NULL) + return subsubnode; + } + } + return NULL; +} + +/* subscription list merging functions */ + +static void +reedah_source_check_for_removal (nodePtr node, gpointer user_data) +{ + gchar *expr = NULL; + + if (node->subscription && g_str_equal (node->subscription->source, REEDAH_READER_BROADCAST_FRIENDS_URL)) + return ; + + if (IS_FEED (node)) { + expr = g_strdup_printf ("/object/list[@name='subscriptions']/object/string[@name='id'][. = 'feed/%s']", node->subscription->source); + } else if (IS_FOLDER (node)) { + node_foreach_child_data (node, reedah_source_check_for_removal, user_data); + expr = g_strdup_printf ("/object/list[@name='subscriptions']/object/list[@name='categories']/object[string='%s']", node->title); + } else { + g_warning ("google_opml_source_check_for_removal(): This should never happen..."); + return; + } + + if (!xpath_find ((xmlNodePtr)user_data, expr)) { + debug1 (DEBUG_UPDATE, "removing %s...", node_get_title (node)); + feedlist_node_removed (node); + } else { + debug1 (DEBUG_UPDATE, "keeping %s...", node_get_title (node)); + } + g_free (expr); +} + +/* + * Find a node by the name under root or create it. + */ +static nodePtr +reedah_source_find_or_create_folder (const gchar *name, nodePtr root) +{ + nodePtr folder = NULL; + GSList *iter_parent; + + /* find a node by the name under root */ + iter_parent = root->children; + while (iter_parent) { + if (g_str_equal (name, node_get_title (iter_parent->data))) { + folder = (nodePtr)iter_parent->data; + break; + } + iter_parent = g_slist_next (iter_parent); + } + + /* if not found, create new folder */ + if (!folder) { + folder = node_new (folder_get_node_type ()); + node_set_title (folder, name); + node_set_parent (folder, root, -1); + feedlist_node_imported (folder); + subscription_update (folder->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); + } + + return folder; +} + +/* + * Check if folder of a node changed in Google Reader and move + * node to the folder with the same name. + */ +static void +reedah_source_update_folder (xmlNodePtr match, ReedahSourcePtr gsource, nodePtr node) +{ + xmlNodePtr xml; + xmlChar *label; + const gchar *ptitle; + nodePtr parent; + + /* check if label of a feed changed */ + parent = node->parent; + ptitle = node_get_title (parent); + xml = xpath_find (match, "./list[@name='categories']/object/string[@name='label']"); + if (xml) { + label = xmlNodeListGetString (xml->doc, xml->xmlChildrenNode, 1); + if (parent == gsource->root || ! g_str_equal (label, ptitle)) { + debug2 (DEBUG_UPDATE, "GSource feed label changed for %s to '%s'", node->id, label); + parent = reedah_source_find_or_create_folder ((gchar*)label, gsource->root); + node_reparent (node, parent); + } + xmlFree (label); + } else { + /* if feed has no label and parent is not gsource root, reparent to gsource root */ + if (parent != gsource->root) + node_reparent (node, gsource->root); + } +} + +static void +reedah_source_merge_feed (ReedahSourcePtr source, const gchar *url, const gchar *title, const gchar *id) +{ + nodePtr node; + GSList *iter; + + /* check if node to be merged already exists */ + iter = source->root->children; + while (iter) { + node = (nodePtr)iter->data; + if (g_str_equal (node->subscription->source, url)) + return; + iter = g_slist_next (iter); + } + + debug2 (DEBUG_UPDATE, "adding %s (%s)", title, url); + node = node_new (feed_get_node_type ()); + node_set_title (node, title); + node_set_data (node, feed_new ()); + + node_set_subscription (node, subscription_new (url, NULL, NULL)); + node->subscription->type = &reedahSourceFeedSubscriptionType; + + /* Save Reedah feed id which we need to fetch items... */ + node->subscription->metadata = metadata_list_append (node->subscription->metadata, "reedah-feed-id", id); + db_subscription_update (node->subscription); + + node_set_parent (node, source->root, -1); + feedlist_node_imported (node); + + /** + * @todo mark the ones as read immediately after this is done + * the feed as retrieved by this has the read and unread + * status inherently. + */ + subscription_update (node->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); + subscription_update_favicon (node->subscription); +} + + +/* OPML subscription type implementation */ + +static void +google_subscription_opml_cb (subscriptionPtr subscription, const struct updateResult * const result, updateFlags flags) +{ + ReedahSourcePtr source = (ReedahSourcePtr) subscription->node->data; + + // FIXME: the following code is very similar to ttrss! + if (result->data && result->httpstatus == 200) { + JsonParser *parser = json_parser_new (); + + if (json_parser_load_from_data (parser, result->data, -1, NULL)) { + JsonArray *array = json_node_get_array (json_get_node (json_parser_get_root (parser), "subscriptions")); + GList *iter, *elements; + GSList *siter; +g_print(">>> %s\n",result->data); + /* We expect something like this: + + [{"id":"feed\/http:\/\/rss.slashdot.org\/Slashdot\/slashdot", + "title":"Slashdot", + "categories":[], + "firstitemmsec":"1368112925514", + "htmlUrl":"null"}, + ... + + Note that the data doesn't contain an URL. + We recover it from the id field. + */ + elements = iter = json_array_get_elements (array); + /* Add all new nodes we find */ + while (iter) { + JsonNode *node = (JsonNode *)iter->data; + + /* ignore everything without a feed url */ + if (json_get_string (node, "id")) { + reedah_source_merge_feed (source, + json_get_string (node, "id") + 5, // FIXME: Unescape string! + json_get_string (node, "title"), + json_get_string (node, "id")); + } + iter = g_list_next (iter); + } + g_list_free (elements); + + /* Remove old nodes we cannot find anymore */ + siter = source->root->children; + while (siter) { + nodePtr node = (nodePtr)siter->data; + gboolean found = FALSE; + + elements = iter = json_array_get_elements (array); + while (iter) { + JsonNode *json_node = (JsonNode *)iter->data; + // FIXME: Compare with unescaped string + if (g_str_equal (node->subscription->source, json_get_string (json_node, "id") + 5)) { + debug1 (DEBUG_UPDATE, "node: %s", node->subscription->source); + found = TRUE; + break; + } + iter = g_list_next (iter); + } + g_list_free (elements); + + if (!found) + feedlist_node_removed (node); + + siter = g_slist_next (siter); + } + + opml_source_export (subscription->node); /* save new feeds to feed list */ + subscription->node->available = TRUE; + //return; + } else { + g_warning ("Invalid JSON returned on Reedah feed list request! >>>%s<<<", result->data); + } + + g_object_unref (parser); + } else { + subscription->node->available = FALSE; + debug0 (DEBUG_UPDATE, "reedah_subscription_cb(): ERROR: failed to get subscription list!"); + } + + if (!(flags & REEDAH_SOURCE_UPDATE_ONLY_LIST)) + node_foreach_child_data (subscription->node, node_update_subscription, GUINT_TO_POINTER (0)); +} + +/** functions for an efficient updating mechanism */ + +static void +reedah_source_opml_quick_update_helper (xmlNodePtr match, gpointer userdata) +{ + ReedahSourcePtr gsource = (ReedahSourcePtr) userdata; + xmlNodePtr xmlNode; + xmlChar *id, *newestItemTimestamp; + nodePtr node = NULL; + const gchar *oldNewestItemTimestamp; + + xmlNode = xpath_find (match, "./string[@name='id']"); + id = xmlNodeGetContent (xmlNode); + + if (g_str_has_prefix (id, "feed/")) + node = reedah_source_opml_get_node_by_source (gsource, id + strlen ("feed/")); + else if (g_str_has_suffix (id, "broadcast-friends")) + node = reedah_source_opml_get_node_by_source (gsource, id); + else { + xmlFree (id); + return; + } + + if (node == NULL) { + xmlFree (id); + return; + } + + xmlNode = xpath_find (match, "./number[@name='newestItemTimestampUsec']"); + newestItemTimestamp = xmlNodeGetContent (xmlNode); + + oldNewestItemTimestamp = g_hash_table_lookup (gsource->lastTimestampMap, node->subscription->source); + + if (!oldNewestItemTimestamp || + (newestItemTimestamp && + !g_str_equal (newestItemTimestamp, oldNewestItemTimestamp))) { + debug3(DEBUG_UPDATE, "ReedahSource: auto-updating %s " + "[oldtimestamp%s, timestamp %s]", + id, oldNewestItemTimestamp, newestItemTimestamp); + g_hash_table_insert (gsource->lastTimestampMap, + g_strdup (node->subscription->source), + g_strdup (newestItemTimestamp)); + + subscription_update (node->subscription, 0); + } + + xmlFree (newestItemTimestamp); + xmlFree (id); +} + +static void +reedah_source_opml_quick_update_cb (const struct updateResult* const result, gpointer userdata, updateFlags flags) +{ + ReedahSourcePtr gsource = (ReedahSourcePtr) userdata; + xmlDocPtr doc; + + if (!result->data) { + /* what do I do? */ + debug0 (DEBUG_UPDATE, "ReedahSource: Unable to get unread counts, this update is aborted."); + return; + } + doc = xml_parse (result->data, result->size, NULL); + if (!doc) { + debug0 (DEBUG_UPDATE, "ReedahSource: The XML failed to parse, maybe the session has expired. (FIXME)"); + return; + } + + xpath_foreach_match (xmlDocGetRootElement (doc), + "/object/list[@name='unreadcounts']/object", + reedah_source_opml_quick_update_helper, gsource); + + xmlFreeDoc (doc); +} + +gboolean +reedah_source_opml_quick_update(ReedahSourcePtr gsource) +{ + updateRequestPtr 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_source (request, REEDAH_READER_UNREAD_COUNTS_URL); + update_request_set_auth_value(request, gsource->authHeaderValue); + + update_execute_request (gsource, request, reedah_source_opml_quick_update_cb, + gsource, 0); + + return TRUE; +} + + +static void +reedah_source_opml_subscription_process_update_result (subscriptionPtr subscription, const struct updateResult * const result, updateFlags flags) +{ + google_subscription_opml_cb (subscription, result, flags); +} + +static gboolean +reedah_source_opml_subscription_prepare_update_request (subscriptionPtr subscription, struct updateRequest *request) +{ + ReedahSourcePtr gsource = (ReedahSourcePtr)subscription->node->data; + + g_assert(gsource); + if (gsource->loginState == REEDAH_SOURCE_STATE_NONE) { + debug0(DEBUG_UPDATE, "ReedahSource: login"); + reedah_source_login ((ReedahSourcePtr) subscription->node->data, 0) ; + return FALSE; + } + debug1 (DEBUG_UPDATE, "updating Reedah subscription (node id %s)", subscription->node->id); + + update_request_set_source (request, REEDAH_READER_SUBSCRIPTION_LIST_URL); + + update_request_set_auth_value (request, gsource->authHeaderValue); + + return TRUE; +} + +/* OPML subscription type definition */ + +struct subscriptionType reedahSourceOpmlSubscriptionType = { + reedah_source_opml_subscription_prepare_update_request, + reedah_source_opml_subscription_process_update_result +}; diff -Nru liferea-1.8.15/src/fl_sources/reedah_source_feed_list.h liferea-1.10.3/src/fl_sources/reedah_source_feed_list.h --- liferea-1.8.15/src/fl_sources/reedah_source_feed_list.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/reedah_source_feed_list.h 2013-08-10 00:21:54.000000000 +0200 @@ -0,0 +1,47 @@ +/** + * Copyright (C) 2013 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 "fl_sources/reedah_source.h" + +/** + * Find a node by the source id. + * + * @param gsource the Google Reader source + * @param source the feed id to find + * + * @returns a node (or NULL) + */ +nodePtr reedah_source_opml_get_node_by_source(ReedahSourcePtr gsource, + const gchar *source); + +/** + * Recursively find a node by the source id. + * + * @param gsource the Google Reader source + * @param source the feed id to find + * + * @returns a node (or NULL) + */ +nodePtr reedah_source_opml_get_subnode_by_node(nodePtr node, const gchar *source); + +/** + * Perform a quick update of the Google Reader source. + * + * @param gsource the Google Reader source + */ +gboolean reedah_source_opml_quick_update (ReedahSourcePtr gsource); diff -Nru liferea-1.8.15/src/fl_sources/reedah_source.h liferea-1.10.3/src/fl_sources/reedah_source.h --- liferea-1.8.15/src/fl_sources/reedah_source.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/reedah_source.h 2013-08-10 00:21:54.000000000 +0200 @@ -0,0 +1,243 @@ +/** + * @file reedah_source.h Google Reader feed list source support + * + * Copyright (C) 2007-2013 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 _REEDAH_SOURCE_H +#define _REEDAH_SOURCE_H + +#include "fl_sources/node_source.h" + +/** + * A nodeSource specific for Google Reader + */ +typedef struct ReedahSource { + nodePtr root; /**< the root node in the feed list */ + gchar *authHeaderValue; /**< the Google Authorization token */ + GQueue *actionQueue; + gint loginState; /**< The current login state */ + gint authFailures; /**< Number of authentication failures */ + + /** + * A map from a subscription source to a timestamp when it was last + * updated (provided by Google). + */ + GHashTable *lastTimestampMap; + + /** + * A timestamp when the last Quick update took place. + */ + GTimeVal lastQuickUpdate; +} *ReedahSourcePtr; + +enum { + REEDAH_SOURCE_STATE_NONE = 0, /**< no authentication tried so far */ + REEDAH_SOURCE_STATE_IN_PROGRESS, /**< authentication in progress */ + REEDAH_SOURCE_STATE_ACTIVE, /**< authentication succeeded */ + REEDAH_SOURCE_STATE_NO_AUTH, /**< authentication has failed */ + REEDAH_SOURCE_STATE_MIGRATE, /**< source will be migrated, do not do anything anymore! */ +}; + +enum { + /** + * Update only the subscription list, and not each node underneath it. + * Note: Uses higher 16 bits to avoid conflict. + */ + REEDAH_SOURCE_UPDATE_ONLY_LIST = (1<<16), + /** + * Only login, do not do any updates. + */ + REEDAH_SOURCE_UPDATE_ONLY_LOGIN = (1<<17) +}; + +/** + * Number of auth failures after which we stop bothering the user while + * auto-updating until he manually updates again. + */ +#define REEDAH_SOURCE_MAX_AUTH_FAILURES 3 + +/** + * Google Source API URL's + * In each of the following, the _URL indicates the URL to use, and _POST + * indicates the corresponging postdata to send. + * @see http://code.google.com/p/pyrfeed/wiki/GoogleReaderAPI + * However as of now, the GoogleReaderAPI documentation seems outdated, some of + * mark read/unread API does not work as mentioned in the documentation. + */ + +/** + * 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. + */ +#define REEDAH_READER_LOGIN_URL "https://www.reedah.com/accounts/ClientLogin" +#define REEDAH_READER_LOGIN_POST "service=reader&Email=%s&Passwd=%s&source=liferea&continue=http://www.reedah.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. + */ +#define REEDAH_READER_BROADCAST_FRIENDS_URL "http://www.reedah.com/reader/atom/user/-/state/com.google/broadcast-friends" + +/** + * Get a list of subscriptions. + */ +#define REEDAH_READER_SUBSCRIPTION_LIST_URL "http://www.reedah.com/reader/api/0/subscription/list" + +/** + * Get a token for an edit operation. (@todo A token can actually be used + * for multiple transactions.) + */ +#define REEDAH_READER_TOKEN_URL "http://www.reedah.com/reader/api/0/token" + +/** + * Add a subscription + * @param URL The feed URL, or the page URL for feed autodiscovery. + * @param T a token obtained using REEDAH_READER_TOKEN_URL + */ +#define REEDAH_READER_ADD_SUBSCRIPTION_URL "http://www.reedah.com/reader/api/0/subscription/edit?client=liferea" +#define REEDAH_READER_ADD_SUBSCRIPTION_POST "s=feed%%2F%s&i=null&ac=subscribe&T=%s" + +/** + * Unsubscribe from a subscription. + * @param url The feed URL + * @param T a token obtained using REEDAH_READER_TOKEN_URL + */ +#define REEDAH_READER_REMOVE_SUBSCRIPTION_URL "http://www.reedah.com/reader/api/0/subscription/edit?client=liferea" +#define REEDAH_READER_REMOVE_SUBSCRIPTION_POST "s=feed%%2F%s&i=null&ac=unsubscribe&T=%s" + +/** + * A list of subscriptions with the unread counters, and the last updated + * timestamps. + */ +#define REEDAH_READER_UNREAD_COUNTS_URL "http://www.reedah.com/reader/api/0/unread-count?all=true&client=liferea" + +/** + * Edit the tags associated with an item. The parameters to this _have_ to be + * sent as post data. + */ +#define REEDAH_READER_EDIT_TAG_URL "http://www.reedah.com/reader/api/0/edit-tag?client=liferea" + +/** + * Postdata for adding a tag when using REEDAH_READER_EDIT_TAG_URL. + * @param i The guid of the item. + * @param prefix The prefix to 's'. For normal feeds this will be "feed", for + * links etc, this should be "user". + * @param s The URL of the subscription containing the item. (Note that the + * following string adds the "feed/" prefix to this.) + * @param a The tag to add. + * @param T a token obtained using REEDAH_READER_TOKEN_URL + */ +#define REEDAH_READER_EDIT_TAG_ADD_TAG "i=%s&s=%s%%2F%s&a=%s&ac=edit-tags&T=%s&async=true" + +/** + * Postdata for removing a tag, when using REEDAH_READER_EDIT_TAG_URL. Do + * not use for removing the "read" tag, see REEDAH_READER_EDIT_TAG_AR_TAG + * for that. + * + * @param i The guid of the item. + * @param prefix The prefix to 's'. @see REEDAH_READER_EDIT_TAG_ADD_TAG + * @param s The URL of the subscription containing the item. (Note that the + * final value of s is feed + "/" + this string) + * @param r The tag to remove + * @param T a token obtained using REEDAH_READER_TOKEN_URL + */ +#define REEDAH_READER_EDIT_TAG_REMOVE_TAG "i=%s&s=%s%%2F%s&r=%s&ac=edit-tags&T=%s&async=true" + +/** + * Postdata for adding a tag, and removing another tag at the same time, + * when using REEDAH_READER_EDIT_TAG_URL. + * @param i The guid of the item. + * @param prefix The prefix to 's'. @see REEDAH_READER_EDIT_TAG_ADD_TAG + * @param s The URL of the subscription containing the item. (Note that the + * final value of s is feed + "/" + this string) + * @param a The tag to add. + * @param r The tag to remove + * @param T a token obtained using REEDAH_READER_TOKEN_URL + */ +#define REEDAH_READER_EDIT_TAG_AR_TAG "i=%s&s=%s%%2F%s&a=%s&r=%s&ac=edit-tags&T=%s&async=true" + +/** + * Postdata for adding a tag, and removing another tag at the same time, for a + * _link_ item, when using REEDAH_READER_EDIT_TAG_URL + * @param i The guid of the link (as provided by google) + * @param a The tag to add + * @param r The tag to remove + * @param T a token obtained using REEDAH_READER_TOKEN_URL + */ +#define REEDAH_READER_EDIT_TAG_ADD_TAG_FOR_LINK "i=%s&s=user%2F-%2Fsource%2Fcom.google%2Flink&a=%s&r=%s&ac=edit-tags&T=%s&async=true" + +/** A set of tags (states) defined by Google reader */ + +#define REEDAH_READER_TAG_KEPT_UNREAD "user/-/state/com.google/kept-unread" +#define REEDAH_READER_TAG_READ "user/-/state/com.google/read" +#define REEDAH_READER_TAG_TRACKING_KEPT_UNREAD "user/-/state/com.google/tracking-kept-unread" +#define REEDAH_READER_TAG_STARRED "user/-/state/com.google/starred" + +/** Interval (in seconds) for doing a Quick Update: 10min */ +#define REEDAH_SOURCE_QUICK_UPDATE_INTERVAL 600 + +/** + * @returns Google Reader source type implementation info. + */ +nodeSourceTypePtr reedah_source_get_type (void); + +extern struct subscriptionType reedahSourceFeedSubscriptionType; +extern struct subscriptionType reedahSourceOpmlSubscriptionType; + +/** + * Find a child node with the given feed source URL. + * + * @param gsource ReedahSource + * @param source a feed source URL to search + * + * @returns a node (or NULL) + */ +nodePtr reedah_source_get_node_from_source (ReedahSourcePtr gsource, const gchar* source); + +/** + * Tries to update the entire source quickly, by updating only those feeds + * which are known to be updated. Suitable for g_timeout_add. This is an + * internal function. + * + * @param data A pointer to a node id of the source. This pointer will + * be g_free'd if the update fails. + * + * @returns FALSE on update failure + */ +gboolean reedah_source_quick_update_timeout (gpointer gsource); + +/** + * Migrate a google source child-node from a Liferea 1.4 style read-only + * google source nodes. + * + * @param node The node to migrate (not the nodeSource!) + */ +void reedah_source_migrate_node (nodePtr node); + +/** + * Perform login for the given Google source. + * + * @param gsource a ReedahSource + * @param flags network request flags + */ +void reedah_source_login (ReedahSourcePtr gsource, guint32 flags); + +#endif diff -Nru liferea-1.8.15/src/fl_sources/theoldreader_source.c liferea-1.10.3/src/fl_sources/theoldreader_source.c --- liferea-1.8.15/src/fl_sources/theoldreader_source.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/theoldreader_source.c 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,423 @@ +/** + * @file theoldreader_source.c TheOldReader feed list source support + * + * Copyright (C) 2007-2013 Lars Windolf + * Copyright (C) 2008 Arnold Noronha + * Copyright (C) 2011 Peter Oliver + * Copyright (C) 2011 Sergey Snitsaruk + * + * 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 "fl_sources/theoldreader_source.h" + +#include +#include +#include +#include + +#include "common.h" +#include "debug.h" +#include "feedlist.h" +#include "item_state.h" +#include "metadata.h" +#include "node.h" +#include "subscription.h" +#include "update.h" +#include "xml.h" +#include "ui/auth_dialog.h" +#include "ui/liferea_dialog.h" +#include "fl_sources/node_source.h" +#include "fl_sources/opml_source.h" +#include "fl_sources/theoldreader_source_edit.h" +#include "fl_sources/theoldreader_source_feed_list.h" + +/** default TheOldReader subscription list update interval = once a day */ +#define THEOLDREADER_SOURCE_UPDATE_INTERVAL 60*60*24 + +/** create a source with given node as root */ +static TheOldReaderSourcePtr +theoldreader_source_new (nodePtr node) +{ + TheOldReaderSourcePtr source = g_new0 (struct TheOldReaderSource, 1) ; + source->root = node; + source->actionQueue = g_queue_new (); + source->loginState = THEOLDREADER_SOURCE_STATE_NONE; + source->lastTimestampMap = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + + return source; +} + +static void +theoldreader_source_free (TheOldReaderSourcePtr gsource) +{ + if (!gsource) + return; + + update_job_cancel_by_owner (gsource); + + g_free (gsource->authHeaderValue); + g_queue_free (gsource->actionQueue) ; + g_hash_table_unref (gsource->lastTimestampMap); + g_free (gsource); +} + +static void +theoldreader_source_login_cb (const struct updateResult * const result, gpointer userdata, updateFlags flags) +{ + TheOldReaderSourcePtr gsource = (TheOldReaderSourcePtr) userdata; + gchar *tmp = NULL; + subscriptionPtr subscription = gsource->root->subscription; + + debug1 (DEBUG_UPDATE, "TheOldReader login processing... %s", result->data); + + g_assert (!gsource->authHeaderValue); + + if (result->data && result->httpstatus == 200) + tmp = strstr (result->data, "Auth="); + + if (tmp) { + gchar *ttmp = tmp; + tmp = strchr (tmp, '\n'); + if (tmp) + *tmp = '\0'; + gsource->authHeaderValue = g_strdup_printf ("GoogleLogin auth=%s", ttmp + 5); + + debug1 (DEBUG_UPDATE, "TheOldReader Auth token found: %s", gsource->authHeaderValue); + + gsource->loginState = THEOLDREADER_SOURCE_STATE_ACTIVE; + gsource->authFailures = 0; + + /* now that we are authenticated trigger updating to start data retrieval */ + if (!(flags & THEOLDREADER_SOURCE_UPDATE_ONLY_LOGIN)) + subscription_update (subscription, flags); + + /* process any edits waiting in queue */ + theoldreader_source_edit_process (gsource); + + } else { + debug0 (DEBUG_UPDATE, "TheOldReader login failed! no Auth token found in result!"); + subscription->node->available = FALSE; + + g_free (subscription->updateError); + subscription->updateError = g_strdup (_("TheOldReader login failed!")); + gsource->authFailures++; + + if (gsource->authFailures < THEOLDREADER_SOURCE_MAX_AUTH_FAILURES) + gsource->loginState = THEOLDREADER_SOURCE_STATE_NONE; + else + gsource->loginState = THEOLDREADER_SOURCE_STATE_NO_AUTH; + + auth_dialog_new (subscription, flags); + } +} + +/** + * Perform a login to TheOldReader, if the login completes the + * TheOldReaderSource will have a valid Auth token and will have loginStatus to + * THEOLDREADER_SOURCE_LOGIN_ACTIVE. + */ +void +theoldreader_source_login (TheOldReaderSourcePtr gsource, guint32 flags) +{ + gchar *username, *password; + updateRequestPtr request; + subscriptionPtr subscription = gsource->root->subscription; + + if (gsource->loginState != THEOLDREADER_SOURCE_STATE_NONE) { + /* this should not happen, as of now, we assume the session + * doesn't expire. */ + debug1(DEBUG_UPDATE, "Logging in while login state is %d\n", gsource->loginState); + } + + request = update_request_new (); + + update_request_set_source (request, THEOLDREADER_READER_LOGIN_URL); + + /* escape user and password as both are passed using an URI */ + username = g_uri_escape_string (subscription->updateOptions->username, NULL, TRUE); + password = g_uri_escape_string (subscription->updateOptions->password, NULL, TRUE); + + request->postdata = g_strdup_printf (THEOLDREADER_READER_LOGIN_POST, username, password); + request->options = update_options_copy (subscription->updateOptions); + + g_free (username); + g_free (password); + + gsource->loginState = THEOLDREADER_SOURCE_STATE_IN_PROGRESS ; + + update_execute_request (gsource, request, theoldreader_source_login_cb, gsource, flags); +} + +/* node source type implementation */ + +static void +theoldreader_source_update (nodePtr node) +{ + TheOldReaderSourcePtr gsource = (TheOldReaderSourcePtr) node->data; + + /* Reset THEOLDREADER_SOURCE_STATE_NO_AUTH as this is a manual + user interaction and no auto-update so we can query + for credentials again. */ + if (gsource->loginState == THEOLDREADER_SOURCE_STATE_NO_AUTH) + gsource->loginState = THEOLDREADER_SOURCE_STATE_NONE; + + subscription_update (node->subscription, 0); // FIXME: 0 ? +} + +static void +theoldreader_source_auto_update (nodePtr node) +{ + GTimeVal now; + TheOldReaderSourcePtr gsource = (TheOldReaderSourcePtr) node->data; + + if (gsource->loginState == THEOLDREADER_SOURCE_STATE_NONE) { + theoldreader_source_update (node); + return; + } + + if (gsource->loginState == THEOLDREADER_SOURCE_STATE_IN_PROGRESS) + return; /* the update will start automatically anyway */ + + g_get_current_time (&now); + + /* do daily updates for the feed list and feed updates according to the default interval */ +/* if (node->subscription->updateState->lastPoll.tv_sec + THEOLDREADER_SOURCE_UPDATE_INTERVAL <= now.tv_sec) { + subscription_update (node->subscription, 0); + g_get_current_time (&gsource->lastQuickUpdate); + } + else if (gsource->lastQuickUpdate.tv_sec + THEOLDREADER_SOURCE_QUICK_UPDATE_INTERVAL <= now.tv_sec) { + theoldreader_source_opml_quick_update (gsource); + theoldreader_source_edit_process (gsource); + g_get_current_time (&gsource->lastQuickUpdate); + }*/ + + // FIXME: Don't do below, but about logic! + if (gsource->lastQuickUpdate.tv_sec + THEOLDREADER_SOURCE_QUICK_UPDATE_INTERVAL <= now.tv_sec) { + subscription_update (node->subscription, 0); + g_get_current_time (&gsource->lastQuickUpdate); + } +} + +static +void theoldreader_source_init (void) +{ + metadata_type_register ("theoldreader-feed-id", METADATA_TYPE_TEXT); +} + +static void theoldreader_source_deinit (void) { } + +static void +theoldreader_source_import_node (nodePtr node) +{ + GSList *iter; + for (iter = node->children; iter; iter = g_slist_next(iter)) { + nodePtr subnode = iter->data; + if (subnode->subscription) + subnode->subscription->type = &theOldReaderSourceFeedSubscriptionType; + if (subnode->type->capabilities + & NODE_CAPABILITY_SUBFOLDERS) + theoldreader_source_import_node (subnode); + } +} + +static void +theoldreader_source_import (nodePtr node) +{ + opml_source_import (node); + + node->subscription->type = &theOldReaderSourceOpmlSubscriptionType; + if (!node->data) + node->data = (gpointer) theoldreader_source_new (node); + + theoldreader_source_import_node (node); +} + +static void +theoldreader_source_export (nodePtr node) +{ + opml_source_export (node); +} + +static gchar * +theoldreader_source_get_feedlist (nodePtr node) +{ + return opml_source_get_feedlist (node); +} + +static void +theoldreader_source_remove (nodePtr node) +{ + opml_source_remove (node); +} + +static nodePtr +theoldreader_source_add_subscription (nodePtr node, subscriptionPtr subscription) +{ + debug_enter ("theoldreader_source_add_subscription"); + nodePtr child = node_new (feed_get_node_type ()); + + debug0 (DEBUG_UPDATE, "TheOldReaderSource: Adding a new subscription"); + node_set_data (child, feed_new ()); + + node_set_subscription (child, subscription); + child->subscription->type = &theOldReaderSourceFeedSubscriptionType; + + node_set_title (child, _("New Subscription")); + + theoldreader_source_edit_add_subscription (node_source_root_from_node (node)->data, subscription->source); + + debug_exit ("theoldreader_source_add_subscription"); + + return child; +} + +static void +theoldreader_source_remove_node (nodePtr node, nodePtr child) +{ + gchar *source; + TheOldReaderSourcePtr gsource = node->data; + + if (child == node) { + feedlist_node_removed (child); + return; + } + + source = g_strdup (child->subscription->source); + + feedlist_node_removed (child); + + /* propagate the removal only if there aren't other copies */ + if (!theoldreader_source_opml_get_node_by_source (gsource, source)) + theoldreader_source_edit_remove_subscription (gsource, source); + + g_free (source); +} + +/* GUI callbacks */ + +static void +on_theoldreader_source_selected (GtkDialog *dialog, + gint response_id, + gpointer user_data) +{ + nodePtr node; + subscriptionPtr subscription; + + if (response_id == GTK_RESPONSE_OK) { + subscription = subscription_new ("http://theoldreader.com/reader", NULL, NULL); + node = node_new (node_source_get_node_type ()); + node_set_title (node, "TheOldReader"); + node_source_new (node, theoldreader_source_get_type ()); + node_set_subscription (node, subscription); + + subscription_set_auth_info (subscription, + gtk_entry_get_text (GTK_ENTRY (liferea_dialog_lookup (GTK_WIDGET(dialog), "userEntry"))), + gtk_entry_get_text (GTK_ENTRY (liferea_dialog_lookup (GTK_WIDGET(dialog), "passwordEntry")))); + + subscription->type = &theOldReaderSourceOpmlSubscriptionType ; + + node->data = theoldreader_source_new (node); + feedlist_node_added (node); + theoldreader_source_update (node); + } + + gtk_widget_destroy (GTK_WIDGET (dialog)); +} + +static void +ui_theoldreader_source_get_account_info (void) +{ + GtkWidget *dialog; + + dialog = liferea_dialog_new ("theoldreader_source.ui", "theoldreader_source_dialog"); + + g_signal_connect (G_OBJECT (dialog), "response", + G_CALLBACK (on_theoldreader_source_selected), + NULL); +} + +static void +theoldreader_source_cleanup (nodePtr node) +{ + TheOldReaderSourcePtr reader = (TheOldReaderSourcePtr) node->data; + theoldreader_source_free(reader); + node->data = NULL ; +} + +static void +theoldreader_source_item_set_flag (nodePtr node, itemPtr item, gboolean newStatus) +{ + nodePtr root = node_source_root_from_node (node); + theoldreader_source_edit_mark_starred ((TheOldReaderSourcePtr)root->data, item->sourceId, node->subscription->source, newStatus); + item_flag_state_changed (item, newStatus); +} + +static void +theoldreader_source_item_mark_read (nodePtr node, itemPtr item, gboolean newStatus) +{ + nodePtr root = node_source_root_from_node (node); + theoldreader_source_edit_mark_read ((TheOldReaderSourcePtr)root->data, item->sourceId, node->subscription->source, newStatus); + item_read_state_changed (item, newStatus); +} + +/** + * Convert all subscriptions of a google source to local feeds + * + * @param node The node to migrate (not the nodeSource!) + */ +static void +theoldreader_source_convert_to_local (nodePtr node) +{ + TheOldReaderSourcePtr gsource = node->data; + + gsource->loginState = THEOLDREADER_SOURCE_STATE_MIGRATE; +} + +/* node source type definition */ + +static struct nodeSourceType nst = { + .id = "fl_theoldreader", + .name = N_("TheOldReader"), + .description = N_("Integrate the feed list of your TheOldReader account. Liferea will " + "present your TheOldReader subscriptions, and will synchronize your feed list and reading lists."), + .capabilities = NODE_SOURCE_CAPABILITY_DYNAMIC_CREATION | + NODE_SOURCE_CAPABILITY_WRITABLE_FEEDLIST | + NODE_SOURCE_CAPABILITY_ADD_FEED | + NODE_SOURCE_CAPABILITY_ITEM_STATE_SYNC | + NODE_SOURCE_CAPABILITY_CONVERT_TO_LOCAL, + .source_type_init = theoldreader_source_init, + .source_type_deinit = theoldreader_source_deinit, + .source_new = ui_theoldreader_source_get_account_info, + .source_delete = theoldreader_source_remove, + .source_import = theoldreader_source_import, + .source_export = theoldreader_source_export, + .source_get_feedlist = theoldreader_source_get_feedlist, + .source_update = theoldreader_source_update, + .source_auto_update = theoldreader_source_auto_update, + .free = theoldreader_source_cleanup, + .item_set_flag = theoldreader_source_item_set_flag, + .item_mark_read = theoldreader_source_item_mark_read, + .add_folder = NULL, + .add_subscription = theoldreader_source_add_subscription, + .remove_node = theoldreader_source_remove_node, + .convert_to_local = theoldreader_source_convert_to_local +}; + +nodeSourceTypePtr +theoldreader_source_get_type (void) +{ + return &nst; +} diff -Nru liferea-1.8.15/src/fl_sources/theoldreader_source_edit.c liferea-1.10.3/src/fl_sources/theoldreader_source_edit.c --- liferea-1.8.15/src/fl_sources/theoldreader_source_edit.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/theoldreader_source_edit.c 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,486 @@ +/** + * @file theoldreader_source_edit.c TheOldReader feed list source syncing support + * + * Copyright (C) 2008 Arnold Noronha + * + * 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 "debug.h" +#include "update.h" +#include "subscription.h" +#include "common.h" +#include "feedlist.h" + + +#include "theoldreader_source.h" +#include "theoldreader_source_edit.h" +#include "config.h" +#include +#include +#include +#include "xml.h" + +/** + * A structure to indicate an edit to the TheOldReader "database". + * These edits are put in a queue and processed in sequential order + * so that google does not end up processing the requests in an + * unintended order. + */ +typedef struct TheOldReaderSourceAction { + /** + * The guid of the item to edit. This will be ignored if the + * edit is acting on an subscription rather than an item. + */ + gchar* guid; + + /** + * A MANDATORY feed url to containing the item, or the url of the + * subscription to edit. + */ + gchar* feedUrl; + + /** + * The source type. Currently known types are "feed" and "user". + * "user" sources are used, for example, for items that are links (as + * opposed to posts) in broadcast-friends. The unique id of the source + * is of the form /. + */ + gchar* feedUrlType; + + /** + * A callback function on completion of the edit. + */ + void (*callback) (TheOldReaderSourcePtr gsource, struct TheOldReaderSourceAction* edit, gboolean success); + + /** + * The type of this TheOldReaderSourceAction. + */ + int actionType ; +} *TheOldReaderSourceActionPtr ; + +enum { + EDIT_ACTION_MARK_READ, + EDIT_ACTION_MARK_UNREAD, + EDIT_ACTION_TRACKING_MARK_UNREAD, /**< every UNREAD request, should be followed by tracking-kept-unread */ + EDIT_ACTION_MARK_STARRED, + EDIT_ACTION_MARK_UNSTARRED, + EDIT_ACTION_ADD_SUBSCRIPTION, + EDIT_ACTION_REMOVE_SUBSCRIPTION +} ; + + +typedef struct TheOldReaderSourceAction* editPtr ; + +typedef struct TheOldReaderSourceActionCtxt { + gchar *nodeId ; + TheOldReaderSourceActionPtr action; +} *TheOldReaderSourceActionCtxtPtr; + + +static void theoldreader_source_edit_push (TheOldReaderSourcePtr gsource, TheOldReaderSourceActionPtr action, gboolean head); + + +static TheOldReaderSourceActionPtr +theoldreader_source_action_new (void) +{ + TheOldReaderSourceActionPtr action = g_slice_new0 (struct TheOldReaderSourceAction); + return action; +} + +static void +theoldreader_source_action_free (TheOldReaderSourceActionPtr action) +{ + g_free (action->guid); + g_free (action->feedUrl); + g_slice_free (struct TheOldReaderSourceAction, action); +} + +static TheOldReaderSourceActionCtxtPtr +theoldreader_source_action_context_new(TheOldReaderSourcePtr gsource, TheOldReaderSourceActionPtr action) +{ + TheOldReaderSourceActionCtxtPtr ctxt = g_slice_new0(struct TheOldReaderSourceActionCtxt); + ctxt->nodeId = g_strdup(gsource->root->id); + ctxt->action = action; + return ctxt; +} + +static void +theoldreader_source_action_context_free(TheOldReaderSourceActionCtxtPtr ctxt) +{ + g_free(ctxt->nodeId); + g_slice_free(struct TheOldReaderSourceActionCtxt, ctxt); +} + +static void +theoldreader_source_edit_action_complete (const struct updateResult* const result, gpointer userdata, updateFlags flags) +{ + TheOldReaderSourceActionCtxtPtr editCtxt = (TheOldReaderSourceActionCtxtPtr) userdata; + nodePtr node = node_from_id (editCtxt->nodeId); + TheOldReaderSourcePtr gsource; + TheOldReaderSourceActionPtr action = editCtxt->action ; + + theoldreader_source_action_context_free (editCtxt); + + if (!node) { + theoldreader_source_action_free (action); + return; /* probably got deleted before this callback */ + } + gsource = (TheOldReaderSourcePtr) node->data; + + if (result->data == NULL || !g_str_equal (result->data, "OK")) { + if (action->callback) + (*action->callback) (gsource, action, FALSE); + debug1 (DEBUG_UPDATE, "The edit action failed with result: %s\n", result->data); + theoldreader_source_action_free (action); + return; /** @todo start a timer for next processing */ + } + + if (action->callback) + action->callback (gsource, action, TRUE); + + theoldreader_source_action_free (action); + + /* process anything else waiting on the edit queue */ + theoldreader_source_edit_process (gsource); +} + +/* the following theoldreader_source_api_* functions are simply funtions that + convert a TheOldReaderSourceActionPtr to a updateRequestPtr */ + +static void +theoldreader_source_api_add_subscription (TheOldReaderSourceActionPtr action, updateRequestPtr request, const gchar* token) +{ + update_request_set_source (request, THEOLDREADER_READER_ADD_SUBSCRIPTION_URL); + gchar* s_escaped = g_uri_escape_string (action->feedUrl, NULL, TRUE) ; + gchar* postdata = g_strdup_printf (THEOLDREADER_READER_ADD_SUBSCRIPTION_POST, s_escaped, token); + g_free (s_escaped); + + debug1 (DEBUG_UPDATE, "theoldreader_source: postdata [%s]", postdata); + request->postdata = postdata ; +} + +static void +theoldreader_source_api_remove_subscription (TheOldReaderSourceActionPtr action, updateRequestPtr request, const gchar* token) +{ + update_request_set_source (request, THEOLDREADER_READER_REMOVE_SUBSCRIPTION_URL); + gchar* s_escaped = g_uri_escape_string (action->feedUrl, NULL, TRUE); + g_assert (!request->postdata); + request->postdata = g_strdup_printf (THEOLDREADER_READER_REMOVE_SUBSCRIPTION_POST, s_escaped, token); + g_free (s_escaped); +} + +static void +theoldreader_source_api_edit_tag (TheOldReaderSourceActionPtr action, updateRequestPtr request, const gchar*token) +{ + update_request_set_source (request, THEOLDREADER_READER_EDIT_TAG_URL); + + const gchar* prefix = "feed" ; + gchar* s_escaped = g_uri_escape_string (action->feedUrl, NULL, TRUE); + gchar* a_escaped = NULL ; + gchar* i_escaped = g_uri_escape_string (action->guid, NULL, TRUE); + gchar* postdata = NULL ; + + /* + * If the source of the item is a feed then the source *id* will be of + * the form tag:google.com,2005:reader/feed/http://foo.com/bar + * If the item is a shared link it is of the form + * tag:google.com,2005:reader/user//source/com.google/link + * It is possible that there are items other thank link that has + * the ../user/.. id. The GR API requires the strings after ..:reader/ + * while TheOldReaderSourceAction only gives me after :reader/feed/ (or + * :reader/user/ as the case might be). I therefore need to guess + * the prefix ('feed/' or 'user/') from just this information. + */ + + if (strstr(action->feedUrl, "://") == NULL) + prefix = "user" ; + + if (action->actionType == EDIT_ACTION_MARK_UNREAD) { + a_escaped = g_uri_escape_string (THEOLDREADER_READER_TAG_KEPT_UNREAD, NULL, TRUE); + gchar *r_escaped = g_uri_escape_string (THEOLDREADER_READER_TAG_READ, NULL, TRUE); + postdata = g_strdup_printf (THEOLDREADER_READER_EDIT_TAG_AR_TAG, i_escaped, prefix, s_escaped, a_escaped, r_escaped, token); + g_free (r_escaped); + } + else if (action->actionType == EDIT_ACTION_MARK_READ) { + a_escaped = g_uri_escape_string (THEOLDREADER_READER_TAG_READ, NULL, TRUE); + postdata = g_strdup_printf (THEOLDREADER_READER_EDIT_TAG_ADD_TAG, i_escaped, prefix, s_escaped, a_escaped, token); + } + else if (action->actionType == EDIT_ACTION_TRACKING_MARK_UNREAD) { + a_escaped = g_uri_escape_string (THEOLDREADER_READER_TAG_TRACKING_KEPT_UNREAD, NULL, TRUE); + postdata = g_strdup_printf (THEOLDREADER_READER_EDIT_TAG_ADD_TAG, i_escaped, prefix, s_escaped, a_escaped, token); + } + else if (action->actionType == EDIT_ACTION_MARK_STARRED) { + a_escaped = g_uri_escape_string (THEOLDREADER_READER_TAG_STARRED, NULL, TRUE) ; + postdata = g_strdup_printf ( + THEOLDREADER_READER_EDIT_TAG_ADD_TAG, i_escaped, prefix, + s_escaped, a_escaped, token); + } + else if (action->actionType == EDIT_ACTION_MARK_UNSTARRED) { + gchar* r_escaped = g_uri_escape_string(THEOLDREADER_READER_TAG_STARRED, NULL, TRUE); + postdata = g_strdup_printf ( + THEOLDREADER_READER_EDIT_TAG_REMOVE_TAG, i_escaped, prefix, + s_escaped, r_escaped, token); + } + + else g_assert (FALSE); + + g_free (s_escaped); + g_free (a_escaped); + g_free (i_escaped); + + debug1 (DEBUG_UPDATE, "theoldreader_source: postdata [%s]", postdata); + + + request->postdata = postdata; +} + +static void +theoldreader_source_edit_token_cb (const struct updateResult * const result, gpointer userdata, updateFlags flags) +{ + nodePtr node; + TheOldReaderSourcePtr gsource; + const gchar* token; + TheOldReaderSourceActionPtr action; + updateRequestPtr request; + + if (result->httpstatus != 200 || result->data == NULL) { + /* FIXME: What is the behaviour that should go here? */ + return; + } + + node = node_from_id ((gchar*) userdata); + g_free (userdata); + + if (!node) { + return; + } + gsource = (TheOldReaderSourcePtr) node->data; + + + token = result->data; + + if (!gsource || g_queue_is_empty (gsource->actionQueue)) + return; + + action = g_queue_peek_head (gsource->actionQueue); + + 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); + + if (action->actionType == EDIT_ACTION_MARK_READ || + action->actionType == EDIT_ACTION_MARK_UNREAD || + action->actionType == EDIT_ACTION_TRACKING_MARK_UNREAD || + action->actionType == EDIT_ACTION_MARK_STARRED || + action->actionType == EDIT_ACTION_MARK_UNSTARRED) + theoldreader_source_api_edit_tag (action, request, token); + else if (action->actionType == EDIT_ACTION_ADD_SUBSCRIPTION ) + theoldreader_source_api_add_subscription (action, request, token); + else if (action->actionType == EDIT_ACTION_REMOVE_SUBSCRIPTION ) + theoldreader_source_api_remove_subscription (action, request, token) ; + + update_execute_request (gsource, request, theoldreader_source_edit_action_complete, theoldreader_source_action_context_new(gsource, action), 0); + + action = g_queue_pop_head (gsource->actionQueue); +} + +void +theoldreader_source_edit_process (TheOldReaderSourcePtr gsource) +{ + updateRequestPtr request; + + g_assert (gsource); + if (g_queue_is_empty (gsource->actionQueue)) + return; + + /* + * Google reader has a system of tokens. So first, I need to request a + * token from google, before I can make the actual edit request. The + * code here is the token code, the actual edit commands are in + * theoldreader_source_edit_token_cb + */ + request = update_request_new (); + request->updateState = update_state_copy (gsource->root->subscription->updateState); + request->options = update_options_copy (gsource->root->subscription->updateOptions); + request->source = g_strdup (THEOLDREADER_READER_TOKEN_URL); + update_request_set_auth_value(request, gsource->authHeaderValue); + + update_execute_request (gsource, request, theoldreader_source_edit_token_cb, + g_strdup(gsource->root->id), 0); +} + +static void +theoldreader_source_edit_push_ (TheOldReaderSourcePtr gsource, TheOldReaderSourceActionPtr action, gboolean head) +{ + g_assert (gsource->actionQueue); + if (head) g_queue_push_head (gsource->actionQueue, action); + else g_queue_push_tail (gsource->actionQueue, action); +} + +static void +theoldreader_source_edit_push (TheOldReaderSourcePtr gsource, TheOldReaderSourceActionPtr action, gboolean head) +{ + g_assert (gsource); + nodePtr root = gsource->root; + theoldreader_source_edit_push_ (gsource, action, head); + + /** @todo any flags I should specify? */ + if (gsource->loginState == THEOLDREADER_SOURCE_STATE_NONE) + subscription_update(root->subscription, THEOLDREADER_SOURCE_UPDATE_ONLY_LOGIN); + else if ( gsource->loginState == THEOLDREADER_SOURCE_STATE_ACTIVE) + theoldreader_source_edit_process (gsource); +} + +static void +update_read_state_callback (TheOldReaderSourcePtr gsource, TheOldReaderSourceActionPtr action, gboolean success) +{ + if (success) { + // FIXME: call item_read_state_changed (item, newState); + } else { + debug0 (DEBUG_UPDATE, "Failed to change item state!\n"); + } +} + +void +theoldreader_source_edit_mark_read (TheOldReaderSourcePtr gsource, const gchar *guid, const gchar *feedUrl, gboolean newStatus) +{ + TheOldReaderSourceActionPtr action = theoldreader_source_action_new (); + + action->guid = g_strdup (guid); + action->feedUrl = g_strdup (feedUrl); + action->actionType = newStatus ? EDIT_ACTION_MARK_READ : + EDIT_ACTION_MARK_UNREAD; + action->callback = update_read_state_callback; + + theoldreader_source_edit_push (gsource, action, FALSE); + + if (newStatus == FALSE) { + /* + * According to the TheOldReader API, to mark an item unread, + * I also need to mark it as tracking-kept-unread in a separate + * network call. + */ + action = theoldreader_source_action_new (); + action->guid = g_strdup (guid); + action->feedUrl = g_strdup (feedUrl); + action->actionType = EDIT_ACTION_TRACKING_MARK_UNREAD; + theoldreader_source_edit_push (gsource, action, FALSE); + } +} + +static void +update_starred_state_callback(TheOldReaderSourcePtr gsource, TheOldReaderSourceActionPtr action, gboolean success) +{ + if (success) { + // FIXME: call item_flag_changed (item, newState); + } else { + debug0 (DEBUG_UPDATE, "Failed to change item state!\n"); + } +} + +void +theoldreader_source_edit_mark_starred (TheOldReaderSourcePtr gsource, const gchar *guid, const gchar *feedUrl, gboolean newStatus) +{ + TheOldReaderSourceActionPtr action = theoldreader_source_action_new (); + + action->guid = g_strdup (guid); + action->feedUrl = g_strdup (feedUrl); + action->actionType = newStatus ? EDIT_ACTION_MARK_STARRED : EDIT_ACTION_MARK_UNSTARRED; + action->callback = update_starred_state_callback; + + theoldreader_source_edit_push (gsource, action, FALSE); +} + +static void +update_subscription_list_callback(TheOldReaderSourcePtr gsource, TheOldReaderSourceActionPtr action, gboolean success) +{ + if (success) { + /* + * It is possible that Google changed the name of the URL that + * was sent to it. In that case, I need to recover the URL + * from the list. But a node with the old URL has already + * been created. Allow the subscription update call to fix that. + */ + GSList* cur = gsource->root->children ; + for(; cur; cur = g_slist_next (cur)) { + nodePtr node = (nodePtr) cur->data ; + if (g_str_equal (node->subscription->source, action->feedUrl)) { + subscription_set_source (node->subscription, ""); + feedlist_node_added (node); + } + } + + debug0 (DEBUG_UPDATE, "Subscription list was updated successful\n"); + subscription_update (gsource->root->subscription, THEOLDREADER_SOURCE_UPDATE_ONLY_LIST); + } else + debug0 (DEBUG_UPDATE, "Failed to update subscriptions\n"); +} + +void +theoldreader_source_edit_add_subscription (TheOldReaderSourcePtr gsource, const gchar* feedUrl) +{ + TheOldReaderSourceActionPtr action = theoldreader_source_action_new () ; + action->actionType = EDIT_ACTION_ADD_SUBSCRIPTION; + action->feedUrl = g_strdup (feedUrl); + action->callback = update_subscription_list_callback; + theoldreader_source_edit_push (gsource, action, TRUE); +} + +static void +theoldreader_source_edit_remove_callback (TheOldReaderSourcePtr gsource, TheOldReaderSourceActionPtr action, gboolean success) +{ + if (success) { + /* + * The node was removed from the feedlist, but could have + * returned because of an update before this edit request + * completed. No cleaner way to handle this. + */ + GSList* cur = gsource->root->children ; + for(; cur; cur = g_slist_next (cur)) { + nodePtr node = (nodePtr) cur->data ; + if (g_str_equal (node->subscription->source, action->feedUrl)) { + feedlist_node_removed (node); + return; + } + } + } else + debug0 (DEBUG_UPDATE, "Failed to remove subscription"); +} + +void theoldreader_source_edit_remove_subscription (TheOldReaderSourcePtr gsource, const gchar* feedUrl) +{ + TheOldReaderSourceActionPtr action = theoldreader_source_action_new (); + action->actionType = EDIT_ACTION_REMOVE_SUBSCRIPTION; + action->feedUrl = g_strdup (feedUrl); + action->callback = theoldreader_source_edit_remove_callback; + theoldreader_source_edit_push (gsource, action, TRUE); +} + +gboolean theoldreader_source_edit_is_in_queue (TheOldReaderSourcePtr gsource, const gchar* guid) +{ + /* this is inefficient, but works for the time being */ + GList *cur = gsource->actionQueue->head; + for(; cur; cur = g_list_next (cur)) { + TheOldReaderSourceActionPtr action = cur->data; + if (action->guid && g_str_equal (action->guid, guid)) + return TRUE; + } + return FALSE; +} diff -Nru liferea-1.8.15/src/fl_sources/theoldreader_source_edit.h liferea-1.10.3/src/fl_sources/theoldreader_source_edit.h --- liferea-1.8.15/src/fl_sources/theoldreader_source_edit.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/theoldreader_source_edit.h 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,86 @@ +/** + * @file theoldreader_source_edit.c TheOldReader feed list source syncing support + * + * Copyright (C) 2008 Arnold Noronha + * + * 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 _THEOLDREADER_SOURCE_EDIT_H +#define _THEOLDREADER_SOURCE_EDIT_H + +#include "theoldreader_source.h" + +#include + +/** + * Process the waiting edits on the edit queue. Call this if the state of + * the TheOldReaderSource has changed. + * + * @param gsource The TheOldReaderSource whose editQueue should be processed. + */ +void theoldreader_source_edit_process (TheOldReaderSourcePtr gsource); + + +/** Edit wrappers */ + +/** + * Mark the given item as read. + * + * @param gsource The TheOldReaderSource structure + * @param guid The guid of the item whose status is to be edited + * @param feedUrl The feedUrl of the feed containing the item. + * @param newStatus The new read status of the item (TRUE for read) + */ +void theoldreader_source_edit_mark_read (TheOldReaderSourcePtr gsource, const gchar* guid, const gchar* feedUrl, gboolean newStatus); + +/** + * Mark the given item as starred. + * + * @param gsource The TheOldReaderSource structure + * @param guid The guid of the item whose status is to be edited + * @param feedUrl The feedUrl of the feed containing the item. + * @param newStatus The new read status of the item (TRUE for read) + */ +void theoldreader_source_edit_mark_starred (TheOldReaderSourcePtr gsource, const gchar *guid, const gchar *feedUrl, gboolean newStatus); + + +/** + * Add a subscription to the google source. + * + * @param gsource The TheOldReaderSource structure + * @param feedUrl the feed to add + */ +void theoldreader_source_edit_add_subscription (TheOldReaderSourcePtr gsource, const gchar* feedUrl); + + +/** + * Remove a subscription from the google source. + * + * @param gsource The TheOldReaderSource structure + * @param feedUrl the feed to remove + */ +void theoldreader_source_edit_remove_subscription (TheOldReaderSourcePtr gsource, const gchar* feedUrl); + +/** + * See if an item with give guid is being modified + * in the queue. + * + * @param TheOldReaderSource the TheOldReaderSource structure + * @param guid the guid of the item + */ +gboolean theoldreader_source_edit_is_in_queue (TheOldReaderSourcePtr gsource, const gchar* guid); + +#endif diff -Nru liferea-1.8.15/src/fl_sources/theoldreader_source_feed.c liferea-1.10.3/src/fl_sources/theoldreader_source_feed.c --- liferea-1.8.15/src/fl_sources/theoldreader_source_feed.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/theoldreader_source_feed.c 2013-08-06 23:26:22.000000000 +0200 @@ -0,0 +1,238 @@ +/** + * @file theoldreader_source_feed.c TheOldReader feed subscription routines + * + * Copyright (C) 2008 Arnold Noronha + * Copyright (C) 2013 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 "common.h" +#include "debug.h" +#include "xml.h" + +#include "feedlist.h" +#include "theoldreader_source.h" +#include "subscription.h" +#include "node.h" +#include "theoldreader_source_edit.h" +#include "metadata.h" +#include "db.h" +#include "item_state.h" + +void +theoldreader_source_migrate_node (nodePtr node) +{ + /* scan the node for bad ID's, if so, brutally remove the node */ + itemSetPtr itemset = node_get_itemset (node); + GList *iter = itemset->ids; + for (; iter; iter = g_list_next (iter)) { + itemPtr item = item_load (GPOINTER_TO_UINT (iter->data)); + if (item && item->sourceId) { + // FIXME: does this work? + if (!g_str_has_prefix(item->sourceId, "tag:google.com")) { + debug1(DEBUG_UPDATE, "Item with sourceId [%s] will be deleted.", item->sourceId); + db_item_remove(GPOINTER_TO_UINT(iter->data)); + } + } + if (item) item_unload (item); + } + + /* cleanup */ + itemset_free (itemset); +} + +static itemPtr +theoldreader_source_load_item_from_sourceid (nodePtr node, gchar *sourceId, GHashTable *cache) +{ + gpointer ret = g_hash_table_lookup (cache, sourceId); + itemSetPtr itemset; + int num = g_hash_table_size (cache); + GList *iter; + itemPtr item = NULL; + + if (ret) + return item_load (GPOINTER_TO_UINT (ret)); + + /* skip the top 'num' entries */ + itemset = node_get_itemset (node); + iter = itemset->ids; + while (num--) iter = g_list_next (iter); + + for (; iter; iter = g_list_next (iter)) { + item = item_load (GPOINTER_TO_UINT (iter->data)); + if (item && item->sourceId) { + /* save to cache */ + g_hash_table_insert (cache, g_strdup(item->sourceId), (gpointer) item->id); + if (g_str_equal (item->sourceId, sourceId)) { + itemset_free (itemset); + return item; + } + } + item_unload (item); + } + + g_warning ("Could not find item for %s!", sourceId); + itemset_free (itemset); + return NULL; +} + +static void +theoldreader_source_item_retrieve_status (const xmlNodePtr entry, subscriptionPtr subscription, GHashTable *cache) +{ + TheOldReaderSourcePtr gsource = (TheOldReaderSourcePtr) node_source_root_from_node (subscription->node)->data ; + xmlNodePtr xml; + nodePtr node = subscription->node; + xmlChar *id = NULL; + gboolean read = FALSE; + + xml = entry->children; + g_assert (xml); + + /* Note: at the moment TheOldReader doesn't exposed a "starred" label + like Google Reader did. It also doesn't expose the like feature it + implements. Therefore we cannot sync the flagged state with + TheOldReader. */ + + for (xml = entry->children; xml; xml = xml->next) { + if (g_str_equal (xml->name, "id")) + id = xmlNodeGetContent (xml); + + if (g_str_equal (xml->name, "category")) { + xmlChar* label = xmlGetProp (xml, "label"); + if (!label) + continue; + + if (g_str_equal (label, "read")) + read = TRUE; + + xmlFree (label); + } + } + + if (!id) { + g_warning ("Skipping item without id in theoldreader_source_item_retrieve_status()!"); + return; + } + + itemPtr item = theoldreader_source_load_item_from_sourceid (node, id, cache); + if (item && item->sourceId) { + if (g_str_equal (item->sourceId, id) && !theoldreader_source_edit_is_in_queue(gsource, id)) { + + if (item->readStatus != read) + item_read_state_changed (item, read); + } + } + if (item) + item_unload (item); + xmlFree (id); +} + +static void +theoldreader_feed_subscription_process_update_result (subscriptionPtr subscription, const struct updateResult* const result, updateFlags flags) +{ + gchar *id; + + debug_start_measurement (DEBUG_UPDATE); + + /* Save old subscription metadata which contains "theoldreader-feed-id" + which is mission critical and the feed parser currently drops all + previous metadata :-( */ + id = g_strdup (metadata_list_get (subscription->metadata, "theoldreader-feed-id")); + + /* Always do standard feed parsing to get the items... */ + feed_get_subscription_type ()->process_update_result (subscription, result, flags); + + /* Set remote id again */ + metadata_list_set (&subscription->metadata, "theoldreader-feed-id", id); + g_free (id); + + if (!result->data) + return; + + /* FIXME: The following workaround ensure that the code below, + that uses UI callbacks item_*_state_changed(), does not + reset the newCount of the feed list (see SF #2666478) + 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, NULL); + if (doc) { + xmlNodePtr root = xmlDocGetRootElement (doc); + xmlNodePtr entry = root->children ; + GHashTable *cache = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + + while (entry) { + if (!g_str_equal (entry->name, "entry")) { + entry = entry->next; + continue; /* not an entry */ + } + + theoldreader_source_item_retrieve_status (entry, subscription, cache); + entry = entry->next; + } + + g_hash_table_unref (cache); + xmlFreeDoc (doc); + } else { + debug0 (DEBUG_UPDATE, "theoldreader_feed_subscription_process_update_result(): Couldn't parse XML!"); + g_warning ("theoldreader_feed_subscription_process_update_result(): Couldn't parse XML!"); + } + + // FIXME: part 2 of the newCount workaround + feedlist_update_new_item_count (newCount); + + debug_end_measurement (DEBUG_UPDATE, "theoldreader_feed_subscription_process_update_result"); +} + +static gboolean +theoldreader_feed_subscription_prepare_update_request (subscriptionPtr subscription, + struct updateRequest *request) +{ + debug0 (DEBUG_UPDATE, "preparing TheOldReader feed subscription for update"); + TheOldReaderSourcePtr source = (TheOldReaderSourcePtr) node_source_root_from_node (subscription->node)->data; + + g_assert (source); + if (source->loginState == THEOLDREADER_SOURCE_STATE_NONE) { + subscription_update (node_source_root_from_node (subscription->node)->subscription, 0) ; + return FALSE; + } + + if (!metadata_list_get (subscription->metadata, "theoldreader-feed-id")) { + g_warning ("Skipping TheOldReader feed '%s' (%s) without id!", subscription->source, subscription->node->id); + return FALSE; + } + + debug1 (DEBUG_UPDATE, "Setting cookies for a TheOldReader subscription '%s'", subscription->source); + gchar* source_escaped = g_uri_escape_string(request->source, NULL, TRUE); + gchar* newUrl = g_strdup_printf ("http://theoldreader.com/reader/atom/%s", metadata_list_get (subscription->metadata, "theoldreader-feed-id")); + update_request_set_source (request, newUrl); + g_free (newUrl); + g_free (source_escaped); + + update_request_set_auth_value (request, source->authHeaderValue); + return TRUE; +} + +struct subscriptionType theOldReaderSourceFeedSubscriptionType = { + theoldreader_feed_subscription_prepare_update_request, + theoldreader_feed_subscription_process_update_result +}; + diff -Nru liferea-1.8.15/src/fl_sources/theoldreader_source_feed_list.c liferea-1.10.3/src/fl_sources/theoldreader_source_feed_list.c --- liferea-1.8.15/src/fl_sources/theoldreader_source_feed_list.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/theoldreader_source_feed_list.c 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,376 @@ +/** + * @file theoldreader_source_feed_list.c TheOldReader feed list handling + * + * Copyright (C) 2013 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 "theoldreader_source_feed_list.h" + +#include +#include + +#include "common.h" +#include "db.h" +#include "debug.h" +#include "feedlist.h" +#include "folder.h" +#include "json.h" +#include "metadata.h" +#include "node.h" +#include "subscription.h" +#include "xml.h" + +#include "fl_sources/opml_source.h" +#include "fl_sources/theoldreader_source.h" +#include "fl_sources/theoldreader_source_edit.h" + +static void +theoldreader_source_merge_feed (TheOldReaderSourcePtr source, const gchar *url, const gchar *title, const gchar *id) +{ + nodePtr node; + GSList *iter; + + /* check if node to be merged already exists */ + iter = source->root->children; + while (iter) { + node = (nodePtr)iter->data; + if (g_str_equal (node->subscription->source, url)) + return; + iter = g_slist_next (iter); + } + + debug2 (DEBUG_UPDATE, "adding %s (%s)", title, url); + node = node_new (feed_get_node_type ()); + node_set_title (node, title); + node_set_data (node, feed_new ()); + + node_set_subscription (node, subscription_new (url, NULL, NULL)); + node->subscription->type = &theOldReaderSourceFeedSubscriptionType; + + /* Save TheOldReader feed id which we need to fetch items... */ + node->subscription->metadata = metadata_list_append (node->subscription->metadata, "theoldreader-feed-id", id); + db_subscription_update (node->subscription); + + node_set_parent (node, source->root, -1); + feedlist_node_imported (node); + + /** + * @todo mark the ones as read immediately after this is done + * the feed as retrieved by this has the read and unread + * status inherently. + */ + subscription_update (node->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); + subscription_update_favicon (node->subscription); +} + +/** + * Find a node by the source id. + */ +nodePtr +theoldreader_source_opml_get_node_by_source (TheOldReaderSourcePtr gsource, const gchar *source) +{ + return theoldreader_source_opml_get_subnode_by_node (gsource->root, source); +} + +/** + * Recursively find a node by the source id. + */ +nodePtr +theoldreader_source_opml_get_subnode_by_node (nodePtr node, const gchar *source) +{ + nodePtr subnode; + nodePtr subsubnode; + GSList *iter = node->children; + for (; iter; iter = g_slist_next (iter)) { + subnode = (nodePtr)iter->data; + if (subnode->subscription + && g_str_equal (subnode->subscription->source, source)) + return subnode; + else if (subnode->type->capabilities + & NODE_CAPABILITY_SUBFOLDERS) { + subsubnode = theoldreader_source_opml_get_subnode_by_node(subnode, source); + if (subnode != NULL) + return subsubnode; + } + } + return NULL; +} + +/* subscription list merging functions */ + +static void +theoldreader_source_check_for_removal (nodePtr node, gpointer user_data) +{ + gchar *expr = NULL; + + if (IS_FEED (node)) { + expr = g_strdup_printf ("/object/list[@name='subscriptions']/object/string[@name='id'][. = 'feed/%s']", node->subscription->source); + } else if (IS_FOLDER (node)) { + node_foreach_child_data (node, theoldreader_source_check_for_removal, user_data); + expr = g_strdup_printf ("/object/list[@name='subscriptions']/object/list[@name='categories']/object[string='%s']", node->title); + } else { + g_warning ("theoldreader_source_check_for_removal(): This should never happen..."); + return; + } + + if (!xpath_find ((xmlNodePtr)user_data, expr)) { + debug1 (DEBUG_UPDATE, "removing %s...", node_get_title (node)); + feedlist_node_removed (node); + } else { + debug1 (DEBUG_UPDATE, "keeping %s...", node_get_title (node)); + } + g_free (expr); +} + +/* + * Find a node by the name under root or create it. + */ +static nodePtr +theoldreader_source_find_or_create_folder (const gchar *name, nodePtr root) +{ + nodePtr folder = NULL; + GSList *iter_parent; + + /* find a node by the name under root */ + iter_parent = root->children; + while (iter_parent) { + if (g_str_equal (name, node_get_title (iter_parent->data))) { + folder = (nodePtr)iter_parent->data; + break; + } + iter_parent = g_slist_next (iter_parent); + } + + /* if not found, create new folder */ + if (!folder) { + folder = node_new (folder_get_node_type ()); + node_set_title (folder, name); + node_set_parent (folder, root, -1); + feedlist_node_imported (folder); + subscription_update (folder->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); + } + + return folder; +} + +/* JSON subscription list processing implementation */ + +static void +theoldreader_subscription_cb (subscriptionPtr subscription, const struct updateResult * const result, updateFlags flags) +{ + TheOldReaderSourcePtr source = (TheOldReaderSourcePtr) subscription->node->data; + + debug1 (DEBUG_UPDATE,"theoldreader_subscription_cb(): %s", result->data); + + // FIXME: the following code is very similar to ttrss! + if (result->data && result->httpstatus == 200) { + JsonParser *parser = json_parser_new (); + + if (json_parser_load_from_data (parser, result->data, -1, NULL)) { + JsonArray *array = json_node_get_array (json_get_node (json_parser_get_root (parser), "subscriptions")); + GList *iter, *elements; + GSList *siter; + + /* We expect something like this: + + [{"id":"feed/51d49b79d1716c7b18000025", + "title":"LZone", + "categories":[], + "sortid":"51d49b79d1716c7b18000025", + "firstitemmsec":"1371403150181", + "url":"http://lzone.de/rss.xml", + "htmlUrl":"http://lzone.de", + "iconUrl":"http://s.yeoldereader.com/system/uploads/feed/picture/5152/884a/4dce/57aa/7e00/icon_0a6a.ico"}, + ... + */ + elements = iter = json_array_get_elements (array); + /* Add all new nodes we find */ + while (iter) { + JsonNode *node = (JsonNode *)iter->data; + + /* ignore everything without a feed url */ + if (json_get_string (node, "url")) { + theoldreader_source_merge_feed (source, + json_get_string (node, "url"), + json_get_string (node, "title"), + json_get_string (node, "id")); + } + iter = g_list_next (iter); + } + g_list_free (elements); + + /* Remove old nodes we cannot find anymore */ + siter = source->root->children; + while (siter) { + nodePtr node = (nodePtr)siter->data; + gboolean found = FALSE; + + elements = iter = json_array_get_elements (array); + while (iter) { + JsonNode *json_node = (JsonNode *)iter->data; + if (g_str_equal (node->subscription->source, json_get_string (json_node, "url"))) { + debug1 (DEBUG_UPDATE, "node: %s", node->subscription->source); + found = TRUE; + break; + } + iter = g_list_next (iter); + } + g_list_free (elements); + + if (!found) + feedlist_node_removed (node); + + siter = g_slist_next (siter); + } + + opml_source_export (subscription->node); /* save new feeds to feed list */ + subscription->node->available = TRUE; + //return; + } else { + g_warning ("Invalid JSON returned on TheOldReader request! >>>%s<<<", result->data); + } + + g_object_unref (parser); + } else { + subscription->node->available = FALSE; + debug0 (DEBUG_UPDATE, "theoldreader_subscription_cb(): ERROR: failed to get subscription list!"); + } + + if (!(flags & THEOLDREADER_SOURCE_UPDATE_ONLY_LIST)) + node_foreach_child_data (subscription->node, node_update_subscription, GUINT_TO_POINTER (0)); +} + +/** functions for an efficient updating mechanism */ +/* +static void +theoldreader_source_opml_quick_update_helper (xmlNodePtr match, gpointer userdata) +{ + TheOldReaderSourcePtr gsource = (TheOldReaderSourcePtr) userdata; + xmlNodePtr xmlNode; + xmlChar *id, *newestItemTimestamp; + nodePtr node = NULL; + const gchar *oldNewestItemTimestamp; + + xmlNode = xpath_find (match, "./string[@name='id']"); + id = xmlNodeGetContent (xmlNode); + + if (g_str_has_prefix (id, "feed/")) + node = theoldreader_source_opml_get_node_by_source (gsource, id + strlen ("feed/")); + else { + xmlFree (id); + return; + } + + if (node == NULL) { + xmlFree (id); + return; + } + + xmlNode = xpath_find (match, "./number[@name='newestItemTimestampUsec']"); + newestItemTimestamp = xmlNodeGetContent (xmlNode); + + oldNewestItemTimestamp = g_hash_table_lookup (gsource->lastTimestampMap, node->subscription->source); + + if (!oldNewestItemTimestamp || + (newestItemTimestamp && + !g_str_equal (newestItemTimestamp, oldNewestItemTimestamp))) { + debug3(DEBUG_UPDATE, "TheOldReaderSource: auto-updating %s " + "[oldtimestamp%s, timestamp %s]", + id, oldNewestItemTimestamp, newestItemTimestamp); + g_hash_table_insert (gsource->lastTimestampMap, + g_strdup (node->subscription->source), + g_strdup (newestItemTimestamp)); + + subscription_update (node->subscription, 0); + } + + xmlFree (newestItemTimestamp); + xmlFree (id); +} + +static void +theoldreader_source_opml_quick_update_cb (const struct updateResult* const result, gpointer userdata, updateFlags flags) +{ + TheOldReaderSourcePtr gsource = (TheOldReaderSourcePtr) userdata; + xmlDocPtr doc; + + if (!result->data) { + debug0 (DEBUG_UPDATE, "TheOldReaderSource: Unable to get unread counts, this update is aborted."); + return; + } + doc = xml_parse (result->data, result->size, NULL); + if (!doc) { + debug0 (DEBUG_UPDATE, "TheOldReaderSource: The XML failed to parse, maybe the session has expired. (FIXME)"); + return; + } + + xpath_foreach_match (xmlDocGetRootElement (doc), + "/object/list[@name='unreadcounts']/object", + theoldreader_source_opml_quick_update_helper, gsource); + + xmlFreeDoc (doc); +} + +gboolean +theoldreader_source_opml_quick_update (TheOldReaderSourcePtr source) +{ + updateRequestPtr request = update_request_new (); + request->updateState = update_state_copy (source->root->subscription->updateState); + request->options = update_options_copy (source->root->subscription->updateOptions); + update_request_set_source (request, THEOLDREADER_READER_UNREAD_COUNTS_URL); + update_request_set_auth_value (request, source->authHeaderValue); + + update_execute_request (source, request, theoldreader_source_opml_quick_update_cb, + source, 0); + + return TRUE; +} +*/ + +static void +theoldreader_source_opml_subscription_process_update_result (subscriptionPtr subscription, const struct updateResult * const result, updateFlags flags) +{ + theoldreader_subscription_cb (subscription, result, flags); +} + +static gboolean +theoldreader_source_opml_subscription_prepare_update_request (subscriptionPtr subscription, struct updateRequest *request) +{ + TheOldReaderSourcePtr gsource = (TheOldReaderSourcePtr)subscription->node->data; + + g_assert(gsource); + if (gsource->loginState == THEOLDREADER_SOURCE_STATE_NONE) { + debug0(DEBUG_UPDATE, "TheOldReaderSource: login"); + theoldreader_source_login ((TheOldReaderSourcePtr) subscription->node->data, 0) ; + return FALSE; + } + debug1 (DEBUG_UPDATE, "updating TheOldReader subscription (node id %s)", subscription->node->id); + + update_request_set_source (request, THEOLDREADER_READER_SUBSCRIPTION_LIST_URL); + + update_request_set_auth_value (request, gsource->authHeaderValue); + + return TRUE; +} + +/* OPML subscription type definition */ + +struct subscriptionType theOldReaderSourceOpmlSubscriptionType = { + theoldreader_source_opml_subscription_prepare_update_request, + theoldreader_source_opml_subscription_process_update_result +}; diff -Nru liferea-1.8.15/src/fl_sources/theoldreader_source_feed_list.h liferea-1.10.3/src/fl_sources/theoldreader_source_feed_list.h --- liferea-1.8.15/src/fl_sources/theoldreader_source_feed_list.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/theoldreader_source_feed_list.h 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,47 @@ +/** + * Copyright (C) 2009 Adrian Bunk + * + * 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 "fl_sources/theoldreader_source.h" + +/** + * Find a node by the source id. + * + * @param gsource the TheOldReader source + * @param source the feed id to find + * + * @returns a node (or NULL) + */ +nodePtr theoldreader_source_opml_get_node_by_source(TheOldReaderSourcePtr gsource, + const gchar *source); + +/** + * Recursively find a node by the source id. + * + * @param gsource the TheOldReader source + * @param source the feed id to find + * + * @returns a node (or NULL) + */ +nodePtr theoldreader_source_opml_get_subnode_by_node(nodePtr node, const gchar *source); + +/** + * Perform a quick update of the TheOldReader source. + * + * @param gsource the TheOldReader source + */ +gboolean theoldreader_source_opml_quick_update (TheOldReaderSourcePtr gsource); diff -Nru liferea-1.8.15/src/fl_sources/theoldreader_source.h liferea-1.10.3/src/fl_sources/theoldreader_source.h --- liferea-1.8.15/src/fl_sources/theoldreader_source.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/fl_sources/theoldreader_source.h 2013-09-19 22:57:38.000000000 +0200 @@ -0,0 +1,235 @@ +/** + * @file theoldreader_source.h TheOldReader feed list source support + * + * Copyright (C) 2007-2013 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 _THEOLDREADER_SOURCE_H +#define _THEOLDREADER_SOURCE_H + +#include "fl_sources/node_source.h" + +/** + * A nodeSource specific for TheOldReader + */ +typedef struct TheOldReaderSource { + nodePtr root; /**< the root node in the feed list */ + gchar *authHeaderValue; /**< the Google Authorization token */ + GQueue *actionQueue; + gint loginState; /**< The current login state */ + gint authFailures; /**< Number of authentication failures */ + + /** + * A map from a subscription source to a timestamp when it was last + * updated (provided by Google). + */ + GHashTable *lastTimestampMap; + + /** + * A timestamp when the last Quick update took place. + */ + GTimeVal lastQuickUpdate; +} *TheOldReaderSourcePtr; + +enum { + THEOLDREADER_SOURCE_STATE_NONE = 0, /**< no authentication tried so far */ + THEOLDREADER_SOURCE_STATE_IN_PROGRESS, /**< authentication in progress */ + THEOLDREADER_SOURCE_STATE_ACTIVE, /**< authentication succeeded */ + THEOLDREADER_SOURCE_STATE_NO_AUTH, /**< authentication has failed */ + THEOLDREADER_SOURCE_STATE_MIGRATE, /**< source will be migrated, do not do anything anymore! */ +}; + +enum { + /** + * Update only the subscription list, and not each node underneath it. + * Note: Uses higher 16 bits to avoid conflict. + */ + THEOLDREADER_SOURCE_UPDATE_ONLY_LIST = (1<<16), + /** + * Only login, do not do any updates. + */ + THEOLDREADER_SOURCE_UPDATE_ONLY_LOGIN = (1<<17) +}; + +/** + * Number of auth failures after which we stop bothering the user while + * auto-updating until he manually updates again. + */ +#define THEOLDREADER_SOURCE_MAX_AUTH_FAILURES 3 + +/** + * TheOldReader API URL's + * In each of the following, the _URL indicates the URL to use, and _POST + * indicates the corresponging postdata to send. + * @see https://github.com/krasnoukhov/theoldreader-api + */ + +/** + * TheOldReader 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. + */ +#define THEOLDREADER_READER_LOGIN_URL "https://theoldreader.com/accounts/ClientLogin" +#define THEOLDREADER_READER_LOGIN_POST "service=reader&Email=%s&Passwd=%s&source=liferea&continue=http://theoldreader.com" + +/** + * Get a list of subscriptions. + */ +#define THEOLDREADER_READER_SUBSCRIPTION_LIST_URL "http://theoldreader.com/reader/api/0/subscription/list?output=json" + +/** + * Get a token for an edit operation. (@todo A token can actually be used + * for multiple transactions.) + */ +#define THEOLDREADER_READER_TOKEN_URL "http://theoldreader.com/reader/api/0/token" + +/** + * Add a subscription + * @param URL The feed URL, or the page URL for feed autodiscovery. + * @param T a token obtained using THEOLDREADER_READER_TOKEN_URL + */ +#define THEOLDREADER_READER_ADD_SUBSCRIPTION_URL "http://theoldreader.com/reader/api/0/subscription/edit?client=liferea" +#define THEOLDREADER_READER_ADD_SUBSCRIPTION_POST "s=feed%%2F%s&i=null&ac=subscribe&T=%s" + +/** + * Unsubscribe from a subscription. + * @param url The feed URL + * @param T a token obtained using THEOLDREADER_READER_TOKEN_URL + */ +#define THEOLDREADER_READER_REMOVE_SUBSCRIPTION_URL "http://theoldreader.com/reader/api/0/subscription/edit?client=liferea" +#define THEOLDREADER_READER_REMOVE_SUBSCRIPTION_POST "s=feed%%2F%s&i=null&ac=unsubscribe&T=%s" + +/** + * A list of subscriptions with the unread counters, and the last updated + * timestamps. + */ +#define THEOLDREADER_READER_UNREAD_COUNTS_URL "http://theoldreader.com/reader/api/0/unread-count?all=true&client=liferea" + +/** + * Edit the tags associated with an item. The parameters to this _have_ to be + * sent as post data. + */ +#define THEOLDREADER_READER_EDIT_TAG_URL "http://theoldreader.com/reader/api/0/edit-tag?client=liferea" + +/** + * Postdata for adding a tag when using THEOLDREADER_READER_EDIT_TAG_URL. + * @param i The guid of the item. + * @param prefix The prefix to 's'. For normal feeds this will be "feed", for + * links etc, this should be "user". + * @param s The URL of the subscription containing the item. (Note that the + * following string adds the "feed/" prefix to this.) + * @param a The tag to add. + * @param T a token obtained using THEOLDREADER_READER_TOKEN_URL + */ +#define THEOLDREADER_READER_EDIT_TAG_ADD_TAG "i=%s&s=%s%%2F%s&a=%s&ac=edit-tags&T=%s&async=true" + +/** + * Postdata for removing a tag, when using THEOLDREADER_READER_EDIT_TAG_URL. Do + * not use for removing the "read" tag, see THEOLDREADER_READER_EDIT_TAG_AR_TAG + * for that. + * + * @param i The guid of the item. + * @param prefix The prefix to 's'. @see THEOLDREADER_READER_EDIT_TAG_ADD_TAG + * @param s The URL of the subscription containing the item. (Note that the + * final value of s is feed + "/" + this string) + * @param r The tag to remove + * @param T a token obtained using THEOLDREADER_READER_TOKEN_URL + */ +#define THEOLDREADER_READER_EDIT_TAG_REMOVE_TAG "i=%s&s=%s%%2F%s&r=%s&ac=edit-tags&T=%s&async=true" + +/** + * Postdata for adding a tag, and removing another tag at the same time, + * when using THEOLDREADER_READER_EDIT_TAG_URL. + * @param i The guid of the item. + * @param prefix The prefix to 's'. @see THEOLDREADER_READER_EDIT_TAG_ADD_TAG + * @param s The URL of the subscription containing the item. (Note that the + * final value of s is feed + "/" + this string) + * @param a The tag to add. + * @param r The tag to remove + * @param T a token obtained using THEOLDREADER_READER_TOKEN_URL + */ +#define THEOLDREADER_READER_EDIT_TAG_AR_TAG "i=%s&s=%s%%2F%s&a=%s&r=%s&ac=edit-tags&T=%s&async=true" + +/** + * Postdata for adding a tag, and removing another tag at the same time, for a + * _link_ item, when using THEOLDREADER_READER_EDIT_TAG_URL + * @param i The guid of the link (as provided by google) + * @param a The tag to add + * @param r The tag to remove + * @param T a token obtained using THEOLDREADER_READER_TOKEN_URL + */ +#define THEOLDREADER_READER_EDIT_TAG_ADD_TAG_FOR_LINK "i=%s&s=user%2F-%2Fsource%2Fcom.google%2Flink&a=%s&r=%s&ac=edit-tags&T=%s&async=true" + +/** A set of tags (states) defined by Google reader */ + +#define THEOLDREADER_READER_TAG_KEPT_UNREAD "user/-/state/com.google/kept-unread" +#define THEOLDREADER_READER_TAG_READ "user/-/state/com.google/read" +#define THEOLDREADER_READER_TAG_TRACKING_KEPT_UNREAD "user/-/state/com.google/tracking-kept-unread" +#define THEOLDREADER_READER_TAG_STARRED "user/-/state/com.google/starred" + +/** Interval (in seconds) for doing a Quick Update: 10min */ +#define THEOLDREADER_SOURCE_QUICK_UPDATE_INTERVAL 600 + +/** + * @returns TheOldReader source type implementation info. + */ +nodeSourceTypePtr theoldreader_source_get_type (void); + +extern struct subscriptionType theOldReaderSourceFeedSubscriptionType; +extern struct subscriptionType theOldReaderSourceOpmlSubscriptionType; + +/** + * Find a child node with the given feed source URL. + * + * @param gsource TheOldReaderSource + * @param source a feed source URL to search + * + * @returns a node (or NULL) + */ +nodePtr theoldreader_source_get_node_from_source (TheOldReaderSourcePtr gsource, const gchar* source); + +/** + * Tries to update the entire source quickly, by updating only those feeds + * which are known to be updated. Suitable for g_timeout_add. This is an + * internal function. + * + * @param data A pointer to a node id of the source. This pointer will + * be g_free'd if the update fails. + * + * @returns FALSE on update failure + */ +gboolean theoldreader_source_quick_update_timeout (gpointer gsource); + +/** + * Migrate a google source child-node from a Liferea 1.4 style read-only + * google source nodes. + * + * @param node The node to migrate (not the nodeSource!) + */ +void theoldreader_source_migrate_node (nodePtr node); + +/** + * Perform login for the given Google source. + * + * @param gsource a TheOldReaderSource + * @param flags network request flags + */ +void theoldreader_source_login (TheOldReaderSourcePtr gsource, guint32 flags); + +#endif diff -Nru liferea-1.8.15/src/fl_sources/ttrss_source.c liferea-1.10.3/src/fl_sources/ttrss_source.c --- liferea-1.8.15/src/fl_sources/ttrss_source.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/ttrss_source.c 2013-10-08 20:11:45.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ttrss_source.c tt-rss feed list source support * - * Copyright (C) 2010-2012 Lars Lindner + * Copyright (C) 2010-2013 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,25 +34,21 @@ #include "node.h" #include "subscription.h" #include "update.h" -#include "ui/auth_dialog.h" #include "ui/liferea_dialog.h" -#include "ui/ui_common.h" #include "fl_sources/node_source.h" #include "fl_sources/opml_source.h" -// FIXME: Avoid doing requests when we are not logged in yet! - -/** default tt-rss subscription list update interval = once a day */ -#define TTRSS_SOURCE_UPDATE_INTERVAL 60*60*24 - -/** create a tt-rss source with given node as root */ +/** Initialize a TinyTinyRSS source with given node as root */ static ttrssSourcePtr ttrss_source_new (nodePtr node) { ttrssSourcePtr source = g_new0 (struct ttrssSource, 1) ; - source->root = node; + source->root = node; + source->apiLevel = 0; source->actionQueue = g_queue_new (); - source->loginState = TTRSS_SOURCE_STATE_NONE; + source->loginState = TTRSS_SOURCE_STATE_NONE; + source->categories = g_hash_table_new (g_direct_hash, g_direct_equal); + source->categoryNodes = g_hash_table_new (g_direct_hash, g_direct_equal); return source; } @@ -76,7 +72,7 @@ ttrssSourcePtr source = (ttrssSourcePtr) userdata; subscriptionPtr subscription = source->root->subscription; - debug1 (DEBUG_UPDATE, "tt-rss getConfig processing... >>>%s<<<", result->data); + debug1 (DEBUG_UPDATE, "TinyTinyRSS getConfig processing... >>>%s<<<", result->data); /* We expect something like: @@ -92,9 +88,10 @@ const gchar *result = json_get_string (node, "daemon_is_running"); if (result && g_str_equal ("true", result)) { source->selfUpdating = TRUE; - debug0 (DEBUG_UPDATE, "This tt-rss source is self-updating!"); + debug0 (DEBUG_UPDATE, "This TinyTinyRSS source is self-updating!"); } else { - debug0 (DEBUG_UPDATE, "This tt-rss source is not self-updating!"); + ui_show_info_box (_("This TinyTinyRSS source is not self-updating and Liferea does not support updating TinyTinyRSS remotely at the moment. Please change the TinyTinyRSS preferences to automatic updating!")); + debug0 (DEBUG_UPDATE, "This TinyTinyRSS source is not self-updating!"); } g_object_unref (parser); @@ -109,51 +106,80 @@ } static void +ttrss_source_set_login_error (ttrssSourcePtr source, gchar *msg) +{ + g_free (source->root->subscription->updateError); + source->root->subscription->updateError = msg; + source->root->available = FALSE; + + g_warning ("TinyTinyRSS login failed: error '%s'!\n", msg); + + if (++source->authFailures < TTRSS_SOURCE_MAX_AUTH_FAILURES) + source->loginState = TTRSS_SOURCE_STATE_NONE; + else + source->loginState = TTRSS_SOURCE_STATE_NO_AUTH; +} + +static void ttrss_source_login_cb (const struct updateResult * const result, gpointer userdata, updateFlags flags) { ttrssSourcePtr source = (ttrssSourcePtr) userdata; subscriptionPtr subscription = source->root->subscription; - - debug1 (DEBUG_UPDATE, "tt-rss login processing... >>>%s<<<", result->data); + JsonParser *parser; + + debug1 (DEBUG_UPDATE, "TinyTinyRSS login processing... >>>%s<<<", result->data); g_assert (!source->session_id); - if (result->data && result->httpstatus == 200) { - JsonParser *parser = json_parser_new (); - - if (json_parser_load_from_data (parser, result->data, -1, NULL)) { - JsonNode *node = json_parser_get_root (parser); + if (!(result->data && result->httpstatus == 200)) { + ttrss_source_set_login_error (source, g_strdup_printf ("Login request failed with HTTP error %d", result->httpstatus)); + return; + } - if (json_get_string (node, "error")) - g_warning ("tt-rss login failed: error '%s'!\n", json_get_string (node, "error")); - - source->session_id = g_strdup (json_get_string (json_get_node (node, "content"), "session_id")); - if (source->session_id) { - debug1 (DEBUG_UPDATE, "Found session_id: >>>%s<<session_id); - } else { - g_warning ("No tt-rss session_id found in response!\n%s", result->data); - } - - g_object_unref (parser); - } else { - g_warning ("Invalid JSON returned on tt-rss login! >>>%s<<<", result->data); - } + parser = json_parser_new (); + if (!json_parser_load_from_data (parser, result->data, -1, NULL)) { + ttrss_source_set_login_error (source, g_strdup ("Invalid JSON returned on login!")); + return; + } + + JsonNode *node = json_parser_get_root (parser); + + /* Check for API specified error... */ + if (json_get_string (json_get_node (node, "content"), "error")) { + const gchar *error = json_get_string (json_get_node (node, "content"), "error"); + + ttrss_source_set_login_error (source, g_strdup (error)); + if (g_str_equal (error, "LOGIN_ERROR")) + auth_dialog_new (source->root->subscription, flags); + + return; + } + + /* Success! Get SID and API Level. */ + source->apiLevel = json_get_int (json_get_node (node, "content"), "api_level"); + source->session_id = g_strdup (json_get_string (json_get_node (node, "content"), "session_id")); + if (source->session_id) { + debug2 (DEBUG_UPDATE, "TinyTinyRSS Found session_id: >>>%s<<< (API level %d)!", source->session_id, source->apiLevel); } else { - g_warning ("tt-rss login failed: HTTP %d\n", result->httpstatus); - source->root->available = FALSE; + ttrss_source_set_login_error (source, g_strdup_printf ("No session_id found in response!\n%s", result->data)); } + + g_object_unref (parser); if (source->session_id) { updateRequestPtr request; + gchar *source_uri; /* Check for remote update daemon running. This needs to be known - before we start updating to decide wether to actively update + before we start updating to decide whether to actively update remote feeds or just fetch them. */ request = update_request_new (); request->options = update_options_copy (subscription->updateOptions); request->postdata = g_strdup_printf (TTRSS_JSON_GET_CONFIG, source->session_id); - update_request_set_source (request, g_strdup_printf (TTRSS_URL, metadata_list_get (subscription->metadata, "ttrss-url"))); + source_uri = g_strdup_printf (TTRSS_URL, source->url); + update_request_set_source (request, source_uri); + g_free (source_uri); update_execute_request (source, request, ttrss_source_get_config_cb, source, flags); } } @@ -165,13 +191,13 @@ void ttrss_source_login (ttrssSourcePtr source, guint32 flags) { - gchar *username, *password; + gchar *username, *password, *source_uri; updateRequestPtr request; subscriptionPtr subscription = source->root->subscription; if (source->loginState != TTRSS_SOURCE_STATE_NONE) { /* this should not happen, as of now, we assume the session doesn't expire. */ - debug1(DEBUG_UPDATE, "Logging in while login state is %d", source->loginState); + debug1 (DEBUG_UPDATE, "Logging in while login state is %d", source->loginState); } request = update_request_new (); @@ -179,8 +205,16 @@ /* escape user and password for JSON call */ username = g_strescape (subscription->updateOptions->username, NULL); password = g_strescape (subscription->updateOptions->password, NULL); - - update_request_set_source (request, g_strdup_printf (TTRSS_URL, metadata_list_get (subscription->metadata, "ttrss-url"))); + + source->url = metadata_list_get (subscription->metadata, "ttrss-url"); + if (!source->url) { + ttrss_source_set_login_error (source, g_strdup ("Fatal: We've lost the TinyTinyRSS server URL! Please re-subscribe!")); + return; + } + + source_uri = g_strdup_printf (TTRSS_URL, source->url); + update_request_set_source (request, source_uri); + g_free (source_uri); request->options = update_options_copy (subscription->updateOptions); request->postdata = g_strdup_printf (TTRSS_JSON_LOGIN, username, password); @@ -195,7 +229,6 @@ /* node source type implementation */ - static void ttrss_source_update (nodePtr node) { @@ -225,17 +258,30 @@ static void ttrss_source_deinit (void) { } static void +ttrss_source_set_subscription_type (nodePtr folder) +{ + GSList *iter; + + for (iter = folder->children; iter; iter = g_slist_next(iter)) { + nodePtr node = (nodePtr) iter->data; + + if (node->subscription) + node->subscription->type = &ttrssSourceFeedSubscriptionType; + else + ttrss_source_set_subscription_type (node); + } +} + +static void ttrss_source_import (nodePtr node) { - GSList *iter; opml_source_import (node); - + node->subscription->type = &ttrssSourceSubscriptionType; if (!node->data) node->data = (gpointer) ttrss_source_new (node); - for (iter = node->children; iter; iter = g_slist_next(iter)) - ((nodePtr) iter->data)->subscription->type = &ttrssSourceFeedSubscriptionType; + ttrss_source_set_subscription_type (node); } static void @@ -267,23 +313,26 @@ nodePtr node; subscriptionPtr subscription = subscription_new ("", NULL, NULL); - /* The is a bit ugly: we need to prevent the tt-rss base + /* This is a bit ugly: we need to prevent the tt-rss base URL from being lost by unwanted permanent redirects on the getFeeds call, so we save it as the homepage meta data value... */ metadata_list_set (&subscription->metadata, "ttrss-url", gtk_entry_get_text (GTK_ENTRY (liferea_dialog_lookup (GTK_WIDGET (dialog), "serverUrlEntry")))); - - subscription->updateOptions->username = g_strdup (gtk_entry_get_text (GTK_ENTRY (liferea_dialog_lookup (GTK_WIDGET(dialog), "userEntry")))); - subscription->updateOptions->password = g_strdup (gtk_entry_get_text (GTK_ENTRY (liferea_dialog_lookup (GTK_WIDGET(dialog), "passwordEntry")))); - subscription->type = &ttrssSourceSubscriptionType; - + node = node_new (node_source_get_node_type ()); node_set_title (node, "Tiny Tiny RSS"); node_source_new (node, ttrss_source_get_type ()); node_set_subscription (node, subscription); - node->data = ttrss_source_new (node); + + subscription_set_auth_info (subscription, + gtk_entry_get_text (GTK_ENTRY (liferea_dialog_lookup (GTK_WIDGET(dialog), "userEntry"))), + gtk_entry_get_text (GTK_ENTRY (liferea_dialog_lookup (GTK_WIDGET(dialog), "passwordEntry")))); + subscription->type = &ttrssSourceSubscriptionType; + + node->data = (gpointer)ttrss_source_new (node); feedlist_node_added (node); ttrss_source_update (node); + db_node_update (node); } gtk_widget_destroy (GTK_WIDGET (dialog)); @@ -306,6 +355,8 @@ ttrss_source_cleanup (nodePtr node) { ttrssSourcePtr source = (ttrssSourcePtr) node->data; + g_hash_table_destroy (source->categories); + g_hash_table_destroy (source->categoryNodes); ttrss_source_free (source); node->data = NULL; } @@ -313,7 +364,7 @@ static void ttrss_source_remote_update_cb (const struct updateResult * const result, gpointer userdata, updateFlags flags) { - debug2 (DEBUG_UPDATE, "tt-rss result processing... status:%d >>>%s<<<", result->httpstatus, result->data); + debug2 (DEBUG_UPDATE, "TinyTinyRSS result processing... status:%d >>>%s<<<", result->httpstatus, result->data); } /* FIXME: Only simple synchronous item change requests... Get async! */ @@ -329,7 +380,7 @@ request->options = update_options_copy (root->subscription->updateOptions); request->postdata = g_strdup_printf (TTRSS_JSON_UPDATE_ITEM_FLAG, source->session_id, item_get_id(item), newStatus?1:0 ); - update_request_set_source (request, g_strdup_printf (TTRSS_URL, metadata_list_get (root->subscription->metadata, "ttrss-url"))); + update_request_set_source (request, g_strdup_printf (TTRSS_URL, source->url)); update_execute_request (source, request, ttrss_source_remote_update_cb, source, 0 /* flags */); item_flag_state_changed (item, newStatus); @@ -346,7 +397,7 @@ request->options = update_options_copy (root->subscription->updateOptions); request->postdata = g_strdup_printf (TTRSS_JSON_UPDATE_ITEM_UNREAD, source->session_id, item_get_id(item), newStatus?0:1 ); - update_request_set_source (request, g_strdup_printf (TTRSS_URL, metadata_list_get (root->subscription->metadata, "ttrss-url"))); + update_request_set_source (request, g_strdup_printf (TTRSS_URL, source->url)); update_execute_request (source, request, ttrss_source_remote_update_cb, source, 0 /* flags */); item_read_state_changed (item, newStatus); diff -Nru liferea-1.8.15/src/fl_sources/ttrss_source_feed.c liferea-1.10.3/src/fl_sources/ttrss_source_feed.c --- liferea-1.8.15/src/fl_sources/ttrss_source_feed.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/ttrss_source_feed.c 2013-10-08 19:53:01.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ttrss_source_feed.c tt-rss feed subscription routines * - * Copyright (C) 2010-2011 Lars Lindner + * Copyright (C) 2010-2013 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -42,7 +42,8 @@ if (json_parser_load_from_data (parser, result->data, -1, NULL)) { JsonArray *array = json_node_get_array (json_get_node (json_parser_get_root (parser), "content")); - GList *iter = json_array_get_elements (array); + GList *elements = json_array_get_elements (array); + GList *iter = elements; GList *items = NULL; /* @@ -68,12 +69,16 @@ while (iter) { JsonNode *node = (JsonNode *)iter->data; itemPtr item = item_new (); - const gchar *content; + gchar *id; + const gchar *content; gchar *xhtml; - - item_set_id (item, g_strdup_printf ("%lld", json_get_int (node, "id"))); + + id = g_strdup_printf ("%" G_GINT64_FORMAT, json_get_int (node, "id")); + item_set_id (item, id); + g_free (id); item_set_title (item, json_get_string (node, "title")); item_set_source (item, json_get_string (node, "link")); + content = json_get_string (node, "content"); xhtml = xhtml_extract_from_string (content, NULL); item_set_description (item, xhtml); @@ -94,7 +99,9 @@ iter = g_list_next (iter); } - + + g_list_free (elements); + /* merge against feed cache */ if (items) { itemSetPtr itemSet = node_get_itemset (subscription->node); @@ -109,8 +116,10 @@ } else { subscription->node->available = FALSE; - g_string_append (((feedPtr)subscription->node->data)->parseErrors, _("Could not parse JSON returned by tt-rss API!")); + g_string_append (((feedPtr)subscription->node->data)->parseErrors, _("Could not parse JSON returned by TinyTinyRSS API!")); } + + g_object_unref (parser); } else { subscription->node->available = FALSE; } @@ -120,12 +129,15 @@ ttrss_feed_subscription_prepare_update_request (subscriptionPtr subscription, struct updateRequest *request) { - debug0 (DEBUG_UPDATE, "ttrss_feed_subscription_prepare_update_request()"); - nodePtr root = node_source_root_from_node (subscription->node); - ttrssSourcePtr source = (ttrssSourcePtr) root->data; - const gchar *feed_id; + nodePtr root = node_source_root_from_node (subscription->node); + ttrssSourcePtr source = (ttrssSourcePtr) root->data; + const gchar *feed_id; + gchar *source_name; + gint fetchCount; + + debug0 (DEBUG_UPDATE, "TinyTinyRSS preparing feed subscription for update"); - debug0 (DEBUG_UPDATE, "preparing tt-rss feed subscription for update"); + // FIXME: if (!source->selfUpdating) trigger remote update first! g_assert(source); if (source->loginState == TTRSS_SOURCE_STATE_NONE) { @@ -135,11 +147,17 @@ feed_id = metadata_list_get (subscription->metadata, "ttrss-feed-id"); if (!feed_id) { - g_warning ("tt-rss feed without id! (%s)", subscription->node->title); + g_warning ("Fatal: TinyTinyRSS feed without id! (%s)", subscription->node->title); return FALSE; } - request->postdata = g_strdup_printf (TTRSS_JSON_HEADLINES, source->session_id, feed_id, 15 /* items to fetch */ ); - update_request_set_source (request, g_strdup_printf (TTRSS_URL, metadata_list_get (root->subscription->metadata, "ttrss-url"))); + + /* We can always max out as TinyTinyRSS does limit results itself */ + fetchCount = feed_get_max_item_count (subscription->node); + + request->postdata = g_strdup_printf (TTRSS_JSON_HEADLINES, source->session_id, feed_id, fetchCount); + source_name = g_strdup_printf (TTRSS_URL, source->url); + update_request_set_source (request, source_name); + g_free (source_name); return TRUE; } diff -Nru liferea-1.8.15/src/fl_sources/ttrss_source_feed_list.c liferea-1.10.3/src/fl_sources/ttrss_source_feed_list.c --- liferea-1.8.15/src/fl_sources/ttrss_source_feed_list.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/ttrss_source_feed_list.c 2013-10-08 19:53:26.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ttrss_source_feed_list.c tt-rss feed list handling routines. * - * Copyright (C) 2010-2011 Lars Lindner + * Copyright (C) 2010-2013 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #include "ttrss_source_feed_list.h" #include @@ -28,6 +27,7 @@ #include "db.h" #include "debug.h" #include "feedlist.h" +#include "folder.h" #include "json.h" #include "metadata.h" #include "node.h" @@ -35,55 +35,144 @@ #include "fl_sources/opml_source.h" #include "fl_sources/ttrss_source.h" +/* subscription list merging functions */ + +static void +ttrss_source_check_node_for_removal (nodePtr node, gpointer user_data) +{ + JsonArray *array = (JsonArray *)user_data; + GList *iter, *elements; + gboolean found = FALSE; + + if (IS_FOLDER (node)) { + // FIXME: check folders too + + node_foreach_child_data (node, ttrss_source_check_node_for_removal, user_data); + } else { + elements = iter = json_array_get_elements (array); + while (iter) { + JsonNode *json_node = (JsonNode *)iter->data; + if (g_str_equal (node->subscription->source, json_get_string (json_node, "feed_url"))) { + debug1 (DEBUG_UPDATE, "node: %s", node->subscription->source); + found = TRUE; + break; + } + iter = g_list_next (iter); + } + g_list_free (elements); + + if (!found) + feedlist_node_removed (node); + } +} + +/* + * Find a node by the name under root or create it. + * + * @param name Folder display name + * @param parent Parent folder or source root node + * + * @returns a valid nodePtr + */ +static nodePtr +ttrss_source_find_or_create_folder (const gchar *name, nodePtr parent) +{ + nodePtr folder = NULL; + GSList *iter_parent; + + folder = feedlist_find_node (parent, FOLDER_BY_TITLE, name); + if (!folder) { + folder = node_new (folder_get_node_type ()); + node_set_title (folder, name); + node_set_parent (folder, parent, -1); + feedlist_node_imported (folder); + subscription_update (folder->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); + } + + return folder; +} + +/* + * Check if folder of a node changed in TinyTinyRSS and move + * node to the correct folder. + */ +static void +ttrss_source_update_folder (ttrssSourcePtr source, nodePtr node) +{ + nodePtr parent; + gint category; + const gchar *feedId; + + feedId = (const gchar *)metadata_list_get (node->subscription->metadata, "ttrss-feed-id"); + if (!feedId) + return; + + category = GPOINTER_TO_INT (g_hash_table_lookup (source->categories, GINT_TO_POINTER (atoi (feedId)))); + parent = g_hash_table_lookup (source->categoryNodes, GINT_TO_POINTER (category)); + if (!parent) + return; + + if (parent != node->parent) { + debug2 (DEBUG_UPDATE, "TinyTinyRSS Moving node \"%s\" to folder \"%s\"", node->title, parent->title); + node_reparent (node, parent); + } + + /* if feed has no category and parent is not source root, reparent to source root */ + if (parent == NULL && node->parent != source->root) { + debug1 (DEBUG_UPDATE, "TinyTinyRSS Moving node \"%s\" back to root", node->title); + node_reparent (node, source->root); + } +} + static void ttrss_source_merge_feed (ttrssSourcePtr source, const gchar *url, const gchar *title, gint64 id) { - nodePtr node; - GSList *iter; - gchar *tmp; + nodePtr node; + GSList *iter; + gchar *tmp; /* check if node to be merged already exists */ - iter = source->root->children; - while (iter) { - node = (nodePtr)iter->data; - if (g_str_equal (node->subscription->source, url)) - return; - iter = g_slist_next (iter); - } + node = feedlist_find_node (source->root, NODE_BY_URL, url); - debug2 (DEBUG_UPDATE, "adding %s (%s)", title, url); - node = node_new (feed_get_node_type ()); - node_set_title (node, title); - node_set_data (node, feed_new ()); + if (!node) { + debug2 (DEBUG_UPDATE, "adding %s (%s)", title, url); + node = node_new (feed_get_node_type ()); + node_set_title (node, title); + node_set_data (node, feed_new ()); - node_set_subscription (node, subscription_new (url, NULL, NULL)); - node->subscription->type = &ttrssSourceFeedSubscriptionType; + node_set_subscription (node, subscription_new (url, NULL, NULL)); + node->subscription->type = &ttrssSourceFeedSubscriptionType; - /* Save tt-rss feed id which we need to fetch items... */ - tmp = g_strdup_printf ("%lld", id); - metadata_list_set (&node->subscription->metadata, "ttrss-feed-id", tmp); - g_free (tmp); + /* Save tt-rss feed id which we need to fetch items... */ + tmp = g_strdup_printf ("%" G_GINT64_FORMAT, id); + metadata_list_set (&node->subscription->metadata, "ttrss-feed-id", tmp); + g_free (tmp); - node_set_parent (node, source->root, -1); - feedlist_node_imported (node); + node_set_parent (node, source->root, -1); + feedlist_node_imported (node); - /** - * @todo mark the ones as read immediately after this is done - * the feed as retrieved by this has the read and unread - * status inherently. - */ - subscription_update (node->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); - subscription_update_favicon (node->subscription); + /** + * @todo mark the ones as read immediately after this is done + * the feed as retrieved by this has the read and unread + * status inherently. + */ + subscription_update (node->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); + subscription_update_favicon (node->subscription); + + /* Important: we must not loose the feed id! */ + db_subscription_update (node->subscription); + } - /* Important: we must not loose the feed id! */ - db_subscription_update (node->subscription); + debug2 (DEBUG_UPDATE, "updating folder for %s (%s)", title, url); + ttrss_source_update_folder (source, node); } /* source subscription type implementation */ static void -ttrss_subscription_cb (subscriptionPtr subscription, const struct updateResult * const result, updateFlags flags) +ttrss_source_subscription_list_cb (const struct updateResult * const result, gpointer user_data, guint32 flags) { + subscriptionPtr subscription = (subscriptionPtr) user_data; ttrssSourcePtr source = (ttrssSourcePtr) subscription->node->data; debug1 (DEBUG_UPDATE,"ttrss_subscription_cb(): %s", result->data); @@ -92,8 +181,9 @@ JsonParser *parser = json_parser_new (); if (json_parser_load_from_data (parser, result->data, -1, NULL)) { - JsonArray *array = json_node_get_array (json_get_node (json_parser_get_root (parser), "content")); - GList *iter = json_array_get_elements (array); + JsonNode *content = json_get_node (json_parser_get_root (parser), "content"); + JsonArray *array; + GList *iter, *elements; GSList *siter; /* We expect something like this: @@ -114,8 +204,21 @@ "last_updated":1287853206}, [...] + + Or an error message that could look like this: + + {"seq":null,"status":1,"content":{"error":"NOT_LOGGED_IN"}} + */ - + + if (!content || (JSON_NODE_TYPE (content) != JSON_NODE_ARRAY)) { + debug0 (DEBUG_UPDATE, "ttrss_subscription_cb(): Failed to get subscription list!"); + subscription->node->available = FALSE; + return; + } + + array = json_node_get_array (content); + elements = iter = json_array_get_elements (array); /* Add all new nodes we find */ while (iter) { JsonNode *node = (JsonNode *)iter->data; @@ -129,72 +232,200 @@ } iter = g_list_next (iter); } - + g_list_free (elements); + /* Remove old nodes we cannot find anymore */ - siter = source->root->children; - while (siter) { - nodePtr node = (nodePtr)siter->data; - gboolean found = FALSE; - - iter = json_array_get_elements (array); - while (iter) { - JsonNode *json_node = (JsonNode *)iter->data; - if (g_str_equal (node->subscription->source, json_get_string (json_node, "feed_url"))) { - debug1 (DEBUG_UPDATE, "node: %s", node->subscription->source); - found = TRUE; - break; - } - iter = g_list_next (iter); - } - - if (!found) - feedlist_node_removed (node); - - siter = g_slist_next (siter); - } + node_foreach_child_data (source->root, ttrss_source_check_node_for_removal, array); - opml_source_export (subscription->node); /* save new feeds to feed list */ + /* Save new subscription tree to OPML cache file */ + opml_source_export (subscription->node); + subscription->node->available = TRUE; - //return; } else { - g_warning ("Invalid JSON returned on tt-rss request! >>>%s<<<", result->data); + g_warning ("Invalid JSON returned on TinyTinyRSSS request! >>>%s<<<", result->data); } + + g_object_unref (parser); } else { subscription->node->available = FALSE; - debug0 (DEBUG_UPDATE, "ttrss_subscription_cb(): ERROR: failed to get subscription list!"); + debug0 (DEBUG_UPDATE, "ttrss_subscription_cb(): ERROR: failed to get TinyTinyRSS subscription list!"); } if (!(flags & TTRSS_SOURCE_UPDATE_ONLY_LIST)) - node_foreach_child_data (subscription->node, node_update_subscription, GUINT_TO_POINTER (0)); - + node_foreach_child_data (subscription->node, node_update_subscription, GUINT_TO_POINTER (0)); +} + +static void +ttrss_source_update_subscription_list (ttrssSourcePtr source, subscriptionPtr subscription) +{ + updateRequestPtr request; + gchar *source_uri; + + request = update_request_new (); + request->updateState = update_state_copy (subscription->updateState); + request->options = update_options_copy (subscription->updateOptions); + + source_uri = g_strdup_printf (TTRSS_URL, source->url); + update_request_set_source (request, source_uri); + g_free (source_uri); + request->postdata = g_strdup_printf (TTRSS_JSON_SUBSCRIPTION_LIST, source->session_id); + + subscription->updateJob = update_execute_request (subscription, request, ttrss_source_subscription_list_cb, subscription, 0); +} + +static void +ttrss_source_merge_categories (ttrssSourcePtr source, nodePtr parent, gint parentId, JsonNode *items) +{ + JsonArray *array = json_node_get_array (items); + GList *iter, *elements; + + elements = iter = json_array_get_elements (array); + while (iter) { + JsonNode *node = (JsonNode *)iter->data; + + gint id = json_get_int (node, "bare_id"); + if (id > 0) { + const gchar *type = json_get_string (node, "type"); + const gchar *name = json_get_string (node, "name"); + + /* ignore everything without a name */ + if (json_get_string (node, "name")) { + + /* Process child categories */ + if (type && g_str_equal (type, "category")) { + nodePtr folder; + + debug2 (DEBUG_UPDATE, "TinyTinyRSS category id=%ld name=%s", id, name); + folder = ttrss_source_find_or_create_folder (name, parent); + g_hash_table_insert (source->categoryNodes, GINT_TO_POINTER (id), folder); + + /* Process child categories ... */ + if (json_get_node (node, "items")) + ttrss_source_merge_categories (source, folder, id, json_get_node (node, "items")); + /* Process child feeds */ + } else { + debug3 (DEBUG_UPDATE, "TinyTinyRSS feed=%s folder=%d (%ld)", name, parentId, id); + g_hash_table_insert (source->categories, GINT_TO_POINTER (id), GINT_TO_POINTER (parentId)); + } + } + + } + iter = g_list_next (iter); + } + g_list_free (elements); } static void ttrss_subscription_process_update_result (subscriptionPtr subscription, const struct updateResult * const result, updateFlags flags) { - debug0 (DEBUG_UPDATE, "ttrss_subscription_process_update_result"); - ttrss_subscription_cb (subscription, result, flags); + ttrssSourcePtr source = (ttrssSourcePtr) subscription->node->data; + + debug1 (DEBUG_UPDATE, "ttrss_subscription_process_update_result: %s", result->data); + + if (result->data && result->httpstatus == 200) { + JsonParser *parser = json_parser_new (); + + if (json_parser_load_from_data (parser, result->data, -1, NULL)) { + JsonNode *content = json_get_node (json_parser_get_root (parser), "content"); + JsonNode *categories, *items; + GSList *siter; + + /* We expect something like this: + + {"categories":{"identifier":"id","label":"name","items":[ + {"id":"CAT:-1","items":[ + {"id":"FEED:-4","name":"All articles","unread":1547,"type":"feed","error":"","updated":"","icon":"images\/tag.png","bare_id":-4,"auxcounter":0}, + {"id":"FEED:-3","name":"Fresh articles","unread":0,"type":"feed","error":"","updated":"","icon":"images\/fresh.png","bare_id":-3,"auxcounter":0}, + {"id":"FEED:-1","name":"Starred articles","unread":0,"type":"feed","error":"","updated":"","icon":"images\/mark_set.svg","bare_id":-1,"auxcounter":0}, + {"id":"FEED:-2","name":"Published articles","unread":0,"type":"feed","error":"","updated":"","icon":"images\/pub_set.svg","bare_id":-2,"auxcounter":0}, + {"id":"FEED:0","name":"Archived articles","unread":0,"type":"feed","error":"","updated":"","icon":"images\/archive.png","bare_id":0,"auxcounter":0}, + {"id":"FEED:-6","name":"Recently read","unread":0,"type":"feed","error":"","updated":"","icon":"images\/recently_read.png","bare_id":-6,"auxcounter":0}], + "name":"Special","type":"category","unread":0,"bare_id":-1}, + {"id":"CAT:1","bare_id":1,"auxcounter":0,"name":"OSS","items":[ + {"id":"CAT:2","bare_id":2,"name":"News","items":[ + {"id":"FEED:4","bare_id":4,"auxcounter":0,"name":"Tiny Tiny RSS: Forum","checkbox":false,"unread":0,"error":"","icon":false,"param":"Jan 03, 13:15"}, + {"id":"FEED:3","bare_id":3,"auxcounter":0,"name":"Tiny Tiny RSS: New Releases","checkbox":false,"unread":0,"error":"","icon":false,"param":"Jan 03, 13:15"}], + "checkbox":false,"type":"category","unread":0,"child_unread":0,"auxcounter":0,"param":"(2 feeds)"}, + {"id":"FEED:6","bare_id":6,"auxcounter":0,"name":"Ars Technica","checkbox":false,"unread":0,"error":"","icon":"feed-icons\/6.ico","param":"Sep 18, 20:43"}, + {"id":"FEED:7","bare_id":7,"auxcounter":0,"name":"LZone","checkbox":false,"unread":0,"error":"","icon":"feed-icons\/7.ico","param":"Jul 06, 23:09"}], + "checkbox":false,"type":"category","unread":0,"child_unread":0,"param":"(4 feeds)"}, + {"id":"CAT:0","bare_id":0,"auxcounter":0,"name":"Uncategorized","items":[ + {"id":"FEED:5","bare_id":5,"auxcounter":0,"name":"Slashdot","checkbox":false,"error":"","icon":false,"param":"Jan 03, 13:15","unread":0,"type":"feed"}], + "type":"category","checkbox":false,"unread":0,"child_unread":0,"param":"(1 feed)"}]}}} + + So we need to: + - ignore all negative categories + - treat feeds in category #0 as root level feeds + - traverse all categories > #1 + - remember category ids in source->categories hash + + As we need to perform a subscription list anyway we can ignore all feed infos + */ + + if (!content) { + debug0 (DEBUG_UPDATE, "ttrss_subscription_process_update_result(): Failed to get subscription list!"); + subscription->node->available = FALSE; + return; + } + + categories = json_get_node (content, "categories"); + if (!categories) { + debug0 (DEBUG_UPDATE, "ttrss_subscription_process_update_result(): Failed to get categories list: no 'categories' element found!"); + subscription->node->available = FALSE; + return; + } + + items = json_get_node (categories, "items"); + if (!items || (JSON_NODE_TYPE (items) != JSON_NODE_ARRAY)) { + debug0 (DEBUG_UPDATE, "ttrss_subscription_process_update_result(): Failed to get categories list: no 'categories' element found!"); + subscription->node->available = FALSE; + return; + } + + /* Process categories tree recursively */ + g_hash_table_remove_all (source->categories); + g_hash_table_insert (source->categoryNodes, GINT_TO_POINTER (0), source->root); + ttrss_source_merge_categories (source, source->root, 0, items); + + /* And trigger the actual feed fetching */ + ttrss_source_update_subscription_list (source, subscription); + } else { + g_warning ("Invalid JSON returned on TinyTinyRSS request! >>>%s<<<", result->data); + } + + g_object_unref (parser); + } else { + subscription->node->available = FALSE; + debug0 (DEBUG_UPDATE, "ttrss_subscription_process_update_result(): Failed to get categories list!"); + } } static gboolean ttrss_subscription_prepare_update_request (subscriptionPtr subscription, struct updateRequest *request) { - debug0 (DEBUG_UPDATE, "ttrs_subscription_prepare_update_request"); ttrssSourcePtr source = (ttrssSourcePtr) subscription->node->data; + gchar *source_uri; + + debug0 (DEBUG_UPDATE, "ttrss_subscription_prepare_update_request"); g_assert (source); if (source->loginState == TTRSS_SOURCE_STATE_NONE) { - debug0 (DEBUG_UPDATE, "TtRssSource: login"); + debug0 (DEBUG_UPDATE, "TinyTinyRSS login"); ttrss_source_login (source, 0); return FALSE; } - debug1 (DEBUG_UPDATE, "updating tt-rss subscription (node id %s)", subscription->node->id); + debug1 (DEBUG_UPDATE, "TinyTinyRSS updating subscription (node id %s)", subscription->node->id); - // FIXME: if (!source->selfUpdating) trigger remote update first! + /* Updating the TinyTinyRSS subscription means updating the list + of categories and the list of feeds in 2 requests and if the + installation is not self-updating to run a remote update for + each feed before fetching it's items */ + + source_uri = g_strdup_printf (TTRSS_URL, source->url); + update_request_set_source (request, source_uri); + g_free (source_uri); + request->postdata = g_strdup_printf (TTRSS_JSON_CATEGORIES_LIST, source->session_id); - update_request_set_source (request, g_strdup_printf (TTRSS_URL, metadata_list_get (subscription->metadata, "ttrss-url"))); - request->postdata = g_strdup_printf (TTRSS_JSON_SUBSCRIPTION_LIST, source->session_id); - return TRUE; } diff -Nru liferea-1.8.15/src/fl_sources/ttrss_source_feed_list.h liferea-1.10.3/src/fl_sources/ttrss_source_feed_list.h --- liferea-1.8.15/src/fl_sources/ttrss_source_feed_list.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/ttrss_source_feed_list.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ttrss_source_feed_list.h tt-rss source feed list handling * - * Copyright (C) 2010 Lars Lindner + * Copyright (C) 2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/fl_sources/ttrss_source.h liferea-1.10.3/src/fl_sources/ttrss_source.h --- liferea-1.8.15/src/fl_sources/ttrss_source.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/fl_sources/ttrss_source.h 2013-10-08 19:46:28.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ttrss_source.h tt-rss feed list source support * - * Copyright (C) 2010-2011 Lars Lindner + * Copyright (C) 2010-2013 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,8 @@ #ifndef _TTRSS_SOURCE_H #define _TTRSS_SOURCE_H +#include + #include "fl_sources/node_source.h" /** @@ -28,16 +30,22 @@ */ typedef struct ttrssSource { nodePtr root; /**< the root node in the feed list */ - gchar *session_id; /**< the tt-rss session id */ + gchar *session_id; /**< the current session id */ + const gchar *url; /**< the API base URL */ GQueue *actionQueue; + gint apiLevel; /**< The API level reported by the instance (or 0) */ gint loginState; /**< The current login state */ + gint authFailures; /**< Number of authentication failures */ gboolean selfUpdating; /**< True if remote updating daemon is running */ + GHashTable *categories; /**< Lookup hash for feed id to category id */ + GHashTable *categoryNodes; /**< Lookup hash for category id to folder node id */ } *ttrssSourcePtr; enum { - TTRSS_SOURCE_STATE_NONE = 0, - TTRSS_SOURCE_STATE_IN_PROGRESS, - TTRSS_SOURCE_STATE_ACTIVE + TTRSS_SOURCE_STATE_NONE = 0, /**< no authentication tried so far */ + TTRSS_SOURCE_STATE_IN_PROGRESS, /**< authentication in progress */ + TTRSS_SOURCE_STATE_ACTIVE, /**< authentication succeeded */ + TTRSS_SOURCE_STATE_NO_AUTH /**< authentication has failed */ }; enum { @@ -53,9 +61,15 @@ }; /** - * tt-rss API URL's + * Number of auth failures after which we stop bothering the user while + * auto-updating until he manually updates again. + */ +#define TTRSS_SOURCE_MAX_AUTH_FAILURES 3 + +/** + * TinyTinyRSS JSON API is documented here: * - * http://tt-rss.org/redmine/wiki/tt-rss/JsonApiReference + * http://tt-rss.org/redmine/projects/tt-rss/wiki/JsonApiReference */ #define TTRSS_URL "%s/api/" @@ -77,7 +91,14 @@ * * @returns JSON feed list */ -#define TTRSS_JSON_SUBSCRIPTION_LIST "{\"op\":\"getFeeds\", \"sid\":\"%s\", \"cat_id\":\"-3\"}" +#define TTRSS_JSON_SUBSCRIPTION_LIST "{\"op\":\"getFeeds\", \"sid\":\"%s\", \"cat_id\":\"-3\", \"include_nested\":\"true\"}" + +/** + * Fetch tt-rss categories list (default is fetching it tree like) + * + * @returns JSON categories list + */ +#define TTRSS_JSON_CATEGORIES_LIST "{\"op\":\"getFeedTree\", \"sid\":\"%s\", \"include_empty\":\"true\"}" /** * Fetch tt-rss headlines for a given feed. diff -Nru liferea-1.8.15/src/folder.c liferea-1.10.3/src/folder.c --- liferea-1.8.15/src/folder.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/folder.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file folder.c sub folders for hierarchic node sources * - * Copyright (C) 2006-2012 Lars Lindner + * Copyright (C) 2006-2012 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,14 +22,13 @@ #include "common.h" #include "debug.h" -#include "export.h" #include "feedlist.h" #include "itemset.h" #include "node.h" #include "vfolder.h" #include "ui/icons.h" #include "ui/ui_folder.h" -#include "ui/ui_node.h" +#include "ui/feed_list_node.h" /* Note: The folder node type implements the behaviour of a folder like node in the feed list. The two most important features are viewing the @@ -119,7 +118,8 @@ NODE_CAPABILITY_SUBFOLDERS | NODE_CAPABILITY_REORDER | NODE_CAPABILITY_SHOW_UNREAD_COUNT | - NODE_CAPABILITY_UPDATE_CHILDS, + NODE_CAPABILITY_UPDATE_CHILDS | + NODE_CAPABILITY_EXPORT, "folder", NULL, folder_import, @@ -130,7 +130,8 @@ folder_remove, node_default_render, ui_folder_add, - ui_node_rename + feed_list_node_rename, + NULL }; fnti.icon = icon_get (ICON_FOLDER); @@ -148,7 +149,8 @@ NODE_CAPABILITY_SUBFOLDERS | NODE_CAPABILITY_REORDER | NODE_CAPABILITY_SHOW_UNREAD_COUNT | - NODE_CAPABILITY_UPDATE_CHILDS, + NODE_CAPABILITY_UPDATE_CHILDS | + NODE_CAPABILITY_EXPORT, "root", NULL, /* and no need for an icon */ folder_import, @@ -159,7 +161,7 @@ folder_remove, node_default_render, ui_folder_add, - ui_node_rename, + feed_list_node_rename, NULL }; diff -Nru liferea-1.8.15/src/folder.h liferea-1.10.3/src/folder.h --- liferea-1.8.15/src/folder.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/folder.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file folder.h sub folders for hierarchic node soures * - * Copyright (C) 2006-2008 Lars Lindner + * Copyright (C) 2006-2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/html.c liferea-1.10.3/src/html.c --- liferea-1.8.15/src/html.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/html.c 2013-07-31 23:29:12.000000000 +0200 @@ -2,7 +2,7 @@ * @file html.c HTML favicon and feed link auto discovery * * Copyright (C) 2004 ahmed el-helw - * Copyright (C) 2004-2009 Lars Lindner + * Copyright (C) 2004-2009 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/htmlview.c liferea-1.10.3/src/htmlview.c --- liferea-1.8.15/src/htmlview.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/htmlview.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file htmlview.c item view interface for HTML rendering * - * Copyright (C) 2006-2010 Lars Lindner + * Copyright (C) 2006-2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -191,12 +191,15 @@ xmlDocPtr doc; xmlNodePtr xmlNode; const gchar *text_direction = NULL; + gboolean isMergedItemset; debug_enter ("htmlview_render_item"); /* 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); + + isMergedItemset = (node != htmlView_priv.node); /* do the XML serialization */ doc = xmlNewDoc ("1.0"); @@ -220,8 +223,9 @@ baseUrl = common_uri_escape (node_get_base_url (node)); render_parameter_add (params, "baseUrl='%s'", baseUrl); } - + render_parameter_add (params, "summary='%d'", summaryMode?1:0); + render_parameter_add (params, "showFeedName='%d'", isMergedItemset?1:0); render_parameter_add (params, "single='%d'", (viewMode == ITEMVIEW_SINGLE_ITEM)?1:0); render_parameter_add (params, "txtDirection='%s'", text_direction); render_parameter_add (params, "appDirection='%s'", common_get_app_direction ()); @@ -315,7 +319,7 @@ itemPtr item = NULL; gchar *baseURL = NULL; gboolean summaryMode; - + /* determine base URL */ switch (mode) { case ITEMVIEW_SINGLE_ITEM: diff -Nru liferea-1.8.15/src/htmlview.h liferea-1.10.3/src/htmlview.h --- liferea-1.8.15/src/htmlview.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/htmlview.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file htmlview.h item view interface for HTML rendering * - * Copyright (C) 2006-2007 Lars Lindner + * Copyright (C) 2006-2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/item.c liferea-1.10.3/src/item.c --- liferea-1.8.15/src/item.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/item.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file item.c common item handling * - * Copyright (C) 2003-2012 Lars Lindner + * Copyright (C) 2003-2012 Lars Windolf * Copyright (C) 2004-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -193,8 +193,9 @@ } void -item_to_xml (itemPtr item, xmlNodePtr parentNode) +item_to_xml (itemPtr item, gpointer xmlNode) { + xmlNodePtr parentNode = (xmlNodePtr)xmlNode; xmlNodePtr duplicatesNode; xmlNodePtr itemNode; gchar *tmp; diff -Nru liferea-1.8.15/src/item.h liferea-1.10.3/src/item.h --- liferea-1.8.15/src/item.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/item.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file item.h common item handling * - * Copyright (C) 2003-2010 Lars Lindner + * Copyright (C) 2003-2012 Lars Windolf * Copyright (C) 2004-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -23,8 +23,6 @@ #define _ITEM_H #include -#include -#include #include /* Currently Liferea knows only a single type of items used @@ -157,8 +155,8 @@ * 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 + * @param parentNode the xmlNodePtr to add to */ -void item_to_xml(itemPtr item, xmlNodePtr parentNode); +void item_to_xml (itemPtr item, gpointer parentNode); #endif diff -Nru liferea-1.8.15/src/item_history.c liferea-1.10.3/src/item_history.c --- liferea-1.8.15/src/item_history.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/item_history.c 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,118 @@ +/** + * @file item_history.c tracking recently viewed items + * + * Copyright (C) 2012 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 "item_history.h" + +#include + +#include "ui/liferea_shell.h" + +#define MAX_HISTORY_SIZE 250 + +static struct itemHistory { + GList *items; /**< FIFO list of all items viewed */ + GList *current; /**< the currently list element */ + guint lastId; /**< Avoid duplicate add */ +} *itemHistory = NULL; + +void +item_history_add (guint id) +{ + if (!itemHistory) + itemHistory = g_new0 (struct itemHistory, 1); + + /* Duplicate add by some selection effect */ + if (itemHistory->lastId == id) + return; + + /* Duplicate add by history navigation */ + if (itemHistory->current && GPOINTER_TO_UINT (itemHistory->current->data) == id) + return; + + itemHistory->items = g_list_append (itemHistory->items, GUINT_TO_POINTER (id)); + itemHistory->current = g_list_last (itemHistory->items); + itemHistory->lastId = id; + + /* if list has reached max size remove first element */ + if (g_list_length (itemHistory->items) > MAX_HISTORY_SIZE) + itemHistory->items = g_list_remove (itemHistory->items, itemHistory->items); + + liferea_shell_update_history_actions (); +} + +itemPtr +item_history_get_next (void) +{ + itemPtr item = NULL; + + if (!itemHistory->current) + return NULL; + + while (!item && item_history_has_next ()) { + itemHistory->current = g_list_next (itemHistory->current); + item = item_load (GPOINTER_TO_UINT (itemHistory->current->data)); + } + + liferea_shell_update_history_actions (); + + return item; +} + +itemPtr +item_history_get_previous (void) +{ + itemPtr item = NULL; + + if (!itemHistory->current) + return NULL; + + while (!item && item_history_has_previous ()) { + itemHistory->current = g_list_previous (itemHistory->current); + item = item_load (GPOINTER_TO_UINT (itemHistory->current->data)); + } + + liferea_shell_update_history_actions (); + + return item; +} + +gboolean +item_history_has_next (void) +{ + if (!itemHistory || !itemHistory->items) + return FALSE; + + if (g_list_last (itemHistory->items) == itemHistory->current) + return FALSE; + + return TRUE; +} + +gboolean +item_history_has_previous (void) +{ + if (!itemHistory || !itemHistory->items) + return FALSE; + + if (itemHistory->items == itemHistory->current) + return FALSE; + + return TRUE; +} diff -Nru liferea-1.8.15/src/item_history.h liferea-1.10.3/src/item_history.h --- liferea-1.8.15/src/item_history.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/item_history.h 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,61 @@ +/** + * @file item_history.h tracking recently viewed items + * + * Copyright (C) 2012 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 _ITEM_HISTORY +#define _ITEM_HISTORY + +#include "item.h" + +/** + * Add a new item to the item history stack. + * + * @param id the id of the item to add + */ +void item_history_add (guint id); + +/** + * Returns the previous item in the item history. + * + * @returns an item (or NULL) to be free'd with item_unload() + */ +itemPtr item_history_get_previous (void); + +/** + * Returns the next item in history. + * + * @returns an item (or NULL) to be free'd with item_unload() + */ +itemPtr item_history_get_next (void); + +/** + * Check whether a previous item exists in the item history. + * + * @returns TRUE if there is an item + */ +gboolean item_history_has_previous (void); + +/** + * Check whether a following item exists in the item history. + * + * @returns TRUE if there is an item + */ +gboolean item_history_has_next (void); + +#endif diff -Nru liferea-1.8.15/src/itemlist.c liferea-1.10.3/src/itemlist.c --- liferea-1.8.15/src/itemlist.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/itemlist.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** - * @file itemlist.c itemlist handling + * @file itemlist.c item list handling * - * Copyright (C) 2004-2012 Lars Lindner + * Copyright (C) 2004-2012 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +29,7 @@ #include "feed.h" #include "feedlist.h" #include "folder.h" +#include "item_history.h" #include "item_state.h" #include "itemlist.h" #include "itemset.h" @@ -41,7 +42,7 @@ #include "ui/liferea_shell.h" #include "ui/feed_list_view.h" #include "ui/liferea_htmlview.h" -#include "ui/ui_node.h" +#include "ui/feed_list_node.h" /* The 'item list' is a controller for 'item view' and database backend. It manages the currently displayed 'node', realizes filtering @@ -187,7 +188,7 @@ itemlist->priv->deferredFilter = FALSE; item = item_load(id); itemview_remove_item(item); - ui_node_update(item->nodeId); + feed_list_node_update(item->nodeId); } /* check for removals caused by vfolder rules */ @@ -416,14 +417,14 @@ itemlist_toggle_flag (itemPtr item) { item_set_flag_state (item, !(item->flagStatus)); - itemview_update (); + /* No itemview_update() to avoid disturbing HTML scroll state and media content */ } void itemlist_toggle_read_status (itemPtr item) { item_set_read_state (item, !(item->readStatus)); - itemview_update (); + /* No itemview_update() to avoid disturbing HTML scroll state and media content */ } /* function to remove items due to item list filtering */ @@ -434,7 +435,7 @@ don't do it and set a flag to do it when unselecting */ if (itemlist->priv->selectedId != item->id) { itemview_remove_item (item); - ui_node_update (item->nodeId); + feed_list_node_update (item->nodeId); } else { itemlist->priv->deferredFilter = TRUE; /* update the item to show new state that forces @@ -477,7 +478,7 @@ } /* soft possibly delayed item remove */ -void +static void itemlist_request_remove_item (itemPtr item) { /* if the currently selected item should be removed we @@ -520,9 +521,6 @@ void itemlist_remove_all_items (nodePtr node) { - GList *iter; - itemSetPtr itemset; - if (node == itemlist->priv->currentNode) itemview_clear (); @@ -547,13 +545,10 @@ itemlist_unhide_item (item); } - /* FIXME: this is tricky. It's possible that the item + /* FIXME: this is tricky. It's possible that the item is * 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? + * that case, we don't want to reload the item. + * So how to know whether the itemview contains the item? */ itemview_update_item (item); } @@ -570,7 +565,7 @@ more matching the display rules because they have changed state */ itemlist_check_for_deferred_action (); - debug1 (DEBUG_GUI, "item list selection changed to \"%s\"", item_get_title (item)); + debug1 (DEBUG_GUI, "item list selection changed to \"%s\"", item?item_get_title (item):"(null)"); itemlist_set_selected (item); @@ -592,7 +587,7 @@ itemview_select_item (item); itemview_update (); } - ui_node_update (item->nodeId); + feed_list_node_update (item->nodeId); } feedlist_reset_new_item_count (); @@ -649,6 +644,46 @@ itemlist_set_view_mode (val); } +static void +itemlist_select_from_history (gboolean back) +{ + itemPtr item; + nodePtr node; + + if (back) + item = item_history_get_previous (); + else + item = item_history_get_next (); + + if (!item) + return; + + node = node_from_id (item->parentNodeId); + if (!node) + return; + + if (node != feedlist_get_selected ()) + feed_list_view_select (node); + + if (NODE_VIEW_MODE_COMBINED == itemlist_get_view_mode ()) + itemlist_set_view_mode (NODE_VIEW_MODE_NORMAL); + + itemview_select_item (item); + item_unload (item); +} + +void +on_prev_read_item_activate (GtkMenuItem *menuitem, gpointer user_data) +{ + itemlist_select_from_history (TRUE); +} + +void +on_next_read_item_activate (GtkMenuItem *menuitem, gpointer user_data) +{ + itemlist_select_from_history (FALSE); +} + /* item loader methods */ static void @@ -675,7 +710,7 @@ g_slist_free (items); } -void +static void itemlist_add_loader (ItemLoader *loader) { g_signal_connect (G_OBJECT (loader), "item-batch-fetched", G_CALLBACK (itemlist_item_batch_fetched_cb), NULL); diff -Nru liferea-1.8.15/src/itemlist.h liferea-1.10.3/src/itemlist.h --- liferea-1.8.15/src/itemlist.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/itemlist.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file itemlist.h itemlist handling * - * Copyright (C) 2004-2011 Lars Lindner + * Copyright (C) 2004-2011 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -132,11 +132,21 @@ */ void on_view_activate(GtkRadioAction *action, GtkRadioAction *current, gpointer user_data); -/* item handling functions */ +/** + * Menu callback to select the previously read item from the item history + */ +void on_prev_read_item_activate (GtkMenuItem *menuitem, gpointer user_data); + +/** + * Menu callback to select the next read item from the item history + */ +void on_next_read_item_activate (GtkMenuItem *menuitem, gpointer user_data); + + +/* item handling function */ void itemlist_update_item(itemPtr item); -void itemlist_request_remove_item(itemPtr item); /** * To be called whenever the user wants to remove @@ -195,13 +205,6 @@ void itemlist_toggle_read_status(itemPtr item); /** - * Adding a loader for item batch loading (e.g. search folder) - * - * @param loader the loader to add to default item list view - */ -void itemlist_add_loader (ItemLoader *loader); - -/** * Register a search result item loader. * * @param loader the search result item loader diff -Nru liferea-1.8.15/src/item_loader.c liferea-1.10.3/src/item_loader.c --- liferea-1.8.15/src/item_loader.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/item_loader.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file item_loader.c Asynchronously loading items * - * Copyright (C) 2011 Lars Lindner + * Copyright (C) 2011 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -101,7 +101,7 @@ return il->priv->node; } -gboolean +static gboolean item_loader_fetch (gpointer user_data) { ItemLoader *il = ITEM_LOADER (user_data); diff -Nru liferea-1.8.15/src/item_loader.h liferea-1.10.3/src/item_loader.h --- liferea-1.8.15/src/item_loader.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/item_loader.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file item_loader.h Interface for asynchronous item loading * - * Copyright (C) 2011 Lars Lindner + * Copyright (C) 2011 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -43,7 +43,7 @@ GObjectClass parent; } ItemLoaderClass; -GType item_loader_get_type(); +GType item_loader_get_type (void); #define ITEM_LOADER_TYPE (item_loader_get_type ()) #define ITEM_LOADER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), ITEM_LOADER_TYPE, ItemLoader)) diff -Nru liferea-1.8.15/src/itemset.c liferea-1.10.3/src/itemset.c --- liferea-1.8.15/src/itemset.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/itemset.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file itemset.c handling sets of items * - * Copyright (C) 2005-2011 Lars Lindner + * Copyright (C) 2005-2011 Lars Windolf * Copyright (C) 2005-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -246,7 +246,7 @@ while (iter) { enclosurePtr enc = enclosure_from_string (iter->data); debug1 (DEBUG_UPDATE, "download enclosure (%s)", (gchar *)iter->data); - enclosure_save_as_file (NULL, enc->url, NULL); + enclosure_download (NULL, enc->url, FALSE /* non interactive */); iter = g_slist_next (iter); enclosure_free (enc); } @@ -454,12 +454,6 @@ return result; } -gboolean -itemset_has_item_id (itemSetPtr itemSet, gulong id) -{ - return (NULL != g_list_find (itemSet->ids, GUINT_TO_POINTER (id))); -} - void itemset_add_rule (itemSetPtr itemSet, const gchar *ruleId, diff -Nru liferea-1.8.15/src/itemset.h liferea-1.10.3/src/itemset.h --- liferea-1.8.15/src/itemset.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/itemset.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file itemset.h interface to handle sets of items * - * Copyright (C) 2005-2011 Lars Lindner + * Copyright (C) 2005-2012 Lars Windolf * Copyright (C) 2005-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -22,8 +22,6 @@ #ifndef _ITEMSET_H #define _ITEMSET_H -#include - #include "item.h" #include "rule.h" @@ -77,16 +75,6 @@ gboolean itemset_check_item (itemSetPtr itemSet, itemPtr item); /** - * Checks wether the given item id is in the given item set. - * - * @param itemSet the itemSet - * @param id the item id - * - * @returns TRUE if item id is in item set - */ -gboolean itemset_has_item_id (itemSetPtr itemSet, gulong id); - -/** * Method that creates and adds a rule to an item set. To be used * on loading time, when creating searches or when editing * search folder properties. diff -Nru liferea-1.8.15/src/item_state.c liferea-1.10.3/src/item_state.c --- liferea-1.8.15/src/item_state.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/item_state.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file item_state.c item state controller interface * - * Copyright (C) 2007-2010 Lars Lindner + * Copyright (C) 2007-2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +25,6 @@ #include "item_state.h" #include "itemset.h" #include "itemlist.h" -#include "newsbin.h" #include "node.h" #include "vfolder.h" #include "fl_sources/node_source.h" diff -Nru liferea-1.8.15/src/item_state.h liferea-1.10.3/src/item_state.h --- liferea-1.8.15/src/item_state.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/item_state.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file item_state.c item state controller interface * - * Copyright (C) 2007-2008 Lars Lindner + * Copyright (C) 2007-2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/json.c liferea-1.10.3/src/json.c --- liferea-1.8.15/src/json.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/json.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file json.h simplification wrappers for libjson-glib * - * Copyright (C) 2010 Lars Lindner + * Copyright (C) 2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/json.h liferea-1.10.3/src/json.h --- liferea-1.8.15/src/json.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/json.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file json.h simplification wrappers for libjson-glib * - * Copyright (C) 2010 Lars Lindner + * Copyright (C) 2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/main.c liferea-1.10.3/src/main.c --- liferea-1.8.15/src/main.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/main.c 2013-08-01 00:04:43.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file main.c Liferea main program * - * Copyright (C) 2003-2012 Lars Lindner + * Copyright (C) 2003-2012 Lars Windolf * Copyright (C) 2004-2006 Nathan J. Conrad * * Some code like the command line handling was inspired by @@ -29,12 +29,12 @@ #endif #include -#include #include #include #include #include +#include #include "conf.h" #include "common.h" @@ -45,7 +45,6 @@ #include "social.h" #include "update.h" #include "xml.h" -#include "ui/ui_session.h" #include "ui/liferea_shell.h" #include "notification/notification.h" @@ -55,44 +54,41 @@ STATE_SHUTDOWN } runState = STATE_STARTING; -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) +static const gchar *initialStateOption = NULL; + +/* GApplication "open" callback for receiving feed-add requests from remote */ +static void +on_feed_add (GApplication *application, + gpointer files, + gint n_files, + gchar *hint, + gpointer user_data) { - UniqueResponse res; - gchar *feed; + GFile **uris = (GFile **)files; /* we always expect only one URI */ - debug1(DEBUG_GUI, "libunique command received >>>%d<<<", command); + g_assert(uris); + g_assert(n_files == 1); + feedlist_add_subscription (g_file_get_uri (uris[0]), NULL, NULL, 0); +} - 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; - } +/* GApplication "activate" callback for normal startup and also processing + local feed-add requests (URI passed in user_data). */ +static void +on_app_activate (GtkApplication *app, gpointer user_data) +{ + GList *list; + gchar *feedUri = (gchar *)user_data; + + list = gtk_application_get_windows (app); + + if (list) { + gtk_window_present (GTK_WINDOW (list->data)); + } else { + liferea_shell_create (app, initialStateOption); - return res; + if (feedUri) + feedlist_add_subscription (feedUri, NULL, NULL, 0); + } } static void @@ -155,30 +151,20 @@ int main (int argc, char *argv[]) { - UniqueApp *app; - UniqueMessageData *msg; + GtkApplication *app; GError *error = NULL; GOptionContext *context; GOptionGroup *debug; gulong debug_flags = 0; LifereaDBus *dbus = NULL; - 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; -#endif + gchar *feedUri = NULL; + gint status; GOptionEntry entries[] = { - { "mainwindow-state", 'w', 0, G_OPTION_ARG_STRING, &initial_state, N_("Start Liferea with its main window in STATE. STATE may be `shown', `iconified', or `hidden'"), N_("STATE") }, -#ifdef USE_SM - { "session", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &opt_session_arg, NULL, NULL }, -#endif + { "mainwindow-state", 'w', 0, G_OPTION_ARG_STRING, &initialStateOption, N_("Start Liferea with its main window in STATE. STATE may be `shown', `iconified', or `hidden'"), N_("STATE") }, { "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 } + { "add-feed", 'a', 0, G_OPTION_ARG_STRING, &feedUri, N_("Add a new subscription"), N_("uri") }, + { NULL, 0, 0, 0, NULL, NULL, NULL } }; GOptionEntry debug_entries[] = { @@ -187,7 +173,7 @@ { "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.8/output.xhtml"), 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 ~/.cache/liferea/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 }, @@ -195,11 +181,9 @@ { "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-vfolder", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Print debugging messages of the search folder matching"), NULL }, { "debug-verbose", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Print verbose debugging messages"), NULL }, - { NULL } + { NULL, 0, 0, 0, NULL, NULL, NULL } }; - if (!g_thread_supported ()) g_thread_init (NULL); - #ifdef ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); @@ -216,11 +200,12 @@ context = g_option_context_new (NULL); g_option_context_set_summary (context, N_("Liferea, the Linux Feed Reader")); - g_option_context_set_description (context, N_("For more information, please visit http://liferea.sourceforge.net/")); + g_option_context_set_description (context, N_("For more information, please visit http://lzone.de/liferea/")); g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); g_option_context_set_translation_domain(context, GETTEXT_PACKAGE); g_option_context_add_group (context, debug); g_option_context_add_group (context, gtk_get_option_group (FALSE)); + g_option_context_add_group (context, g_irepository_get_option_group ()); g_option_context_parse (context, &argc, &argv, &error); g_option_context_free (context); @@ -240,26 +225,15 @@ 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); - } + /* Single instance checks, also note that we pass or only RPC (add-feed) + as activate signal payload as it is simply an URI string. */ + app = gtk_application_new ("net.sourceforge.liferea", G_APPLICATION_HANDLES_OPEN); + g_signal_connect (app, "activate", G_CALLBACK (on_app_activate), feedUri); + g_signal_connect (app, "open", G_CALLBACK (on_feed_add), NULL); - /* GTK theme support */ + g_set_prgname ("liferea"); g_set_application_name (_("Liferea")); - gtk_window_set_default_icon_name ("liferea"); + gtk_window_set_default_icon_name ("liferea"); /* GTK theme support */ debug_start_measurement (DEBUG_DB); @@ -273,29 +247,6 @@ dbus = liferea_dbus_new (); - /* 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") || - (show_tray_icon && start_in_tray)) { - initialState = MAINWINDOW_HIDDEN; - } else { - initialState = MAINWINDOW_SHOWN; - } - - liferea_shell_create (initialState); - g_set_prgname ("liferea"); - -#ifdef USE_SM - /* This must be after feedlist reading because some session - managers will tell Liferea to exit if Liferea does not - respond to SM requests within a minute or two. This starts - the main loop soon after opening the SM connection. */ - session_init (BIN_DIR G_DIR_SEPARATOR_S "liferea", opt_session_arg); - session_set_cmd (NULL, initialState); -#endif signal (SIGTERM, signal_handler); signal (SIGINT, signal_handler); signal (SIGHUP, signal_handler); @@ -308,13 +259,22 @@ debug_end_measurement (DEBUG_DB, "startup"); - if (feed) - feedlist_add_subscription (feed, NULL, NULL, 0); + status = g_application_run (G_APPLICATION (app), 0, NULL); - gtk_main (); + /* Trigger RPCs if we are not primary instance (currently only feed-add) */ + if (feedUri && g_application_get_is_remote (G_APPLICATION (app))) { + GFile *uris[2]; + + uris[0] = g_file_new_for_uri (feedUri); + uris[1] = NULL; + g_application_open (G_APPLICATION (app), uris, 1, "feed-add"); + g_object_unref (uris[0]); + } g_object_unref (G_OBJECT (dbus)); - return 0; + g_object_unref (app); + + return status; } static gboolean @@ -330,18 +290,13 @@ /* order is important ! */ update_deinit (); - db_deinit (); - social_free (); liferea_shell_destroy (); -#ifdef USE_SM - /* unplug */ - session_end (); -#endif + + db_deinit (); + social_free (); conf_deinit (); - gtk_main_quit (); - debug_exit ("liferea_shutdown"); return FALSE; } diff -Nru liferea-1.8.15/src/Makefile.am liferea-1.10.3/src/Makefile.am --- liferea-1.8.15/src/Makefile.am 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/Makefile.am 2013-07-31 23:29:12.000000000 +0200 @@ -9,13 +9,16 @@ -DBIN_DIR=\""$(bindir)"\" \ -I$(top_srcdir)/src \ $(PACKAGE_CFLAGS) \ - $(SM_CFLAGS) + $(INTROSPECTION_CFLAGS) bin_PROGRAMS = liferea bin_SCRIPTS = liferea-add-feed liferea_SOURCES = \ + auth.c auth.h \ + auth_activatable.c auth_activatable.h \ browser.c browser.h \ + browser_history.c browser_history.h \ comments.c comments.h \ common.c common.h \ conf.c conf.h \ @@ -34,6 +37,7 @@ html.c html.h \ htmlview.c htmlview.h \ item.c item.h \ + item_history.c item_history.h \ item_loader.c item_loader.h \ item_state.c item_state.h \ itemset.c itemset.h \ @@ -47,6 +51,7 @@ node.c node.h \ node_type.c node_type.h \ node_view.h \ + plugins_engine.c plugins_engine.h \ render.c render.h \ rule.c rule.h \ social.c social.h \ @@ -62,10 +67,10 @@ fl_sources/libliflsources.a \ ui/libliui.a \ webkit/libwebkit.a \ - $(SYNC_LIB) \ - $(PACKAGE_LIBS) $(SM_LIBS) \ - $(INTLLIBS) $(AVAHI_LIBS) \ - $(WEBKIT_LIBS) $(LIBNOTIFY_LIBS) + $(PACKAGE_LIBS) \ + $(INTLLIBS) \ + $(WEBKIT_LIBS) \ + $(INTROSPECTION_LIBS) EXTRA_DIST = $(srcdir)/liferea-add-feed.in DISTCLEANFILES = $(srcdir)/liferea-add-feed @@ -82,3 +87,32 @@ liferea_LDADD += $(LIBINDICATE_LIBS) endif + +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = Liferea-3.0.gir + +Liferea-3.0.gir: liferea +INTROSPECTION_SCANNER_ARGS = -I$(top_srcdir)/src --warn-all --accept-unprefixed --identifier-prefix=Liferea --verbose +Liferea_3_0_gir_NAMESPACE = Liferea +Liferea_3_0_gir_VERSION = 3.0 +Liferea_3_0_gir_PROGRAM = $(builddir)/liferea +Liferea_3_0_gir_FILES = \ + auth.c auth.h \ + auth_activatable.c auth_activatable.h \ + enclosure.h \ + ui/itemview.c ui/itemview.h \ + ui/liferea_shell.c ui/liferea_shell.h \ + ui/liferea_shell_activatable.c ui/liferea_shell_activatable.h \ + ui/media_player.c ui/media_player.h \ + ui/media_player_activatable.c ui/media_player_activatable.h +Liferea_3_0_gir_INCLUDES = Gtk-3.0 + +girdir = $(datadir)/liferea/gir-1.0 +gir_DATA = $(INTROSPECTION_GIRS) + +typelibdir = $(libdir)/liferea/girepository-1.0 +typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + +CLEANFILES = \ + $(gir_DATA) \ + $(typelib_DATA) diff -Nru liferea-1.8.15/src/Makefile.in liferea-1.10.3/src/Makefile.in --- liferea-1.8.15/src/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/src/Makefile.in 2013-10-08 20:14:31.000000000 +0200 @@ -16,6 +16,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -49,22 +50,24 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = liferea-add-feed CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibdir)" PROGRAMS = $(bin_PROGRAMS) -am_liferea_OBJECTS = browser.$(OBJEXT) comments.$(OBJEXT) \ +am_liferea_OBJECTS = auth.$(OBJEXT) auth_activatable.$(OBJEXT) \ + browser.$(OBJEXT) browser_history.$(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_loader.$(OBJEXT) item_state.$(OBJEXT) \ - itemset.$(OBJEXT) itemlist.$(OBJEXT) json.$(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) vfolder_loader.$(OBJEXT) \ - xml.$(OBJEXT) + item.$(OBJEXT) item_history.$(OBJEXT) item_loader.$(OBJEXT) \ + item_state.$(OBJEXT) itemset.$(OBJEXT) itemlist.$(OBJEXT) \ + json.$(OBJEXT) metadata.$(OBJEXT) migrate.$(OBJEXT) \ + net.$(OBJEXT) net_monitor.$(OBJEXT) newsbin.$(OBJEXT) \ + node.$(OBJEXT) node_type.$(OBJEXT) plugins_engine.$(OBJEXT) \ + render.$(OBJEXT) rule.$(OBJEXT) social.$(OBJEXT) \ + subscription.$(OBJEXT) update.$(OBJEXT) main.$(OBJEXT) \ + vfolder.$(OBJEXT) vfolder_loader.$(OBJEXT) xml.$(OBJEXT) liferea_OBJECTS = $(am_liferea_OBJECTS) am__DEPENDENCIES_1 = @WITH_LIBNOTIFY_TRUE@am__DEPENDENCIES_2 = notification/libnotify.a \ @@ -73,8 +76,8 @@ liferea_DEPENDENCIES = parsers/libliparsers.a \ fl_sources/libliflsources.a ui/libliui.a webkit/libwebkit.a \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_3) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -141,6 +144,7 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +DATA = $(gir_DATA) $(typelib_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -204,13 +208,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -226,6 +229,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -272,8 +283,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -302,6 +311,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -340,11 +350,14 @@ -DBIN_DIR=\""$(bindir)"\" \ -I$(top_srcdir)/src \ $(PACKAGE_CFLAGS) \ - $(SM_CFLAGS) + $(INTROSPECTION_CFLAGS) bin_SCRIPTS = liferea-add-feed liferea_SOURCES = \ + auth.c auth.h \ + auth_activatable.c auth_activatable.h \ browser.c browser.h \ + browser_history.c browser_history.h \ comments.c comments.h \ common.c common.h \ conf.c conf.h \ @@ -363,6 +376,7 @@ html.c html.h \ htmlview.c htmlview.h \ item.c item.h \ + item_history.c item_history.h \ item_loader.c item_loader.h \ item_state.c item_state.h \ itemset.c itemset.h \ @@ -376,6 +390,7 @@ node.c node.h \ node_type.c node_type.h \ node_view.h \ + plugins_engine.c plugins_engine.h \ render.c render.h \ rule.c rule.h \ social.c social.h \ @@ -388,12 +403,36 @@ xml.c xml.h liferea_LDADD = parsers/libliparsers.a fl_sources/libliflsources.a \ - ui/libliui.a webkit/libwebkit.a $(SYNC_LIB) $(PACKAGE_LIBS) \ - $(SM_LIBS) $(INTLLIBS) $(AVAHI_LIBS) $(WEBKIT_LIBS) \ - $(LIBNOTIFY_LIBS) $(am__append_1) $(am__append_2) + ui/libliui.a webkit/libwebkit.a $(PACKAGE_LIBS) $(INTLLIBS) \ + $(WEBKIT_LIBS) $(INTROSPECTION_LIBS) $(am__append_1) \ + $(am__append_2) EXTRA_DIST = $(srcdir)/liferea-add-feed.in DISTCLEANFILES = $(srcdir)/liferea-add-feed AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = liferea-add-feed +INTROSPECTION_GIRS = Liferea-3.0.gir +INTROSPECTION_SCANNER_ARGS = -I$(top_srcdir)/src --warn-all --accept-unprefixed --identifier-prefix=Liferea --verbose +Liferea_3_0_gir_NAMESPACE = Liferea +Liferea_3_0_gir_VERSION = 3.0 +Liferea_3_0_gir_PROGRAM = $(builddir)/liferea +Liferea_3_0_gir_FILES = \ + auth.c auth.h \ + auth_activatable.c auth_activatable.h \ + enclosure.h \ + ui/itemview.c ui/itemview.h \ + ui/liferea_shell.c ui/liferea_shell.h \ + ui/liferea_shell_activatable.c ui/liferea_shell_activatable.h \ + ui/media_player.c ui/media_player.h \ + ui/media_player_activatable.c ui/media_player_activatable.h + +Liferea_3_0_gir_INCLUDES = Gtk-3.0 +girdir = $(datadir)/liferea/gir-1.0 +gir_DATA = $(INTROSPECTION_GIRS) +typelibdir = $(libdir)/liferea/girepository-1.0 +typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) +CLEANFILES = \ + $(gir_DATA) \ + $(typelib_DATA) + all: all-recursive .SUFFIXES: @@ -546,7 +585,10 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_activatable.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/browser.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/browser_history.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@ @@ -565,6 +607,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/html.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htmlview.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/item.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/item_history.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/item_loader.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/item_state.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itemlist.Po@am__quote@ @@ -578,6 +621,7 @@ @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)/plugins_engine.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)/social.Po@am__quote@ @@ -613,6 +657,42 @@ clean-libtool: -rm -rf .libs _libs +install-girDATA: $(gir_DATA) + @$(NORMAL_INSTALL) + test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)" + @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(girdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(girdir)" || exit $$?; \ + done + +uninstall-girDATA: + @$(NORMAL_UNINSTALL) + @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir) +install-typelibDATA: $(typelib_DATA) + @$(NORMAL_INSTALL) + test -z "$(typelibdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibdir)" + @list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(typelibdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(typelibdir)" || exit $$?; \ + done + +uninstall-typelibDATA: + @$(NORMAL_UNINSTALL) + @list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(typelibdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -809,10 +889,10 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(PROGRAMS) $(SCRIPTS) +all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -837,6 +917,7 @@ mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -868,7 +949,7 @@ info-am: -install-data-am: +install-data-am: install-girDATA install-typelibDATA install-dvi: install-dvi-recursive @@ -914,7 +995,8 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS +uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-girDATA uninstall-typelibDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -926,16 +1008,21 @@ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-binPROGRAMS install-binSCRIPTS \ 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 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 \ - uninstall-binPROGRAMS uninstall-binSCRIPTS + install-exec install-exec-am install-girDATA install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-typelibDATA 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 uninstall-binPROGRAMS \ + uninstall-binSCRIPTS uninstall-girDATA uninstall-typelibDATA + + +-include $(INTROSPECTION_MAKEFILE) +Liferea-3.0.gir: liferea # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru liferea-1.8.15/src/metadata.c liferea-1.10.3/src/metadata.c --- liferea-1.8.15/src/metadata.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/metadata.c 2013-07-31 23:29:12.000000000 +0200 @@ -2,7 +2,7 @@ * @file metadata.c handling of typed item and feed meta data * * Copyright (C) 2004-2006 Nathan J. Conrad - * Copyright (C) 2004-2010 Lars Lindner + * Copyright (C) 2004-2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -147,6 +147,15 @@ return type; } +static gint +metadata_value_cmp (gconstpointer a, gconstpointer b) +{ + if (g_str_equal ((gchar *)a, (gchar *)b)) + return 0; + + return 1; +} + GSList * metadata_list_append (GSList *metadata, const gchar *strid, const gchar *data) { @@ -194,7 +203,9 @@ while (iter) { p = (struct pair*)iter->data; if (g_str_equal (p->strid, strid)) { - p->data = g_slist_append (p->data, checked_data); + /* Avoid duplicate values */ + if (NULL == g_slist_find_custom (p->data, checked_data, metadata_value_cmp)) + p->data = g_slist_append (p->data, checked_data); return metadata; } iter = iter->next; @@ -335,26 +346,3 @@ } } -GSList * -metadata_parse_xml_nodes (xmlNodePtr cur) -{ - xmlNodePtr attribute = cur->xmlChildrenNode; - GSList *metadata = NULL; - - while (attribute) { - if (attribute->type == XML_ELEMENT_NODE && - !xmlStrcmp (attribute->name, BAD_CAST"attribute")) { - xmlChar *name = xmlGetProp (attribute, BAD_CAST"name"); - if (name) { - gchar *value = xmlNodeListGetString (cur->doc, attribute->xmlChildrenNode, TRUE); - if (value) { - metadata = metadata_list_append (metadata, name, value); - xmlFree (value); - } - xmlFree (name); - } - } - attribute = attribute->next; - } - return metadata; -} diff -Nru liferea-1.8.15/src/metadata.h liferea-1.10.3/src/metadata.h --- liferea-1.8.15/src/metadata.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/metadata.h 2013-07-31 23:29:12.000000000 +0200 @@ -2,7 +2,7 @@ * @file metadata.h handling of typed item and feed metadata * * Copyright (C) 2004-2006 Nathan J. Conrad - * Copyright (C) 2008 Lars Lindner + * Copyright (C) 2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -158,14 +158,4 @@ */ void metadata_add_xml_nodes(GSList *metadata, xmlNodePtr parentNode); -/** - * Parses the given XML node and returns a new metadata attribute - * value list. To be used for feed cache loading. - * - * @param cur the XML node to parse - * - * @returns list of values - */ -GSList * metadata_parse_xml_nodes(xmlNodePtr cur); - #endif diff -Nru liferea-1.8.15/src/migrate.c liferea-1.10.3/src/migrate.c --- liferea-1.8.15/src/migrate.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/migrate.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file migrate.c migration between different cache versions * - * Copyright (C) 2007-2011 Lars Lindner + * Copyright (C) 2007-2012 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,21 +22,20 @@ #include #include -#include +#include #include "common.h" #include "db.h" #include "debug.h" -#include "feed.h" -#include "item.h" -#include "itemset.h" -#include "metadata.h" -#include "node.h" -#include "xml.h" -#include "ui/ui_common.h" - -#define LIFEREA_CURRENT_DIR ".liferea_1.8" +#include "export.h" +/** + * Copy a from $HOME//subdir to a target directory /subdir. + * + * @param from relative base path in $HOME (e.g. ".liferea_1.4") + * @param to absolute target base path (e.g. "/home/joe/.config") + * @param subdir subdir to copy from source to destination (can be empty string) + */ static void migrate_copy_dir (const gchar *from, const gchar *to, @@ -45,9 +44,11 @@ gchar *fromDirname, *toDirname; gchar *srcfile, *destfile; GDir *dir; + + g_print ("Processing %s%s...\n", from, subdir); fromDirname = g_build_filename (g_get_home_dir (), from, subdir, NULL); - toDirname = g_build_filename (g_get_home_dir (), to, subdir, NULL); + toDirname = g_build_filename (to, subdir, NULL); dir = g_dir_open (fromDirname, 0, NULL); while (NULL != (srcfile = (gchar *)g_dir_read_name (dir))) { @@ -68,267 +69,62 @@ g_free (toDirname); } -static itemPtr -migrate_item_parse_cache (xmlNodePtr cur, - gboolean migrateCache) -{ - itemPtr item; - gchar *tmp; - - g_assert(NULL != cur); - - item = item_new(); - item->popupStatus = FALSE; - - cur = cur->xmlChildrenNode; - while(cur) { - if(cur->type != XML_ELEMENT_NODE || - !(tmp = xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1))) { - cur = cur->next; - continue; - } - - if(!xmlStrcmp(cur->name, BAD_CAST"title")) - item_set_title(item, tmp); - - else if(!xmlStrcmp(cur->name, BAD_CAST"description")) - item_set_description(item, tmp); - - else if(!xmlStrcmp(cur->name, BAD_CAST"source")) - item_set_source(item, tmp); - - else if(!xmlStrcmp(cur->name, BAD_CAST"real_source_url")) - metadata_list_set(&(item->metadata), "realSourceUrl", tmp); - - else if(!xmlStrcmp(cur->name, BAD_CAST"real_source_title")) - metadata_list_set(&(item->metadata), "realSourceTitle", tmp); - - else if(!xmlStrcmp(cur->name, BAD_CAST"id")) - item_set_id(item, tmp); - - else if(!xmlStrcmp(cur->name, BAD_CAST"validGuid")) - item->validGuid = TRUE; - - else if(!xmlStrcmp(cur->name, BAD_CAST"readStatus")) - item->readStatus = (0 == atoi(tmp))?FALSE:TRUE; - - else if(!xmlStrcmp(cur->name, BAD_CAST"updateStatus")) - item->updateStatus = (0 == atoi(tmp))?FALSE:TRUE; - - else if(!xmlStrcmp(cur->name, BAD_CAST"mark")) - item->flagStatus = (1 == atoi(tmp))?TRUE:FALSE; - - else if(!xmlStrcmp(cur->name, BAD_CAST"time")) - item->time = atol(tmp); - - else if(!xmlStrcmp(cur->name, BAD_CAST"attributes")) - item->metadata = metadata_parse_xml_nodes(cur); - - g_free(tmp); - tmp = NULL; - cur = cur->next; - } - - item->hasEnclosure = (NULL != metadata_list_get(item->metadata, "enclosure")); - - if (migrateCache && item->description) { - gchar *desc = xhtml_from_text (item->description); - item_set_description (item, desc); - g_free(desc); - } - return item; -} - -#define FEED_CACHE_VERSION "1.1" - static void -migrate_load_from_cache (const gchar *sourceDir, const gchar *id) +migrate_from_14plus (const gchar *oldBaseDir, nodePtr node) { - nodePtr node; - feedParserCtxtPtr ctxt; - gboolean migrateFrom10 = TRUE; - gchar *filename; - guint itemCount = 0; - - debug_enter ("migrate_load_from_cache"); - - node = node_from_id (id); - if (!node) { - debug1 (DEBUG_CACHE, "ignoring cache file %s because it is not referenced in feed list...", id); - return; /* propably a stale cache file */ - } - - ctxt = feed_create_parser_ctxt (); - ctxt->subscription = node->subscription; - ctxt->feed = (feedPtr)node->data; - - filename = g_build_filename (sourceDir, node->id, NULL); - debug2 (DEBUG_CACHE, "loading cache file \"%s\" (feed \"%s\")", filename, subscription_get_source(ctxt->subscription)); - - if ((!g_file_get_contents (filename, &ctxt->data, &ctxt->dataLength, NULL)) || (*ctxt->data == 0)) { - debug1 (DEBUG_CACHE, "could not load cache file %s", filename); - g_free (filename); - return; - } - - g_print ("migrating feed %s ", id); - - do { - xmlNodePtr cur; - - g_assert (NULL != ctxt->data); - - if (NULL == xml_parse_feed (ctxt)) - break; - - if (NULL == (cur = xmlDocGetRootElement (ctxt->doc))) - break; - - while (cur && xmlIsBlankNode (cur)) - cur = cur->next; - - if (cur && !xmlStrcmp (cur->name, BAD_CAST"feed")) { - xmlChar *version; - if ((version = xmlGetProp (cur, BAD_CAST"version"))) { - migrateFrom10 = xmlStrcmp (BAD_CAST FEED_CACHE_VERSION, version); - xmlFree (version); - } - } else { - break; - } + GFile *sourceDbFile, *targetDbFile; + gchar *newConfigDir, *newCacheDir, *newDataDir, *oldCacheDir, *filename; - cur = cur->xmlChildrenNode; - while (cur) { - - if (!xmlStrcmp (cur->name, BAD_CAST"item")) { - itemPtr item; - - itemCount++; - item = migrate_item_parse_cache (cur, migrateFrom10); - item->nodeId = g_strdup (id); - - /* migrate item to DB */ - g_assert (0 == item->id); - db_item_update (item); - - if (0 == (itemCount % 10)) - g_print("."); - item_unload(item); - } - - cur = cur->next; - } - } while (FALSE); - - if (ctxt->doc) - xmlFreeDoc (ctxt->doc); - - g_free (ctxt->data); - g_free (filename); - - feed_free_parser_ctxt (ctxt); - - db_node_update (node); - if (node->subscription) - db_subscription_update (node->subscription); - - g_print ("\n"); + g_print("Performing %s -> XDG cache migration...\n", oldBaseDir); - debug_exit ("migrate_load_from_cache"); -} - -static void -migrate_items (const gchar *sourceDir) -{ - GDir *dir; - gchar *id; - - dir = g_dir_open (sourceDir, 0, NULL); - while (NULL != (id = (gchar *)g_dir_read_name (dir))) - { - debug_start_measurement (DEBUG_CACHE); - migrate_load_from_cache (sourceDir, id); - debug_end_measurement (DEBUG_CACHE, "parse feed"); - } - g_dir_close (dir); -} + /* 1.) Close already loaded DB */ + db_deinit (); -static void -migrate_from_10 (void) -{ - gchar *sourceDir; + /* 2.) Copy all files */ + newCacheDir = g_build_filename (g_get_user_cache_dir(), "liferea", NULL); + newConfigDir = g_build_filename (g_get_user_config_dir(), "liferea", NULL); + newDataDir = g_build_filename (g_get_user_data_dir(), "liferea", NULL); + oldCacheDir = g_build_filename (oldBaseDir, "cache", NULL); + + migrate_copy_dir (oldBaseDir, newConfigDir, ""); + migrate_copy_dir (oldCacheDir, newCacheDir, G_DIR_SEPARATOR_S "favicons"); + migrate_copy_dir (oldCacheDir, newCacheDir, G_DIR_SEPARATOR_S "plugins"); + + /* 3.) Move DB to from new config dir to cache dir instead (this is + caused by the batch copy in step 2.) */ + sourceDbFile = g_file_new_for_path (g_build_filename (newConfigDir, "liferea.db", NULL)); + targetDbFile = g_file_new_for_path (g_build_filename (newDataDir, "liferea.db", NULL)); + g_file_move (sourceDbFile, targetDbFile, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, NULL); + g_object_unref (sourceDbFile); + g_object_unref (targetDbFile); - g_print ("Performing 1.0 -> %s cache migration...\n", LIFEREA_CURRENT_DIR); - migrate_copy_dir (".liferea", LIFEREA_CURRENT_DIR, ""); - migrate_copy_dir (".liferea", LIFEREA_CURRENT_DIR, "cache" G_DIR_SEPARATOR_S "favicons"); - - sourceDir = g_build_filename (g_get_home_dir(), ".liferea", "cache", "feeds", NULL); - migrate_items (sourceDir); - g_free (sourceDir); -} + /* 3.) And reopen the copied DB */ + db_init (); -static void -migrate_from_12 (void) -{ - gchar *sourceDir; - - g_print("Performing .liferea_1.2 -> %s cache migration...\n", LIFEREA_CURRENT_DIR); - - /* copy everything besides the feed cache */ - migrate_copy_dir (".liferea_1.2", LIFEREA_CURRENT_DIR, ""); - migrate_copy_dir (".liferea_1.2", LIFEREA_CURRENT_DIR, "cache" G_DIR_SEPARATOR_S "favicons"); - migrate_copy_dir (".liferea_1.2", LIFEREA_CURRENT_DIR, "cache" G_DIR_SEPARATOR_S "scripts"); - migrate_copy_dir (".liferea_1.2", LIFEREA_CURRENT_DIR, "cache" G_DIR_SEPARATOR_S "plugins"); - - /* migrate feed cache to new DB format */ - sourceDir = g_build_filename (g_get_home_dir(), ".liferea_1.2", "cache", "feeds", NULL); - migrate_items (sourceDir); - g_free (sourceDir); -} + /* 4.) Migrate file feed list into DB */ + filename = common_create_config_filename ("feedlist.opml"); -static void -migrate_from_14plus (const gchar *olddir) -{ - g_print("Performing %s -> %s cache migration...\n", olddir, LIFEREA_CURRENT_DIR); - - /* close already loaded DB */ - db_deinit (); + if (!import_OPML_feedlist (filename, node, FALSE, TRUE)) + g_error ("Fatal: Feed list migration failed!"); - /* 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 (); + g_free (filename); + g_free (newConfigDir); + g_free (newCacheDir); + g_free (oldCacheDir); } void -migration_execute (migrationMode mode) +migration_execute (migrationMode mode, nodePtr node) { - const gchar *olddir; - switch (mode) { - case MIGRATION_FROM_10: - olddir = ".liferea"; - migrate_from_10 (); - break; - case MIGRATION_FROM_12: - olddir = ".liferea_1.2"; - migrate_from_12 (); - break; case MIGRATION_FROM_14: - olddir = ".liferea_1.4"; - migrate_from_14plus (olddir); + migrate_from_14plus (".liferea_1.4", node); break; case MIGRATION_FROM_16: - olddir = ".liferea_1.6"; - migrate_from_14plus (olddir); + migrate_from_14plus (".liferea_1.6", node); break; - case MIGRATION_FROM_17: - olddir = ".liferea_1.7"; - migrate_from_14plus (olddir); + case MIGRATION_FROM_18: + migrate_from_14plus (".liferea_1.8", node); break; case MIGRATION_MODE_INVALID: default: @@ -336,8 +132,4 @@ return; break; } - - ui_show_info_box (_("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!"), olddir); } diff -Nru liferea-1.8.15/src/migrate.h liferea-1.10.3/src/migrate.h --- liferea-1.8.15/src/migrate.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/migrate.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file migrate.h migration between different cache versions * - * Copyright (C) 2007-2011 Lars Lindner + * Copyright (C) 2007-2011 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,20 +21,21 @@ #ifndef _MIGRATE_H #define _MIGRATE_H +#include "node.h" + typedef enum { MIGRATION_MODE_INVALID = 0, - MIGRATION_FROM_10, - MIGRATION_FROM_12, MIGRATION_FROM_14, MIGRATION_FROM_16, - MIGRATION_FROM_17 + MIGRATION_FROM_18 } migrationMode; /** * Performs a migration for the given migration mode. * * @param mode migration mode + * @param node feed list root node */ -void migration_execute (migrationMode mode); +void migration_execute (migrationMode mode, nodePtr node); #endif diff -Nru liferea-1.8.15/src/net.c liferea-1.10.3/src/net.c --- liferea-1.8.15/src/net.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/net.c 2013-09-30 21:54:03.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file net.c HTTP network access using libsoup * - * Copyright (C) 2007-2009 Lars Lindner + * Copyright (C) 2007-2009 Lars Windolf * Copyright (C) 2009 Emilio Pozuelo Monfort * * This program is free software; you can redistribute it and/or modify @@ -113,6 +113,8 @@ g_assert (NULL != job->request); debug1 (DEBUG_NET, "downloading %s", job->request->source); + if (job->request->postdata && (debug_level & DEBUG_VERBOSE) && (debug_level & DEBUG_NET)) + debug1 (DEBUG_NET, " postdata=>>>%s<<<", job->request->postdata); /* Prepare the SoupMessage */ msg = soup_message_new (job->request->postdata ? SOUP_METHOD_POST : SOUP_METHOD_GET, @@ -177,8 +179,7 @@ * displaying the dialog ourselves, and requeing the msg if we get credentials */ /* If the feed has "dont use a proxy" selected, disable the proxy for the msg */ - if ((job->request->options && job->request->options->dontUseProxy) || - (network_get_proxy_host () == NULL)) + if (job->request->options && job->request->options->dontUseProxy) soup_message_disable_feature (msg, SOUP_TYPE_PROXY_URI_RESOLVER); soup_session_queue_message (session, msg, network_process_callback, job); @@ -210,15 +211,15 @@ /* Set an appropriate user agent */ if (g_getenv ("LANG")) { - /* e.g. "Liferea/1.6.0 (Linux; de_DE; http://liferea.sf.net/)" */ - useragent = g_strdup_printf ("Liferea/%s (%s; %s; %s)", VERSION, OSNAME, g_getenv ("LANG"), HOMEPAGE); + /* e.g. "Liferea/1.10.0 (Linux; de_DE; http://liferea.sf.net/) AppleWebKit (KHTML, like Gecko)" */ + useragent = g_strdup_printf ("Liferea/%s (%s; %s; %s) AppleWebKit (KHTML, like Gecko)", VERSION, OSNAME, g_getenv ("LANG"), HOMEPAGE); } else { - /* e.g. "Liferea/1.6.0 (Linux; http://liferea.sf.net/)" */ - useragent = g_strdup_printf ("Liferea/%s (%s; %s)", VERSION, OSNAME, HOMEPAGE); + /* e.g. "Liferea/1.10.0 (Linux; http://liferea.sf.net/) AppleWebKit (KHTML, like Gecko)" */ + useragent = g_strdup_printf ("Liferea/%s (%s; %s) AppleWebKit (KHTML, like Gecko)", VERSION, OSNAME, HOMEPAGE); } /* Cookies */ - filename = common_create_cache_filename ("", "cookies", "txt"); + filename = common_create_config_filename ("cookies.txt"); cookies = soup_cookie_jar_text_new (filename, FALSE); g_free (filename); @@ -227,12 +228,20 @@ session = 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, SOUP_SESSION_ADD_FEATURE, cookies, SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_CONTENT_DECODER, NULL); - if (proxy) + + if (proxy) { + debug1 (DEBUG_NET, "Initializing libsoup with proxy '%s'", proxy); + g_object_set (G_OBJECT (session), + SOUP_SESSION_PROXY_URI, proxy, + NULL); soup_uri_free (proxy); + } else { + debug0 (DEBUG_NET, "Initializing libsoup with libproxy defaults"); + soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_DEFAULT); + } g_signal_connect (session, "authenticate", G_CALLBACK (network_authenticate), NULL); diff -Nru liferea-1.8.15/src/net.h liferea-1.10.3/src/net.h --- liferea-1.8.15/src/net.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/net.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file net.h HTTP network access interface * - * Copyright (C) 2007-2009 Lars Lindner + * Copyright (C) 2007-2009 Lars Windolf * Copyright (C) 2009 Emilio Pozuelo Monfort * * This program is free software; you can redistribute it and/or modify diff -Nru liferea-1.8.15/src/net_monitor.c liferea-1.10.3/src/net_monitor.c --- liferea-1.8.15/src/net_monitor.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/net_monitor.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file network_monitor.c network status monitor * - * Copyright (C) 2009 Lars Lindner + * Copyright (C) 2009 Lars Windolf * Copyright (C) 2010 Emilio Pozuelo Monfort * * This program is free software; you can redistribute it and/or modify diff -Nru liferea-1.8.15/src/net_monitor.h liferea-1.10.3/src/net_monitor.h --- liferea-1.8.15/src/net_monitor.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/net_monitor.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file network_monitor.c network status monitor * - * Copyright (C) 2009 Lars Lindner + * Copyright (C) 2009 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/newsbin.c liferea-1.10.3/src/newsbin.c --- liferea-1.8.15/src/newsbin.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/newsbin.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file newsbin.c news bin node type implementation * - * Copyright (C) 2006-2010 Lars Lindner + * Copyright (C) 2006-2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,9 +29,8 @@ #include "itemlist.h" #include "metadata.h" #include "render.h" -#include "vfolder.h" #include "ui/icons.h" -#include "ui/ui_node.h" +#include "ui/feed_list_node.h" #include "ui/liferea_dialog.h" static GtkWidget *newnewsbindialog = NULL; @@ -159,7 +158,7 @@ nodeType->remove = newsbin_remove; nodeType->render = newsbin_render; nodeType->request_add = ui_newsbin_add; - nodeType->request_properties = ui_node_rename; + nodeType->request_properties = feed_list_node_rename; nodeType->free = feed_get_node_type()->free; } diff -Nru liferea-1.8.15/src/newsbin.h liferea-1.10.3/src/newsbin.h --- liferea-1.8.15/src/newsbin.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/newsbin.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file newsbin.h news bin node type implementation * - * Copyright (C) 2006 Lars Lindner + * Copyright (C) 2006 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,8 +33,6 @@ void on_newnewsbinbtn_clicked(GtkButton *button, gpointer user_data); -void on_newsbinnamechange_clicked(GtkButton *button, gpointer user_data); - void on_popup_copy_to_newsbin(gpointer data); /* implementation of the node type interface */ diff -Nru liferea-1.8.15/src/node.c liferea-1.10.3/src/node.c --- liferea-1.8.15/src/node.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/node.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file node.c hierarchic feed list node handling * - * Copyright (C) 2003-2012 Lars Lindner + * Copyright (C) 2003-2012 Lars Windolf * Copyright (C) 2004-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -22,6 +22,7 @@ #include #include "common.h" +#include "conf.h" #include "db.h" #include "debug.h" #include "itemlist.h" @@ -34,7 +35,7 @@ #include "vfolder.h" #include "fl_sources/node_source.h" #include "ui/liferea_shell.h" -#include "ui/ui_node.h" +#include "ui/feed_list_node.h" #include "ui/ui_tray.h" static GHashTable *nodes = NULL; /**< node id -> node lookup table */ @@ -87,6 +88,7 @@ node = (nodePtr)g_new0 (struct node, 1); node->type = type; + node->viewMode = NODE_VIEW_MODE_DEFAULT; node->sortColumn = NODE_VIEW_SORT_BY_TIME; node->sortReversed = TRUE; /* default sorting is newest date at top */ node->available = TRUE; @@ -223,7 +225,7 @@ NODE_TYPE (node)->update_counters (node); if (old != node->unreadCount) { - ui_node_update (node->id); + feed_list_node_update (node->id); ui_tray_update (); liferea_shell_update_unread_stats (); } @@ -243,7 +245,7 @@ if ((oldUnreadCount != node->unreadCount) || (oldItemCount != node->itemCount)) - ui_node_update (node->id); + feed_list_node_update (node->id); /* Update the unread count of the parent nodes, usually they just add all child unread counters */ @@ -325,8 +327,8 @@ new_parent->children = g_slist_insert (new_parent->children, node, -1); node->parent = new_parent; - ui_node_remove_node (node); - ui_node_add (node); + feed_list_node_remove_node (node); + feed_list_node_add (node); } void @@ -410,7 +412,7 @@ g_free (node->iconFile); if (node->icon) - node->iconFile = common_create_cache_filename ("cache" G_DIR_SEPARATOR_S "favicons", node->id, "png"); + node->iconFile = common_create_cache_filename ("favicons", node->id, "png"); else node->iconFile = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "pixmaps", "default.png", NULL); } @@ -468,13 +470,40 @@ void node_set_view_mode (nodePtr node, nodeViewType viewMode) { - node->viewMode = viewMode; + gint defaultViewMode; + + /* To allow users to select a default viewing mode for the layout + we need to store only exceptions from this mode, which is why + we compare the mode to be set with the default and if it's equal + we just set NODE_VIEW_MODE_DEFAULT. + + This allows to not OPML export the viewMode attribute for nodes + the are in default viewing mode, which then allows to follow + a switch in the preference to a new default viewing mode. + + This of course also means that the we use some state on each + changing of the view mode preference. + */ + + conf_get_int_value (DEFAULT_VIEW_MODE, &defaultViewMode); + + if (viewMode != (nodeViewType)defaultViewMode) + node->viewMode = viewMode; + else + node->viewMode = NODE_VIEW_MODE_DEFAULT; } nodeViewType node_get_view_mode (nodePtr node) { - return node->viewMode; + gint defaultViewMode; + + conf_get_int_value (DEFAULT_VIEW_MODE, &defaultViewMode); + + if (NODE_VIEW_MODE_DEFAULT == node->viewMode) + return defaultViewMode; + else + return node->viewMode; } const gchar * diff -Nru liferea-1.8.15/src/node.h liferea-1.10.3/src/node.h --- liferea-1.8.15/src/node.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/node.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file node.h hierarchic feed list node interface * - * Copyright (C) 2003-2012 Lars Lindner + * Copyright (C) 2003-2010 Lars Windolf * Copyright (C) 2004-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -83,7 +83,7 @@ nodePtr node_new (struct nodeType *type); /** - * Can be used to check wether an id is used or not. + * Can be used to check whether an id is used or not. * * @param id the node id to check * @@ -173,7 +173,7 @@ void node_reset_update_counter (nodePtr node, GTimeVal *now); /** - * Determines wether node1 is an ancestor of node2 + * Determines whether node1 is an ancestor of node2 * * @param node1 the possible ancestor * @param node2 the possible child @@ -337,7 +337,9 @@ void node_set_view_mode(nodePtr node, nodeViewType newMode); /** - * Query the viewing mode setting of a given mode. + * Query the effective viewing mode setting of a given mode. + * When node viewing mode is set to default it will return the + * configured default. * * @param node the node * @@ -356,7 +358,7 @@ const gchar * node_get_base_url(nodePtr node); /** - * Query wether a feed be added to the given node. + * Query whether a feed be added to the given node. * * @param node the node * @@ -365,7 +367,7 @@ gboolean node_can_add_child_feed (nodePtr node); /** - * Query wether a folder be added to the given node. + * Query whether a folder be added to the given node. * * @param node the node * diff -Nru liferea-1.8.15/src/node_type.c liferea-1.10.3/src/node_type.c --- liferea-1.8.15/src/node_type.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/node_type.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file node_type.c node type handling * - * Copyright (C) 2007-2008 Lars Lindner + * Copyright (C) 2007-2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/node_type.h liferea-1.10.3/src/node_type.h --- liferea-1.8.15/src/node_type.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/node_type.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file node_type.h node type interface * - * Copyright (C) 2007-2010 Lars Lindner + * Copyright (C) 2007-2012 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,6 +23,7 @@ #include "node.h" +#include #include /** node type capabilities */ @@ -85,7 +86,7 @@ * * @returns type string (or NULL if unknown) */ -const gchar *node_type_to_str(nodePtr node); +const gchar *node_type_to_str (nodePtr node); /** * Maps node type string to type constant. @@ -94,7 +95,7 @@ * * @returns node type */ -nodeTypePtr node_str_to_type(const gchar *str); +nodeTypePtr node_str_to_type (const gchar *str); /** * Interactive node adding (e.g. feed menu->new subscription), @@ -105,6 +106,6 @@ * * @returns TRUE on success */ -gboolean node_type_request_interactive_add(nodeTypePtr nodeType); +gboolean node_type_request_interactive_add (nodeTypePtr nodeType); #endif diff -Nru liferea-1.8.15/src/node_view.h liferea-1.10.3/src/node_view.h --- liferea-1.8.15/src/node_view.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/node_view.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file node_view.h node view modes * - * Copyright (C) 2009 Lars Lindner + * Copyright (C) 2009-2012 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ NODE_VIEW_MODE_NORMAL = 0, NODE_VIEW_MODE_WIDE = 1, NODE_VIEW_MODE_COMBINED = 2, - NODE_VIEW_MODE_INVALID + NODE_VIEW_MODE_DEFAULT, } nodeViewType; typedef enum { diff -Nru liferea-1.8.15/src/notification/libnotify.c liferea-1.10.3/src/notification/libnotify.c --- liferea-1.8.15/src/notification/libnotify.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/notification/libnotify.c 2013-07-31 23:29:12.000000000 +0200 @@ -158,11 +158,7 @@ // notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL); // notify_notification_clear_actions(n); -#if HAVE_LIBNOTIFY == 4 n = notify_notification_new (node_get_title (node_p), labelText_now_p, NULL); -#else - n = notify_notification_new (node_get_title (node_p), labelText_now_p, NULL, NULL); -#endif 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); @@ -176,9 +172,6 @@ node_p->id, NULL); } -#if HAVE_LIBNOTIFY == 1 - notify_notification_attach_to_status_icon (n, ui_tray_get_status_icon ()); -#endif if (!notify_notification_show (n, NULL)) { g_warning ("libnotify.c - failed to update notification via libnotify\n"); } @@ -253,11 +246,7 @@ labelSummary_p = g_strdup_printf (ngettext ("%s has %d update", "%s has %d updates", item_count), node_get_title (node), item_count); -#if HAVE_LIBNOTIFY == 4 n = notify_notification_new (_("Feed Update"), labelSummary_p, "liferea"); -#else - n = notify_notification_new (_("Feed Update"), labelSummary_p, "liferea", NULL); -#endif g_free (labelSummary_p); if (supports_append) { @@ -279,9 +268,7 @@ node->id, NULL); } notify_notification_set_category (n, "feed"); -#if HAVE_LIBNOTIFY == 1 - notify_notification_attach_to_status_icon (n, ui_tray_get_status_icon ()); -#endif + if (!notify_notification_show (n, NULL)) g_warning ("notif_libnotify.c - failed to send notification via libnotify"); } diff -Nru liferea-1.8.15/src/notification/Makefile.in liferea-1.10.3/src/notification/Makefile.in --- liferea-1.8.15/src/notification/Makefile.in 2013-06-24 22:13:48.000000000 +0200 +++ liferea-1.10.3/src/notification/Makefile.in 2013-10-08 20:14:32.000000000 +0200 @@ -120,13 +120,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -142,6 +141,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -188,8 +195,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -218,6 +223,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -Nru liferea-1.8.15/src/notification/notification.c liferea-1.10.3/src/notification/notification.c --- liferea-1.8.15/src/notification/notification.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/notification/notification.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file notification.c generic notification handling * - * Copyright (C) 2006-2008 Lars Lindner + * Copyright (C) 2006-2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/notification/notification.h liferea-1.10.3/src/notification/notification.h --- liferea-1.8.15/src/notification/notification.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/notification/notification.h 2013-07-31 23:29:12.000000000 +0200 @@ -2,7 +2,7 @@ * @file notification.h generic notification interface * * Copyright (C) 2006 Norman Jonas - * Copyright (C) 2006-2008 Lars Lindner + * Copyright (C) 2006-2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/atom10.c liferea-1.10.3/src/parsers/atom10.c --- liferea-1.8.15/src/parsers/atom10.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/atom10.c 2013-07-31 23:29:12.000000000 +0200 @@ -2,7 +2,7 @@ * @file atom10.c Atom 1.0 Parser * * Copyright (C) 2005-2006 Nathan Conrad - * Copyright (C) 2003-2010 Lars Lindner + * Copyright (C) 2003-2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -250,8 +250,12 @@ invalid = TRUE; name = g_strdup (_("Invalid Atom feed: unknown author")); } - /* FIXME: so something with "invalid" flag */ - tmp = g_strdup_printf ("%s%s%s", name, uri?uri:"", email?email:""); + + if (!invalid) + tmp = g_strdup_printf ("%s%s%s", name, uri?uri:"", email?email:""); + else + tmp = NULL; + g_free (uri); g_free (email); g_free (name); @@ -555,8 +559,10 @@ { /* parse feed author */ gchar *author = atom10_parse_person_construct (cur); - ctxt->subscription->metadata = metadata_list_append (ctxt->subscription->metadata, "author", author); - g_free (author); + if (author) { + ctxt->subscription->metadata = metadata_list_append (ctxt->subscription->metadata, "author", author); + g_free (author); + } /* FIXME: make item parsing use this author if not specified elsewhere */ } @@ -582,8 +588,10 @@ { /* parse feed contributors */ gchar *contributer = atom10_parse_person_construct (cur); - ctxt->subscription->metadata = metadata_list_append (ctxt->subscription->metadata, "contributor", contributer); - g_free (contributer); + if (contributer) { + ctxt->subscription->metadata = metadata_list_append (ctxt->subscription->metadata, "contributor", contributer); + g_free (contributer); + } } static void diff -Nru liferea-1.8.15/src/parsers/atom10.h liferea-1.10.3/src/parsers/atom10.h --- liferea-1.8.15/src/parsers/atom10.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/atom10.h 2013-07-31 23:29:12.000000000 +0200 @@ -2,7 +2,7 @@ * @file atom10.h Atom 1.0 Parser * * Copyright (C) 2005-2006 Nathan Conrad - * Copyright (C) 2003-2008 Lars Lindner + * Copyright (C) 2003-2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/cdf_channel.c liferea-1.10.3/src/parsers/cdf_channel.c --- liferea-1.8.15/src/parsers/cdf_channel.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/cdf_channel.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file cdf_channel.c CDF channel parsing * - * Copyright (C) 2003-2010 Lars Lindner + * Copyright (C) 2003-2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/cdf_channel.h liferea-1.10.3/src/parsers/cdf_channel.h --- liferea-1.8.15/src/parsers/cdf_channel.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/cdf_channel.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file cdf_channel.h CDF channel parsing * - * Copyright (C) 2003-2008 Lars Lindner + * Copyright (C) 2003-2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/cdf_item.c liferea-1.10.3/src/parsers/cdf_item.c --- liferea-1.8.15/src/parsers/cdf_item.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/cdf_item.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file cdf_item.c CDF item parsing * - * Copyright (C) 2003-2007 Lars Lindner + * Copyright (C) 2003-2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/cdf_item.h liferea-1.10.3/src/parsers/cdf_item.h --- liferea-1.8.15/src/parsers/cdf_item.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/cdf_item.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file cdf_item.h CDF item tag parsing * - * Copyright (C) 2003-2006 Lars Lindner + * Copyright (C) 2003-2006 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/Makefile.in liferea-1.10.3/src/parsers/Makefile.in --- liferea-1.8.15/src/parsers/Makefile.in 2013-06-24 22:13:49.000000000 +0200 +++ liferea-1.10.3/src/parsers/Makefile.in 2013-10-08 20:14:32.000000000 +0200 @@ -136,13 +136,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -158,6 +157,14 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBINDICATE_CFLAGS = @LIBINDICATE_CFLAGS@ @@ -204,8 +211,6 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -234,6 +239,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -Nru liferea-1.8.15/src/parsers/ns_admin.c liferea-1.10.3/src/parsers/ns_admin.c --- liferea-1.8.15/src/parsers/ns_admin.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_admin.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_admin.c admin namespace support * - * Copyright (C) 2003-2008 Lars Lindner + * Copyright (C) 2003-2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_admin.h liferea-1.10.3/src/parsers/ns_admin.h --- liferea-1.8.15/src/parsers/ns_admin.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_admin.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /* admin namespace support - Copyright (C) 2003-2007 Lars Lindner + Copyright (C) 2003-2007 Lars Windolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_ag.c liferea-1.10.3/src/parsers/ns_ag.c --- liferea-1.8.15/src/parsers/ns_ag.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_ag.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_ag.c mod_aggregation support * - * Copyright (C) 2003-2009 Lars Lindner + * Copyright (C) 2003-2009 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_ag.h liferea-1.10.3/src/parsers/ns_ag.h --- liferea-1.8.15/src/parsers/ns_ag.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_ag.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /* mod_aggregation support - Copyright (C) 2003-2007 Lars Lindner + Copyright (C) 2003-2007 Lars Windolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_blogChannel.c liferea-1.10.3/src/parsers/ns_blogChannel.c --- liferea-1.8.15/src/parsers/ns_blogChannel.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_blogChannel.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_blogChannel.c blogChannel namespace support * - * Copyright (C) 2003-2008 Lars Lindner + * Copyright (C) 2003-2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_blogChannel.h liferea-1.10.3/src/parsers/ns_blogChannel.h --- liferea-1.8.15/src/parsers/ns_blogChannel.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_blogChannel.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_blogChannel.h blogChannel namespace support * - * Copyright (C) 2003-2007 Lars Lindner + * Copyright (C) 2003-2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_cC.c liferea-1.10.3/src/parsers/ns_cC.c --- liferea-1.8.15/src/parsers/ns_cC.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_cC.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_cC.c creativeCommon RSS namespace support * - * Copyright (C) 2003-2007 Lars Lindner + * Copyright (C) 2003-2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_cC.h liferea-1.10.3/src/parsers/ns_cC.h --- liferea-1.8.15/src/parsers/ns_cC.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_cC.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_cC.h creativeCommon RSS namespace support * - * Copyright (C) 2003-2007 Lars Lindner + * Copyright (C) 2003-2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_content.c liferea-1.10.3/src/parsers/ns_content.c --- liferea-1.8.15/src/parsers/ns_content.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_content.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_content.c content namespace support * - * Copyright (C) 2003-2007 Lars Lindner + * Copyright (C) 2003-2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_content.h liferea-1.10.3/src/parsers/ns_content.h --- liferea-1.8.15/src/parsers/ns_content.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_content.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_content.h content namespace support * - * Copyright (C) 2003-2007 Lars Lindner + * Copyright (C) 2003-2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_dc.c liferea-1.10.3/src/parsers/ns_dc.c --- liferea-1.8.15/src/parsers/ns_dc.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_dc.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_dc.c Dublin Core support for RSS and Atom * - * Copyright (C) 2003-2010 Lars Lindner + * Copyright (C) 2003-2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_dc.h liferea-1.10.3/src/parsers/ns_dc.h --- liferea-1.8.15/src/parsers/ns_dc.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_dc.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_dc.h Dublin Core support for RSS, Atom and OCS * - * Copyright (C) 2003-2007 Lars Lindner + * Copyright (C) 2003-2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_itunes.c liferea-1.10.3/src/parsers/ns_itunes.c --- liferea-1.8.15/src/parsers/ns_itunes.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_itunes.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_itunes.c itunes namespace support * - * Copyright (C) 2007 Lars Lindner + * Copyright (C) 2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_itunes.h liferea-1.10.3/src/parsers/ns_itunes.h --- liferea-1.8.15/src/parsers/ns_itunes.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_itunes.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_itunes.h itunes namespace support * - * Copyright (C) 2007 Lars Lindner + * Copyright (C) 2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_media.c liferea-1.10.3/src/parsers/ns_media.c --- liferea-1.8.15/src/parsers/ns_media.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_media.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_media.c Yahoo media namespace support * - * Copyright (C) 2007-2010 Lars Lindner + * Copyright (C) 2007-2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -57,46 +57,47 @@ (example quoted from specification) */ - if (!xmlStrcmp(cur->name, BAD_CAST"content")) { + if (xmlStrcmp(cur->name, BAD_CAST"content")) { tmp = xml_get_attribute (cur, "url"); - if (tmp) { - /* 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) && feedURL && (feedURL[0] != '|') && - (strstr (feedURL, "://") != NULL)) { - /* add base URL if necessary and possible */ - tmp2 = g_strdup_printf ("%s/%s", feedURL, tmp); - g_free (tmp); - tmp = tmp2; - } - - /* gravatars are often supplied as media:content with medium='image' - so we treat do not treat such occurences as enclosures */ - if (medium && !strcmp (medium, "image") && strstr (tmp, "www.gravatar.com")) { - metadata_list_set (&(ctxt->item->metadata), "gravatar", tmp); - } else { - /* Never add enclosures for images already contained in the description */ - if (!(ctxt->item->description && strstr (ctxt->item->description, tmp))) { - gchar *encl_string = enclosure_values_to_string (tmp, type, length, FALSE /* not yet downloaded */); - ctxt->item->metadata = metadata_list_append (ctxt->item->metadata, "enclosure", encl_string); - g_free (encl_string); + if (!tmp) + return; + + /* 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) && feedURL && (feedURL[0] != '|') && + (strstr (feedURL, "://") != NULL)) { + /* add base URL if necessary and possible */ + tmp2 = g_strdup_printf ("%s/%s", feedURL, tmp); + g_free (tmp); + tmp = tmp2; + } + + /* gravatars are often supplied as media:content with medium='image' + so we treat do not treat such occurences as enclosures */ + if (medium && !strcmp (medium, "image") && strstr (tmp, "www.gravatar.com")) { + metadata_list_set (&(ctxt->item->metadata), "gravatar", tmp); + } else { + /* Never add enclosures for images already contained in the description */ + if (!(ctxt->item->description && strstr (ctxt->item->description, tmp))) { + gchar *encl_string = enclosure_values_to_string (tmp, type, length, FALSE /* not yet downloaded */); + ctxt->item->metadata = metadata_list_append (ctxt->item->metadata, "enclosure", encl_string); + g_free (encl_string); - ctxt->item->hasEnclosure = TRUE; - } + ctxt->item->hasEnclosure = TRUE; } - g_free (tmp); - g_free (type); - g_free (medium); - g_free (lengthStr); } + g_free (tmp); + g_free (type); + g_free (medium); + g_free (lengthStr); } // FIXME: should we support media:player too? diff -Nru liferea-1.8.15/src/parsers/ns_media.h liferea-1.10.3/src/parsers/ns_media.h --- liferea-1.8.15/src/parsers/ns_media.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_media.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_media.h Yahoo media namespace support * - * Copyright (C) 2007 Lars Lindner + * Copyright (C) 2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_photo.c liferea-1.10.3/src/parsers/ns_photo.c --- liferea-1.8.15/src/parsers/ns_photo.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_photo.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_photo.c photo blog namespace support * - * Copyright (C) 2004-2007 Lars Lindner + * Copyright (C) 2004-2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_photo.h liferea-1.10.3/src/parsers/ns_photo.h --- liferea-1.8.15/src/parsers/ns_photo.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_photo.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_photo.h photo/ph namespace support * - * Copyright (C) 2003-2007 Lars Lindner + * Copyright (C) 2003-2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_slash.c liferea-1.10.3/src/parsers/ns_slash.c --- liferea-1.8.15/src/parsers/ns_slash.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_slash.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_slash.c slash namespace support * - * Copyright (C) 2003-2007 Lars Lindner + * Copyright (C) 2003-2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_slash.h liferea-1.10.3/src/parsers/ns_slash.h --- liferea-1.8.15/src/parsers/ns_slash.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_slash.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_slash.h slash namespace support * - * Copyright (C) 2003-2007 Lars Lindner + * Copyright (C) 2003-2007 Lars Windolf * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff -Nru liferea-1.8.15/src/parsers/ns_syn.c liferea-1.10.3/src/parsers/ns_syn.c --- liferea-1.8.15/src/parsers/ns_syn.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_syn.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_syn.c syndication namespace support * - * Copyright (C) 2003-2007 Lars Lindner + * Copyright (C) 2003-2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_syn.h liferea-1.10.3/src/parsers/ns_syn.h --- liferea-1.8.15/src/parsers/ns_syn.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_syn.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_syn.h syndication namespace support * - * Copyright (C) 2003-2007 Lars Lindner + * Copyright (C) 2003-2007 Lars Windolf * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff -Nru liferea-1.8.15/src/parsers/ns_trackback.c liferea-1.10.3/src/parsers/ns_trackback.c --- liferea-1.8.15/src/parsers/ns_trackback.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_trackback.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_trackback.c trackback namespace support * - * Copyright (C) 2007-2008 Lars Lindner + * Copyright (C) 2007-2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_trackback.h liferea-1.10.3/src/parsers/ns_trackback.h --- liferea-1.8.15/src/parsers/ns_trackback.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_trackback.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_trackback.h trackback namespace support * - * Copyright (C) 2007 Lars Lindner + * Copyright (C) 2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_wfw.c liferea-1.10.3/src/parsers/ns_wfw.c --- liferea-1.8.15/src/parsers/ns_wfw.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_wfw.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_wfw.c Well-Formed Web RSS namespace support * - * Copyright (C) 2007 Lars Lindner + * Copyright (C) 2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/ns_wfw.h liferea-1.10.3/src/parsers/ns_wfw.h --- liferea-1.8.15/src/parsers/ns_wfw.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/ns_wfw.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file ns_wfw.h Well-Formed Web RSS namespace support * - * Copyright (C) 2007 Lars Lindner + * Copyright (C) 2007 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/pie_entry.c liferea-1.10.3/src/parsers/pie_entry.c --- liferea-1.8.15/src/parsers/pie_entry.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/pie_entry.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file pie_entry.c Atom0.3 entry parsing * - * Copyright (C) 2003-2009 Lars Lindner + * Copyright (C) 2003-2009 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/pie_entry.h liferea-1.10.3/src/parsers/pie_entry.h --- liferea-1.8.15/src/parsers/pie_entry.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/pie_entry.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file pie_entry.h Atom 0.3 entry tag parsing * - * Copyright (C) 2003-2008 Lars Lindner + * Copyright (C) 2003-2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/pie_feed.c liferea-1.10.3/src/parsers/pie_feed.c --- liferea-1.8.15/src/parsers/pie_feed.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/pie_feed.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file pie_feed.c Atom 0.3 channel parsing * - * Copyright (C) 2003-2010 Lars Lindner + * Copyright (C) 2003-2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/pie_feed.h liferea-1.10.3/src/parsers/pie_feed.h --- liferea-1.8.15/src/parsers/pie_feed.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/pie_feed.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file pie_feed.h Atom 0.3 feed parsing * - * Copyright (C) 2003-2010 Lars Lindner + * Copyright (C) 2003-2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/rss_channel.c liferea-1.10.3/src/parsers/rss_channel.c --- liferea-1.8.15/src/parsers/rss_channel.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/rss_channel.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file rss_channel.c some tolerant and generic RSS/RDF channel parsing * - * Copyright (C) 2003-2010 Lars Lindner + * Copyright (C) 2003-2010 Lars Windolf * Copyright (C) 2005-2006 Nathan Conrad * * This program is free software; you can redistribute it and/or modify diff -Nru liferea-1.8.15/src/parsers/rss_channel.h liferea-1.10.3/src/parsers/rss_channel.h --- liferea-1.8.15/src/parsers/rss_channel.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/rss_channel.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file rss_channel.h some tolerant and generic RSS/RDF channel parsing * - * Copyright (C) 2003-2008 Lars Lindner + * Copyright (C) 2003-2008 Lars Windolf * Copyright (C) 2005-2006 Nathan Conrad * * This program is free software; you can redistribute it and/or modify diff -Nru liferea-1.8.15/src/parsers/rss_item.c liferea-1.10.3/src/parsers/rss_item.c --- liferea-1.8.15/src/parsers/rss_item.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/rss_item.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file rss_item.c RSS/RDF item parsing * - * Copyright (C) 2003-2010 Lars Lindner + * Copyright (C) 2003-2010 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/parsers/rss_item.h liferea-1.10.3/src/parsers/rss_item.h --- liferea-1.8.15/src/parsers/rss_item.h 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/parsers/rss_item.h 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file rss_item.h RSS item tag parsing * - * Copyright (C) 2003-2008 Lars Lindner + * Copyright (C) 2003-2008 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru liferea-1.8.15/src/plugins_engine.c liferea-1.10.3/src/plugins_engine.c --- liferea-1.8.15/src/plugins_engine.c 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/plugins_engine.c 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,137 @@ +/* + * plugins_engine.c: Liferea Plugins using libpeas + * (derived from gtranslator code) + * + * Copyright (C) 2002-2005 Paolo Maggi + * Copyright (C) 2010 Steve Frécinaux + * Copyright (C) 2012 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 + +#include +#include +#include +#include + +#include "plugins_engine.h" + +G_DEFINE_TYPE (LifereaPluginsEngine, liferea_plugins_engine, PEAS_TYPE_ENGINE) + +struct _LifereaPluginsEnginePrivate +{ + GSettings *plugin_settings; +}; + +LifereaPluginsEngine *default_engine = NULL; + +static void +liferea_plugins_engine_init (LifereaPluginsEngine * engine) +{ + gchar *typelib_dir; + GError *error = NULL; + + engine->priv = G_TYPE_INSTANCE_GET_PRIVATE (engine, + LIFEREA_TYPE_PLUGINS_ENGINE, + LifereaPluginsEnginePrivate); + + peas_engine_enable_loader (PEAS_ENGINE (engine), "python"); + + engine->priv->plugin_settings = g_settings_new ("net.sf.liferea.plugins"); + + /* Require Lifereas's typelib. */ + typelib_dir = g_build_filename (PACKAGE_LIB_DIR, + "girepository-1.0", NULL); + + if (!g_irepository_require_private (g_irepository_get_default (), + typelib_dir, "Liferea", "3.0", 0, &error)) + { + g_warning ("Could not load Liferea repository: %s", error->message); + g_error_free (error); + error = NULL; + } + + g_free (typelib_dir); + + /* This should be moved to libpeas */ + if (!g_irepository_require (g_irepository_get_default (), + "Peas", "1.0", 0, &error)) + { + g_warning ("Could not load Peas repository: %s", error->message); + g_error_free (error); + error = NULL; + } + + if (!g_irepository_require (g_irepository_get_default (), + "PeasGtk", "1.0", 0, &error)) + { + g_warning ("Could not load PeasGtk repository: %s", error->message); + g_error_free (error); + error = NULL; + } + + peas_engine_add_search_path (PEAS_ENGINE (engine), + g_build_filename (g_get_user_data_dir (), "liferea", "plugins", NULL), + g_build_filename (g_get_user_data_dir (), "liferea", "plugins", NULL)); + + peas_engine_add_search_path (PEAS_ENGINE (engine), + g_build_filename (PACKAGE_LIB_DIR, "plugins", NULL), + g_build_filename (PACKAGE_DATA_DIR, "plugins", NULL)); + + g_settings_bind (engine->priv->plugin_settings, + "active-plugins", + engine, "loaded-plugins", G_SETTINGS_BIND_DEFAULT); +} + +static void +liferea_plugins_engine_dispose (GObject * object) +{ + LifereaPluginsEngine *engine = LIFEREA_PLUGINS_ENGINE (object); + + if (engine->priv->plugin_settings) { + g_object_unref (engine->priv->plugin_settings); + engine->priv->plugin_settings = NULL; + } + + G_OBJECT_CLASS (liferea_plugins_engine_parent_class)->dispose (object); +} + +static void +liferea_plugins_engine_class_init (LifereaPluginsEngineClass * klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->dispose = liferea_plugins_engine_dispose; + + g_type_class_add_private (klass, sizeof (LifereaPluginsEnginePrivate)); +} + +LifereaPluginsEngine * +liferea_plugins_engine_get_default (void) +{ + if (!default_engine) { + default_engine = LIFEREA_PLUGINS_ENGINE (g_object_new (LIFEREA_TYPE_PLUGINS_ENGINE, NULL)); + g_object_add_weak_pointer (G_OBJECT (default_engine), (gpointer) &default_engine); + } + + return default_engine; +} diff -Nru liferea-1.8.15/src/plugins_engine.h liferea-1.10.3/src/plugins_engine.h --- liferea-1.8.15/src/plugins_engine.h 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.3/src/plugins_engine.h 2013-07-31 23:29:12.000000000 +0200 @@ -0,0 +1,56 @@ +/* + * plugins_engine.h: Liferea Plugins using libpeas + * + * Copyright (C) 2012 Lars Windolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 _PLUGINS_ENGINE +#define _PLUGINS_ENGINE + +#include +#include + +G_BEGIN_DECLS + +#define LIFEREA_TYPE_PLUGINS_ENGINE (liferea_plugins_engine_get_type ()) +#define LIFEREA_PLUGINS_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LIFEREA_TYPE_PLUGINS_ENGINE, LifereaPluginsEngine)) +#define LIFEREA_PLUGINS_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LIFEREA_TYPE_PLUGINS_ENGINE, LifereaPluginsEngineClass)) +#define LIFEREA_IS_PLUGINS_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LIFEREA_TYPE_PLUGINS_ENGINE)) +#define LIFEREA_IS_PLUGINS_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIFEREA_TYPE_PLUGINS_ENGINE)) +#define LIFEREA_PLUGINS_ENGINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), LIFEREA_TYPE_PLUGINS_ENGINE, LifereaPluginsEngineClass)) +typedef struct _LifereaPluginsEngine LifereaPluginsEngine; +typedef struct _LifereaPluginsEnginePrivate LifereaPluginsEnginePrivate; + +struct _LifereaPluginsEngine { + PeasEngine parent; + LifereaPluginsEnginePrivate *priv; +}; + +typedef struct _LifereaPluginsEngineClass LifereaPluginsEngineClass; + +struct _LifereaPluginsEngineClass { + PeasEngineClass parent_class; +}; + +GType liferea_plugins_engine_get_type (void) G_GNUC_CONST; + +LifereaPluginsEngine *liferea_plugins_engine_get_default (void); + +G_END_DECLS + +#endif diff -Nru liferea-1.8.15/src/render.c liferea-1.10.3/src/render.c --- liferea-1.8.15/src/render.c 2013-06-24 22:11:04.000000000 +0200 +++ liferea-1.10.3/src/render.c 2013-07-31 23:29:12.000000000 +0200 @@ -1,7 +1,7 @@ /** - * @file render.c generic XSLT rendering handling + * @file render.c generic GTK theme and XSLT rendering handling * - * Copyright (C) 2006-2011 Lars Lindner + * Copyright (C) 2006-2013 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -35,13 +35,10 @@ #include "common.h" #include "debug.h" #include "item.h" -#include "itemlist.h" #include "itemset.h" #include "render.h" #include "xml.h" #include "ui/liferea_htmlview.h" -#include "ui/itemview.h" -#include "ui/liferea_shell.h" /* Liferea provides special screens and the item and the feed displays using self-generated HTML. To separate code and layout and to easily @@ -62,6 +59,13 @@ static GHashTable *stylesheets = NULL; /* XSLT stylesheet cache */ static void +render_parameter_free (renderParamPtr paramSet) +{ + g_strfreev (paramSet->params); + g_free (paramSet); +} + +static void render_init (void) { gchar **shortlang = NULL; /* e.g. "de" */ @@ -72,7 +76,7 @@ render_parameter_free (langParams); /* Install default stylesheet if it does not yet exist */ - filename = common_create_cache_filename ("", "liferea", "css"); + filename = common_create_config_filename ("liferea.css"); if (!g_file_test (filename, G_FILE_TEST_EXISTS)) common_copy_file (PACKAGE_DATA_DIR "/" PACKAGE "/css/user.css", filename); g_free(filename); @@ -157,10 +161,11 @@ } *themeColorPtr; static GSList *themeColors = NULL; +static gboolean darkTheme = FALSE; /* Determining of theme colors, to be inserted in CSS */ static themeColorPtr -render_get_theme_color (const gchar *name, GdkColor themeColor) +render_calculate_theme_color (const gchar *name, GdkColor themeColor) { themeColorPtr tc; gushort r, g, b; @@ -177,38 +182,56 @@ return tc; } -static void -render_get_theme_colors (void) +void +render_init_theme_colors (GtkWidget *widget) { GtkStyle *style; GdkColor *color; + gint textAvg, bgAvg; - style = itemview_get_style (); + style = gtk_widget_get_style (widget); g_assert (NULL == themeColors); - themeColors = g_slist_append (themeColors, render_get_theme_color ("GTK-COLOR-FG", style->fg[GTK_STATE_NORMAL])); - themeColors = g_slist_append (themeColors, render_get_theme_color ("GTK-COLOR-BG", style->bg[GTK_STATE_NORMAL])); - themeColors = g_slist_append (themeColors, render_get_theme_color ("GTK-COLOR-LIGHT", style->light[GTK_STATE_NORMAL])); - themeColors = g_slist_append (themeColors, render_get_theme_color ("GTK-COLOR-DARK", style->dark[GTK_STATE_NORMAL])); - themeColors = g_slist_append (themeColors, render_get_theme_color ("GTK-COLOR-MID", style->mid[GTK_STATE_NORMAL])); - themeColors = g_slist_append (themeColors, render_get_theme_color ("GTK-COLOR-BASE", style->base[GTK_STATE_NORMAL])); - themeColors = g_slist_append (themeColors, render_get_theme_color ("GTK-COLOR-TEXT", style->text[GTK_STATE_NORMAL])); + themeColors = g_slist_append (themeColors, render_calculate_theme_color ("GTK-COLOR-FG", style->fg[GTK_STATE_NORMAL])); + themeColors = g_slist_append (themeColors, render_calculate_theme_color ("GTK-COLOR-BG", style->bg[GTK_STATE_NORMAL])); + themeColors = g_slist_append (themeColors, render_calculate_theme_color ("GTK-COLOR-LIGHT", style->light[GTK_STATE_NORMAL])); + themeColors = g_slist_append (themeColors, render_calculate_theme_color ("GTK-COLOR-DARK", style->dark[GTK_STATE_NORMAL])); + themeColors = g_slist_append (themeColors, render_calculate_theme_color ("GTK-COLOR-MID", style->mid[GTK_STATE_NORMAL])); + themeColors = g_slist_append (themeColors, render_calculate_theme_color ("GTK-COLOR-BASE", style->base[GTK_STATE_NORMAL])); + themeColors = g_slist_append (themeColors, render_calculate_theme_color ("GTK-COLOR-TEXT", style->text[GTK_STATE_NORMAL])); color = NULL; - gtk_widget_style_get (liferea_shell_get_window (), "link-color", &color, NULL); + gtk_widget_style_get (widget, "link-color", &color, NULL); if (color) { - themeColors = g_slist_append (themeColors, render_get_theme_color ("GTK-COLOR-NORMAL-LINK", *color)); + themeColors = g_slist_append (themeColors, render_calculate_theme_color ("GTK-COLOR-NORMAL-LINK", *color)); debug0 (DEBUG_HTML, "successfully set the color for links"); gdk_color_free (color); } color = NULL; - gtk_widget_style_get (liferea_shell_get_window (), "visited-link-color", &color, NULL); + gtk_widget_style_get (widget, "visited-link-color", &color, NULL); if (color) { - themeColors = g_slist_append (themeColors, render_get_theme_color("GTK-COLOR-VISITED-LINK", *color)); + themeColors = g_slist_append (themeColors, render_calculate_theme_color("GTK-COLOR-VISITED-LINK", *color)); debug0 (DEBUG_HTML, "successfully set the color for visited links"); gdk_color_free (color); } + + /* As there doesn't seem to be a safe way to determine wether we have a + dark GTK theme, let's guess it from the foreground vs. background + color average */ + + textAvg = style->text[GTK_STATE_NORMAL].red / 256 + + style->text[GTK_STATE_NORMAL].green / 256 + + style->text[GTK_STATE_NORMAL].blue / 256; + + bgAvg = style->bg[GTK_STATE_NORMAL].red / 256 + + style->bg[GTK_STATE_NORMAL].green / 256 + + style->bg[GTK_STATE_NORMAL].blue / 256; + + if (textAvg > bgAvg) { + debug0 (DEBUG_HTML, "Dark GTK theme detected."); + darkTheme = TRUE; + } } static gchar * @@ -226,6 +249,34 @@ } const gchar * +render_get_theme_color (const gchar *name) +{ + GSList *iter; + + if (!themeColors) + return NULL; + + iter = themeColors; + while (iter) { + themeColorPtr tc = (themeColorPtr)iter->data; + if (g_str_equal (name, tc->name)) + return tc->value; + iter = g_slist_next (iter); + } + + return NULL; +} + +gboolean +render_is_dark_theme (void) +{ + if (!themeColors) + return FALSE; + + return darkTheme; +} + +const gchar * render_get_css (gboolean externalCss) { if (!css) { @@ -235,7 +286,7 @@ gchar *tmp; if (!themeColors) - render_get_theme_colors(); + return NULL; css = g_string_new(NULL); @@ -251,7 +302,7 @@ g_free(defaultStyleSheetFile); - userStyleSheetFile = g_build_filename (common_get_cache_path (), "liferea.css", NULL); + userStyleSheetFile = common_create_config_filename ("liferea.css"); if (g_file_get_contents(userStyleSheetFile, &tmp, NULL, NULL)) { tmp = render_set_theme_colors(tmp); @@ -271,8 +322,8 @@ g_free(adblockStyleSheetFile); if (externalCss) { - /* dump CSS to cache file and create a