diff options
| author | Andrew Dolgov <[email protected]> | 2017-12-02 23:13:49 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2017-12-02 23:13:49 +0300 |
| commit | 4ee398a41e2176d4a5c997920db35cb6bed12f2e (patch) | |
| tree | a75d1c72a9d755fc8d0a641ff3c3b78032841ee4 | |
| parent | 1e78803c4482d7f89ef79956da00b4155f523b61 (diff) | |
| parent | 7c4d7bce3f15afbdab0487e101cd2f85afed8bd5 (diff) | |
Merge branch 'master' of git.fakecake.org:tt-rss into pdo-experimental
| -rw-r--r-- | include/functions.php | 2 | ||||
| -rw-r--r-- | locale/ru_RU/LC_MESSAGES/messages.mo | bin | 73963 -> 73982 bytes | |||
| -rw-r--r-- | locale/ru_RU/LC_MESSAGES/messages.po | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/include/functions.php b/include/functions.php index f1b016de7..1d7033c89 100644 --- a/include/functions.php +++ b/include/functions.php @@ -57,7 +57,7 @@ // do not cache files smaller than that (bytes) define_default('CACHE_MAX_DAYS', 7); // 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 // not complying with http if-modified-since (seconds) diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo Binary files differindex 1a9fc2be6..565c0e8c9 100644 --- a/locale/ru_RU/LC_MESSAGES/messages.mo +++ b/locale/ru_RU/LC_MESSAGES/messages.mo diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po index f0d48000f..3796076b8 100644 --- a/locale/ru_RU/LC_MESSAGES/messages.po +++ b/locale/ru_RU/LC_MESSAGES/messages.po @@ -1996,7 +1996,7 @@ msgstr "" #: classes/pref/feeds.php:744 #: classes/pref/feeds.php:922 msgid "Mark updated articles as unread" -msgstr "Пометить все статьи как прочитанные?" +msgstr "Отметить обновлённые статьи как непрочитанные" #: classes/pref/feeds.php:748 msgid "Icon" |