Merge master

CHANGELOG.md

@@ -1,4 +1,5 @@
 ### HEAD
+* Update to Bootstrap 2.3.1
 * Simplify alerts
 * Remove disabled post nav links
 * Use Bootstrap media object for listing comments

assets/css/less/bootstrap/bootstrap.less

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.3.0
+ * Bootstrap v2.3.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

assets/css/less/bootstrap/responsive.less

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.3.0
+ * Bootstrap Responsive v2.3.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

assets/js/plugins/bootstrap/bootstrap-affix.js

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-affix.js v2.3.0
+ * bootstrap-affix.js v2.3.1
  * http://twitter.github.com/bootstrap/javascript.html#affix
  * ==========================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-alert.js

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-alert.js v2.3.0
+ * bootstrap-alert.js v2.3.1
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-button.js

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-button.js v2.3.0
+ * bootstrap-button.js v2.3.1
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-carousel.js

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-carousel.js v2.3.0
+ * bootstrap-carousel.js v2.3.1
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -75,7 +75,7 @@
       if (!e) this.paused = true
       if (this.$element.find('.next, .prev').length && $.support.transition.end) {
         this.$element.trigger($.support.transition.end)
-        this.cycle()
+        this.cycle(true)
       }
       clearInterval(this.interval)
       this.interval = null

assets/js/plugins/bootstrap/bootstrap-collapse.js

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-collapse.js v2.3.0
+ * bootstrap-collapse.js v2.3.1
  * http://twitter.github.com/bootstrap/javascript.html#collapse
  * =============================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-dropdown.js

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-dropdown.js v2.3.0
+ * bootstrap-dropdown.js v2.3.1
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -158,7 +158,7 @@
   $(document)
     .on('click.dropdown.data-api', clearMenus)
     .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('.dropdown-menu', function (e) { e.stopPropagation() })
+    .on('click.dropdown-menu', function (e) { e.stopPropagation() })
     .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
     .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
 

assets/js/plugins/bootstrap/bootstrap-modal.js

