diff --git a/CHANGES.txt b/CHANGES.txt index 76bec7a691..aae741d050 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -New in master +New in v7.8.6 ============= Features diff --git a/docs/extending.txt b/docs/extending.txt index 5c0ffa9fde..7e377a292f 100644 --- a/docs/extending.txt +++ b/docs/extending.txt @@ -9,7 +9,7 @@ Extending Nikola ================ -:Version: 7.8.5 +:Version: 7.8.6 :Author: Roberto Alsina .. class:: alert alert-info pull-right diff --git a/docs/man/nikola.1.gz b/docs/man/nikola.1.gz index bb63c65523..11d36a7279 100644 Binary files a/docs/man/nikola.1.gz and b/docs/man/nikola.1.gz differ diff --git a/docs/man/nikola.rst b/docs/man/nikola.rst index 8d181266df..cf2dac9ef7 100644 --- a/docs/man/nikola.rst +++ b/docs/man/nikola.rst @@ -6,7 +6,7 @@ Nikola A Static Site and Blog Generator -------------------------------- -:Version: Nikola 7.8.5 +:Version: Nikola 7.8.6 :Manual section: 1 :Manual group: User Commands diff --git a/docs/manual.txt b/docs/manual.txt index 842c320d14..13aca5b526 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -9,7 +9,7 @@ The Nikola Handbook =================== -:Version: 7.8.5 +:Version: 7.8.6 .. class:: alert alert-info pull-right diff --git a/docs/path_handlers.txt b/docs/path_handlers.txt index 16fe5a2d63..c536117c6a 100644 --- a/docs/path_handlers.txt +++ b/docs/path_handlers.txt @@ -17,19 +17,12 @@ archive link://archive/2013 => /archives/2013/index.html archive_atom - Link to archive Atom path, name is the year. + Link to archive Atom path, name is the year (archive pages must be indexes). Example: link://archive_atom/2013 => /archives/2013/index.atom -archive_rss - Link to archive RSS path, name is the year. - - Example: - - link://archive_rss/2013 => /archives/2013/rss.xml - author Link to an author's page. diff --git a/docs/social_buttons.txt b/docs/social_buttons.txt index a842d56014..a57a0415cb 100644 --- a/docs/social_buttons.txt +++ b/docs/social_buttons.txt @@ -9,7 +9,7 @@ Using Alternative Social Buttons with Nikola ============================================ -:Version: 7.8.5 +:Version: 7.8.6 .. class:: alert alert-info pull-right diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py index 55716af4d1..4d9edb3a05 100644 --- a/docs/sphinx/conf.py +++ b/docs/sphinx/conf.py @@ -51,9 +51,9 @@ # built documents. # # The short X.Y version. -version = '7.8.5' +version = '7.8.6' # The full version, including alpha/beta/rc tags. -release = '7.8.5' +release = '7.8.6' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/support.rst b/docs/support.rst index b053eb936d..f2b7d0a6a4 100644 --- a/docs/support.rst +++ b/docs/support.rst @@ -4,7 +4,7 @@ .. description: Get help using Nikola, or contact us. .. author: The Nikola Team -:Version: 7.8.5 +:Version: 7.8.6 .. class:: alert alert-info pull-right diff --git a/docs/template-variables.rst b/docs/template-variables.rst index 15d0f9039f..38437db76e 100644 --- a/docs/template-variables.rst +++ b/docs/template-variables.rst @@ -3,7 +3,7 @@ .. date: 2017-04-13 12:00:00 .. author: The Nikola Team -:Version: 7.8.5 +:Version: 7.8.6 :Author: Chris Warrick Variables available in templates are listed below. diff --git a/docs/theming.txt b/docs/theming.txt index 3d454ac726..1c6a649bbc 100644 --- a/docs/theming.txt +++ b/docs/theming.txt @@ -9,7 +9,7 @@ Theming Nikola ============== -:Version: 7.8.5 +:Version: 7.8.6 :Author: Roberto Alsina .. class:: alert alert-info pull-right diff --git a/nikola/__init__.py b/nikola/__init__.py index ba1040da93..ad68cbf57f 100644 --- a/nikola/__init__.py +++ b/nikola/__init__.py @@ -29,7 +29,7 @@ from __future__ import absolute_import import os -__version__ = '7.8.5' +__version__ = '7.8.6' DEBUG = bool(os.getenv('NIKOLA_DEBUG')) from .nikola import Nikola # NOQA diff --git a/nikola/data/themes/base/messages/messages_ru.py b/nikola/data/themes/base/messages/messages_ru.py index 7e2256a328..840c7d823a 100644 --- a/nikola/data/themes/base/messages/messages_ru.py +++ b/nikola/data/themes/base/messages/messages_ru.py @@ -16,7 +16,7 @@ "More posts about %s": "Больше записей о %s", "Newer posts": "Новые записи", "Next post": "Следующая запись", - "Next": "", + "Next": "Следующая", "No posts found.": "Записей не найдено.", "Nothing found.": "Ничего не найдено.", "Older posts": "Старые записи", @@ -28,7 +28,7 @@ "Posts for {month} {day}, {year}": "Записи за {day} {month} {year}", "Posts for {month} {year}": "Записи за {month} {year}", "Previous post": "Предыдущая запись", - "Previous": "", + "Previous": "Предыдущая", "Publication date": "Дата опубликования", "RSS feed": "RSS лента", "Read in English": "Прочесть по-русски", @@ -38,9 +38,9 @@ "Subcategories:": "Подкатегории:", "Tags and Categories": "Тэги и категории", "Tags": "Тэги", - "Toggle navigation": "", + "Toggle navigation": "Включить навигацию", "Uncategorized": "Несортированное", - "Up": "", + "Up": "Наверх", "Updates": "Обновления", "Write your page here.": "Создайте Вашу страницу здесь.", "Write your post here.": "Создайте Вашу запись здесь.", diff --git a/setup.py b/setup.py index fc1cd280d2..3f9d291df7 100755 --- a/setup.py +++ b/setup.py @@ -116,7 +116,7 @@ def run(self): setup(name='Nikola', - version='7.8.5', + version='7.8.6', description='A modular, fast, simple, static website and blog generator', long_description=open('README.rst').read(), author='Roberto Alsina and others', diff --git a/snapcraft.yaml b/snapcraft.yaml index fb3b6f7ffc..a1198560b3 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: nikola -version: 7.8.5 +version: 7.8.6 summary: A static website generator description: A static website generator confinement: strict diff --git a/translations/nikola.messages/ru.po b/translations/nikola.messages/ru.po index cc8ccabffd..f9a8101246 100644 --- a/translations/nikola.messages/ru.po +++ b/translations/nikola.messages/ru.po @@ -8,10 +8,12 @@ # Translators: # Translators: # Dmitry Verkhoturov , 2014 +# Dmitry Verkhoturov , 2014 # Evgeny [PTM] , 2016 # Max Arnold , 2013 # Max Arnold , 2013 # Oleksandr Fedorov, 2015 +# Oleksandr Fedorov, 2015 # Roberto Alsina , 2013 # Roberto Alsina , 2013 msgid "" @@ -19,8 +21,8 @@ msgstr "" "Project-Id-Version: Nikola\n" "Report-Msgid-Bugs-To: ralsina@netmanagers.com.ar\n" "POT-Creation-Date: 2013-03-15 12:24-0300\n" -"PO-Revision-Date: 2017-01-07 11:37+0000\n" -"Last-Translator: Chris Warrick \n" +"PO-Revision-Date: 2017-05-15 08:13+0000\n" +"Last-Translator: vadim Kucherenko \n" "Language-Team: Russian (http://www.transifex.com/ralsina/nikola/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -151,7 +153,7 @@ msgid "Posts by %s" msgstr "Запись %s" msgid "Toggle navigation" -msgstr "" +msgstr "Включить навигацию" #. Used to format months per year msgid "{month} {year}" @@ -162,10 +164,10 @@ msgid "{month} {day}, {year}" msgstr "" msgid "Previous" -msgstr "" +msgstr "Предыдущая" msgid "Up" -msgstr "" +msgstr "Наверх" msgid "Next" -msgstr "" +msgstr "Следующая"