rosa-build/config/locales
Alexander Machehin 2b9434f346 Merge branch 'master' into 369-bootstrap
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/angular-new/models/build_list.js.erb
	app/assets/javascripts/extra/build_list.js
	app/controllers/projects/build_lists_controller.rb
	app/controllers/projects/projects_controller.rb
	app/models/platform.rb
	app/views/projects/base/_layout.html.haml
	app/views/projects/build_lists/_new_form.html.haml
	app/views/projects/build_lists/show.html.haml
	app/views/projects/git/base/_fork.html.haml
	app/views/projects/git/commits/_commits.html.haml
	config/locales/en.yml
	config/locales/ru.yml
2014-10-16 16:41:29 +06:00
..
layout [#19] add issue references from commit 2013-03-22 22:50:13 +06:00
models Merge branch 'master' into 369-bootstrap 2014-10-16 16:41:29 +06:00
datatables.en.yml [issue #195] Added AJAX to /projects list. 2012-03-27 19:50:00 +04:00
datatables.ru.yml [issue #195] Added AJAX to /projects list. 2012-03-27 19:50:00 +04:00
date.en.yml [#369] commits index page 2014-07-09 22:29:15 +06:00
date.ru.yml [#369] commits index page 2014-07-09 22:29:15 +06:00
devise.en.yml Fixed: confirmation_instructions 2014-03-31 14:25:56 +04:00
devise.ru.yml Fixed: confirmation_instructions 2014-03-31 14:25:56 +04:00
en.yml Merge branch 'master' into 369-bootstrap 2014-10-16 16:41:29 +06:00
invite.en.yml Change wiki doc url for en version 2012-12-27 15:28:08 +04:00
invite.ru.yml #975: update title on pages 2013-02-28 17:48:26 +04:00
layout.en.yml [#369] add tree content pagination 2014-07-09 15:38:36 +06:00
layout.ru.yml [#369] add tree content pagination 2014-07-09 15:38:36 +06:00
menu.en.yml #435: added Statistic model 2014-10-06 23:16:12 +04:00
menu.ru.yml #435: changes according to Alexander's comments 2014-10-14 21:17:39 +04:00
pluralization.en.yml [refs #230] edit password page 2012-03-02 02:04:06 +02:00
pluralization.ru.yml [refs #230] edit password page 2012-03-02 02:04:06 +02:00
ru.yml Merge branch 'master' into 369-bootstrap 2014-10-16 16:41:29 +06:00
title.en.yml [#98] fix common tracker/pulls title for english locale 2013-05-16 16:01:06 +06:00
title.ru.yml [#98] again fix common tracker/pulls title 2013-05-16 15:31:10 +06:00
tour.en.yml [refs #466] add i18n 2012-05-15 21:35:48 +06:00
tour.ru.yml [refs #443] remove old file, fixed ru translation 2012-05-21 16:46:08 +06:00
users.en.yml #406: Hiding email from public profile 2014-06-26 00:49:06 +04:00
users.ru.yml #406: Hiding email from public profile 2014-06-26 00:49:06 +04:00
wiki.en.yml [Refs #263] Fix localization: mistakes, typos and missing translations. Special thanks to Eugeni Dodonov for help. 2012-03-29 14:48:15 +04:00
wiki.ru.yml Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263 2012-03-03 02:28:27 +02:00