Merge branch 'release/v25'

nastachku · Apr 12, 2013 · 53c381f · 53c381f
2 parents d36a50a + b775777
commit 53c381f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/views/layouts/web/shared/_navigation.html.haml b/app/views/layouts/web/shared/_navigation.html.haml
@@ -15,5 +15,6 @@
           = item :li, t(".lectors"), lectors_path
           = item :li, t(".lectures"), lectures_path
           = item :li, t('.lectures_20'), user_lectures_path
-          = item :li, t(".routes"), page_path(:routes)
+          / = item :li, t(".routes"), page_path(:routes)
+          = item :li, t(".broadcast"), page_path(:broadcast)
           = item :li, t(".contacts"), page_path(:contacts)
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
@@ -26,6 +26,7 @@ ru:
           lectures_20: 'Доклады 2.0'
           schedule: 'Программа'
           menu: "Меню"
+          broadcast: "Стачка ON-LINE"
         navbar:
           logout: 'Выйти'
           login: 'Войти'