valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.fakecake.org:tt-rss into pdo-experimental

This commit is contained in:
Andrew Dolgov 2017-12-02 23:13:49 +03:00
parent 1e78803c44 7c4d7bce3f
commit 4ee398a41e
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.php
View File

@ -57,7 +57,7 @@
// do not cache files smaller than that (bytes) // do not cache files smaller than that (bytes)
define_default('CACHE_MAX_DAYS', 7); define_default('CACHE_MAX_DAYS', 7);
// max age in days for various automatically cached (temporary) files // max age in days for various automatically cached (temporary) files
define_default('MAX_CONDITIONAL_INTERVAL', 3600*6); define_default('MAX_CONDITIONAL_INTERVAL', 3600*12);
// max interval between forced unconditional updates for servers // max interval between forced unconditional updates for servers
// not complying with http if-modified-since (seconds) // not complying with http if-modified-since (seconds)

BIN
locale/ru_RU/LC_MESSAGES/messages.mo
View File

Binary file not shown.

2
locale/ru_RU/LC_MESSAGES/messages.po
View File

@ -1996,7 +1996,7 @@ msgstr ""
#: classes/pref/feeds.php:744 #: classes/pref/feeds.php:744
#: classes/pref/feeds.php:922 #: classes/pref/feeds.php:922
msgid "Mark updated articles as unread" msgid "Mark updated articles as unread"
msgstr "Пометить все статьи как прочитанные?" msgstr "Отметить обновлённые статьи как непрочитанные"
#: classes/pref/feeds.php:748 #: classes/pref/feeds.php:748
msgid "Icon" msgid "Icon"