Moved hard-coded fetch timeout values into config file to allow site-level tuning
Merge branch 'master' into tunable-fetches

Conflicts:
	include/rssfuncs.php
Move tuning settings to different file so config.php isn't overcrowded
by default
Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git into tunable-fetches
Merge branch 'master' into tunable-fetches
Add hook to add explanations of hotkey actions via plugins.
updated german translation
Merge branch 'master' of https://github.com/HeikoAdams/Tiny-Tiny-RSS
label_create: set default owner_uid
pref-prefs: don't use schema-defined help/desc/section names
schema: remove unused prefs help_text/short_desc/section_name
remove blank string gettext invocations
rebase translations
update pref descriptions
rebase translations
Merge branch 'master' of git://github.com/HeikoAdams/Tiny-Tiny-RSS into HeikoAdams-master

Conflicts:
	locale/de_DE/LC_MESSAGES/messages.mo
	locale/de_DE/LC_MESSAGES/messages.po
rebase translatiosn
Merge pull request #119 from dandersson/hotkey_info_hook

Hook to add hotkey definition texts via plugins
Add more czech strings. 42 remaining.
Fix header to contain relevant info. Wipe unused strings.