Merge branch '2.4.x' into 2.4.x-saas

This commit is contained in:
Martin Konecny 2013-05-22 16:09:02 -04:00
commit 254d3b8950
47 changed files with 1204 additions and 1135 deletions

View file

@ -403,7 +403,7 @@ function setupEventListeners() {
$(".stream_type_help_icon").qtip({
content: {
text: sprintf(
$.i18n._("Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided."),
$.i18n._("Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided."),
"<a target='_blank' href='https://wiki.sourcefabric.org/x/NgPQ'>",
"</a>",
"<a target='_blank' href='https://wiki.sourcefabric.org/x/KgPQ'>",