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

diff --git a/include/functions.php b/include/functions.php
index f1b016de7ecf67e9c9f6353eb91680d63ab78006..1d7033c899b46e773d4677a4df9c62947b3630b1 100644 (file)
--- 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
index 1a9fc2be6ae61b994b0a56c0151e380b36f8b2a9..565c0e8c905bd1a4d919ed8f6e228b8ae0038193 100644 (file)
Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ

diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index f0d48000f8e26de99ba2d0da27b26b2e25ef2332..3796076b868e5f4db9d04dabd8ad8bcb6dd5599c 100644 (file)
--- 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 "Ð\9fомеÑ\82иÑ\82Ñ\8c вÑ\81е Ñ\81Ñ\82аÑ\82Ñ\8cи как пÑ\80оÑ\87иÑ\82аннÑ\8bе?"
+msgstr "Ð\9eÑ\82меÑ\82иÑ\82Ñ\8c обновлÑ\91ннÑ\8bе Ñ\81Ñ\82аÑ\82Ñ\8cи как непÑ\80оÑ\87иÑ\82аннÑ\8bе"
 
 #: classes/pref/feeds.php:748
 msgid "Icon"