diff options
Diffstat (limited to '')
52 files changed, 556 insertions, 1032 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c5883ff8..192d12c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ -# Changes for Newsbeuter +# Changes for Newsboat ## 2.10 - Unreleased +This is what Newsbeuter 2.10 should have been. Newsboat continues Newsbeuter's +version numbering to show that we are a spiritual continuation, not a separate +project. + ### Added - Solarized-light colorscheme (OmeGa) - Japanese and Catalan translations (The Flying Rapist; Alejandro Gallo) @@ -126,456 +130,3 @@ Kerdoncuff) - Don't ignore config's last line if there's no \n at the end (#426) (Spiridonov Alexander) - - - -## 2.9 - 2015-02-19 - -### Added -- Support for FeedHQ - -### Changed -- Update to Brazilian Portuguese translation (#126) -- Code base now uses C++11 -- Don't override feed titles for hidden feeds -- Don't render inline images (#154) - -### Fixed -- Custom keybindings in tag and filter selection dialogs (#78) -- Incorrect reloading of tags after editing the urls file -- Dumpconfig -- Missing variable in log output (#124) -- Type of configuration variables to path where appropriate (#125) -- Crash when GUID is lost (#127) -- Dependency check (#132) -- Segfault in `jump_to_next_unread_item` (#133) -- Feeds appearing empty due to variable shadowing issue -- Catch an exception that might be thrown by the "killfile" function - - - -## 2.8 - 2014-01-19 - -### Added -- Bookmark script for getpocket.com support (Andreas Happe) -- Support for The Old Reader -- Support for NewsBlur (Thomas Weißschuh) - -### Changed -- In the feed list, quitting now is the same as clearing the tag in case a tag - is selected -- Make guid generation smarter (Jochen Sprickerhof) -- Update French translation (Sabrina Dubroca) - -### Fixed -- Issues with the build process on OpenBSD (Kyle Isom) -- Crash bug in filter expression parsing -- Crash bug with unbalanced `<ol>` tags (Richard Quirk) - - - -## 2.7 - 2013-08-27 - -### Added -- Option to colorize unread messages (Patrick Steinhardt) -- Option to swap title and hints bar (Patrick Steinhardt) -- `%u` and `%t` support to itemview (Giuliano Schneider) - -### Changed -- Only force redraw if a form action is active (Patrick Steinhardt) - -### Fixed -- Crash bug - - - -## 2.6 - 2013-03-19 - -### Added -- Support for `<q>` and `<aside>` tags (Daniel Aleksandersen) -- Norwegian bokmål translation (Daniel Aleksandersen) - -### Changed -- Style table headers in bold (Daniel Aleksandersen) -- Updated Russian translation (Justin Forest) -- Updated Polish translation (Michal Siemek) -- More compact default user-agent on Mac OS X (Daniel Aleksandersen) -- Remove all soft-hyphens (Daniel Aleksandersen) - -### Fixed -- Crash in RSS parser (thanks to Isaac Good) -- Authentication issues with Google Reader (thanks to Fabrice Noilhan) -- Bug in Google authentication (Daniel Aleksandersen). - - - -## 2.5 (2012-01-06): - -### Added -- `download-full-page` configuration option -- Configuration option to use external URL viewer (#242) -- Ability to store Google Reader password in an external file (#239) -- Tiny Tiny RSS support (#243) -- `delete-read-articles-on-quit` option - -### Changed -- HTTP authentication method is now configurable (#247) - -### Fixed -- Rendering of nested `<ol>` lists - - - -## 2.4 - 2011-02-01 - -### Added -- Support for query feeds in combination with Google Reader support -- Ability to configure proxy authentication method -- `-q` flag to enable quiet startup (Isaac Good) -- Keys to jump to the next/previous feed or article regardless of its "unread" - status (Jim Pryor) -- XDG Base Directory support (Elrond) -- `cookie-cache` configuration option (#234) -- On-demand loading of feeds to reduce memory usage -- Feedlist re-sorting after all feeds have been reloaded -- Support for Google Reader offline mode - -### Removed -- Bloglines support, as the service shuts down on October 1, 2010 - -### Fixed -- Google Reader authentication issue with certain passwords (#238) - - - -## 2.3 - 2010-06-24 - -### Changed -- Made newsbeuter silent on lockfile errors when '-x' option is used - -### Fixed -- HTML rendering of bold and underline text when light background is configured -- issues #192, #194, #197, #198, #199, #200, #201, #202, #210, #216 -- Google Reader authentication (by Seth Mason) - - - -## 2.2 - 2010-03-14 - -### Added -- Google Reader support -- Article highlighting in article list based on the article content (#174) -- "Hard quit" key to immediately quit from Newsbeuter (Jim Pryor) -- "Download status" format specifier for feedlist-format (#181). -- HTML table renderer (Stefan Erben) -- `open-in-browser-and-mark-read` key (Isaac Good) - -### Changed -- "Ignore article" functionality extended with different ignore modes - (download/display; #52) - -### Fixed -- Issues #90, #160, #161, #168, #169, #171, #179, #180, #184 -- Issues #183, #188 (Stefan Erben) - - - -## 2.1 - 2009-12-08 - -### Added -- Support for `dc:creator` tag for RSS 2.0 parser -- When entering a feed, the first unread article is automatically selected (can - be turned off with `goto-first-unread no`) -- When marking a feed read, move the selection to the next feed (unless a filter - is currently applied) -- Length field to article list format (Stefan Erben) -- Support for 256-color terminals -- `dumpform` commandline command as a debugging aid -- Allow deletion of articles from article view -- Support for SOCKS proxies -- `notify-beep` notification beep (Vern Sun) -- Key to quickly jump to article URLs above #10 (Stefan Erben) - -### Changed -- Improved HTML rendering (Stefan Erben) - -### Fixed -- Podbeuter ignored `use-proxy` configuration command (#144) - - - -## 2.0 - 2009-04-21 - -### Added -- More flexible dialog handling -- Ability to specify a list of OPML URLs when using OPML as URL source -- `keep-articles-days` config option to optionally keep articles only for - a limited number of days -- `bookmark-interactive` config option to indicate that the configured - bookmarking command is interactive -- Ability to search for text from the article view -- Basic support for Yahoo Media RSS -- `:source` commandline command to (re)load configuration files -- `age` attribute for articles to filter them for relative age (in days) -- Ability to configure local files as feeds -- `random-unread` key to go to a random unread article -- Ability to sort feed list and article list by interactively choosing the sort - method -- `pipe-to` key to pipe articles to external commands -- Backtick evaluation for configuration files -- Commandline completion -- `between` operator for filter language -- `set` commandline command can now toggle boolean variables and reset - configuration variables of all types to their default -- Commandline and search history persistence - -### Changed -- Improved position handling in article list (#112) (Isaac Good) -- Replaced mrss with new RSS/Atom parser -- Made article view pager configurable -- Improved HTML rendering of links and underlined and bold text -- When opening articles from a search result dialog, make search phrase stand - out in article view. -- Improved help dialog so that it now shows unbound functions -- Improved and extended conditional HTTP download handling - -### Fixed -- A lot of bugs (#102, #111, #117, #130, #131) -- Don't display authentication information in URLs (#121) - - - -## 1.3 - 2008-12-06 - -### Added -- Placeholders for `download-path` (#46) -- Ability to edit the list of subscribed URLs from newsbeuter through a text - editor -- A file format to exchange information about read articles between different - newsbeuter instances -- `feed-sort-order` configuration option to sort the feed list by the first tag -- Ability to toggle read flag from article view (Isaac Good) -- Ability to configure the number of parallel reload threads (#101) - -### Changed -- Some internal data structures now use smart pointers (stability improvement) -- Extended podbeuter to keep finished downloads in the queue until they've been - played -- Extended keymap to allow dialog-specific configuration -- Extended macros to enable modification of configuration variables - - - -## 1.2 - 2008-09-02 - -### Added -- `download-timeout` and `download-retries` config options to make newsbeuter - more reliable over unreliable connection (#88) - -### Changed -- Improved whitespace handling in XML parser (fixes Debian issue #496765) - -### Fixed -- Crash in case of invalid color/attribute names in the configuration -- Broken `open-in-browser` operation for URLs that contained a single quote - (fixes Debian issue #497495; fixes incomplete security fix) - - - -## 1.1 - 2008-09-01 - -### Added -- Line wrap for the article view's headers and the link list on the bottom - (fixes Debian issue #491122) -- Test suite for functional tests of the user interface - -### Security -- Fixed potential security issue when opening article URLs with the configured - browser (thanks to J.H.M. Dassen (Ray) for pointing out) - - - -## 1.0 - 2008-08-20 - -### Added -- Support for highlighting of regular expressions -- Search function in help dialog -- `show-read-articles` configuration option to toggle displaying of read - articles -- `always-download` configuration option to configure a list of feed URLs for - which newsbeuter ignores the Last-Modified timestamp -- Reading progress display in article view -- Optional format string support for `browser` configuration option -- `reset-unread-on-update` configuration command - - - -## 0.9.1 - 2008-05-12 - -### Added -- Ability to open feed's link by pressing the `open-in-browser` key in feed list. - -### Fixed -- Issue with filter feeds -- Issue with RFC-822 date parsing where the year only had 2 digits - - - -## 0.9 - 2008-05-01 - -### Added -- Commandline option to podbeuter to automatically start download -- `article-sort-order` configuration option to freely configure the sort order - of article lists -- Ability to delete articles - -### Changed -- Improved locking to allow multiple newsbeuter instances (one instance per - cache file) -- Flagged articles don't get deleted anymore - -### Fixed -- Lots of bug fixes - - - -## 0.8.2 - 2008-03-16 - -### Fixed -- Broken string conversion - - - -## 0.8.1 - 2008-03-12 - -### Fixed -- Crash (related to string conversion of format string support) - - - -## 0.8 - 2008-03-07 - -### Added -- Custom configurability of feed list and article list format -- Special tags to rename feeds -- Macro support -- Ruby scripting support - -### Changed -- Improved reload speed by checking the Last-Modified header -- Directly integrated nxml/mrss code since API and ABI are a moving target - - - -## 0.7 - 2007-09-18 - -### Added -- Possibility to predefine filters -- Bloglines synchronization support -- OPML online subscription support -- Plugin-based bookmarking support -- Custom flagging of articles -- Implemented more key commands to ease navigation even more -- Possibility to optionally use an external HTML renderer - -### Changed -- Redesigned search function - - - -## 0.6 - 2007-08-14 - -### Added -- Support for reloading the urls file -- Query feeds -- History for the most important input fields -- Additional commandline commands - -### Fixed -- Major bug with filtering in the item list -- OPML import functionality - - - -## 0.5 - 2007-08-02 - -### Added -- Unicode compatibility -- Support for notifications -- Filter language -- It is now possible to freely configure e.g. the up/down-keys - -### Changed -- Improved HTML rendering -- Improved lock file handling - - - -## 0.4 - 2007-05-08 - -### Added -- Configuration option to disable cache cleanup (user request) -- Configuration option to set the HTTP user-agent header to a custom value -- Italian translation (Andrea Marchesini) -- Unit tests -- `include` configuration command to make it possible to separate the - configuration into several files -- Global configuration file /etc/newsbeuter/config -- Support for Snownews/Liferea extension scripts - -### Changed -- Refactored view -- Significant speed improvement for reload and cache cleanup (Jürgen Jung) - - - -## 0.3 - 2007-03-26 - -### Added -- gettext support -- Podcast support - -### Changed -- Now, everything is stored as UTF-8 internally, and gets converted on-the-fly - -### Removed -- Dependency to `libidn` - -### Fixed -- Numerous bugs - - - -## 0.2 - 2007-02-21 - -### Added -- Possibility to use the space key for key bindings -- Possibility to view all URLs within an article and open them in a browser -- HTTP proxy support -- Color configuration support -- Tagging/categorization support -- Auto-reload support -- Search dialog - -### Changed -- `next unread` function now works across feeds when in item view -- Improved HTML rendering (occasional missing spaces, `<pre>` tags) - -### Removed -- Unnecessary mutex lock/unlock that made newsbeuter lock up when the - `max-items` config option was set - - - -## 0.1.1 - 2007-01-17 - -### Fixed -- Crash when ISO-8859-1 encoded feeds with umlauts in the title were displayed - on systems with UTF-8 locales enabled - - - -## 0.1 - 2007-01-16 - -### Added -- This is an initial release of Newsbeuter @@ -3,6 +3,7 @@ MIT/X Consortium License Copyright 2006-2015 Andreas Krennmair <ak@newsbeuter.org> Copyright 2015-2017 Alexander Batischev <eual.jp@gmail.com> Copyright 2006-2017 Newsbeuter contributors +Copyright 2017 Newsboat contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -24,7 +24,7 @@ BARE_CXXFLAGS=-std=c++11 -ggdb $(INCLUDES) CXXFLAGS+=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) LDFLAGS+=-L. -fprofile-arcs -ftest-coverage -PACKAGE=newsbeuter +PACKAGE=newsboat ifeq (, $(filter $(MAKECMDGOALS),distclean run-i18nspector)) include config.mk @@ -42,7 +42,7 @@ FILTERLIB_SOURCES=filter/Scanner.cpp filter/Parser.cpp filter/FilterParser.cpp FILTERLIB_OBJS:=$(patsubst %.cpp,%.o,$(FILTERLIB_SOURCES)) FILTERLIB_OUTPUT=libfilter.a -NEWSBEUTER=newsbeuter +NEWSBEUTER=newsboat NEWSBEUTER_SOURCES:=$(shell cat mk/newsbeuter.deps) NEWSBEUTER_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBEUTER_SOURCES)) NEWSBEUTER_LIBS=-lbeuter -lfilter -lpthread -lrsspp @@ -52,7 +52,7 @@ RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SOURCES)) RSSPPLIB_OUTPUT=librsspp.a -PODBEUTER=podbeuter +PODBEUTER=podboat PODBEUTER_SOURCES:=$(shell cat mk/podbeuter.deps) PODBEUTER_OBJS:=$(patsubst %.cpp,%.o,$(PODBEUTER_SOURCES)) PODBEUTER_LIBS=-lbeuter -lpthread @@ -139,11 +139,11 @@ clean: clean-newsbeuter clean-podbeuter clean-libbeuter clean-libfilter clean-do distclean: clean clean-mo test-clean profclean $(RM) core *.core core.* config.mk -doc: doc/xhtml/newsbeuter.html doc/xhtml/faq.html doc/newsbeuter.1 doc/podbeuter.1 +doc: doc/xhtml/newsboat.html doc/xhtml/faq.html doc/newsboat.1 doc/podboat.1 -doc/xhtml/newsbeuter.html: doc/newsbeuter.txt +doc/xhtml/newsboat.html: doc/newsboat.txt $(MKDIR) doc/xhtml - $(A2X) -f xhtml -D doc/xhtml doc/newsbeuter.txt + $(A2X) -f xhtml -D doc/xhtml doc/newsboat.txt $(CHMOD) u+w doc/xhtml/docbook-xsl.css doc/xhtml/faq.html: doc/faq.txt @@ -157,14 +157,14 @@ doc/newsbeuter-cfgcmds.txt: doc/generate.pl doc/configcommands.dsv doc/newsbeuter-keycmds.txt: doc/generate2.pl doc/keycmds.dsv doc/generate2.pl doc/keycmds.dsv > doc/newsbeuter-keycmds.txt -doc/newsbeuter.1: doc/manpage-newsbeuter.txt doc/newsbeuter-cfgcmds.txt doc/newsbeuter-keycmds.txt - $(A2X) -f manpage doc/manpage-newsbeuter.txt +doc/newsboat.1: doc/manpage-newsboat.txt doc/newsbeuter-cfgcmds.txt doc/newsbeuter-keycmds.txt + $(A2X) -f manpage doc/manpage-newsboat.txt doc/podbeuter-cfgcmds.txt: doc/generate.pl doc/podbeuter-cmds.dsv doc/generate.pl doc/podbeuter-cmds.dsv > doc/podbeuter-cfgcmds.txt -doc/podbeuter.1: doc/manpage-podbeuter.txt doc/podbeuter-cfgcmds.txt - $(A2X) -f manpage doc/manpage-podbeuter.txt +doc/podboat.1: doc/manpage-podboat.txt doc/podbeuter-cfgcmds.txt + $(A2X) -f manpage doc/manpage-podboat.txt fmt: astyle --suffix=none --style=java --indent=tab --indent-classes *.cpp include/*.h src/*.cpp rss/*.{cpp,h} test/*.cpp @@ -1,35 +1,24 @@ -Newsbeuter [](https://travis-ci.org/akrennmair/newsbeuter) [](https://coveralls.io/github/akrennmair/newsbeuter?branch=master) -===================== -by Andreas Krennmair <ak@newsbeuter.org> +Newsboat +======== -<a href="http://newsbeuter.org"> -<img - src="https://newsbeuter.files.wordpress.com/2008/04/newsbeuter_640x640.png" - align="left" height="80" width="80" vspace="6" /></a> - -Newsbeuter is an RSS feed reader for the text console. Zed Shaw -[called](http://zedshaw.com/archive/i-want-the-mutt-of-feed-readers/) it "The -Mutt of Feed Readers". - -It is designed to run on Unix-like operating systems such as GNU/Linux and -FreeBSD. NetBSD is currently not supported, due to technical limitations. +Newsboat is an actively maintained fork of Newsbeuter, an RSS/Atom feed reader +for the text console. Downloading ----------- -You can download the latest version of newsbeuter from the following website: -http://www.newsbeuter.org/ +You can download the latest version of Newsboat from the official site: +https://newsboat.org/ -Alternatively, you can check out the latest version from the newsbeuter -Git repository (hosted on GitHub): +Alternatively, you can check out the latest version from the Git repository: - git clone git://github.com/akrennmair/newsbeuter.git + git clone git://github.com/newsboat/newsboat.git Dependencies ------------ -Newsbeuter depends on a number of libraries, which need to be installed before -newsbeuter can be compiled. +Newsboat depends on a number of libraries, which need to be installed before +newsboat can be compiled. - GCC 4.9 or newer, or Clang 3.6 or newer - [STFL (version 0.21 or newer)](http://www.clifford.at/stfl/) @@ -45,7 +34,8 @@ Debian unstable comes with ready-to-use packages for these dependencies. Installation ------------ -Compiling and installing newsbeuter is as simple as: + +Compiling and installing newsboat is as simple as: make make install @@ -63,21 +53,17 @@ If you're a developer, here's how you can run the test suite: Note the use of ramdisk as `TMPDIR`: some of our tests require temporary files, which degrades the performance quite a bit if `TMPDIR` isn't in-memory. -Contact -------- -Andreas Krennmair <ak@newsbeuter.org> - Support ------- * Bugs and whatnot should be reported to the - [issue tracker](https://github.com/akrennmair/newsbeuter/issues) + [issue tracker](https://github.com/newsboat/newsboat/issues) * Drop us a line at - [Newsbeuter mailing list](http://groups.google.com/group/newsbeuter) -* Chat with developers and fellow users on #newsbeuter at + [newsboat mailing list](http://groups.google.com/group/newsboat) +* Chat with developers and fellow users on #newsboat at [Freenode](https://freenode.net) License ------- -Newsbeuter is licensed under the MIT/X Consortium License. See the file LICENSE +Newsboat is licensed under the MIT/X Consortium License. See the file LICENSE for further details. @@ -1,7 +1,7 @@ #ifndef NEWSBEUTER_CONFIG__H #define NEWSBEUTER_CONFIG__H -#define PACKAGE "newsbeuter" +#define PACKAGE "newsboat" #define PROGRAM_NAME PACKAGE #define REAL_VERSION "2.10" @@ -11,11 +11,11 @@ #define PROGRAM_VERSION REAL_VERSION #endif -#define PROGRAM_URL "http://www.newsbeuter.org/" +#define PROGRAM_URL "https://newsboat.org/" #define NEWSBEUTER_PATH_SEP "/" -#define NEWSBEUTER_CONFIG_SUBDIR ".newsbeuter" -#define NEWSBEUTER_SUBDIR_XDG "newsbeuter" +#define NEWSBEUTER_CONFIG_SUBDIR ".newsboat" +#define NEWSBEUTER_SUBDIR_XDG "newsboat" #include <libintl.h> #include <locale.h> diff --git a/contrib/getpocket.com/create-pocket-user-token.sh b/contrib/getpocket.com/create-pocket-user-token.sh index ddb2112e..c5c7666e 100755 --- a/contrib/getpocket.com/create-pocket-user-token.sh +++ b/contrib/getpocket.com/create-pocket-user-token.sh @@ -7,13 +7,13 @@ APPLICATION_CONSUMER_KEY="19002-18d9a9028a5ae783a9caabcd" -output=`wget --post-data '{ "consumer_key":"19002-18d9a9028a5ae783a9caabcd", "redirect_uri":"https://github.com/akrennmair/newsbeuter/blob/c8c92a17fa0862fb7a648e88723eb48cb9cb582c/contrib/getpocket.com/after_authentication.md"}' --header="Content-Type: application/json; charset=UTF-8" --header "X-Accept: application/json" "https://getpocket.com/v3/oauth/request" -O - 2>/dev/null` +output=`wget --post-data '{ "consumer_key":"19002-18d9a9028a5ae783a9caabcd", "redirect_uri":"https://github.com/newsboat/newsboat/blob/c8c92a17fa0862fb7a648e88723eb48cb9cb582c/contrib/getpocket.com/after_authentication.md"}' --header="Content-Type: application/json; charset=UTF-8" --header "X-Accept: application/json" "https://getpocket.com/v3/oauth/request" -O - 2>/dev/null` # shamelessy copy this from contrib/bookmark-pinboard TMP_TOKEN=`echo $output | sed 's/^.*\"code\":"\([^"]*\)".*$/\1/'` # redirect user to pocket authentication page -AUTH_URL="https://getpocket.com/auth/authorize?request_token=$TMP_TOKEN&redirect_uri=https://github.com/akrennmair/newsbeuter/blob/c8c92a17fa0862fb7a648e88723eb48cb9cb582c/contrib/getpocket.com/after_authentication.md" +AUTH_URL="https://getpocket.com/auth/authorize?request_token=$TMP_TOKEN&redirect_uri=https://github.com/newsboat/newsboat/blob/c8c92a17fa0862fb7a648e88723eb48cb9cb582c/contrib/getpocket.com/after_authentication.md" echo $TMP_TOKEN> /tmp/pocket_token echo "please navigate to $AUTH_URL, active the access. Then press enter" diff --git a/doc/chapter-cmdline.txt b/doc/chapter-cmdline.txt index 925f809c..ed901eb5 100644 --- a/doc/chapter-cmdline.txt +++ b/doc/chapter-cmdline.txt @@ -1,6 +1,6 @@ -Like other text-oriented software, newsbeuter contains an internal commandline to +Like other text-oriented software, Newsboat contains an internal commandline to modify configuration variables ad hoc and to run own commands. It provides a flexible -access to the functionality of newsbeuter which is especially useful for +access to the functionality of Newsboat which is especially useful for advanced users. To start the commandline, type ":". You will see a ":" prompt at the bottom of @@ -8,17 +8,17 @@ the screen, similar to tools like vi(m) or mutt. You can now enter commands. Pressing the return key executes the command (possibly giving feedback to the user) and closes the commandline. You can cancel entering commands by pressing the ESC key. The history of all the commands that you enter will be saved to -\~/.newsbeuter/history.cmdline. The backlog is limited to 100 entries by default, +\~/.newsboat/history.cmdline. The backlog is limited to 100 entries by default, but can be influenced by setting the "history-limit" configuration variable. To disable history saving, set the history-limit to 0. -Starting with newsbeuter 2.0, the commandline provides you with some help if -you can't remember the full names of commandline commands. By pressing the TAB -key, newsbeuter will try to automatically complete your command. If there is -more than one possible completion, you can subsequently press the TAB key to -cycle through all results. If no match is found, no suggestion will be inserted -into the commandline. For the "set" command, the completion also works for -configuration variable names. +The commandline provides you with some help if you can't remember the full +names of commandline commands. By pressing the TAB key, newsboat will try to +automatically complete your command. If there is more than one possible +completion, you can subsequently press the TAB key to cycle through all +results. If no match is found, no suggestion will be inserted into the +commandline. For the "set" command, the completion also works for configuration +variable names. In addition, some common key combination such as Ctrl-G (to cancel input), Ctrl-K (to delete text from the cursor position to the end of line), Ctrl-U (to @@ -27,7 +27,7 @@ position) were added. Please be aware that the input history of both the command line and the search functions are saved to the filesystems, to the files -\~/.newsbeuter/history.cmdline resp. \~/.newsbeuter/history.search. By default, +\~/.newsboat/history.cmdline resp. \~/.newsboat/history.search. By default, the last 100 entries are saved, but this can be configured (configuration variable history-limit) and also totally disabled (by setting said variable to 0). diff --git a/doc/chapter-firststeps.txt b/doc/chapter-firststeps.txt index acff5ec6..25144205 100644 --- a/doc/chapter-firststeps.txt +++ b/doc/chapter-firststeps.txt @@ -1,10 +1,10 @@ -After you've installed newsbeuter, you can run it for the first time by typing -"newsbeuter" on your command prompt. This will bring you the following message: +After you've installed newsboat, you can run it for the first time by typing +"newsboat" on your command prompt. This will bring you the following message: - Error: no URLs configured. Please fill the file /home/ak/.newsbeuter/urls with RSS feed URLs or import an OPML file. + Error: no URLs configured. Please fill the file /home/ak/.newsboat/urls with RSS feed URLs or import an OPML file. - newsbeuter 2.10 - usage: ./newsbeuter [-i <file>|-e] [-u <urlfile>] [-c <cachefile>] [-x <command> ...] [-h] + newsboat 2.10 + usage: ./newsboat [-i <file>|-e] [-u <urlfile>] [-c <cachefile>] [-x <command> ...] [-h] -e, --export-to-opml export OPML feed to stdout -r, --refresh-on-start refresh feeds on start -i, --import-from-opml=<file> import OPML file @@ -21,9 +21,9 @@ After you've installed newsbeuter, you can run it for the first time by typing -I, --import-from-file=<file> import list of read articles from <file> -h, --help this help -This means that newsbeuter can't start without any configured feeds. To add -feeds to newsbeuter, you can either add URLs to the configuration file -$HOME/.newsbeuter/urls or you can import an OPML file by running "newsbeuter -i +This means that newsboat can't start without any configured feeds. To add +feeds to newsboat, you can either add URLs to the configuration file +$HOME/.newsboat/urls or you can import an OPML file by running "newsboat -i blogroll.opml". To manually add URLs, open the file with your favorite text editor and add the URLs, one per line: @@ -36,18 +36,18 @@ provide the username/password in the following way: http://username:password@hostname.domain.tld/feed.rss In order to protect username and password, make sure that -$HOME/.newsbeuter/urls has the appropriate permissions. Newsbeuter also makes +$HOME/.newsboat/urls has the appropriate permissions. Newsboat also makes sure that usernames and passwords within URLs aren't displayed in its user interface. In case there is a '@' in the username, you need to write it as '%40' instead so that it can be distinguished from the '@' that separates the username/password part from the hostname part. You can also configure local files as feeds, by prefixing the local path with -"file://" and adding it to the $HOME/.newsbeuter/urls file: +"file://" and adding it to the $HOME/.newsboat/urls file: file:///var/log/rss_eventlog.xml -Now you can run newsbeuter again, and it will present you with a controllable +Now you can run newsboat again, and it will present you with a controllable list of the URLs that you configured previously. You can now start downloading the feeds, either by pressing "R" to download all feeds, or by pressing "r" to download the currently selected feed. You can then select a feed you want to @@ -59,15 +59,15 @@ article. You can scroll through this text, and also run a browser (default: lynx) to view the complete article if the content is empty or just an abstract or a short description. Pressing "q" brings you back to the article list, and pressing "q" again brings you back to the feed list. Pressing "q" a third time -then closes newsbeuter. +then closes newsboat. -Newsbeuter caches the article that it downloads. This means that when you start -newsbeuter again and reload a feed, the old articles can still be read even if +Newsboat caches the article that it downloads. This means that when you start +newsboat again and reload a feed, the old articles can still be read even if they aren't in the current RSS feeds anymore. Optionally you can configure how many articles shall be preserved by feed so that the article backlog doesn't grow endlessly (see "max-items" below). -Newsbeuter also uses a number of measures to preserve the users' and feed +Newsboat also uses a number of measures to preserve the users' and feed providers' bandwidth, by trying to avoid unnecessary feed downloads through the use of conditional HTTP downloading. It saves every feed's "Last-Modified" and "ETag" response header values (if present) and advises the feed's HTTP server @@ -77,8 +77,8 @@ updates faster, it also reduces the amount of transferred data per request. Conditional HTTP downloading can be optionally disabled per feed by using the "always-download" configuration command. -Several aspects of newsbeuter's behaviour can be configured via a configuration -file, by default $HOME/.newsbeuter/config. This configuration file contains +Several aspects of newsboat's behaviour can be configured via a configuration +file, by default $HOME/.newsboat/config. This configuration file contains lines in the form "<config-command> <arg1> ...". The configuration file can also contain comments, which start with the '#' character and go as far as the end of line. If you need to enter a configuration argument that contains @@ -91,7 +91,7 @@ system within the configuration. Backticks can be escaped with a backslash ("\`"); in that case, they'll be replaced with a literal backtick in the configuration. -Searching for articles is possible in newsbeuter, too. Just press the "/" key, +Searching for articles is possible in newsboat, too. Just press the "/" key, enter your search phrase, and the title and content of all articles are searched for it. When you do a search from the list of feeds, all articles of all feeds will be searched. When you do a search from the article list of a @@ -99,7 +99,7 @@ feed, only the articles of the currently viewed feed are searched. When opening an article from a search result dialog, the search phrase is highlighted. The history of all your searches is saved to the filesystem, to -\~/.newsbeuter/history.search. By default, the last 100 search phrases are +\~/.newsboat/history.search. By default, the last 100 search phrases are stored, but this limited can be influenced through the "history-limit" configuration variable. To disable search history saving, simply set the history-limit to 0. diff --git a/doc/chapter-password.txt b/doc/chapter-password.txt index e5faf353..825b3b41 100644 --- a/doc/chapter-password.txt +++ b/doc/chapter-password.txt @@ -7,25 +7,25 @@ This is useful if the user wants to share the configuration file online or store the password in a password manager or the systems keyring. For example when using the API for "The Old Reader", -Newsbeuter will first check the `oldreader-password` configuration variable, +newsboat will first check the `oldreader-password` configuration variable, if this variable is set (meaning it's present and not empty), then its value will be used for authentication. If `oldreader-password` is not set (meaning it's not present or it's empty) but the `oldreader-passwordfile` configuration variable is set, then the first line of this file will be used as the password. This is, unless the file doesn't exist, is unreadable or its first line is empty, -in those cases Newsbeuter will exit with an error. +in those cases Newsboat will exit with an error. If `oldreader-passwordfile` is not set but `oldreader-passwordeval` is set, then the command will be evaluated and the first line of the result will be used as the password. This is, unless the first line of the result's string is empty, -in those cases Newsbeuter will exit with an error. -Newsbeuter will ignore the exit status of the command, +in those cases Newsboat will exit with an error. +Newsboat will ignore the exit status of the command, however it will wait for the command to exit. -The command's output to stderr will be ignored by Newsbeuter and forwarded to +The command's output to stderr will be ignored by Newsboat and forwarded to the user, the output to stdout on the other hand will never be printed. If neither `oldreader-password`, `oldreader-passwordfile` nor -`oldreader-passwordeval` are set, then Newsbeuter will ask for the user's +`oldreader-passwordeval` are set, then Newsboat will ask for the user's password with an interactive prompt. The entered password will be used unless it is empty, -in which case Newsbeuter will exit with an error. +in which case Newsboat will exit with an error. diff --git a/doc/chapter-podcasts.txt b/doc/chapter-podcasts.txt index ebcc6add..353def3b 100644 --- a/doc/chapter-podcasts.txt +++ b/doc/chapter-podcasts.txt @@ -1,23 +1,23 @@ A podcast is a media file distributed over the internet using syndication feeds -such as RSS, for later playback on portable players or computers. Newsbeuter +such as RSS, for later playback on portable players or computers. Newsboat contains support for downloading and saving podcasts. This support differs a bit from other podcast aggregators or "podcatchers" in how it is done. Podcast content is transported in RSS feeds via special tags called -"enclosures". Newsbeuter recognizes these enclosures and stores the relevant +"enclosures". Newsboat recognizes these enclosures and stores the relevant information for every podcast item it finds in an RSS feed. Since version 2.0, it also recognizes and handles the Yahoo Media RSS extensions. What the user then can do is to add the podcast download URL to a download queue. -Alternatively, newsbeuter can be configured to automatically do that. This -queue is stored in the file $HOME/.newsbeuter/queue. +Alternatively, newsboat can be configured to automatically do that. This +queue is stored in the file $HOME/.newsboat/queue. -The user can then use the download manager "podbeuter" to download these files -to a directory on the local filesystem. Podbeuter comes with the newsbeuter -package, and features a look and feel very close to the one of newsbeuter. It +The user can then use the download manager "podboat" to download these files +to a directory on the local filesystem. Podboat comes with the newsboat +package, and features a look and feel very close to the one of newsboat. It also shares the same configuration file. Podcasts that have been downloaded but haven't been played yet remain in the queue but are marked as downloaded. You can remove them by purging them from -the queue with the 'P' key. After you've played a file and close podbeuter, it +the queue with the 'P' key. After you've played a file and close podboat, it will be removed from the queue. The downloaded file remains on the filesystem. diff --git a/doc/chapter-snownews.txt b/doc/chapter-snownews.txt index 30c6b4ef..fb8aacde 100644 --- a/doc/chapter-snownews.txt +++ b/doc/chapter-snownews.txt @@ -1,14 +1,14 @@ -From version 0.4 on, newsbeuter contains support for Snownews extensions. The +Newsboat contains support for Snownews extensions. The RSS feed readers Snownews and Liferea share a common way of extending the readers with custom scripts. Two mechanisms, namely "execurl" and "filter" type -scripts, are available and supported by newsbeuter. +scripts, are available and supported by newsboat. An "execurl" script can be any program that gets executed and whose output is interpreted as RSS feed, while "filter" scripts are fed with the content of a configured URL and whose output is interpreted as RSS feed. The configuration is simple and straight-forward. Just add to your -~/.newsbeuter/urls file configuration lines like the following ones: +~/.newsboat/urls file configuration lines like the following ones: exec:~/bin/execurl-script filter:~/bin/filter-script:http://some.test/url diff --git a/doc/chapter-tagging.txt b/doc/chapter-tagging.txt index 88dcd948..e3e4df4a 100644 --- a/doc/chapter-tagging.txt +++ b/doc/chapter-tagging.txt @@ -1,19 +1,19 @@ -Newsbeuter comes with the possibility to categorize or "tag", as we call it, -RSS feeds. Every RSS feed can be assigned 0 or more tags. Within newsbeuter, you +Newsboat comes with the possibility to categorize or "tag", as we call it, +RSS feeds. Every RSS feed can be assigned 0 or more tags. Within newsboat, you can then select to only show RSS feeds that match a certain tag. That makes it easy to categorize your feeds in a flexible and powerful way. -Usually, the \~/.newsbeuter/urls file contains one RSS feed URL per line. To +Usually, the \~/.newsboat/urls file contains one RSS feed URL per line. To assign a tag to an RSS feed, simply attach it as a single word, separated by blanks such as space or tab. If the tag needs to contain spaces, you must use -quotes (") around the tag (see example below). An example \~/.newsbeuter/urls +quotes (") around the tag (see example below). An example \~/.newsboat/urls file may look like this: http://blog.fefe.de/rss.xml?html interesting conspiracy news "cool stuff" http://rss.orf.at/news.xml news orf http://www.heise.de/newsticker/heise.rdf news interesting -When you now start newsbeuter with this configuration, you can press "t" to select +When you now start newsboat with this configuration, you can press "t" to select a tag. When you select the tag "news", you will see all three RSS feeds. Pressing "t" again and e.g. selecting the "conspiracy" tag, you will only see the http://blog.fefe.de/rss.xml?html RSS feed. Pressing "^T" clears the current tag, diff --git a/doc/configcommands.dsv b/doc/configcommands.dsv index a18cef74..b9b11252 100644 --- a/doc/configcommands.dsv +++ b/doc/configcommands.dsv @@ -2,27 +2,27 @@ always-display-description|[true/false]|false|If true, then the description will always-download|<rssurl> [<rssurl>]|n/a|The parameters of this configuration command are one or more RSS URLs. These URLs will always get downloaded, regardless of their Last-Modified timestamp and ETag header.|always-download "http://www.n-tv.de/23.rss" article-sort-order|<sortfield>[-<direction>]|date|The sortfield specifies which article property shall be used for sorting (currently available: date, title, flags, author, link, guid). The optional direction specifies the sort direction ("asc" specifies ascending sorting, "desc" specifies descending sorting. for date, "desc" is default, for all others, "asc" is default).|article-sort-order author-desc articlelist-format|<format>|"%4i %f %D %6L %?T?;%-17T; ?%t"|This variable defines the format of entries in the article list. See the respective section in the documentation for more information on format strings (note that the semicolon should actually be a vertical bar; this is a limitation in AsciiDoc).|articlelist-format "%4i %f %D %?T?;%-17T; ?%t" -articlelist-title-format|<format>|"%N %V - Articles in feed '%T' (%u unread, %t total) - %U"|Format of the title in article list. See "Format Strings" section of Newsbeuter manual for details on available formats.|articlelist-title-format "Articles in feed '%T' (%u unread)" +articlelist-title-format|<format>|"%N %V - Articles in feed '%T' (%u unread, %t total) - %U"|Format of the title in article list. See "Format Strings" section of Newsboat manual for details on available formats.|articlelist-title-format "Articles in feed '%T' (%u unread)" auto-reload|[yes/no]|no|If enabled, all feeds will be automatically reloaded at start up and then continuously after a certain time has passed (see reload-time).|auto-reload yes bind-key|<key> <operation> [<dialog>]|n/a|Bind key <key> to <operation>. This means that whenever <key> is pressed, then <operation> is executed (if applicable in the current dialog). A list of available operations can be found below. Optionally, you can specify a dialog. If you specify one, the key binding will only be added to the specified dialog. Available dialogs are "all" (default if none is specified), "feedlist", "filebrowser", "help", "articlelist", "article", "tagselection", "filterselection", "urlview" and "podbeuter".|bind-key ^R reload-all bookmark-autopilot|[yes/no]|no|If set to yes, the configured bookmark command is executed without any further input asked from user, unless the url or the title cannot be found/guessed.|bookmark-autopilot yes bookmark-cmd|<bookmark-command>|""|If set, then <bookmark-command> will be used as bookmarking plugin. See the documentation on bookmarking for further information.|bookmark-cmd "~/bin/delicious-bookmark.sh" bookmark-interactive|[yes/no]|no|If set to yes, then the configured bookmark command is an interactive program.|bookmark-interactive yes browser|<browser-command>|lynx|Set the browser command to use when opening an article in the browser. If <browser-command> contains %u, it will be used as complete commandline and %u will be replaced with the URL that shall be opened.|browser "w3m %u" -cache-file|<path>|"~/.newsbeuter/cache.db"|This configuration option sets the cache file. This is especially useful if the filesystem of your home directory doesn't support proper locking (e.g. NFS).|cache-file "/tmp/testcache.db" +cache-file|<path>|"~/.newsboat/cache.db"|This configuration option sets the cache file. This is especially useful if the filesystem of your home directory doesn't support proper locking (e.g. NFS).|cache-file "/tmp/testcache.db" cleanup-on-quit|[yes/no]|yes|If yes, then the cache gets locked and superfluous feeds and items are removed, such as feeds that can't be found in the urls configuration file anymore.|cleanup-on-quit no color|<element> <fgcolor> <bgcolor> [<attr> ...]|n/a|Set the foreground color, background color and optional attributes for a certain element|color background white black -confirm-exit|[yes/no]|no|If set to yes, then newsbeuter will ask for confirmation whether the user really wants to quit newsbeuter.|confirm-exit yes -cookie-cache|<file>|""|Set a cookie cache. If set, then cookies will be cached (i.e. read from and written to) in this file.|cookie-cache "~/.newsbeuter/cookies.txt" +confirm-exit|[yes/no]|no|If set to yes, then newsboat will ask for confirmation whether the user really wants to quit newsboat.|confirm-exit yes +cookie-cache|<file>|""|Set a cookie cache. If set, then cookies will be cached (i.e. read from and written to) in this file.|cookie-cache "~/.newsboat/cookies.txt" datetime-format|<date/time format>|%b %d|This format specifies the date/time format in the article list. For a detailed documentation on the allowed formats, consult the manpage of strftime(3).|datetime-format "%D, %R" define-filter|<name> <filter>|n/a|With this command, you can predefine filters, which you can later select from a list, and which are then applied after selection. This is especially useful for filters that you need often and you don't want to enter them every time you need them.|define-filter "all feeds with 'fun' tag" "tags # \\"fun\\"" -delete-read-articles-on-quit|[yes/no]|"no"|If set to "yes", then all read articles will be deleted when you quit newsbeuter.|delete-read-articles-on-quit yes -dialogs-title-format|<format>|"%N %V - Dialogs"|Format of the title in dialog list. See "Format Strings" section of Newsbeuter manual for details on available formats.|N %V - Dialogs|dialogs-title-format "Dialogs" +delete-read-articles-on-quit|[yes/no]|"no"|If set to "yes", then all read articles will be deleted when you quit newsboat.|delete-read-articles-on-quit yes +dialogs-title-format|<format>|"%N %V - Dialogs"|Format of the title in dialog list. See "Format Strings" section of Newsboat manual for details on available formats.|N %V - Dialogs|dialogs-title-format "Dialogs" display-article-progress|[yes/no]|yes|If set to yes, then a read progress (in percent) is displayed in the article view. Otherwise, no read progress is displayed.|display-article-progress no download-full-page|[yes/no]|no|If set to yes, then for all feed items with no content but with a link, the link is downloaded and the result used as content instead. This may significantly increase the download times of "empty" feeds.|download-full-page yes -download-retries|<number retries>|1|How many times newsbeuter shall try to successfully download a feed before giving up. This is an option to improve the success of downloads on slow and shaky connections such as via a TOR proxy.|download-retries 4 -download-timeout|<seconds>|30|The number of seconds newsbeuter shall wait when downloading a feed before giving up. This is an option to improve the success of downloads on slow and shaky connections such as via a TOR proxy.|download-timeout 60 -error-log|<path>|""|If set, then user errors (e.g. errors regarding defunct RSS feeds) will be logged to this file.|error-log "~/.newsbeuter/error.log" +download-retries|<number retries>|1|How many times newsboat shall try to successfully download a feed before giving up. This is an option to improve the success of downloads on slow and shaky connections such as via a TOR proxy.|download-retries 4 +download-timeout|<seconds>|30|The number of seconds newsboat shall wait when downloading a feed before giving up. This is an option to improve the success of downloads on slow and shaky connections such as via a TOR proxy.|download-timeout 60 +error-log|<path>|""|If set, then user errors (e.g. errors regarding defunct RSS feeds) will be logged to this file.|error-log "~/.newsboat/error.log" external-url-viewer|<command>|""|If set, then "show-urls" will pipe the current article to a specific external tool instead of using the internal URL viewer. This can be used to integrate tools such as urlview.|external-url-viewer "urlview" feed-sort-order|<sortorder>|none|If set to "firsttag", the feeds in the feed list will be sorted by their first tag in the urls file.|feed-sort-order firsttag feedhq-flag-share|<flag>|""|If this is set and FeedHQ support is used, then all articles that are flagged with the specified flag are being "shared" in FeedHQ so that people that follow you can see it.|feedhq-flag-share "a" @@ -35,20 +35,20 @@ feedhq-passwordeval|<command>|""|Another secure alternative, is providing your p feedhq-show-special-feeds|[yes/no]|yes|If this is set, then "special feeds" like "People you follow" (articles shared by people you follow), "Starred items" (your starred articles) and "Shared items" (your shared articles) appear in your subscription list.|feedhq-show-special-feeds "no" feedhq-url|<url>|"https://feedhq.org/"|Configures the URL where your FeedHQ instance resides.|feedhq-url "https://feedhq.example.com/" feedlist-format|<format>|"%4i %n %11u %t"|This variable defines the format of entries in the feed list. See the respective section in the documentation for more information on format strings.|feedlist-format " %n %4i - %11u -%> %t" -feedlist-title-format|<format>|"N %V - Your feeds (%u unread, %t total)%?T? - tag `%T'&?"|Format of the title in feed list. See "Format Strings" section of Newsbeuter manual for details on available formats.|feedlist-title-format "Feeds (%u unread, %t total)" -filebrowser-title-format|<format>|"%N %V - %?O?Open File&Save File? - %f"|Format of the title in file browser. See "Format Strings" section of Newsbeuter manual for details on available formats.|N %V - %?O?Open File&Save File? - %f|filebrowser-title-format "%?O?Open File&Save File? - %f" +feedlist-title-format|<format>|"N %V - Your feeds (%u unread, %t total)%?T? - tag `%T'&?"|Format of the title in feed list. See "Format Strings" section of Newsboat manual for details on available formats.|feedlist-title-format "Feeds (%u unread, %t total)" +filebrowser-title-format|<format>|"%N %V - %?O?Open File&Save File? - %f"|Format of the title in file browser. See "Format Strings" section of Newsboat manual for details on available formats.|N %V - %?O?Open File&Save File? - %f|filebrowser-title-format "%?O?Open File&Save File? - %f" goto-first-unread|[yes/no]|yes|If set to yes (the default), then the first unread article will be selected whenever a feed is entered.|goto-first-unread no goto-next-feed|[yes/no]|yes|If set to yes, then the next-unread, prev-unread and random-unread keys will search in other feeds for unread articles if all articles in the current feed are read. If set to no, then these keys will stop in the current feed.|goto-next-feed no -help-title-format|<format>|"%N %V - Help"|Format of the title in help window. See "Format Strings" section of Newsbeuter manual for details on available formats.|N %V - Help|help-title-format "%N %V - Help" -highlight|<target> <regex> <fgcolor> [<bgcolor> [<attribute> ...]]|n/a|With this command, you can highlight text parts in the feed list, the article list and the article view. For a detailed documentation, see the chapter on highlighting.|highlight all "newsbeuter" red +help-title-format|<format>|"%N %V - Help"|Format of the title in help window. See "Format Strings" section of Newsboat manual for details on available formats.|N %V - Help|help-title-format "%N %V - Help" +highlight|<target> <regex> <fgcolor> [<bgcolor> [<attribute> ...]]|n/a|With this command, you can highlight text parts in the feed list, the article list and the article view. For a detailed documentation, see the chapter on highlighting.|highlight all "newsboat" red highlight-article|<filterexpr> <fgcolor> <bgcolor> [<attribute> ...]|n/a|With this command, you can highlight articles in the article list if they match a filter expression. For a detailed documentation, see the chapter on highlighting.|highlight-article "author =~ \\"Andreas Krennmair\\"" white red bold history-limit|<number>|100|Defines the maximum number of entries of commandline resp. search history to be saved. To disable history saving, set history-limit to 0.|history-limit 0 html-renderer|<path>|internal|If set to "internal", then the internal HTML renderer will be used. Otherwise, the specified command will be executed, the HTML to be rendered will be written to the command's stdin, and the program's output will be displayed. This makes it possible to use other, external programs, such as w3m, links or lynx, to render HTML.|html-renderer "w3m -dump -T text/html" http-auth-method|<method>|any|Set HTTP authentication method. Allowed values: any, basic, digest, digest_ie (only available with libcurl 7.19.3 and newer), gssnegotiate, ntlm, anysafe.|http-auth-method digest ignore-article|<feed> <filterexpr>|n/a|If a downloaded article from <feed> matches <filterexpr>, then it is ignored and not presented to the user. This command is further explained in the "kill file" section below.|ignore-article "*" "title =~ \\"Windows\\"" ignore-mode|[download/display]|download|This configuration option defines in what way an article is ignored (see ignore-article). If set to "download", then it is ignored in the download/parsing phase (which is the default) and thus never written to the cache, if it set to "display", it is ignored when displaying articles but is kept in the cache.|ignore-mode "display" -include|<path>|n/a|With this command, you can include other files to be interpreted as configuration files. This is especially useful to separate your configuration into several files, e.g. key configuration, color configuration, ...|include "~/.newsbeuter/colors" -itemview-title-format|<format>|"%N %V - Article '%T' (%u unread, %t total)"|Format of the title in article view. See "Format Strings" section of Newsbeuter manual for details on available formats.|N %V - Article '%T' (%u unread, %t total)|itemview-title-format "Article '%T'" +include|<path>|n/a|With this command, you can include other files to be interpreted as configuration files. This is especially useful to separate your configuration into several files, e.g. key configuration, color configuration, ...|include "~/.newsboat/colors" +itemview-title-format|<format>|"%N %V - Article '%T' (%u unread, %t total)"|Format of the title in article view. See "Format Strings" section of Newsboat manual for details on available formats.|N %V - Article '%T' (%u unread, %t total)|itemview-title-format "Article '%T'" keep-articles-days|<days>|0|If set the a number greater than 0, only articles that are were published within the last <n> days are kept, and older articles are deleted. If set to 0 (default value), this option is not active.|keep-articles-days 30 macro|<macro key> <command list>|n/a|With this command, you can define a macro key and specify a list of commands that shall be executed when the macro prefix and the macro key are pressed.|macro k open ; reload ; quit mark-as-read-on-hover|[yes/no]|no|If set to yes, then all articles that get selected in the article list are marked as read.|mark-as-read-on-hover yes @@ -63,7 +63,7 @@ newsblur-passwordeval|<command>|""|Another secure alternative, is providing your newsblur-url|<url>|"https://newsblur.com"|Configures the URL where the newsblur instance resides.|newsblur-url "https://localhost" notify-always|[yes/no]|no|If no, notifications will only be made when there are new feeds or articles. If yes, notifications will be made regardless.|notify-always yes notify-beep|[yes/no]|no|If yes, then the speaker beep on new articles.|notify-beep yes -notify-format|<string>|"newsbeuter: finished reload, %f unread feeds (%n unread articles total)"|Format string that is used for formatting notifications. See the chapter on format strings for more information.|notify-format "%d new articles (%n unread articles, %f unread feeds)" +notify-format|<string>|"newsboat: finished reload, %f unread feeds (%n unread articles total)"|Format string that is used for formatting notifications. See the chapter on format strings for more information.|notify-format "%d new articles (%n unread articles, %f unread feeds)" notify-program|<path>|""|If set, then the configured program will be executed if new articles arrived (through a reload) or if notify-always is true. The first parameter of the called program contains the notification message.|notify-program "~/bin/my-notifier" notify-screen|[yes/no]|no|If yes, then a "privacy message" will be sent to the terminal, containing a notification message about new articles. This is especially useful if you use terminal emulations such as GNU screen which implement privacy messages.|notify-screen yes notify-xterm|[yes/no]|no|If yes, then the xterm window title will be set to a notification message about new articles.|notify-xterm yes @@ -84,7 +84,7 @@ oldreader-show-special-feeds|[yes/no]|yes|If this is set, then "special feeds" l openbrowser-and-mark-jumps-to-next-unread|[yes/no]|no|If set to yes, jump to the next unread item when an item is opened in the browser and marked as read.|openbrowser-and-mark-jumps-to-next-unread yes opml-url|<url> ...|""|If the OPML online subscription mode is enabled, then the list of feeds will be taken from the OPML file found on this location. Optionally, you can specify more than one URL. All the listed OPML URLs will then be taken into account when loading the feed list.|opml-url "http://host.domain.tld/blogroll.opml" "http://example.com/anotheropmlfile.opml" pager|[<path>/internal]|internal|If set to "internal", then the internal pager will be used. Otherwise, the article to be displayed will be rendered to be a temporary file and then displayed with the configured pager. If the pager path is set to an empty string, the content of the "PAGER" environment variable will be used. If the pager path contains a placeholder "%f", it will be replaced with the temporary filename.|less %f -podcast-auto-enqueue|[yes/no]|no|If yes, then all podcast URLs that are found in articles are added to the podcast download queue. See the respective section in the documentation for more information on podcast support in newsbeuter.|podcast-auto-enqueue yes +podcast-auto-enqueue|[yes/no]|no|If yes, then all podcast URLs that are found in articles are added to the podcast download queue. See the respective section in the documentation for more information on podcast support in newsboat.|podcast-auto-enqueue yes prepopulate-query-feeds|[yes/no]|no|If yes, then all query feeds are prepopulated with articles on startup.|prepopulate-query-feeds yes ssl-verifyhost|[yes/no]|yes|If no, skip verification of the certificate's name against host.|ssl-verifyhost no ssl-verifypeer|[yes/no]|yes|If no, skip verification of the peer's SSL certificate.|ssl-verifypeer no @@ -92,16 +92,16 @@ proxy-auth-method|<method>|any|Set proxy authentication method. Allowed values: proxy-auth|<auth>|n/a|Set the proxy authentication string.|proxy-auth user:password proxy-type|<type>|http|Set proxy type. Allowed values: http, socks4, socks4a, socks5, socks5h.|proxy-type socks5 proxy|<server:port>|n/a|Set the proxy to use for downloading RSS feeds. (Don't forget to actually enable the proxy with `use-proxy yes`.)|proxy localhost:3128 -refresh-on-startup|[yes/no]|no|If yes, then all feeds will be reloaded when newsbeuter starts up. This is equivalent to the -r commandline option.|refresh-on-startup yes +refresh-on-startup|[yes/no]|no|If yes, then all feeds will be reloaded when newsboat starts up. This is equivalent to the -r commandline option.|refresh-on-startup yes reload-only-visible-feeds|[yes/no]|no|If yes, then manually reloading all feeds will only reload the currently visible feeds, e.g. if a filter or a tag is set.|reload-only-visible-feeds yes reload-threads|<number>|1|The number of parallel reload threads that shall be started when all feeds are reloaded.|reload-threads 3 reload-time|<number>|60|The number of minutes between automatic reloads.|reload-time 120 reset-unread-on-update|<url> ...|n/a|With this configuration command, you can provide a list of RSS feed URLs for whose articles the unread flag will be reset if an article has been updated, i.e. its content has been changed. This is especially useful for RSS feeds where single articles are updated after publication, and you want to be notified of the updates.|reset-unread-on-update "http://blog.fefe.de/rss.xml?html" save-path|<path>|~/|The default path where articles shall be saved to. If an invalid path is specified, the current directory is used.|save-path "~/Saved Articles" search-highlight-colors|<fgcolor> <bgcolor> [<attribute> ...]|black yellow bold|This configuration command specifies the highlighting colors when searching for text from the article view.|search-highlight-colors white black bold -searchresult-title-format|<format>|"%N %V - Search result (%u unread, %t total)"|Format of the title in search result. See "Format Strings" section of Newsbeuter manual for details on available formats.|N %V - Search result (%u unread, %t total)|searchresult-title-format "Search result" -selectfilter-title-format|<format>|"%N %V - Select Filter"|Format of the title in filter selection dialog. See "Format Strings" section of Newsbeuter manual for details on available formats.|N %V - Select Filter|selectfilter-title-format "Select Filter" -selecttag-title-format|<format>|"%N %V - Select Tag"|Format of the title in tag selection dialog. See "Format Strings" section of Newsbeuter manual for details on available formats.|N %V - Select Tag|selecttag-title-format "Select Tag" +searchresult-title-format|<format>|"%N %V - Search result (%u unread, %t total)"|Format of the title in search result. See "Format Strings" section of Newsboat manual for details on available formats.|N %V - Search result (%u unread, %t total)|searchresult-title-format "Search result" +selectfilter-title-format|<format>|"%N %V - Select Filter"|Format of the title in filter selection dialog. See "Format Strings" section of Newsboat manual for details on available formats.|N %V - Select Filter|selectfilter-title-format "Select Filter" +selecttag-title-format|<format>|"%N %V - Select Tag"|Format of the title in tag selection dialog. See "Format Strings" section of Newsboat manual for details on available formats.|N %V - Select Tag|selecttag-title-format "Select Tag" show-keymap-hint|[yes/no]|yes|If no, then the keymap hints on the bottom of screen will not be displayed.|show-keymap-hint no show-read-articles|[yes/no]|yes|If yes, then all articles of a feed are listed in the article list. If no, then only unread articles are listed.|show-read-articles no show-read-feeds|[yes/no]|yes|If yes, then all feeds, including those without unread articles, are listed. If no, then only feeds with one or more unread articles are list.|show-read-feeds no @@ -118,7 +118,7 @@ ttrss-passwordfile|<path-to-file>|""|A more secure alternative to the above, by ttrss-passwordeval|<command>|""|Another secure alternative, is providing your password from an external command that is evaluated during login. This can be used to read your password from a gpg encrypted file or your system keyring.|ttrss-passwordeval "command some-parameter" ttrss-url|<url>|""|Configures the URL where the Tiny Tiny RSS installation you want to use resides.|ttrss-url "http://example.com/ttrss/" unbind-key|<key> [<dialog>]|n/a|Unbind key <key>. This means that no operation is called when <key> is pressed. Optionally, you can specify a dialog (for a list of available dialogs, see "bind-key" above). If you specify one, the key binding will only be unbound for the specified dialog.|unbind-key R -urls-source|<source>|"local"|This configuration command sets the source where URLs shall be retrieved from. By default, this is ~/.newsbeuter/urls. Alternatively, you can set it to "opml", which enables newsbeuter's OPML online subscription mode, to "ttrss" which enables newsbeuter's Tiny Tiny RSS support, to "oldreader", which enables newsbeuter's The Old Reader support, to "newsblur", which enables NewsBlur support, or "feedhq" for FeedHQ support, or "ocnews" for ownCloud News support. Query feed specifications will be read from the local urls file regardless of this setting.|urls-source "oldreader" -urlview-title-format|<format>|"%N %V - URLs"|Format of the title in URL view. See "Format Strings" section of Newsbeuter manual for details on available formats.|N %V - URLs|urlview-title-format "URLs" +urls-source|<source>|"local"|This configuration command sets the source where URLs shall be retrieved from. By default, this is ~/.newsboat/urls. Alternatively, you can set it to "opml", which enables newsboat's OPML online subscription mode, to "ttrss" which enables newsboat's Tiny Tiny RSS support, to "oldreader", which enables newsboat's The Old Reader support, to "newsblur", which enables NewsBlur support, or "feedhq" for FeedHQ support, or "ocnews" for ownCloud News support. Query feed specifications will be read from the local urls file regardless of this setting.|urls-source "oldreader" +urlview-title-format|<format>|"%N %V - URLs"|Format of the title in URL view. See "Format Strings" section of Newsboat manual for details on available formats.|N %V - URLs|urlview-title-format "URLs" use-proxy|[yes/no]|no|If yes, then the configured proxy will be used for downloading the RSS feeds.|use-proxy yes user-agent|<user agent string>|""|If set to a non-zero-length string, this value will be used as HTTP User-Agent header for all HTTP requests.|user-agent "Lynx/2.8.5rel.1 libwww-FM/2.14" diff --git a/doc/example-config b/doc/example-config index fcde048f..f73907ed 100644 --- a/doc/example-config +++ b/doc/example-config @@ -1,5 +1,5 @@ # -# Newsbeuter's example config +# Newsboat's example config # #### always-display-description @@ -55,7 +55,7 @@ #### articlelist-title-format # # Format of the title in article list. See "Format Strings" section of -# Newsbeuter manual for details on available formats. +# Newsboat manual for details on available formats. # # Syntax: <format> # @@ -144,7 +144,7 @@ # # Syntax: <path> # -# Default value: "~/.newsbeuter/cache.db" +# Default value: "~/.newsboat/cache.db" # # cache-file "/tmp/testcache.db" @@ -173,8 +173,8 @@ #### confirm-exit # -# If set to yes, then newsbeuter will ask for confirmation whether the user -# really wants to quit newsbeuter. +# If set to yes, then newsboat will ask for confirmation whether the user +# really wants to quit newsboat. # # Syntax: [yes/no] # @@ -191,7 +191,7 @@ # # Default value: "" # -# cookie-cache "~/.newsbeuter/cookies.txt" +# cookie-cache "~/.newsboat/cookies.txt" #### datetime-format # @@ -221,7 +221,7 @@ #### delete-read-articles-on-quit # # If set to "yes", then all read articles will be deleted when you quit -# newsbeuter. +# newsboat. # # Syntax: [yes/no] # @@ -232,7 +232,7 @@ #### dialogs-title-format # # Format of the title in dialog list. See "Format Strings" section of -# Newsbeuter manual for details on available formats. +# Newsboat manual for details on available formats. # # Syntax: <format> # @@ -265,7 +265,7 @@ #### download-retries # -# How many times newsbeuter shall try to successfully download a feed before +# How many times newsboat shall try to successfully download a feed before # giving up. This is an option to improve the success of downloads on slow and # shaky connections such as via a TOR proxy. # @@ -277,7 +277,7 @@ #### download-timeout # -# The number of seconds newsbeuter shall wait when downloading a feed before +# The number of seconds newsboat shall wait when downloading a feed before # giving up. This is an option to improve the success of downloads on slow and # shaky connections such as via a TOR proxy. # @@ -296,7 +296,7 @@ # # Default value: "" # -# error-log "~/.newsbeuter/error.log" +# error-log "~/.newsboat/error.log" #### external-url-viewer # @@ -436,7 +436,7 @@ #### feedlist-title-format # -# Format of the title in feed list. See "Format Strings" section of Newsbeuter +# Format of the title in feed list. See "Format Strings" section of Newsboat # manual for details on available formats. # # Syntax: <format> @@ -448,7 +448,7 @@ #### filebrowser-title-format # # Format of the title in file browser. See "Format Strings" section of -# Newsbeuter manual for details on available formats. +# Newsboat manual for details on available formats. # # Syntax: <format> # @@ -482,7 +482,7 @@ #### help-title-format # # Format of the title in help window. See "Format Strings" section of -# Newsbeuter manual for details on available formats. +# Newsboat manual for details on available formats. # # Syntax: <format> # @@ -500,7 +500,7 @@ # # Default value: n/a # -# highlight all "newsbeuter" red +# highlight all "newsboat" red #### highlight-article # @@ -586,12 +586,12 @@ # # Default value: n/a # -# include "~/.newsbeuter/colors" +# include "~/.newsboat/colors" #### itemview-title-format # # Format of the title in article view. See "Format Strings" section of -# Newsbeuter manual for details on available formats. +# Newsboat manual for details on available formats. # # Syntax: <format> # @@ -760,7 +760,7 @@ # # Syntax: <string> # -# Default value: "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +# Default value: "newsboat: finished reload, %f unread feeds (%n unread articles total)" # # notify-format "%d new articles (%n unread articles, %f unread feeds)" @@ -999,7 +999,7 @@ # # If yes, then all podcast URLs that are found in articles are added to the # podcast download queue. See the respective section in the documentation for -# more information on podcast support in newsbeuter. +# more information on podcast support in newsboat. # # Syntax: [yes/no] # @@ -1082,7 +1082,7 @@ #### refresh-on-startup # -# If yes, then all feeds will be reloaded when newsbeuter starts up. This is +# If yes, then all feeds will be reloaded when newsboat starts up. This is # equivalent to the -r commandline option. # # Syntax: [yes/no] @@ -1162,7 +1162,7 @@ #### searchresult-title-format # # Format of the title in search result. See "Format Strings" section of -# Newsbeuter manual for details on available formats. +# Newsboat manual for details on available formats. # # Syntax: <format> # @@ -1173,7 +1173,7 @@ #### selectfilter-title-format # # Format of the title in filter selection dialog. See "Format Strings" section -# of Newsbeuter manual for details on available formats. +# of Newsboat manual for details on available formats. # # Syntax: <format> # @@ -1184,7 +1184,7 @@ #### selecttag-title-format # # Format of the title in tag selection dialog. See "Format Strings" section of -# Newsbeuter manual for details on available formats. +# Newsboat manual for details on available formats. # # Syntax: <format> # @@ -1376,10 +1376,10 @@ #### urls-source # # This configuration command sets the source where URLs shall be retrieved -# from. By default, this is ~/.newsbeuter/urls. Alternatively, you can set it -# to "opml", which enables newsbeuter's OPML online subscription mode, to -# "ttrss" which enables newsbeuter's Tiny Tiny RSS support, to "oldreader", -# which enables newsbeuter's The Old Reader support, to "newsblur", which +# from. By default, this is ~/.newsboat/urls. Alternatively, you can set it +# to "opml", which enables newsboat's OPML online subscription mode, to +# "ttrss" which enables newsboat's Tiny Tiny RSS support, to "oldreader", +# which enables newsboat's The Old Reader support, to "newsblur", which # enables NewsBlur support, or "feedhq" for FeedHQ support, or "ocnews" for # ownCloud News support. Query feed specifications will be read from the local # urls file regardless of this setting. @@ -1392,7 +1392,7 @@ #### urlview-title-format # -# Format of the title in URL view. See "Format Strings" section of Newsbeuter +# Format of the title in URL view. See "Format Strings" section of Newsboat # manual for details on available formats. # # Syntax: <format> diff --git a/doc/faq.txt b/doc/faq.txt index 4726ba11..0da1b393 100644 --- a/doc/faq.txt +++ b/doc/faq.txt @@ -1,9 +1,9 @@ -Newsbeuter FAQ -============== +Newsboat FAQ +============ I get errors like "`color01' is not a valid color" -------------------------------------------------- -Numbers that start with zero are treated as octal; starting with newsbeuter +Numbers that start with zero are treated as octal; starting with newsboat 2.10, these are not allowed since https://github.com/akrennmair/newsbeuter/issues/186[they only add confusion]. Use decimal numbers instead. @@ -11,6 +11,6 @@ Use decimal numbers instead. I want to have a feed that contains all unread articles of all feeds -------------------------------------------------------------------- This is supported since newsbeuter 0.7. All you need to do is to add the -following line to your +~/.newsbeuter/urls+ file: +following line to your +~/.newsboat/urls+ file: "query:Unread Articles:unread = \"yes\"" diff --git a/doc/gen-example-config.pl b/doc/gen-example-config.pl index 092b5cbf..d8ad7a85 100755 --- a/doc/gen-example-config.pl +++ b/doc/gen-example-config.pl @@ -3,9 +3,9 @@ use warnings; use strict; -print "####################################\n"; -print "# newsbeuter example configuration #\n"; -print "####################################\n\n"; +print "##################################\n"; +print "# Newsboat example configuration #\n"; +print "##################################\n\n"; while (my $line = <STDIN>) { my ($option,$syntax,$defaultparam,$desc,$example) = split(/\|/, $line); diff --git a/doc/keycmds.dsv b/doc/keycmds.dsv index 5425fb0a..f6d50f5d 100644 --- a/doc/keycmds.dsv +++ b/doc/keycmds.dsv @@ -25,7 +25,7 @@ set-tag:t:Select tag. open-search:/:Opens the search dialog. When a search is done in the article list, then the search operation only applies to the articles of the current feed, otherwise to all articles. goto-url:#:Open the URL dialog and then opens specified URL. enqueue:e:Add the podcast download URL of the current article (if any is found) to the podcast download queue (see the respective section in the documentation for more information on podcast support). -edit-urls:E:Edit the list of subscribed URLs. newsbeuter will start the editor configured through the $VISUAL environment variable (if unset, $EDITOR is used; fallback: "vi"). When editing is finished, newsbeuter will reload the URLs file. +edit-urls:E:Edit the list of subscribed URLs. newsboat will start the editor configured through the $VISUAL environment variable (if unset, $EDITOR is used; fallback: "vi"). When editing is finished, newsboat will reload the URLs file. reload-urls:^R:Reload the URLs configuration file. redraw:^L:Redraw the screen. cmdline:<colon>:Open the command line. diff --git a/doc/manpage-newsbeuter.txt b/doc/manpage-newsboat.txt index 406cd8f7..ae7941c1 100644 --- a/doc/manpage-newsbeuter.txt +++ b/doc/manpage-newsboat.txt @@ -1,23 +1,23 @@ -NEWSBEUTER(1) +NEWSBOAT(1) =========== -Andreas Krennmair <ak@newsbeuter.org> +Alexander Batischev <eual.jp@gmail.com> NAME ---- -newsbeuter - an RSS/Atom feed reader for text terminals +newsboat - an RSS/Atom feed reader for text terminals SYNOPSIS -------- -'newsbeuter' [-r] [-e] [-i opmlfile] [-u urlfile] [-c cachefile] [-C configfile] [-X] [-o] [-x <command> ...] [-h] +'newsboat' [-r] [-e] [-i opmlfile] [-u urlfile] [-c cachefile] [-C configfile] [-X] [-o] [-x <command> ...] [-h] DESCRIPTION ----------- -'newsbeuter' is an RSS/Atom feed reader for text terminals. RSS and Atom are a +'newsboat' is an RSS/Atom feed reader for text terminals. RSS and Atom are a number of widely-used XML formats to transmit, publish and syndicate articles, -for example news or blog articles. Newsbeuter is designed to be used on text +for example news or blog articles. Newsboat is designed to be used on text terminals on Unix or Unix-like systems such as GNU/Linux, BSD or Mac OS X. @@ -40,7 +40,7 @@ OPTIONS settings. -v, -V, --version:: - Get version information about newsbeuter and the libraries it uses + Get version information about newsboat and the libraries it uses -i opmlfile, --import-from-opml=opmlfile:: Import an OPML file @@ -55,7 +55,7 @@ OPTIONS Use an alternative configuration file -x command ..., --execute=command...:: - Execute one or more commands to run newsbeuter unattended. Currently available + Execute one or more commands to run newsboat unattended. Currently available commands are "reload" and "print-unread". -l loglevel, --log-level=loglevel:: @@ -109,7 +109,7 @@ COMMAND LINE include::chapter-cmdline.txt[] 'quit':: - Quit newsbeuter + Quit newsboat 'save' <filename>:: Save current article to <filename> @@ -136,37 +136,36 @@ include::chapter-cmdline.txt[] XDG Base Directory Support -------------------------- -Newsbeuter defaults to storing everything in '$HOME/.newsbeuter' directory. If -you prefer XDG, create '$HOME/.config/newsbeuter' and -'$HOME/.local/share/newsbeuter' directories, and Newsbeuter will use them +Newsboat defaults to storing everything in '$HOME/.newsboat' directory. If +you prefer XDG, create '$HOME/.config/newsboat' and +'$HOME/.local/share/newsboat' directories, and Newsboat will use them from there on. -If you already have some files in '$HOME/.newsbeuter/', move them as follows: +If you already have some files in '$HOME/.newsboat/', move them as follows: 'config', 'urls':: - to '$HOME/.config/newsbeuter/' + to '$HOME/.config/newsboat/' 'cache.db', 'history.search', 'history.cmdline':: - to '$HOME/.local/share/newsbeuter/' + to '$HOME/.local/share/newsboat/' -See also a corresponding section in podbeuter(1). +See also a corresponding section in podboat(1). FILES ----- dotfiles:: - '$HOME/.newsbeuter/config' + '$HOME/.newsboat/config' + - '$HOME/.newsbeuter/urls' + '$HOME/.newsboat/urls' XDG:: - '$HOME/.config/newsbeuter/config' + '$HOME/.config/newsboat/config' + - '$HOME/.config/newsbeuter/urls' + '$HOME/.config/newsboat/urls' SEE ALSO -------- -podbeuter(1). The documentation that comes with newsbeuter is a good -source about the general use and configuration of newsbeuter. +podboat(1) diff --git a/doc/manpage-podbeuter.txt b/doc/manpage-podbeuter.txt deleted file mode 100644 index 0a87f7ec..00000000 --- a/doc/manpage-podbeuter.txt +++ /dev/null @@ -1,89 +0,0 @@ -PODBEUTER(1) -=========== -Andreas Krennmair <ak@newsbeuter.org> - - -NAME ----- -podbeuter - a podcast download manager for text terminals - - -SYNOPSIS --------- -'podbeuter' [-C configfile] [-q queuefile] [-a] [-h] - - -DESCRIPTION ------------ -'podbeuter' is a podcast manager for text terminals. It is a helper program to -'newsbeuter' which queues podcast downloads into a file. These queued downloads -can then be download with 'newsbeuter'. - - -OPTIONS -------- --h, --help:: - Display help - --C configfile, --config-file=configfile:: - Use an alternative configuration file - --q queuefile, --queue-file=queuefile:: - Use an alternative queue file - --a, --autodownload:: - Start automatic download of all queued files on startup - --l loglevel, --log-level=loglevel:: - Generate a logfile with a certain loglevel. Valid loglevels are 1 to 6. An - actual logfile will only be written when you provide a logfile name. - --d logfile, --log-file=logfile:: - Use this logfile as output when logging debug messages. Please note that this - only works when providing a loglevel. - -PODCAST SUPPORT ---------------- - -include::chapter-podcasts.txt[] - - -CONFIGURATION COMMANDS ----------------------- - -include::podbeuter-cfgcmds.txt[] - - -XDG Base Directory Support --------------------------- - -Podbeuter defaults to storing everything in '$HOME/.newsbeuter' directory. If -you prefer XDG, create '$HOME/.config/newsbeuter' and -'$HOME/.local/share/newsbeuter' directories, and Podbeuter will use them from -there on. - -If you already have some files in '$HOME/.newsbeuter/', move the 'queue' file to -'$HOME/.local/share/newsbeuter/', and that should be it. - -See also a corresponding section in newsbeuter(1). - - -FILES ------ - -dotfiles:: - '$HOME/.newsbeuter/config' - + - '$HOME/.newsbeuter/urls' - -XDG:: - '$HOME/.config/newsbeuter/config' - + - '$HOME/.config/newsbeuter/urls' - - -SEE ALSO --------- -newsbeuter(1). The documentation that comes with newsbeuter is a good -source about the general use and configuration of newsbeuter's podcast -support. diff --git a/doc/manpage-podboat.txt b/doc/manpage-podboat.txt new file mode 100644 index 00000000..b34a2155 --- /dev/null +++ b/doc/manpage-podboat.txt @@ -0,0 +1,87 @@ +Podboat(1) +=========== +Alexander Batischev <eual.jp@gmail.com> + + +NAME +---- +podboat - a podcast download manager for text terminals + + +SYNOPSIS +-------- +'podboat' [-C configfile] [-q queuefile] [-a] [-h] + + +DESCRIPTION +----------- +'podboat' is a podcast manager for text terminals. It is a helper program to +'newsboat' which queues podcast downloads into a file. These queued downloads +can then be download with 'newsboat'. + + +OPTIONS +------- +-h, --help:: + Display help + +-C configfile, --config-file=configfile:: + Use an alternative configuration file + +-q queuefile, --queue-file=queuefile:: + Use an alternative queue file + +-a, --autodownload:: + Start automatic download of all queued files on startup + +-l loglevel, --log-level=loglevel:: + Generate a logfile with a certain loglevel. Valid loglevels are 1 to 6. An + actual logfile will only be written when you provide a logfile name. + +-d logfile, --log-file=logfile:: + Use this logfile as output when logging debug messages. Please note that this + only works when providing a loglevel. + +PODCAST SUPPORT +--------------- + +include::chapter-podcasts.txt[] + + +CONFIGURATION COMMANDS +---------------------- + +include::podbeuter-cfgcmds.txt[] + + +XDG Base Directory Support +-------------------------- + +Podboat defaults to storing everything in '$HOME/.newsboat' directory. If +you prefer XDG, create '$HOME/.config/newsboat' and +'$HOME/.local/share/newsboat' directories, and Podboat will use them from +there on. + +If you already have some files in '$HOME/.newsboat/', move the 'queue' file to +'$HOME/.local/share/newsboat/', and that should be it. + +See also a corresponding section in newsboat(1). + + +FILES +----- + +dotfiles:: + '$HOME/.newsboat/config' + + + '$HOME/.newsboat/urls' + +XDG:: + '$HOME/.config/newsboat/config' + + + '$HOME/.config/newsboat/urls' + + +SEE ALSO +-------- +newsboat(1) diff --git a/doc/newsbeuter.txt b/doc/newsboat.txt index 8107df0d..cf11018c 100644 --- a/doc/newsbeuter.txt +++ b/doc/newsboat.txt @@ -1,64 +1,63 @@ -The Newsbeuter RSS Feedreader -============================= -Andreas Krennmair <ak@newsbeuter.org> +The Newsboat RSS Feedreader +=========================== Introduction ------------ -Newsbeuter is an RSS/Atom feedreader. RSS and Atom are a number of widely-used +Newsboat is an RSS/Atom feedreader. RSS and Atom are a number of widely-used XML formats to transmit, publish and syndicate articles, for example news or -blog articles. Newsbeuter is designed to be used on text terminals on Unix or +blog articles. Newsboat is designed to be used on text terminals on Unix or Unix-like systems such as GNU/Linux, FreeBSD or Mac OS X. Platforms ~~~~~~~~~ -Newsbeuter has been tested on Linux (with glibc and musl-libc), FreeBSD and Mac -OS X, and is available in the form of pre-built packages for many popular Linux -distributions. For a current list of distributions with newsbeuter packages, -consult http://www.newsbeuter.org/download.html[this list on the newsbeuter -website]. +Newsboat has been tested on Linux (with glibc and musl-libc), FreeBSD and Mac +OS X. NetBSD is currently not supported, due to technical limitations in the iconv() implementation. -Why "Newsbeuter"? -~~~~~~~~~~~~~~~~ -"Newsbeuter" is a pun on the German word "Wildbeuter", which means -"hunter-gatherer". During the stone age, people hunted and gathered their food, -and these days, they hunt and gather news and information. Credits for this -idea goes to Clifford Wolf, who submitted it to a little competition that was -started when I got aware that the original name would violate French and -European registered trademarks. +Why "Newsboat"? +~~~~~~~~~~~~~~~ +"Newsboat" is a play on the name of its ancestor, "Newsbeuter". They're spelled +quite differently, but sound similar. ("Newsbeuter" is a pun on German word +"wildbeuter"; "newsboat" is an English word.) + +Newsboats were the vessels that collected and delivered news shuffling between +boats in the port. Newsboat the program will collect the news for you, just +like its namesakes did back in the day. Installation ------------ -This chapter describes how to compile and install newsbeuter from source. +This chapter describes how to compile and install newsboat from source. -Downloading Newsbeuter +Downloading Newsboat ~~~~~~~~~~~~~~~~~~~~~~ -Newsbeuter is available as source package. Simply go to -http://www.newsbeuter.org/[] and download the latest source package, which is +Newsboat is available as source package. Simply go to +https://newsboat.org/[] and download the latest source package, which is usually in the .tar.gz file format. Alternatively, you can check out the latest -development source tree from the newsbeuter Git repository (hosted on GitHub) +development source tree from the newsboat Git repository by running the following command on the commandline: - git clone git://github.com/akrennmair/newsbeuter.git + git clone git://github.com/newsboat/newsboat.git Dependencies ~~~~~~~~~~~~ -Newsbeuter depends on a number of libraries to function correctly. This table +Newsboat depends on a number of libraries to function correctly. This table lists these dependencies. Please be aware that the list libraries may themselves depend on other libraries. These dependencies are not listed here. -Please also be aware that you need a recent C++ compiler. Currently, newsbeuter -has only been tested with GCC. - -- STFL (version 0.21 or newer): http://www.clifford.at/stfl/[] -- SQLite 3 (version 3.5 or newer): http://www.sqlite.org/[] -- libcurl: http://curl.haxx.se/download.html[] -- GNU gettext (on systems that don't provide gettext in the libc): ftp://ftp.gnu.org/gnu/gettext/[] -- pkg-config: http://pkg-config.freedesktop.org/wiki/[] -- libxml2: http://xmlsoft.org/[] +Please also be aware that you need a recent C++ compiler. + +- GCC 4.9 or newer, or Clang 3.6 or newer +- [STFL (version 0.21 or newer)](http://www.clifford.at/stfl/) +- [SQLite3 (version 3.5 or newer)](http://www.sqlite.org/download.html) +- [libcurl (version 7.18.0 or newer)](http://curl.haxx.se/download.html) +- GNU gettext (on systems that don't provide gettext in the libc): + ftp://ftp.gnu.org/gnu/gettext/ +- [pkg-config](http://pkg-config.freedesktop.org/wiki/) +- [libxml2](http://xmlsoft.org/downloads.html) +- [json-c (version 0.11 or newer)](https://github.com/json-c/json-c/wiki) If you intend to modify and regenerate the filter language parser, you will also need Coco/R for C++, which you can download from @@ -71,13 +70,13 @@ files. Compiling and Installing ~~~~~~~~~~~~~~~~~~~~~~~~ After you've downloaded and installed the dependencies mentioned above, you can -start compiling and installing newsbeuter. To compile newsbeuter, simply run +start compiling and installing newsboat. To compile newsboat, simply run "make" in the source tree. After a short time, this should complete successfully, and you can go on with installation by running "make install". By -default, this will install the "newsbeuter" binary to the /usr/local/bin +default, this will install the "newsboat" binary to the /usr/local/bin directory. You can provide an alternative installation path using the prefix -parameter, e.g. running "make install prefix=/opt/newsbeuter" will install the -binary to the directory /opt/newsbeuter/bin. +parameter, e.g. running "make install prefix=/opt/newsboat" will install the +binary to the directory /opt/newsboat/bin. First Steps @@ -137,7 +136,7 @@ Example Configuration Configuring Colors ~~~~~~~~~~~~~~~~~~ -It is possible to configure custom color settings in newsbeuter. The basic configuration +It is possible to configure custom color settings in newsboat. The basic configuration syntax is: color <element> <foreground color> <background color> [<attribute> ...] @@ -160,7 +159,7 @@ supported: The "default" color means that the terminal's default color will be used. The "color<n>" color name (where "n" is a decimal number *not* starting with zero) can be used if your terminal support 256 colors (e.g. gnome-terminal, xterm -with $TERM set to xterm-256color). Newsbeuter contains support for 256 color +with $TERM set to xterm-256color). Newsboat contains support for 256 color terminals since version 2.1. For a complete chart of colors and their corresponding numbers, please see http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html[]. @@ -187,7 +186,7 @@ Currently, the following elements are supported: - *background*: the application background - *article*: the article text -The default color configuration of newsbeuter looks like this: +The default color configuration of newsboat looks like this: color background white black color listnormal white black @@ -202,7 +201,7 @@ Migrating from other RSS Feed Readers ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ It is very likely that you have used other RSS feed readers before. In this -case, it is practical to migrate the previous configuration to newsbeuter. The +case, it is practical to migrate the previous configuration to newsboat. The vast amount of RSS feed readers allows the export of subscriptions via OPML files. OPML is an XML file format that was designed to save outlines, and has found its primary use in the import and export of feed subscriptions between @@ -224,19 +223,19 @@ following command is necessary: raggle --export-opml ~/blogroll.opml When you have exported the subscriptions from your old RSS feed reader, you can -import them into newsbeuter: +import them into newsboat: - newsbeuter -i ~/blogroll.opml + newsboat -i ~/blogroll.opml -Don't worry, newsbeuter won't destroy your existing configuration, or add +Don't worry, newsboat won't destroy your existing configuration, or add subscriptions more than once: every URL that is added to the subscription list is checked before whether it is already in the list, and is only added if not. This makes it possible to merge several OPML files into your subscription list. If your old RSS feed reader was able to structure your subscriptions in -hierarchies, and reflected this structure in the exported OPML file, newsbeuter +hierarchies, and reflected this structure in the exported OPML file, newsboat doesn't throw away this information (although it doesn't support hierarchies), but -generates tags from it. Tags are newsbeuter's way of organizing subscriptions +generates tags from it. Tags are newsboat's way of organizing subscriptions in a non-hierarchical way. More information on the use of tags can be found below. Imagine the following folder hierarchy: @@ -257,7 +256,7 @@ Subscriptions found in the folder "Private" will be tagged with "Private", subscriptions in the folder "International" will be tagged with "News" and "News/International", subscriptions in the folder "Erlang" will be tagged ith "IT", "IT/Programming" and "IT/Programming/Erlang", and so on. This means that -when you select the tag "Programming" in newsbeuter, you will see all +when you select the tag "Programming" in newsboat, you will see all subscriptions that were in the "Programming" folder or one of its subfolders before. This means that you will lose virtually nothing of your previously configured structure. @@ -280,7 +279,7 @@ include::chapter-snownews.txt[] Bookmarking ~~~~~~~~~~~ -Since version 0.7, newsbeuter contains a plugin-based bookmarking system. When a user bookmarks a link (possible +Newsboat contains a plugin-based bookmarking system. When a user bookmarks a link (possible in the article list, in the article view, and in the URL view), he is asked for the URL to bookmark (already preset with the URL of the current selection), the bookmark title (in most cases preset with the title of the current selection), the bookmark description and (since 2.10) the @@ -289,9 +288,9 @@ an external program, configured via the configuration command "bookmark-cmd", is parameters. The plugin itself implements the actual bookmark saving (e.g. writing the bookmark to an external file, or storing it to a del.icio.us account). If everything went OK, the plugin simply exits. In case something goes wrong while saving the bookmark, it writes out an error message as a single line. -This error message is then presented to the user from within newsbeuter. +This error message is then presented to the user from within newsboat. -Newsbeuter comes with an example plugin, which implements a simple tab-separated bookmark file. This +Newsboat comes with an example plugin, which implements a simple tab-separated bookmark file. This example can be found in the "doc" subdirectory. @@ -305,13 +304,13 @@ include::chapter-cmdline.txt[] `20`20`40`20~~~~~~~~~~~~~~~~~~~ Command:Syntax:Description:Example ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -quit:quit:Quit newsbeuter.:quit +quit:quit:Quit newsboat.:quit save:save <filename>:Save the currently select article to disk. This works in the article list and in the article view.:save ~/important.txt set:set <variable>[=<value>|&|!]:Set configuration variable <variable> to <value>. If no value is specified, the current value is printed out. Specifying a '!' after the name of boolean configuration variables toggles their values, a '&' directly after the name of a configuration variable of any type resets its value to the documented default value.:set reload-time=15 tag:tag <tagname>:Only display feeds with the tag <tagname>.:tag news goto:goto <case-insensitive substring>:Go to the next feed whose name contains the case-insensitive substring.:goto foo -source:source <filename> [...]:Load the specified configuration files. This allows it to load alternative configuration files or reload already loaded configuration files on-the-fly from the filesystem.:source ~/.newsbeuter/colors -dumpconfig:dumpconfig <filename>:Save current internal state of configuration to file, so that it can be instantly reused as configuration file.:dumpconfig ~/.newsbeuter/config.saved +source:source <filename> [...]:Load the specified configuration files. This allows it to load alternative configuration files or reload already loaded configuration files on-the-fly from the filesystem.:source ~/.newsboat/colors +dumpconfig:dumpconfig <filename>:Save current internal state of configuration to file, so that it can be instantly reused as configuration file.:dumpconfig ~/.newsboat/config.saved dumpform:dumpform:Dump current dialog to text file. This is meant for debugging purposes only.:dumpform n/a:<number>:Jump to the entry with the index <number> (usually seen at the left side of the list). This currently works for the feed list and the article list.:30 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -320,7 +319,7 @@ n/a:<number>:Jump to the entry with the index <number> (usually seen at the left Filter Language ~~~~~~~~~~~~~~~ -Newsbeuter provides a powerful filter language that enables the user to +Newsboat provides a powerful filter language that enables the user to filter the content of many dialogs, such as the feed list or the article list. The basic concept is that every feed and every article has a number of attributes which can then be compared with user-supplied @@ -411,21 +410,21 @@ traditionally called a "killfile", i.e. based on the content of this "killfile", articles that match certain conditions do not get displayed and are not presented to the user at all. -In newsbeuter, such a "killfile" can be implemented on a per-article basis via +In newsboat, such a "killfile" can be implemented on a per-article basis via the configuration file. The most important configuration command for this is "ignore-article": ignore-article "*" "title =~ \"Gentoo\"" - ignore-article "http://synflood.at/blog/index.php?/feeds/index.rss2" "title =~ \"newsbeuter\"" + ignore-article "http://synflood.at/blog/index.php?/feeds/index.rss2" "title =~ \"newsboat\"" The basic format is that the user specifies an RSS feed for which the ignore shall be applied ("*" matches all RSS feeds), and then a filter expression (see -previous section). If newsbeuter hits an article in the specified RSS feed that +previous section). If newsboat hits an article in the specified RSS feed that matches the specified filter expression, then this article is ignored and never presented to the user. The configuration itself can contain as many ignore-article commands as desired. -Since newsbeuter 2.2, you can specify the way an article is ignored. There are +You can also specify the way an article is ignored. There are two ways available: - During download: articles are ignored when a feed is downloaded and parsed, @@ -449,8 +448,8 @@ configuration file: Query Feeds ~~~~~~~~~~~ -Query feeds are a mechanism of newsbeuter to define custom "meta feeds" by using -newsbeuter's built-in filter language. A query feed is a feed that is aggregated +Query feeds are a mechanism of newsboat to define custom "meta feeds" by using +newsboat's built-in filter language. A query feed is a feed that is aggregated from all currently downloaded articles of all feeds. To narrow down the set of articles, the user has to specify a filter. Only articles that match this filter are added to the query feed. @@ -461,11 +460,11 @@ article was originally fetched. If you want query feeds to be updated at startup, set `prepopulate-query-feeds` to `yes`. To define a query feed, the user has to add a line to the file -~/.newsbeuter/urls in the following format: +~/.newsboat/urls in the following format: query:<name of feed>:<filter expression> [<tag> ...] -The "query:" in the beginning tells newsbeuter that it's a query feed, "<name of +The "query:" in the beginning tells newsboat that it's a query feed, "<name of feed>" specifies the name under which the query feed shall be displayed in the feed list, and "<filter expression>" is the filter expression that shall be used. Like every other feed, a query feed can be tagged to organize it like @@ -496,21 +495,13 @@ Basically, the possibility of what can be realized with query feeds is only limited by what can be queried from articles and feeds with the filter language and by your creativity. -Google Reader Support -~~~~~~~~~~~~~~~~~~~~~ - -Since version 2.2, newsbeuter contained support for Google Reader. After Google -Reader was discontinued by Google, Google Reader support was subsequently -removed from newsbeuter and replaced with support for alternatives such as The -Old Reader, NewsBlur and FeedHQ. - The Old Reader Support ~~~~~~~~~~~~~~~~~~~~~ http://theoldreader.com/[The Old Reader] is a successor to Google Reader. -Newsbeuter provides functionality to use The Old Reader as its +Newsboat provides functionality to use The Old Reader as its backend: people can use The Old Reader to manage their subscriptions, and in -addition, use newsbeuter to download and read articles. Newsbeuter will keep +addition, use newsboat to download and read articles. Newsboat will keep the information which articles have already been read synchronized with The Old Reader, so that users usually won't see articles more than once. In addition, it will only ever download unread articles from The Old Reader. @@ -519,7 +510,7 @@ In order to use The Old Reader support, you first need to configure the proper U urls-source "oldreader" -In addition, newsbeuter needs to know your The Old Reader username and password +In addition, newsboat needs to know your The Old Reader username and password so that it can authenticate with The Old Reader: oldreader-login "your-oldreader-account" @@ -530,20 +521,20 @@ instead of +"+.) See also <<_passwords_for_external_apis,oldreader-passwordfile and oldreader-passwordeval>>. -After setting these configuration values, you can start newsbeuter, it will +After setting these configuration values, you can start newsboat, it will authenticate with The Old Reader and download your subscription list. If you use -"folders" in The Old Reader to organize your feeds, newsbeuter will regard them +"folders" in The Old Reader to organize your feeds, newsboat will regard them and make them available via its "tags" capability: each feed is tagged with the name of the folder in which it resides. -When you mark single items or complete feeds as read, newsbeuter will +When you mark single items or complete feeds as read, newsboat will synchronize this information directly to The Old Reader. This, of course, includes opening articles. Toggling read articles back to "unread" is also communicated to The Old Reader. In addition, The Old Reader provides the ability to "star" and to "share" articles. Starred articles are basically bookmarks, while shared articles are -shown to people that follow your The Old Reader account. Newsbeuter allows the +shown to people that follow your The Old Reader account. Newsboat allows the use of this feature by mapping its powerful "flags" to the "star"/"unstar" resp. "share"/"unshare" operations. @@ -556,7 +547,7 @@ that shall be used: After that, use these flags when you edit flags for an article, and these articles will be starred resp. shared. -By default, newsbeuter also shows The Old Reader "special feeds": +By default, newsboat also shows The Old Reader "special feeds": - People you follow: articles shared by people that you follow. - Starred items: articles that you starred. - Shared items: articles that you shared. @@ -565,13 +556,13 @@ You can disable these feeds by setting the following configuration variable: oldreader-show-special-feeds no -The Old Reader's folders are converted into Newsbeuter tags. You can select and +The Old Reader's folders are converted into Newsboat tags. You can select and filter feeds by tags; see "Tagging" and "Filter Language" sections for details. NewsBlur Support ~~~~~~~~~~~~~~~~ -Newsbeuter also supports NewsBlur, another alternative to Google Reader. +Newsboat also supports NewsBlur, another alternative to Google Reader. Configuration basically works the same as with The Old Reader. First, set your urls-source: @@ -588,17 +579,17 @@ instead of +"+.) See also <<_passwords_for_external_apis,newsblur-passwordfile and newsblur-passwordeval>>. -When you start newsbeuter, it will download the feeds that you configured +When you start newsboat, it will download the feeds that you configured in NewsBlur. Please take a closer look at the configuration commands for what -you can configure in newsbeuter regarding NewsBlur. +you can configure in newsboat regarding NewsBlur. -NewsBlur's folders are converted into Newsbeuter tags. You can select and +NewsBlur's folders are converted into Newsboat tags. You can select and filter feeds by tags; see "Tagging" and "Filter Language" sections for details. FeedHQ Support ~~~~~~~~~~~~~~ -Newsbeuter also supports FeedHQ, another alternative to Google Reader. +Newsboat also supports FeedHQ, another alternative to Google Reader. Configuration basically works the same as with The Old Reader. First, set your urls-source: @@ -619,34 +610,27 @@ if you're using a standalone instance, you should add one more setting: feedhq-url "https://the.url.of/your/feedhq/instance" -When you start newsbeuter, it will download the feeds that you configured +When you start newsboat, it will download the feeds that you configured in FeedHQ. Please take a closer look at the configuration commands for what -you can configure in newsbeuter regarding FeedHQ. +you can configure in newsboat regarding FeedHQ. -FeedHQ's folders are converted into Newsbeuter tags. You can select and filter +FeedHQ's folders are converted into Newsboat tags. You can select and filter feeds by tags; see "Tagging" and "Filter Language" sections for details. -Bloglines Synchronization -~~~~~~~~~~~~~~~~~~~~~~~~~ - -Up to and including version 2.3, newsbeuter contained support for synchronization -with Bloglines. On October 1, 2010, Bloglines was discontinued, and newsbeuter's -support for Bloglines was subsequently removed. - Tiny Tiny RSS Synchronization ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Since version 2.5, newsbeuter can be used to synchronize with Tiny Tiny RSS +Newsboat can be used to synchronize with Tiny Tiny RSS installations. Tiny Tiny RSS is a web-based and (optionally) multi-user feed reader. By providing the ability to use Tiny Tiny RSS as its backend, it's possible for users to manage their subscriptions centrally within Tiny Tiny RSS -while reading them wherever they are using newsbeuter. +while reading them wherever they are using newsboat. If you want to use Tiny Tiny RSS support, don't forget to activate the external API support in your preferences. To use Tiny Tiny RSS support, you need to configure a few things. First of all, -newsbeuter needs to know that you want to use Tiny Tiny RSS and which +newsboat needs to know that you want to use Tiny Tiny RSS and which installation exactly: urls-source "ttrss" @@ -663,7 +647,7 @@ instead of +"+.) See also <<_passwords_for_external_apis,ttrss-passwordfile and ttrss-passwordeval>>. Tiny Tiny RSS provides two modes of usage, single-user mode and multi-user -mode. newsbeuter needs to know about this, too: In single-user mode, +mode. newsboat needs to know about this, too: In single-user mode, authentication is done via Basic HTTP authentication, while in multi-user mode, authentication is done against Tiny Tiny RSS itself. @@ -677,13 +661,13 @@ of the url like this: ttrss-url "http://htuser:htpasswd@example.com/ttrss/" -With these settings, newsbeuter should be able to connect to Tiny Tiny RSS and +With these settings, newsboat should be able to connect to Tiny Tiny RSS and download your subscribed feeds. Articles or even complete feeds that you marked as read are synchronized directly to Tiny Tiny RSS. Tiny Tiny RSS provides the ability to "star" and to "publish" articles. Starred articles are basically bookmarks, while published articles can be retrieved via -a public RSS feed. Newsbeuter allows the use of these features by mapping its +a public RSS feed. Newsboat allows the use of these features by mapping its flags to the "star" and "publish" operations. In order to use this mapping, you need to configure the flags that shall be used: @@ -694,7 +678,7 @@ In order to use this mapping, you need to configure the flags that shall be used After that, use these flags when you edit flags for an article, and these articles will be starred resp. published. -TT-RSS folders are converted into Newsbeuter tags. You can select and filter +TT-RSS folders are converted into Newsboat tags. You can select and filter feeds by tags; see "Tagging" and "Filter Language" sections for details. ownCloud News Synchronization @@ -702,7 +686,7 @@ ownCloud News Synchronization To use ownCloud News support you need to configure a few things. -First, set your +urls-source+ to +ocnews+ and tell Newsbeuter where to find +First, set your +urls-source+ to +ocnews+ and tell Newsboat where to find your ownCloud instance: urls-source "ocnews" @@ -719,20 +703,20 @@ ownCloud News API uses HTTP basic auth, therefore running ownCloud with SSL is h recommended. ownCloud News provides the ability to "star" articless; starred articles are basically -bookmarks. Newsbeuter allows the use of this feature by mapping user-specified +bookmarks. Newsboat allows the use of this feature by mapping user-specified flag to the "star" operation. In order to use this mapping, you need to configure the flag that shall be used: ocnews-flag-star "s" -If for any reason you don't want Newsbeuter to verify the hostname of your +If for any reason you don't want Newsboat to verify the hostname of your instance against the hostname specified in the SSL certificate you're using, just say so: ocnews-verifyhost "no" -OwnCloud News' folders are converted into Newsbeuter tags. You can select and +OwnCloud News' folders are converted into Newsboat tags. You can select and filter feeds by tags; see "Tagging" and "Filter Language" sections for details. OPML Online Subscription Mode @@ -775,7 +759,7 @@ article list. In the article view, all flags (if available) are listed. Macro Support ~~~~~~~~~~~~~ -In newsbeuter, it's possible to define macros to execute more than one command +In newsboat, it's possible to define macros to execute more than one command at once. A macro is configured using the "macro" configuration command. The first parameter to "macro" is the key, all parameters afterwards are operations (as listed in the "Available Operations" table above), optionally with @@ -795,21 +779,21 @@ something else, such as running an image viewer from the URLs view: macro i set browser "feh %u"; open-in-browser ; set browser "elinks %u" You can even use this feature to enqueue any of the URLs from the URLs view to -podbeuter's download queue: +podboat's download queue: - macro E set browser "echo %u >> ~/.newsbeuter/queue" ; open-in-browser ; set browser "elinks %u" + macro E set browser "echo %u >> ~/.newsboat/queue" ; open-in-browser ; set browser "elinks %u" Commandline Commands ~~~~~~~~~~~~~~~~~~~~ -Newsbeuter comes with a -x option that indicates that commands added as arguments +Newsboat comes with a -x option that indicates that commands added as arguments to the command line shall be executed. Currently, the following commands are available: -- reload: this option reloads all feeds, and quits newsbeuter without printing any output. +- reload: this option reloads all feeds, and quits newsboat without printing any output. This is useful if a user wants to periodically reload all feeds without always having - a running newsbeuter instance, e.g. from cron. -- print-unread: this option prints the number of unread articles and quits newsbeuter. + a running newsboat instance, e.g. from cron. +- print-unread: this option prints the number of unread articles and quits newsboat. This is useful for users who want to integrate this number into some kind of monitoring system. @@ -817,7 +801,7 @@ available: Format Strings ~~~~~~~~~~~~~~ -Newsbeuter contains a powerful format string system to make it possible for the +Newsboat contains a powerful format string system to make it possible for the user to configure the format of various aspects of the application, such as the format of entries in the feed list or in the article list. @@ -829,7 +813,7 @@ that is specified by the number, while negative number specify left padding. Followed by the padding indication comes the actual sequence identifier, which is usually a single letter. -In addition, newsbeuter provides other, more powerful sequences, such as +In addition, newsboat provides other, more powerful sequences, such as "%>[char]", which indicates that the text right to the sequence will be aligned right on the screen, and characters between the text on the left and the text on the right will be filled by "[char]". Another powerful format is the @@ -900,11 +884,11 @@ Examples: Dialog Titles ^^^^^^^^^^^^^ -Starting with newsbeuter 2.0, it is now officially supported to customize +You can customize the title format of all available dialogs. Here is a list of dialogs with their respective title format configuration variables, and a list of available formats and their meaning. Please note that the title formats are localized, so if you -work on a different locale that is supported by newsbeuter, the actually displayed +work on a different locale that is supported by newsboat, the actually displayed title text may vary unless you customize it. .Dialog Title Formats @@ -929,7 +913,7 @@ Dialog List:dialogs-title-format:%N %V - Dialogs `30`60~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Identifier:Meaning ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -N:Name of the program, i.e. "newsbeuter" +N:Name of the program, i.e. "newsboat" V:Program version u:Number of unread articles (if applicable) t:Number of total articles (if applicable) @@ -973,7 +957,7 @@ F:Feed title Highlighting Text ~~~~~~~~~~~~~~~~~ -Since version 1.0, newsbeuter supports the highlighting of text in the feed +Newsboat supports the highlighting of text in the feed list, the article list and the article view, using regular expressions to describe patterns to be highlighted. The command syntax goes like this: @@ -989,7 +973,7 @@ section. Examples for possible highlighting configurations are: - highlight all "newsbeuter" red + highlight all "newsboat" red highlight article "^(Feed|Title|Author|Link|Date):" default default underline highlight feedlist "https?://[^ ]+" yellow red bold @@ -1016,7 +1000,7 @@ Example: Advanced Dialog Management ~~~~~~~~~~~~~~~~~~~~~~~~~~ -Since version 2.0, newsbeuter supports an advanced concept of dialogs. +Newsboat supports an advanced concept of dialogs. Previously, all dialogs (feed list, article list, article view) were internally laid out as a pure stack. In 2.0, this changed: all dialogs are managed in a list, and the user can jump to another, previously opened dialog from @@ -1032,26 +1016,26 @@ open dialogs by selecting them and pressing Ctrl-X. XDG Base Directory Support ~~~~~~~~~~~~~~~~~~~~~~~~~~ -Newsbeuter implements limited support for the +Newsboat implements limited support for the http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html[XDG Base Directory Specification]. It needs to be set up manually by creating the following directories: - '~/.local/share/newsbeuter/' - '~/.config/newsbeuter/' + '~/.local/share/newsboat/' + '~/.config/newsboat/' If these directories exist or the environment variables `$XDG_CONFIG_HOME` and -`$XDG_DATA_HOME` are set, newsbeuter will use these directories, otherwise it -will default to '~/.newsbeuter' as its configuration directory. +`$XDG_DATA_HOME` are set, newsboat will use these directories, otherwise it +will default to '~/.newsboat' as its configuration directory. -If you're currently using '~/.newsbeuter/' but wish to migrate to XDG +If you're currently using '~/.newsboat/' but wish to migrate to XDG directories, you should move the files as follows: 'config', 'urls':: - to '$HOME/.config/newsbeuter/' + to '$HOME/.config/newsboat/' 'cache.db', 'history.search', 'history.cmdline', 'queue':: - to '$HOME/.local/share/newsbeuter/' + to '$HOME/.local/share/newsboat/' Podcast Support @@ -1059,7 +1043,7 @@ Podcast Support include::chapter-podcasts.txt[] -.Podbeuter Configuration Commands +.Podboat Configuration Commands [frame="all", grid="all",format="dsv",separator="|"] `10`15`15`40`20~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Configuration Command|Argument(s)|Default|Description|Example @@ -1067,7 +1051,7 @@ Configuration Command|Argument(s)|Default|Description|Example include::podbeuter-cmds.dsv[] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.Available Operations in Podbeuter +.Available Operations in Podboat [frame="all", grid="all", format="dsv"] `20`20`60~~~~~~~~~~~~~~~~~~~~~~~~ Operation:Default key:Description @@ -1083,41 +1067,41 @@ pb-increase-max-dls:+:Increase the "max-downloads" option by 1. pb-decrease-max-dls:-:Decrease the "max-downloads" option by 1. If the option is already 1, no further decrease is possible. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -A usual "use case" is to configure newsbeuter to automatically enqueue newly +A usual "use case" is to configure newsboat to automatically enqueue newly found podcast download URLs. Then, the user reloads the podcast RSS feeds in -newsbeuter, and after that, he/she uses podbeuter to view the current queue, and +newsboat, and after that, he/she uses podboat to view the current queue, and either selectively download certain files or automatically download them all -together by pressing "a" within podbeuter. +together by pressing "a" within podboat. -Running multiple copies of Newsbeuter simultaneously +Running multiple copies of Newsboat simultaneously ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ During development and testing, you might want to run a second copy of -Newsbeuter, operating with different config, URLs list or cache file. This can +Newsboat, operating with different config, URLs list or cache file. This can be achieved by creative use of XDG environment variables. This approach is not beautiful, but it works. First of all, you will need to create a directory to store the data. Let's call it +test+: - $ mkdir -p test/newsbeuter + $ mkdir -p test/newsboat -Note that we also create a subdirectory called +newsbeuter+; this is required +Note that we also create a subdirectory called +newsboat+; this is required to satisfy XDG specification. **ATTENTION**: if this subdirectory is absent, -Newsbeuter will attempt to run on your live data! +Newsboat will attempt to run on your live data! -You can now create +config+ and +urls+ files inside +test/newsbeuter+; you can +You can now create +config+ and +urls+ files inside +test/newsboat+; you can also copy +cache.db+ if you don't want to start with a fresh one. -When the files are ready, you can invoke Newsbeuter as follows: +When the files are ready, you can invoke Newsboat as follows: - $ XDG_CONFIG_HOME=test XDG_DATA_HOME=test newsbeuter + $ XDG_CONFIG_HOME=test XDG_DATA_HOME=test newsboat -(This will look +newsbeuter+ binary up in your +PATH+; if you've just built -your own, use +./newsbeuter+ instead, or provide a full path.) +(This will look +newsboat+ binary up in your +PATH+; if you've just built +your own, use +./newsboat+ instead, or provide a full path.) -By modifying the environment in which Newsbeuter runs you also modify -environments of all the programs that Newsbeuter starts; that includes filters +By modifying the environment in which Newsboat runs you also modify +environments of all the programs that Newsboat starts; that includes filters and external HTML renderers. If they rely on +XDG_*+ variables, they will look for things in +test+ directory and might fail. @@ -1131,20 +1115,21 @@ environment, e.g.: As already said: not beautiful, but gets the job done. -Using SQLite Triggers with newsbeuter +Using SQLite Triggers with newsboat ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -This section was kindly provided by mailto:elrond+newsbeuter(at)samba-tng.org[Elrond]. +This section was written by mailto:elrond+newsbeuter(at)samba-tng.org[Elrond], +originally for Newsbeuter. -SQLite, the db used by newsbeuter, supports triggers. These are small +SQLite, the db used by newsboat, supports triggers. These are small snippets of SQL that get executed inside the database by the database engine. They're stored inside the db and the normal user (including -newsbeuter itself) doesn't see them. Just the db seems to do some magic: +newsboat itself) doesn't see them. Just the db seems to do some magic: Like changing some values when you change another value. -So what is this good for when looking at newsbeuter? Well, first off, it's a +So what is this good for when looking at newsboat? Well, first off, it's a hack. The real answer should be to use application logic (do it inside -newsbeuter, not in the db). So: Don't use this, unless you know, what you're +newsboat, not in the db). So: Don't use this, unless you know, what you're doing, and unless you have some sort of backup. Example @@ -1156,18 +1141,18 @@ Suppose you have a strange feed where the articles become "new" by just changing their subject, and nothing else changes. The body is just empty, and the URL keeps the same. This feed really exists. It's the "updated software rss feed" of some major company and the title just contains the name of the driver -and version number. And the URL points to the download page. newsbeuter +and version number. And the URL points to the download page. newsboat considers articles only as new, when they have a new UniqueID (this is good). So those articles are never marked as new (unread) ever again. -So what can we do? We do some magic: We let the db test if newsbeuter +So what can we do? We do some magic: We let the db test if newsboat changes the subject and then let itself mark the article again as unread. 1. You need the sqlite3 command line tool (available via apt-get install sqlite3 on Debian) or some other tool to do direct sql on the sqlite database. -2. Start sqlite3 with the newsbeuter db: +2. Start sqlite3 with the newsboat db: - Rivendell:~/.newsbeuter% sqlite3 cache.db + Rivendell:~/.newsboat% sqlite3 cache.db SQLite version 3.4.2 Enter ".help" for instructions sqlite> @@ -1182,8 +1167,8 @@ changes the subject and then let itself mark the article again as unread. 4. Leave sqlite3 with <Ctrl-D> or .quit. -That's it. newsbeuter (well, its db) now marks articles as unread when their -title changes. And nicely enough this works all inside newsbeuter, no need to +That's it. newsboat (well, its db) now marks articles as unread when their +title changes. And nicely enough this works all inside newsboat, no need to restart it so that it rereads the cache, that magically modifies itself. It just works. @@ -1195,35 +1180,38 @@ include::chapter-password.txt[] Feedback -------- -If you want to tell us something related to newsbeuter, don't hesitate to send -an email: ak@newsbeuter.org +If you want to tell us something related to newsboat, don't hesitate to send +an email to our mailing list: newsboat@googlegroups.com -Alternatively, you can reach the newsbeuter developers on IRC: channel -#newsbeuter on irc.freenode.net. +Alternatively, you can reach the newsboat developers on IRC: channel +#newsboat on irc.freenode.net. -If you want to report newsbeuter bugs, please use this issue tracker: -https://github.com/akrennmair/newsbeuter/issues/[] +If you want to report newsboat bugs, please use this issue tracker: +https://github.com/newsboat/newsboat/issues/[] License ------- MIT/X Consortium License -(C)opyright 2006-2011 Andreas Krennmair <ak@newsbeuter.org> +Copyright 2006-2015 Andreas Krennmair <ak@newsbeuter.org> +Copyright 2015-2017 Alexander Batischev <eual.jp@gmail.com> +Copyright 2006-2017 Newsbeuter contributors +Copyright 2017 Newsboat contributors -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/doc/podbeuter-cmds.dsv b/doc/podbeuter-cmds.dsv index 7080eb8e..ec04c3cd 100644 --- a/doc/podbeuter-cmds.dsv +++ b/doc/podbeuter-cmds.dsv @@ -1,3 +1,3 @@ -download-path|<path>|~/|Specifies the directory where podbeuter shall download the files to. Optionally, the placeholders "%n" (for the podcast feed's name) and "%h" (for the podcast feed's hostname) can be used to place downloads in a directory structure.|download-path "~/Downloads/%h/%n" +download-path|<path>|~/|Specifies the directory where podboat shall download the files to. Optionally, the placeholders "%n" (for the podcast feed's name) and "%h" (for the podcast feed's hostname) can be used to place downloads in a directory structure.|download-path "~/Downloads/%h/%n" max-downloads|<number>|1|Specifies the maximum number of parallel downloads when automatic download is enabled.|max-downloads 3 player|<player command>|""|Specifies the player that shall be used for playback of downloaded files.|player "mp3blaster" diff --git a/filter/FilterParser.cpp b/filter/FilterParser.cpp index 43b1294a..c7bf6e42 100644 --- a/filter/FilterParser.cpp +++ b/filter/FilterParser.cpp @@ -7,7 +7,7 @@ using namespace newsbeuter; FilterParser::FilterParser() : root(0), curpos(0), next_must_descend_right(false) { } -FilterParser::~FilterParser() { +FilterParser::~FilterParser() { cleanup(); } @@ -25,7 +25,7 @@ FilterParser& FilterParser::operator=(FilterParser& p) { return *this; } -void FilterParser::add_logop(int op) { +void FilterParser::add_logop(int op) { //fprintf(stderr,"add_logop: op = %d\n", op); expression * expr = new expression(op); if (!root) { @@ -42,10 +42,10 @@ void FilterParser::add_logop(int op) { curpos = root = expr; } } - // printf("logop: %d\n", op); + // printf("logop: %d\n", op); } -void FilterParser::add_matchexpr(char * name, int op, char * lit) { +void FilterParser::add_matchexpr(char * name, int op, char * lit) { //fprintf(stderr,"add_matchexpr: name = %s op = %d lit = %s\n", name, op, lit); expression * expr = new expression(name, lit, op); if (next_must_descend_right) { @@ -67,15 +67,15 @@ void FilterParser::add_matchexpr(char * name, int op, char * lit) { } coco_string_delete(name); coco_string_delete(lit); - // printf("matchexpr: %ls lit = %ls op = %d\n", name, lit, op); + // printf("matchexpr: %ls lit = %ls op = %d\n", name, lit, op); } -void FilterParser::open_block() { +void FilterParser::open_block() { //fprintf(stderr,"open_block\n"); next_must_descend_right = true; } -void FilterParser::close_block() { +void FilterParser::close_block() { //fprintf(stderr,"close_block\n"); if (curpos != root) { curpos = curpos->parent; @@ -118,7 +118,7 @@ expression::expression(const std::string& n, const std::string& lit, int o) : na } } -expression::expression(int o) : op(o), l(NULL), r(NULL), parent(NULL), regex(NULL) { +expression::expression(int o) : op(o), l(NULL), r(NULL), parent(NULL), regex(NULL) { } expression::~expression() { diff --git a/include/keymap.h b/include/keymap.h index 6a11d707..91e9a070 100644 --- a/include/keymap.h +++ b/include/keymap.h @@ -31,7 +31,7 @@ enum { namespace newsbeuter { enum operation { OP_NIL = 0, - // general and newsbeuter-specific operations: + // general and newsboat-specific operations: OP_NB_MIN, OP_QUIT, OP_HARDQUIT, @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 2.5\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 2.5\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-07-13 20:19+0300\n" "PO-Revision-Date: 2017-07-19 20:19+0300\n" "Last-Translator: Alejandro Gallo <aamsgallo@gmail.com>\n" @@ -35,9 +35,9 @@ msgstr "`%s' no és un element de configuració vàlid" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" -"newsbeuter: recàrrega finalitzada, %f fonts no llegides (%n total d'articles " +"newsboat: recàrrega finalitzada, %f fonts no llegides (%n total d'articles " "no llegits)" #: src/configcontainer.cpp:155 @@ -274,9 +274,9 @@ msgstr "índex de fonts invàlid (error de software)" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" -"newsbeuter és software lliure, y llicenciat sota la MIT/X Consortium License." +"newsboat és software lliure, y llicenciat sota la MIT/X Consortium License." #: src/controller.cpp:977 #, c-format @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 0.3\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 0.3\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2017-01-27 01:10+0100\n" "Last-Translator: Lysander Trischler <github@lyse.isobeef.org>\n" @@ -35,9 +35,9 @@ msgstr "`%s' ist kein gültiges Konfigurationselement" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" -"newsbeuter: Neuladen beendet, %f ungelesene Feeds (%n ungelesene Artikel " +"newsboat: Neuladen beendet, %f ungelesene Feeds (%n ungelesene Artikel " "insgesamt)" #: src/configcontainer.cpp:155 @@ -272,9 +272,9 @@ msgstr "ungültiger Feed-Index (Bug)" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" -"newsbeuter ist Freie Software und unter der MIT/X Consortium License " +"newsboat ist Freie Software und unter der MIT/X Consortium License " "lizenziert." #: src/controller.cpp:977 @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 2.5\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 2.5\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2013-02-08 06:24-0500\n" "Last-Translator: OmeGa <omega@mailoo.org>\n" @@ -35,9 +35,9 @@ msgstr "`%s' no es un elemento de configuración válido" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" -"newsbeuter: recarga finalizada, %f fuentes no leídas (%n total de artículos " +"newsboat: recarga finalizada, %f fuentes no leídas (%n total de artículos " "no leídos)" #: src/configcontainer.cpp:155 @@ -274,9 +274,9 @@ msgstr "índice de fuentes inválido (error de software)" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" -"newsbeuter es software libre, y licenciado bajo la MIT/X Consortium License." +"newsboat es software libre, y licenciado bajo la MIT/X Consortium License." #: src/controller.cpp:977 #, c-format diff --git a/po/es_ES.po b/po/es_ES.po index 3931db92..51153ef1 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 2.1\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 2.1\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2010-02-23 14:50+0100\n" "Last-Translator: ROOT <epsilon@correoe.no-ip.org>\n" @@ -33,7 +33,7 @@ msgstr "`%s' no es un elemento de configuración válido" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" "newsbeauter: recarga finalizada, %f feeds no leidos (%n total de articulos " "no leidos)" @@ -273,8 +273,8 @@ msgstr "Indice de feeds invalido (fallo)" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." -msgstr "newsbeuter es software libre bajo MIT/X Consortium License" +"newsboat is free software and licensed under the MIT/X Consortium License." +msgstr "newsboat es software libre bajo MIT/X Consortium License" #: src/controller.cpp:977 #, c-format @@ -6,8 +6,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 2.6\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 2.6\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2017-07-11 10:22+0200\n" "Last-Translator: rugie <fliehen@posteo.net>\n" @@ -36,9 +36,9 @@ msgstr "`%s' n'est pas un élément de configuration valide" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" -"newsbeuter : rechargement terminé, %f fils à lire (%n articles à lire au " +"newsboat : rechargement terminé, %f fils à lire (%n articles à lire au " "total)" #: src/configcontainer.cpp:155 @@ -274,9 +274,9 @@ msgstr "Index de fil invalide (bug)" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" -"newsbeuter est un logiciel libre, publié sous la licence MIT/X Consortium." +"newsboat est un logiciel libre, publié sous la licence MIT/X Consortium." #: src/controller.cpp:977 #, c-format @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 0.7\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 0.7\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2008-01-28 10:00+0100\n" "Last-Translator: Zsolt Udvari <udvzsolt@gmail.com>\n" @@ -33,9 +33,9 @@ msgstr "`%s' nem érvényes konfigurációs elem" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" -"newsbeuter: újratöltés befejezve, %f olvasatlan üzenet (%n olvasatlan " +"newsboat: újratöltés befejezve, %f olvasatlan üzenet (%n olvasatlan " "összesen)" #: src/configcontainer.cpp:155 @@ -272,9 +272,9 @@ msgstr "érvénytelen hírforrás index (bug)" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" -"newsbeuter egy ingyenes szoftver és MIT/X Consortium License-szel " +"newsboat egy ingyenes szoftver és MIT/X Consortium License-szel " "rendelkezik." #: src/controller.cpp:977 @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 2.1\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 2.1\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2010-04-29 12:01+0200\n" "Last-Translator: Andrea Marchesini <baku@ippolita.net>\n" @@ -35,9 +35,9 @@ msgstr "`%s' non è un elemento di configurazione valido" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" -"newsbeuter: caricamento terminato, %f feed non letti (%n totale articoli non " +"newsboat: caricamento terminato, %f feed non letti (%n totale articoli non " "letti)" #: src/configcontainer.cpp:155 @@ -274,9 +274,9 @@ msgstr "indice del feed non valido (bug)" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" -"newsbeuter è software libero e concesso in licenza nei termini della Licenza " +"newsboat è software libero e concesso in licenza nei termini della Licenza " "MIT/X Consortium." #: src/controller.cpp:977 @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 2.9\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 2.9\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2015-04-26 05:55+0900\n" "Last-Translator: Grady Martin <GradyMartin@gmail.com>\n" @@ -33,8 +33,8 @@ msgstr "" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" -msgstr "newsbeuter: 同期完了 更新されたフィード%f部 新規記事%n件" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" +msgstr "newsboat: 同期完了 更新されたフィード%f部 新規記事%n件" #: src/configcontainer.cpp:155 msgid "%N %V - Articles in feed '%T' (%u unread, %t total) - %U" @@ -254,9 +254,9 @@ msgstr "" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" -"newsbeuterはフリーソフトウェアでありMITあるいはXライセンスの下でご利用いただ" +"newsboatはフリーソフトウェアでありMITあるいはXライセンスの下でご利用いただ" "けます。" #: src/controller.cpp:977 @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 2.5\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 2.5\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2012-08-08 20:07+0100\n" "Last-Translator: Daniel Aleksandersen <code@daniel.priv.no>\n" @@ -35,9 +35,9 @@ msgstr "`%s' er ikke et gyldig oppsettselement" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" -"newsbeuter: fullførte oppdateringen, %f uleste nyhetsstrømmer (totalt %n " +"newsboat: fullførte oppdateringen, %f uleste nyhetsstrømmer (totalt %n " "uleste artikler)" #: src/configcontainer.cpp:155 @@ -278,9 +278,9 @@ msgstr "ugyldig strøminndeks (programfeil)" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" -"newsbeuter er fri programvare lisensiert under MIT/X Consortium License." +"newsboat er fri programvare lisensiert under MIT/X Consortium License." #: src/controller.cpp:977 #, c-format diff --git a/po/newsbeuter.pot b/po/newsbeuter.pot index 19b7821e..f1f9af9e 100644 --- a/po/newsbeuter.pot +++ b/po/newsbeuter.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" @@ -35,7 +35,7 @@ msgstr "" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" #: src/configcontainer.cpp:155 @@ -256,7 +256,7 @@ msgstr "" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" #: src/controller.cpp:977 @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 2.7\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 2.7\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2013-10-26 22:20+0100\n" "Last-Translator: Erwin Poeze <donnut@outlook.com>\n" @@ -35,9 +35,9 @@ msgstr "configuratie-element ‘%s’ is ongeldig" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" -"newsbeuter: klaar met vernieuwen, %f ongelezen feeds (%n ongelezen artikelen " +"newsboat: klaar met vernieuwen, %f ongelezen feeds (%n ongelezen artikelen " "in totaal)" #: src/configcontainer.cpp:155 @@ -273,9 +273,9 @@ msgstr "ongeldige feed-index (bug)" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" -"newsbeuter is vrije software en gelicenseerd onder de MIT/X Consortium " +"newsboat is vrije software en gelicenseerd onder de MIT/X Consortium " "License." #: src/controller.cpp:977 @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 2.5\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 2.5\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2008-04-18 20:10+0100\n" "Last-Translator: Maciej Delmanowski <maciej.delmanowski@harnir.net>\n" @@ -34,9 +34,9 @@ msgstr "`%s' nie jest poprawnym elementem konfiguracji" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" -"newsbeuter: odświeżanie zakończone, %f nieprzeczytanych kanałów(%n " +"newsboat: odświeżanie zakończone, %f nieprzeczytanych kanałów(%n " "nieprzeczytanych artykułów)" #: src/configcontainer.cpp:155 @@ -274,9 +274,9 @@ msgstr "nieprawidłowy indeks kanału (bug)" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" -"newsbeuter jest wolnym oprogramowaniem na licencji MIT/X Consortium License." +"newsboat jest wolnym oprogramowaniem na licencji MIT/X Consortium License." #: src/controller.cpp:977 #, c-format diff --git a/po/pt_BR.po b/po/pt_BR.po index 5196f50c..16f77ffb 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 2.8\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 2.8\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2014-04-13 16:40-0300\n" "Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n" @@ -38,9 +38,9 @@ msgstr "'%s' não é um elemento de configuração válido" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" -"newsbeuter: recarregamento terminado, %f fontes não lidos (%n artigos não " +"newsboat: recarregamento terminado, %f fontes não lidos (%n artigos não " "lidos no total)" #: src/configcontainer.cpp:155 @@ -273,9 +273,9 @@ msgstr "índice de fonte inválido (erro de software)" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" -"O newsbeuter é um software livre e está licenciado sob a MIT/X Consortium " +"O newsboat é um software livre e está licenciado sob a MIT/X Consortium " "License." #: src/controller.cpp:977 @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 1.3\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 1.3\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2016-11-19 13:00+0300\n" "Last-Translator: Konstantin Shakhnov <kastian@mail.ru>\n" @@ -36,9 +36,9 @@ msgstr "элемента конфигурации `%s' не существует #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" -"newsbeuter: обновление завершено, %f не прочитанных лент (всего %n заметок " +"newsboat: обновление завершено, %f не прочитанных лент (всего %n заметок " "не прочитано)" #: src/configcontainer.cpp:155 @@ -271,7 +271,7 @@ msgstr "неверный индекс ленты (сбой)" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" #: src/controller.cpp:977 @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter-1.4\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat-1.4\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2009-03-16 21:29+0100\n" "Last-Translator: Niklas Grahn <terra.unknown@yahoo.com>\n" @@ -35,9 +35,9 @@ msgstr "`%s' är inte ett giltigt konfigurationselement" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" -"newsbeuter: omläsning färdig, %f olästa webbkanaler (%n olästa artiklar " +"newsboat: omläsning färdig, %f olästa webbkanaler (%n olästa artiklar " "totalt)" #: src/configcontainer.cpp:155 @@ -275,9 +275,9 @@ msgstr "ogiltigt webbkanalsindex (fel)" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" -"newsbeuter är fri programvara och licenserat under MIT/X Consortium-licensen." +"newsboat är fri programvara och licenserat under MIT/X Consortium-licensen." #: src/controller.cpp:977 #, c-format @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 1.2\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 1.2\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2008-11-18 14:41+0200\n" "Last-Translator: H.Gökhan SARI <hsa2@difuzyon.net>\n" @@ -34,9 +34,9 @@ msgstr "" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" -"newsbeuter: yeniden yükleme tamamlandı, %f okunmamış besleme (%n okunmamış " +"newsboat: yeniden yükleme tamamlandı, %f okunmamış besleme (%n okunmamış " "toplam yazı)" #: src/configcontainer.cpp:155 @@ -273,7 +273,7 @@ msgstr "geçersiz besleme indeksi (bug)" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" #: src/controller.cpp:977 @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 0.9\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 0.9\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2008-08-02 15:32+0400\n" "Last-Translator: Ivan Kovnatsky <sevenfourk@gmail.com>\n" @@ -33,9 +33,9 @@ msgstr "`%s' недійсний елемент конфігурації" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" msgstr "" -"newsbeuter: завантаження завершено, %f непрочитаних тем (%n всього " +"newsboat: завантаження завершено, %f непрочитаних тем (%n всього " "непрочитаних статей)" #: src/configcontainer.cpp:155 @@ -272,9 +272,9 @@ msgstr "непрацездатний індекс теми (помилка)" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" -"newsbeuter - це вільне програмне забезпечення, що ліцензоване під MIT/X " +"newsboat - це вільне програмне забезпечення, що ліцензоване під MIT/X " "Consortium License." #: src/controller.cpp:977 @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 0.7\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 0.7\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2007-11-21 22:51+0100\n" "Last-Translator: josh yu <joshyupeng@gmail.com>\n" @@ -33,8 +33,8 @@ msgstr "" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" -msgstr "newsbeuter:重新加载完毕, %f个种子含未读文章(共有 %n 篇未读文章)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" +msgstr "newsboat:重新加载完毕, %f个种子含未读文章(共有 %n 篇未读文章)" #: src/configcontainer.cpp:155 msgid "%N %V - Articles in feed '%T' (%u unread, %t total) - %U" @@ -263,7 +263,7 @@ msgstr "无效的种子索引(bug）" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." +"newsboat is free software and licensed under the MIT/X Consortium License." msgstr "" #: src/controller.cpp:977 diff --git a/po/zh_TW.po b/po/zh_TW.po index ba2b543c..f21bb77c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: newsbeuter 1.0\n" -"Report-Msgid-Bugs-To: https://github.com/akrennmair/newsbeuter/issues\n" +"Project-Id-Version: newsboat 1.0\n" +"Report-Msgid-Bugs-To: https://github.com/newsboat/newsboat/issues\n" "POT-Creation-Date: 2017-01-23 20:19+0300\n" "PO-Revision-Date: 2010-03-03 16:55+0800\n" "Last-Translator: Aeglos <aeglos.lin@gmail.com>\n" @@ -36,8 +36,8 @@ msgstr "`%s'不是一個有效的組態項目" #: src/configcontainer.cpp:84 #, c-format -msgid "newsbeuter: finished reload, %f unread feeds (%n unread articles total)" -msgstr "newsbeuter:重新載入完成, %f個來源含未讀文章(共有 %n 篇未讀文章)" +msgid "newsboat: finished reload, %f unread feeds (%n unread articles total)" +msgstr "newsboat:重新載入完成, %f個來源含未讀文章(共有 %n 篇未讀文章)" #: src/configcontainer.cpp:155 msgid "%N %V - Articles in feed '%T' (%u unread, %t total) - %U" @@ -264,8 +264,8 @@ msgstr "無效的來源索引(bug）" #: src/controller.cpp:976 msgid "" -"newsbeuter is free software and licensed under the MIT/X Consortium License." -msgstr "newsbeuter是基於MIT/X Consortium License發佈的自由軟體" +"newsboat is free software and licensed under the MIT/X Consortium License." +msgstr "newsboat是基於MIT/X Consortium License發佈的自由軟體" #: src/controller.cpp:977 #, c-format diff --git a/src/colormanager.cpp b/src/colormanager.cpp index 86216847..83e9582f 100644 --- a/src/colormanager.cpp +++ b/src/colormanager.cpp @@ -79,7 +79,7 @@ void colormanager::dump_config(std::vector<std::string>& config_output) { } /* - * this is podbeuter-specific color management + * this is podboat-specific color management * TODO: refactor this */ void colormanager::set_pb_colors(podbeuter::pb_view * v) { diff --git a/src/configcontainer.cpp b/src/configcontainer.cpp index 931f9468..4a378cea 100644 --- a/src/configcontainer.cpp +++ b/src/configcontainer.cpp @@ -84,7 +84,7 @@ configcontainer::configcontainer() { "notify-beep", configdata("no", configdata_t::BOOL) }, { "notify-format", configdata( - _("newsbeuter: finished reload, %f unread " + _("newsboat: finished reload, %f unread " "feeds (%n unread articles total)"), configdata_t::STR) }, { "notify-program", configdata("", configdata_t::PATH) }, diff --git a/src/controller.cpp b/src/controller.cpp index 3a534f28..46a2ba43 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -974,9 +974,10 @@ void controller::version_information(const char * argv0, unsigned int level) { std::cout << "Copyright (C) 2006-2015 Andreas Krennmair" << std::endl; std::cout << "Copyright (C) 2015-2017 Alexander Batischev" << std::endl; std::cout << "Copyright (C) 2006-2017 Newsbeuter contributors" << std::endl; + std::cout << "Copyright (C) 2017 Newsboat contributors" << std::endl; std::cout << std::endl; - std::cout << _("newsbeuter is free software and licensed under the MIT/X Consortium License.") << std::endl; + std::cout << _("newsboat is free software and licensed under the MIT/X Consortium License.") << std::endl; std::cout << strprintf::fmt(_("Type `%s -vv' for more information."), argv0) << std::endl << std::endl; struct utsname xuts; @@ -1373,7 +1374,7 @@ void controller::execute_commands(char ** argv, unsigned int i) { std::string controller::write_temporary_item(std::shared_ptr<rss_item> item) { char filename[_POSIX_PATH_MAX]; - snprintf(filename, sizeof(filename), "/tmp/newsbeuter-article.XXXXXX"); + snprintf(filename, sizeof(filename), "/tmp/newsboat-article.XXXXXX"); int fd = mkstemp(filename); if (fd != -1) { write_item(item, filename); diff --git a/src/download.cpp b/src/download.cpp index d55d6b7f..e827f0a5 100644 --- a/src/download.cpp +++ b/src/download.cpp @@ -6,7 +6,7 @@ namespace podbeuter { /* - * the download class represents a single download entry in podbeuter. + * the download class represents a single download entry in podboat. * It manages the filename, the URL, the current state, the progress, etc. */ diff --git a/src/pb_controller.cpp b/src/pb_controller.cpp index a6581f5e..ce4d490a 100644 --- a/src/pb_controller.cpp +++ b/src/pb_controller.cpp @@ -200,11 +200,11 @@ void pb_controller::run(int argc, char * argv[]) { } }; - std::cout << strprintf::fmt(_("Starting %s %s..."), "podbeuter", PROGRAM_VERSION) << std::endl; + std::cout << strprintf::fmt(_("Starting %s %s..."), "podboat", PROGRAM_VERSION) << std::endl; pid_t pid; if (!utils::try_fs_lock(lock_file, pid)) { - std::cout << strprintf::fmt(_("Error: an instance of %s is already running (PID: %u)"), "podbeuter", pid) << std::endl; + std::cout << strprintf::fmt(_("Error: an instance of %s is already running (PID: %u)"), "podboat", pid) << std::endl; return; } @@ -231,7 +231,7 @@ void pb_controller::run(int argc, char * argv[]) { cfgparser.register_handler("reset-unread-on-update", &null_cah); try { - cfgparser.parse("/etc/newsbeuter/config"); + cfgparser.parse("/etc/newsboat/config"); cfgparser.parse(config_file); } catch (const configexception& ex) { std::cout << ex.what() << std::endl; @@ -270,7 +270,7 @@ void pb_controller::run(int argc, char * argv[]) { void pb_controller::usage(const char * argv0) { auto msg = strprintf::fmt(_("%s %s\nusage %s [-C <file>] [-q <file>] [-h]\n"), - "podbeuter", + "podboat", PROGRAM_VERSION, argv0); std::cout << msg; diff --git a/src/view.cpp b/src/view.cpp index 8745c52d..6c3bfb10 100644 --- a/src/view.cpp +++ b/src/view.cpp @@ -165,7 +165,7 @@ void view::run() { curs_set(0); /* - * This is the main "event" loop of newsbeuter. + * This is the main "event" loop of newsboat. */ while (formaction_stack_size() > 0) { diff --git a/test/cache.cpp b/test/cache.cpp index b081438c..fa8c3c7e 100644 --- a/test/cache.cpp +++ b/test/cache.cpp @@ -43,7 +43,7 @@ TEST_CASE("Cleaning old articles works", "[cache]") { item->set_title("Test item"); item->set_link("http://example.com/item"); item->set_guid("http://example.com/item"); - item->set_author("Newsbeuter Testsuite"); + item->set_author("Newsboat Testsuite"); item->set_description(""); item->set_pubDate(time(nullptr)); // current time item->set_unread(true); @@ -51,7 +51,7 @@ TEST_CASE("Cleaning old articles works", "[cache]") { rsscache->externalize_rssfeed(feed, false); - /* Simulating a restart of Newsbeuter. */ + /* Simulating a restart of Newsboat. */ /* Setting "keep-articles-days" to non-zero value to trigger * cache::clean_old_articles(). diff --git a/test/generate_coverage_report.sh b/test/generate_coverage_report.sh index bc9c0c57..4d11b7c2 100755 --- a/test/generate_coverage_report.sh +++ b/test/generate_coverage_report.sh @@ -13,6 +13,6 @@ lcov --capture --base-directory . --directory . --output-file $APPTEST_INFO lcov --base-directory . --directory . --output-file $APPTOTAL_INFO \ --add-tracefile $APPBASE_INFO --add-tracefile $APPTEST_INFO lcov --remove $APPTOTAL_INFO '/usr/*' --output-file $APPTOTAL_INFO -lcov --remove $APPTOTAL_INFO 'newsbeuter/test/*' --output-file $APPTOTAL_INFO +lcov --remove $APPTOTAL_INFO 'newsboat/test/*' --output-file $APPTOTAL_INFO rm -rf html genhtml -o html $APPTOTAL_INFO diff --git a/test/test-helpers.h b/test/test-helpers.h index 2bbb6971..65db0b23 100644 --- a/test/test-helpers.h +++ b/test/test-helpers.h @@ -57,7 +57,7 @@ namespace TestHelpers { tempdir = "/tmp/"; } - tempdir += "/newsbeuter-tests/"; + tempdir += "/newsboat-tests/"; int status = mkdir(tempdir.c_str(), S_IRWXU); if (status != 0) { |