@@ -1,5 +1,5 @@
 /* =========================================================
- * bootstrap-modal.js v2.3.0
+ * bootstrap-modal.js v2.3.1
  * http://twitter.github.com/bootstrap/javascript.html#modals
  * =========================================================
  * Copyright 2012 Twitter, Inc.
@@ -148,7 +148,7 @@
       }
 
     , removeBackdrop: function () {
-        this.$backdrop.remove()
+        this.$backdrop && this.$backdrop.remove()
         this.$backdrop = null
       }
 

assets/js/plugins/bootstrap/bootstrap-popover.js

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-popover.js v2.3.0
+ * bootstrap-popover.js v2.3.1
  * http://twitter.github.com/bootstrap/javascript.html#popovers
  * ===========================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-scrollspy.js

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-scrollspy.js v2.3.0
+ * bootstrap-scrollspy.js v2.3.1
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
  * =============================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-tab.js

@@ -1,5 +1,5 @@
 /* ========================================================
- * bootstrap-tab.js v2.3.0
+ * bootstrap-tab.js v2.3.1
  * http://twitter.github.com/bootstrap/javascript.html#tabs
  * ========================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-tooltip.js

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-tooltip.js v2.3.0
+ * bootstrap-tooltip.js v2.3.1
  * http://twitter.github.com/bootstrap/javascript.html#tooltips
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ===========================================================
@@ -80,7 +80,15 @@
     }
 
   , enter: function (e) {
-      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+      var defaults = $.fn[this.type].defaults
+        , options = {}
+        , self
+
+      this._options && $.each(this._options, function (key, value) {
+        if (defaults[key] != value) options[key] = value
+      }, this)
+
+      self = $(e.currentTarget)[this.type](options).data(this.type)
 
       if (!self.options.delay || !self.options.delay.show) return self.show()
 

assets/js/plugins/bootstrap/bootstrap-transition.js

@@ -1,5 +1,5 @@
 /* ===================================================
- * bootstrap-transition.js v2.3.0
+ * bootstrap-transition.js v2.3.1
  * http://twitter.github.com/bootstrap/javascript.html#transitions
  * ===================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-typeahead.js

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-typeahead.js v2.3.0
+ * bootstrap-typeahead.js v2.3.1
  * http://twitter.github.com/bootstrap/javascript.html#typeahead
  * =============================================================
  * Copyright 2012 Twitter, Inc.

lang/ru_RU.po

@@ -2,325 +2,316 @@ msgid ""
 msgstr ""
 "Project-Id-Version: roots-russian\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-13 16:17-0300\n"
+"POT-Creation-Date: \n"
-"PO-Revision-Date: 2012-07-09 18:43+0400\n"
+"PO-Revision-Date: 2013-03-01 21:19+0400\n"
-"Last-Translator: fedor\n"
+"Last-Translator: Fedor Sumkin <qosys.net@gmai.com>\n"
-"Language-Team: program-school.ru <fvompe@gmail.com>\n"
+"Language-Team: Fedor Sumkin <qosys.net@gmail.com>\n"
+"Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11) ? 0 : ((n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2);\n"
 "X-Poedit-KeywordsList: _;gettext;gettext_noop;__;_e\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Basepath: .\n"
+"X-Generator: Poedit 1.5.5\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: 404.php:7
+#: 404.php:5
-msgid "File Not Found"
+msgid ""
-msgstr "Файл не найден"
+"The page you are looking for might have been removed, had its name changed, "
+"or is temporarily unavailable."
+msgstr ""
+"Страница, которую вы ищете, возможно, была удалена, переименована, или она "
+"временно недоступна."
 
-#: 404.php:11
+#: 404.php:8
-msgid "The page you are looking for might have been removed, had its name changed, or is temporarily unavailable."
-msgstr "Страница, которую вы ищете, возможно, была удалена, переименована, или она временно недоступна."
-
-#: 404.php:13
 msgid "Please try the following:"
 msgstr "Пожалуйста, попробуйте следующее:"
 
-#: 404.php:15
+#: 404.php:10
 msgid "Check your spelling"
 msgstr "Проверьте правописание"
 
-#: 404.php:16
+#: 404.php:11
-#, php-format
 msgid "Return to the <a href=\"%s\">home page</a>"
 msgstr "Вернуться на <a href=\"%s\">главную страницу</a>"
 
-#: 404.php:17
+#: 404.php:12
 msgid "Click the <a href=\"javascript:history.back()\">Back</a> button"
 msgstr "Нажмите на кнопку <a href=\"javascript:history.back()\">назад</a>"
 
-#: archive.php:13
+#: lib/activation.php:31 lib/activation.php:32
-#, php-format
-msgid "Daily Archives: %s"
-msgstr "Архив за день: %s"
-
-#: archive.php:15
-#, php-format
-msgid "Monthly Archives: %s"
-msgstr "Архив за месяц: %s"
-
-#: archive.php:17
-#, php-format
-msgid "Yearly Archives: %s"
-msgstr "Архив за год: %s"
-
-#: archive.php:21
-#, php-format
-msgid "Author Archives: %s"
-msgstr "Архив автора: %s"
-
-#: comments.php:7
-#, php-format
-msgid "<cite class=\"fn\">%s</cite>"
-msgstr ""
-
-#: comments.php:8
-#, php-format
-msgid "%1$s"
-msgstr ""
-
-#: comments.php:9
-msgid "(Edit)"
-msgstr "(Редактировать)"
-
-#: comments.php:15
-msgid "Your comment is awaiting moderation."
-msgstr "Ваш комментарий ожидает модерации."
-
-#: comments.php:32
-msgid "This post is password protected. Enter the password to view comments."
-msgstr "Это сообщение защищено паролем. Введите пароль для просмотра комментариев."
-
-#: comments.php:49
-msgid "&larr; Older comments"
-msgstr "&larr; Старые комментарии"
-
-#: comments.php:50
-msgid "Newer comments &rarr;"
-msgstr "Новые комментарии &rarr;"
-
-#: comments.php:58
-#: comments.php:68
-msgid "Comments are closed."
-msgstr "Комментарии закрыты."
-
-#: comments.php:75
-msgid "Leave a Reply"
-msgstr "Оставить комментарий"
-
-#: comments.php:75
-#, php-format
-msgid "Leave a Reply to %s"
-msgstr "Оставить комментарий %s"
-
-#: comments.php:78
-#, php-format
-msgid "You must be <a href=\"%s\">logged in</a> to post a comment."
-msgstr "Вы должны быть <a href=\"%s\">залогинены</a>, чтобы оставить комментарий."
-
-#: comments.php:82
-#, php-format
-msgid "Logged in as <a href=\"%s/wp-admin/profile.php\">%s</a>."
-msgstr "Вы вошли как <a href=\"%s/wp-admin/profile.php\">%s</a>."
-
-#: comments.php:82
-msgid "Log out of this account"
-msgstr "Выход из этой учетной записи"
-
-#: comments.php:82
-msgid "Log out &raquo;"
-msgstr "Выйдите из системы »"
-
-#: comments.php:84
-msgid "Name"
-msgstr "Имя"
-
-#: comments.php:84
-#: comments.php:86
-msgid " (required)"
-msgstr " (необходимо)"
-
-#: comments.php:86
-msgid "Email (will not be published)"
-msgstr "E-mail (не публикуется)"
-
-#: comments.php:88
-msgid "Website"
-msgstr "Сайт"
-
-#: comments.php:91
-msgid "Comment"
-msgstr "Комментарий"
-
-#: comments.php:93
-msgid "Submit Comment"
-msgstr "Добавить комментарий"
-
-#: functions.php:45
-msgid "Primary Navigation"
-msgstr "Основная Навигация"
-
-#: functions.php:74
-#, php-format
-msgid "Posted on %s at %s."
-msgstr "Опубликовано %s в %s."
-
-#: functions.php:75
-msgid "Written by"
-msgstr "Написано"
-
-#: index.php:7
-msgid "Latest Posts"
-msgstr "Последние посты"
-
-#: loop-single.php:14
-msgid "Pages:"
-msgstr "Страницы:"
-
-#: loop.php:5
-msgid "Sorry, no results were found."
-msgstr "Извините, ничего не найдено."
-
-#: loop.php:37
-msgid "&larr; Older posts"
-msgstr "&larr; К предыдущему сообщения"
-
-#: loop.php:38
-msgid "Newer posts &rarr;"
-msgstr "Новые сообщения &rarr;"
-
-#: search.php:7
-msgid "Search Results for"
-msgstr "Результаты поиска"
-
-#: searchform.php:2
-msgid "Search for:"
-msgstr "Поиск:"
-
-#: searchform.php:3
-#: searchform.php:4
-msgid "Search"
-msgstr "Поиск"
-
-#: inc/roots-activation.php:32
-#: inc/roots-activation.php:33
 msgid "Theme Activation"
 msgstr "Активация темы"
 
-#: inc/roots-activation.php:70
+#: lib/activation.php:68
-#, php-format
 msgid "%s Theme Activation"
 msgstr "%s Активация темы"
 
-#: inc/roots-activation.php:85
+#: lib/activation.php:83 lib/activation.php:85
-#: inc/roots-activation.php:87
 msgid "Create static front page?"
 msgstr "Создать статичную первую страницу?"
 
-#: inc/roots-activation.php:89
+#: lib/activation.php:87 lib/activation.php:100 lib/activation.php:113
-#: inc/roots-activation.php:102
+#: lib/activation.php:126 lib/activation.php:139
-#: inc/roots-activation.php:115
-#: inc/roots-activation.php:128
-#: inc/roots-activation.php:141
 msgid "Yes"
 msgstr "Да"
 
-#: inc/roots-activation.php:90
+#: lib/activation.php:88 lib/activation.php:101 lib/activation.php:114
-#: inc/roots-activation.php:103
+#: lib/activation.php:127 lib/activation.php:140
-#: inc/roots-activation.php:116
-#: inc/roots-activation.php:129
-#: inc/roots-activation.php:142
 msgid "No"
 msgstr "Нет"
 
-#: inc/roots-activation.php:93
+#: lib/activation.php:91
 msgid "Create a page called Home and set it to be the static front page"
 msgstr "Создать страницу Home и установить её как статичную первую страницу"
 
-#: inc/roots-activation.php:98
+#: lib/activation.php:96
 msgid "Change permalink structure?"
 msgstr "Изменить структуру постоянных ссылок?"
 
-#: inc/roots-activation.php:100
+#: lib/activation.php:98
 msgid "Update permalink structure?"
 msgstr "Обновить структуру постоянных ссылок?"
 
-#: inc/roots-activation.php:106
+#: lib/activation.php:104
 msgid "Change permalink structure to /&#37;postname&#37;/"
 msgstr "Изменение структуры постоянных ссылок на /&#37;postname&#37;/"
 
-#: inc/roots-activation.php:111
+#: lib/activation.php:109
 msgid "Change uploads folder?"
 msgstr "Изменить папку загрузки?"
 
-#: inc/roots-activation.php:113
+#: lib/activation.php:111
 msgid "Update uploads folder?"
 msgstr "Обновить папку загрузки?"
 
-#: inc/roots-activation.php:119
+#: lib/activation.php:117
 msgid "Change uploads folder to /assets/ instead of /wp-content/uploads/"
 msgstr "Поменять папку загрузки на /assets/ с /wp-content/uploads/"
 
-#: inc/roots-activation.php:124
+#: lib/activation.php:122 lib/activation.php:124
-#: inc/roots-activation.php:126
 msgid "Create navigation menu?"
 msgstr "Создать меню навигации?"
 
-#: inc/roots-activation.php:132
+#: lib/activation.php:130
 msgid "Create the Primary Navigation menu and set the location"
 msgstr "Создать меню навигации Primary Navigation"
 
-#: inc/roots-activation.php:137
+#: lib/activation.php:135 lib/activation.php:137
-#: inc/roots-activation.php:139
 msgid "Add pages to menu?"
 msgstr "Добавить страницу в меню?"
 
-#: inc/roots-activation.php:145
+#: lib/activation.php:143
 msgid "Add all current published pages to the Primary Navigation"
-msgstr "Добавить все опубликованные страницы в меню навигации Primary Navigation"
+msgstr ""
+"Добавить все опубликованные страницы в меню навигации Primary Navigation"
 
-#: inc/roots-cleanup.php:370
+#: lib/cleanup.php:388
 msgid "Continued"
-msgstr "Продолжающийся"
+msgstr "Читать дальше"
 
-#: inc/roots-cleanup.php:538
+#: lib/htaccess.php:25
-#, php-format
-msgid "Please update your <a href=\"%s\">site tagline</a> <a href=\"%s\" style=\"float: right;\">Hide Notice</a>"
-msgstr "Пожалуйста, обновите ваш <a href=\"%s\">лозунг для сайта</ a> <a href=\"%s\" style=\"float: right;\">Скрыть замечание</a>"
-
-#: inc/roots-htaccess.php:11
-#, php-format
 msgid "Please make sure your <a href=\"%s\">.htaccess</a> file is writable "
 msgstr "Убедитесь, что файл <a href=\"%s\">.htaccess</a> доступен для записи"
 
-#: inc/roots-widgets.php:5
+#: lib/init.php:13
+msgid "Primary Navigation"
+msgstr "Основная Навигация"
+
+#: lib/utils.php:14
+msgid "Latest Posts"
+msgstr "Последние новости"
+
+#: lib/utils.php:23
+msgid "Daily Archives: %s"
+msgstr "Архив за день: %s"
+
+#: lib/utils.php:25
+msgid "Monthly Archives: %s"
+msgstr "Архив за месяц: %s"
+
+#: lib/utils.php:27
+msgid "Yearly Archives: %s"
+msgstr "Архив за год: %s"
+
+#: lib/utils.php:31
+msgid "Author Archives: %s"
+msgstr "Архив автора: %s"
+
+#: lib/utils.php:36
+msgid "Search Results for %s"
+msgstr "Результаты поиска %s"
+
+#: lib/utils.php:38
+msgid "File Not Found"
+msgstr "Файл не найден"
+
+#: lib/widgets.php:6
+msgid "Primary Sidebar"
+msgstr "Первичная боковая панель"
+
+#: lib/widgets.php:15
+msgid "Footer"
+msgstr "Футер"
+
+#: lib/widgets.php:41
 msgid "Use this widget to add a vCard"
 msgstr "Используйте этот виджет для добавления vCard"
 
-#: inc/roots-widgets.php:6
+#: lib/widgets.php:43
 msgid "Roots: vCard"
 msgstr ""
 
-#: inc/roots-widgets.php:33
+#: lib/widgets.php:70
 msgid "vCard"
 msgstr ""
 
-#: inc/roots-widgets.php:99
+#: templates/comments.php:7
-msgid "Title (optional):"
+msgid "<cite class=\"fn\">%s</cite>"
-msgstr "Заголовок (необязательно):"
+msgstr ""
 
-#: inc/roots-widgets.php:103
+#: templates/comments.php:8
-msgid "Street Address:"
+msgid "%1$s"
-msgstr "Адрес:"
+msgstr ""
 
-#: inc/roots-widgets.php:107
+#: templates/comments.php:9
-msgid "City/Locality:"
+msgid "(Edit)"
-msgstr "Город/Населенный пункт:"
+msgstr "(Редактировать)"
 
-#: inc/roots-widgets.php:111
+#: templates/comments.php:15
-msgid "State/Region:"
+msgid "Your comment is awaiting moderation."
-msgstr "Штат/Регион:"
+msgstr "Ваш комментарий ожидает модерации."
 
-#: inc/roots-widgets.php:115
+#: templates/comments.php:32
-msgid "Zipcode/Postal Code:"
+msgid "This post is password protected. Enter the password to view comments."
-msgstr "Почтовый индекс:"
+msgstr ""
+"Это сообщение защищено паролем. Введите пароль для просмотра комментариев."
 
-#: inc/roots-widgets.php:119
+#: templates/comments.php:39
-msgid "Telephone:"
+msgid "One Response to &ldquo;%2$s&rdquo;"
-msgstr "Телефон:"
+msgid_plural "%1$s Responses to &ldquo;%2$s&rdquo;"
+msgstr[0] "Один ответ к &ldquo;%2$s&rdquo;"
+msgstr[1] "%1$s ответа к &ldquo;%2$s&rdquo;"
+msgstr[2] "%1$s ответов к &ldquo;%2$s&rdquo;"
 
-#: inc/roots-widgets.php:123
+#: templates/comments.php:49 templates/comments.php:51
-msgid "Email:"
+msgid "&larr; Older comments"
-msgstr "Почта:"
+msgstr "&larr; Старые комментарии"
 
+#: templates/comments.php:54 templates/comments.php:56
+msgid "Newer comments &rarr;"
+msgstr "Новые комментарии &rarr;"
+
+#: templates/comments.php:66 templates/comments.php:76
+msgid "Comments are closed."
+msgstr "Комментарии закрыты."
+
+#: templates/comments.php:83
+msgid "Leave a Reply"
+msgstr "Оставить комментарий"
+
+#: templates/comments.php:83
+msgid "Leave a Reply to %s"
+msgstr "Оставить комментарий к %s"
+
+#: templates/comments.php:86
+msgid "You must be <a href=\"%s\">logged in</a> to post a comment."
+msgstr "Вы должны <a href=\"%s\">войти</a>, чтобы оставить комментарий."
+
+#: templates/comments.php:90
+msgid "Logged in as <a href=\"%s/wp-admin/profile.php\">%s</a>."
+msgstr "Вы вошли как <a href=\"%s/wp-admin/profile.php\">%s</a>."
+
+#: templates/comments.php:90
+msgid "Log out of this account"
+msgstr "Выход из этой учетной записи"
+
+#: templates/comments.php:90
+msgid "Log out &raquo;"
+msgstr "Выйдите из системы »"
+
+#: templates/comments.php:92
+msgid "Name"
+msgstr "Имя"
+
+#: templates/comments.php:92 templates/comments.php:94
+msgid " (required)"
+msgstr " (необходимо)"
+
+#: templates/comments.php:94
+msgid "Email (will not be published)"
+msgstr "E-mail (не публикуется)"
+
+#: templates/comments.php:96
+msgid "Website"
+msgstr "Сайт"
+
+#: templates/comments.php:99
+msgid "Comment"
+msgstr "Комментарий"
+
+#: templates/comments.php:101
+msgid "Submit Comment"
+msgstr "Добавить комментарий"
+
+#: templates/content-single.php:11
+msgid "Pages:"
+msgstr "Страницы:"
+
+#: templates/content.php:4
+msgid "Sorry, no results were found."
+msgstr "Извините, ничего не найдено."
+
+#: templates/content.php:28 templates/content.php:30
+msgid "&larr; Older posts"
+msgstr "&larr; Предыдущие сообщения"
+
+#: templates/content.php:33 templates/content.php:35
+msgid "Newer posts &rarr;"
+msgstr "Новые сообщения &rarr;"
+
+#: templates/entry-meta.php:1
+msgid "Posted on %s at %s."
+msgstr "Опубликовано %s в %s."
+
+#: templates/entry-meta.php:2
+msgid "Written by"
+msgstr "Написано"
+
+#: templates/searchform.php:2
+msgid "Search for:"
+msgstr "Поиск:"
+
+#: templates/searchform.php:3 templates/searchform.php:4
+msgid "Search"
+msgstr "Поиск"
+
+#~ msgid ""
+#~ "Please update your <a href=\"%s\">site tagline</a> <a href=\"%s\" style="
+#~ "\"float: right;\">Hide Notice</a>"
+#~ msgstr ""
+#~ "Пожалуйста, обновите ваш <a href=\"%s\">лозунг для сайта</ a> <a href=\"%s"
+#~ "\" style=\"float: right;\">Скрыть замечание</a>"
+
+#~ msgid "Title (optional):"
+#~ msgstr "Заголовок (необязательно):"
+
+#~ msgid "Street Address:"
+#~ msgstr "Адрес:"
+
+#~ msgid "City/Locality:"
+#~ msgstr "Город/Населенный пункт:"
+
+#~ msgid "State/Region:"
+#~ msgstr "Штат/Регион:"
+
+#~ msgid "Zipcode/Postal Code:"
+#~ msgstr "Почтовый индекс:"
+
+#~ msgid "Telephone:"
+#~ msgstr "Телефон:"
+
+#~ msgid "Email:"
+#~ msgstr "Электронная почта:"

lib/h5bp-htaccess

@@ -5,7 +5,7 @@
 ### https://github.com/h5bp/server-configs/blob/master/apache/.htaccess
 ###
 ### Added:
-###   Block access to access to WordPress files that reveal version information.
+###   Block access to WordPress files that reveal version information.
 ###
 ### Removed:
 ###   Expires headers:      Use W3 Total Cache
@@ -417,4 +417,4 @@ AddCharset utf-8 .atom .css .js .json .rss .vtt .xml
 # Increase cookie security
 <IfModule mod_php5.c>
   php_value session.cookie_httponly true
-</IfModule>
+</IfModule>

lib/scripts.php

@@ -12,7 +12,7 @@
  * 3. /theme/assets/js/main.min.js (in footer)
  */
 function roots_scripts() {
-  wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, '99a8db779c85fab09c1780951893470f');
+  wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, 'cad8f7f7e4be4fd457ecb1eee9ff7e93');
 
   // Load style.css from child theme
   if (is_child_theme()) {
@@ -32,7 +32,7 @@ function roots_scripts() {
   }
 
   wp_register_script('modernizr', get_template_directory_uri() . '/assets/js/vendor/modernizr-2.6.2.min.js', false, null, false);
-  wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, '7103cef06004b25ce6b9258e83d475ef', true);
+  wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, '2889bb2f21e80b03b270797843bf4c2d', true);
   wp_enqueue_script('modernizr');
   wp_enqueue_script('jquery');
   wp_enqueue_script('roots_scripts');

templates/head.php

@@ -5,7 +5,7 @@
 <!--[if gt IE 8]><!--> <html class="no-js" <?php language_attributes(); ?>> <!--<![endif]-->
 <head>
   <meta charset="utf-8">
-  <title><?php wp_title('|', true, 'right'); bloginfo('name'); ?></title>
+  <title><?php wp_title(''); ?></title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <?php wp_head(); ?>