Merge branch '4.3-dev' into 4.4-dev

Author: laoneo

administrator/components/com_templates/tmpl/styles/default.php

@@ -121,7 +121,7 @@
                                     <?php elseif ($item->home != '0' && $item->home != '1') : ?>
                                         <?php echo Text::sprintf('COM_TEMPLATES_STYLES_PAGES_ALL_LANGUAGE', $this->escape($item->language_title)); ?>
                                     <?php elseif ($item->assigned > 0) : ?>
-                                        <?php echo Text::sprintf('COM_TEMPLATES_STYLES_PAGES_SELECTED', $this->escape($item->assigned)); ?>
+                                        <?php echo Text::plural('COM_TEMPLATES_STYLES_PAGES_SELECTED', $this->escape($item->assigned)); ?>
                                     <?php else : ?>
                                         <?php echo Text::_('COM_TEMPLATES_STYLES_PAGES_NONE'); ?>
                                     <?php endif; ?>

administrator/language/en-GB/com_templates.ini

@@ -218,6 +218,7 @@ COM_TEMPLATES_STYLES_FILTER_SEARCH_DESC="Search in style description."
 COM_TEMPLATES_STYLES_PAGES_ALL="Default for all pages"
 COM_TEMPLATES_STYLES_PAGES_ALL_LANGUAGE="Default for %s pages"
 COM_TEMPLATES_STYLES_PAGES_NONE="Not assigned"
+COM_TEMPLATES_STYLES_PAGES_SELECTED_1="Assigned on %s page"
 COM_TEMPLATES_STYLES_PAGES_SELECTED="Assigned on %s pages"
 COM_TEMPLATES_STYLES_TABLE_CAPTION="Template Styles"
 COM_TEMPLATES_STYLE_CANNOT_DELETE_DEFAULT_STYLE="Can't delete default style."