Updating translation
Updating translation
Updating translation
Merge remote-tracking branch 'upstream/master'
Merge pull request #280 from PerryWerneck/master

Updatings pt-BR translation
fix globalUpdateFeeds failing when no active session exists
tweak zoomed display date/tags a bit
filter testing: exclude archived articles because filtering on them makes no sense
fix cat filters always applying if set to uncategorized
Revert "Include both title and text attributes"

This reverts commit 631c06760190b7e207a8a16bb76517f7f308dc68.
loadMoreHeadlines: use shorter syntax for adaptive offset calculation
pass feed information to article filters
passing --log option to update daemon processes
pass logfile to child tasks if locking is possible, lock logfile before writing, add kludge to prevent update_rss_feed unneeded debugging go into master logfile
Merge pull request #298 from rangerer/update_daemon_log

passing --log option to update daemon processes
use plurals for comment/comments link in article, properly translate comments string, add feed title to article in zoom mode
fix xgettext extraction of plural forms, replace wrong ngettext() calls with _ngettext(), rebase translations
Merge remote-tracking branch 'upstream/master'

Conflicts:
	locale/ca_CA/LC_MESSAGES/messages.mo
	locale/ca_CA/LC_MESSAGES/messages.po
	locale/cs_CZ/LC_MESSAGES/messages.mo
	locale/cs_CZ/LC_MESSAGES/messages.po
	locale/de_DE/LC_MESSAGES/messages.mo
	locale/de_DE/LC_MESSAGES/messages.po
	locale/es_ES/LC_MESSAGES/messages.mo
	locale/es_ES/LC_MESSAGES/messages.po
	locale/fi_FI/LC_MESSAGES/messages.mo
	locale/fi_FI/LC_MESSAGES/messages.po
	locale/fr_FR/LC_MESSAGES/messages.mo
	locale/fr_FR/LC_MESSAGES/messages.po
	locale/hu_HU/LC_MESSAGES/messages.mo
	locale/hu_HU/LC_MESSAGES/messages.po
	locale/it_IT/LC_MESSAGES/messages.mo
	locale/it_IT/LC_MESSAGES/messages.po
	locale/ja_JP/LC_MESSAGES/messages.mo
	locale/ja_JP/LC_MESSAGES/messages.po
	locale/ko_KR/LC_MESSAGES/messages.mo
	locale/ko_KR/LC_MESSAGES/messages.po
	locale/lv_LV/LC_MESSAGES/messages.mo
	locale/lv_LV/LC_MESSAGES/messages.po
	locale/nb_NO/LC_MESSAGES/messages.mo
	locale/nb_NO/LC_MESSAGES/messages.po
	locale/nl_NL/LC_MESSAGES/messages.mo
	locale/nl_NL/LC_MESSAGES/messages.po
	locale/pl_PL/LC_MESSAGES/messages.mo
	locale/pl_PL/LC_MESSAGES/messages.po
	locale/pt_BR/LC_MESSAGES/messages.mo
	locale/pt_BR/LC_MESSAGES/messages.po
	locale/ru_RU/LC_MESSAGES/messages.mo
	locale/ru_RU/LC_MESSAGES/messages.po
	locale/sv_SE/LC_MESSAGES/messages.mo
	locale/sv_SE/LC_MESSAGES/messages.po
	locale/zh_CN/LC_MESSAGES/messages.mo
	locale/zh_CN/LC_MESSAGES/messages.po
	messages.pot