Index: authentication.php
===================================================================
--- authentication.php  (revision 27175)
+++ authentication.php  (working copy)
@@ -78,8 +78,8 @@
                // update config
                if (update_config($config)) {
                        CProfile::update('web.authentication.config', $_REQUEST['config'], PROFILE_TYPE_INT);
-                       add_audit(AUDIT_ACTION_UPDATE, AUDIT_RESOURCE_ZABBIX_CONFIG, _('Authentication method changed to Zabbix internal'));
-                       show_message(_('Authentication method changed to Zabbix internal'));
+                       add_audit(AUDIT_ACTION_UPDATE, AUDIT_RESOURCE_ZABBIX_CONFIG, _('Authentication method changed to Zabbix internal.'));
+                       show_message(_('Authentication method changed to Zabbix internal.'));
                        $isAuthenticationTypeChanged = false;
                }
                else {
Index: include/views/configuration.template.edit.php
===================================================================
--- include/views/configuration.template.edit.php       (revision 27175)
+++ include/views/configuration.template.edit.php       (working copy)
@@ -137,7 +137,7 @@
        $newgroupTB->setAttribute('maxlength', 64);
        $tmp_label = _('New group');
        if ($USER_DETAILS['type'] != USER_TYPE_SUPER_ADMIN) {
-               $tmp_label .= SPACE._('(Only superadmins can create group)');
+               $tmp_label .= SPACE._('(Only Super Admins can create group)');
                $newgroupTB->setReadonly(true);
        }
        $templateList->addRow(array(new CLabel($tmp_label, 'newgroup'), BR(), $newgroupTB), null, null, null, 'new');
Index: include/views/configuration.host.edit.php
===================================================================
--- include/views/configuration.host.edit.php   (revision 27175)
+++ include/views/configuration.host.edit.php   (working copy)
@@ -190,7 +190,7 @@
 $newgroupTB->setAttribute('maxlength', 64);
 $tmp_label = _('New host group');
 if ($USER_DETAILS['type'] != USER_TYPE_SUPER_ADMIN) {
-       $tmp_label .= SPACE._('(Only superadmins can create group)');
+       $tmp_label .= SPACE._('(Only Super Admins can create group)');
        $newgroupTB->setReadonly(true);
 }
 $hostList->addRow(array(new CLabel($tmp_label, 'newgroup'), BR(), $newgroupTB), null, null, null, 'new');
Index: include/classes/import/importers/CMapImporter.php
===================================================================
--- include/classes/import/importers/CMapImporter.php   (revision 27175)
+++ include/classes/import/importers/CMapImporter.php   (working copy)
@@ -197,7 +197,7 @@
                                        case SYSMAP_ELEMENT_TYPE_MAP:
                                                $selement['elementid'] = $this->referencer->resolveMap($selement['element']['name']);
                                                if (!$selement['elementid']) {
-                                                       throw new Exception(_s('Cannot find map "%1$s" used in map %2$s".',
+                                                       throw new Exception(_s('Cannot find map "%1$s" used in map "%2$s".',
                                                                $selement['element']['name'], $map['name']));
                                                }
                                                break;
@@ -205,7 +205,7 @@
                                        case SYSMAP_ELEMENT_TYPE_HOST_GROUP:
                                                $selement['elementid'] = $this->referencer->resolveGroup($selement['element']['name']);
                                                if (!$selement['elementid']) {
-                                                       throw new Exception(_s('Cannot find group "%1$s" used in map %2$s".',
+                                                       throw new Exception(_s('Cannot find group "%1$s" used in map "%2$s".',
                                                                $selement['element']['name'], $map['name']));
                                                }
                                                break;
@@ -213,7 +213,7 @@
                                        case SYSMAP_ELEMENT_TYPE_HOST:
                                                $selement['elementid'] = $this->referencer->resolveHost($selement['element']['host']);
                                                if (!$selement['elementid']) {
-                                                       throw new Exception(_s('Cannot find host "%1$s" used in map %2$s".',
+                                                       throw new Exception(_s('Cannot find host "%1$s" used in map "%2$s".',
                                                                $selement['element']['host'], $map['name']));
                                                }
                                                break;
@@ -222,7 +222,7 @@
                                                $el = $selement['element'];
                                                $selement['elementid'] = $this->referencer->resolveTrigger($el['description'], $el['expression']);
                                                if (!$selement['elementid']) {
-                                                       throw new Exception(_s('Cannot find trigger "%1$s" used in map %2$s".',
+                                                       throw new Exception(_s('Cannot find trigger "%1$s" used in map "%2$s".',
                                                                $selement['element']['description'], $map['name']));
                                                }
                                                break;
Index: include/html.inc.php
===================================================================
--- include/html.inc.php        (revision 27175)
+++ include/html.inc.php        (working copy)
@@ -247,14 +247,14 @@
                case 'favourite':
                        if (infavorites($params['fav'], $params['elid'], $params['elname'])) {
                                $icon = new CIcon(
-                                       _('Remove from favourites'),
+                                       _('Remove from Favourites'),
                                        'iconminus',
                                        'rm4favorites("'.$params['elname'].'", "'.$params['elid'].'", 0);'
                                );
                        }
                        else {
                                $icon = new CIcon(
-                                       _('Add to favourites'),
+                                       _('Add to Favourites'),
                                        'iconplus',
                                        'add2favorites("'.$params['elname'].'", "'.$params['elid'].'");'
                                );
Index: screens.php
===================================================================
--- screens.php (revision 27175)
+++ screens.php (working copy)
@@ -81,14 +81,14 @@
                if ($_REQUEST['favaction'] == 'add') {
                        $result = add2favorites('web.favorite.screenids', $_REQUEST['favid'], $_REQUEST['favobj']);
                        if ($result) {
-                               echo '$("addrm_fav").title = "'._('Remove from favourites').'";'."\n".
+                               echo '$("addrm_fav").title = "'._('Remove from Favourites').'";'."\n".
                                        '$("addrm_fav").onclick = function() { rm4favorites("'.$_REQUEST['favobj'].'", "'.$_REQUEST['favid'].'", 0); }'."\n";
                        }
                }
                elseif ($_REQUEST['favaction'] == 'remove') {
                        $result = rm4favorites('web.favorite.screenids', $_REQUEST['favid'], $_REQUEST['favobj']);
                        if ($result) {
-                               echo '$("addrm_fav").title = "'._('Add to favourites').'";'."\n".
+                               echo '$("addrm_fav").title = "'._('Add to Favourites').'";'."\n".
                                        '$("addrm_fav").onclick = function() { add2favorites("'.$_REQUEST['favobj'].'", "'.$_REQUEST['favid'].'"); }'."\n";
                        }
                }
Index: history.php
===================================================================
--- history.php (revision 27175)
+++ history.php (working copy)
@@ -87,7 +87,7 @@
                        if('add' == $_REQUEST['favaction']){
                                $result = add2favorites('web.favorite.graphids',$_REQUEST['favid'],$_REQUEST['favobj']);
                                if($result){
-                                       print('$("addrm_fav").title = "'._('Remove from favourites.').'";'."\n");
+                                       print('$("addrm_fav").title = "'._('Remove from Favourites').'";'."\n");
                                        print('$("addrm_fav").onclick = function(){rm4favorites("itemid","'.$_REQUEST['favid'].'",0);}'."\n");
                                }
                        }
@@ -95,7 +95,7 @@
                                $result = rm4favorites('web.favorite.graphids',$_REQUEST['favid'],$_REQUEST['favobj']);

                                if($result){
-                                       print('$("addrm_fav").title = "'._('Add to favourites.').'";'."\n");
+                                       print('$("addrm_fav").title = "'._('Add to Favourites').'";'."\n");
                                        print('$("addrm_fav").onclick = function(){ add2favorites("itemid","'.$_REQUEST['favid'].'");}'."\n");
                                }
                        }
Index: host_screen.php
===================================================================
--- host_screen.php     (revision 27175)
+++ host_screen.php     (working copy)
@@ -86,7 +86,7 @@
                        if('add' == $_REQUEST['favaction']){
                                $result = add2favorites('web.favorite.screenids',$_REQUEST['favid'],$_REQUEST['favobj']);
                                if($result){
-                                       print('$("addrm_fav").title = "'._('Remove from favourites.').'";'."\n");
+                                       print('$("addrm_fav").title = "'._('Remove from Favourites').'";'."\n");
                                        print('$("addrm_fav").onclick = function(){rm4favorites("'.$_REQUEST['favobj'].'","'.$_REQUEST['favid'].'",0);}'."\n");
                                }
                        }
@@ -94,7 +94,7 @@
                                $result = rm4favorites('web.favorite.screenids',$_REQUEST['favid'],$_REQUEST['favobj']);

                                if($result){
-                                       print('$("addrm_fav").title = "'._('Add to favourites.').'";'."\n");
+                                       print('$("addrm_fav").title = "'._('Add to Favourites').'";'."\n");
                                        print('$("addrm_fav").onclick = function(){ add2favorites("'.$_REQUEST['favobj'].'","'.$_REQUEST['favid'].'");}'."\n");
                                }
                        }
Index: api/classes/CUserGroup.php
===================================================================
--- api/classes/CUserGroup.php  (revision 27175)
+++ api/classes/CUserGroup.php  (working copy)
@@ -392,7 +392,7 @@
                        $massUpdate['usrgrpids'] = $usrgrp['usrgrpid'];
                        unset($massUpdate['usrgrpid']);
                        if (!$this->massUpdate($massUpdate))
-                               self::exception(ZBX_API_ERROR_PARAMETERS, _('Cannot update group.'));
+                               self::exception(ZBX_API_ERROR_PARAMETERS, _('Cannot update group'));
                }

                return array('usrgrpids'=> $usrgrpids);
Index: api/classes/CTemplate.php
===================================================================
--- api/classes/CTemplate.php   (revision 27175)
+++ api/classes/CTemplate.php   (working copy)
@@ -993,16 +993,16 @@
                        }

                        if (!preg_match('/^'.ZBX_PREG_HOST_FORMAT.'$/', $template['host'])) {
-                               self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect characters used for Template name [ %1$s ]', $template['host']));
+                               self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect characters used for template name "%s".', $template['host']));
                        }

                        if (isset($template['host'])) {
                                if ($this->exists(array('host' => $template['host']))) {
-                                       self::exception(ZBX_API_ERROR_PARAMETERS, _s('Template "%s" already exists.', $template['host']));
+                                       self::exception(ZBX_API_ERROR_PARAMETERS, _s('Template "%1$s" already exists.', $template['host']));
                                }

                                if (API::Host()->exists(array('host' => $template['host']))) {
-                                       self::exception(ZBX_API_ERROR_PARAMETERS, _s('Host "%s" already exists.', $template['host']));
+                                       self::exception(ZBX_API_ERROR_PARAMETERS, _s('Host "%1$s" already exists.', $template['host']));
                                }
                        }

Index: api/classes/CTrigger.php
===================================================================
--- api/classes/CTrigger.php    (revision 27175)
+++ api/classes/CTrigger.php    (working copy)
@@ -546,7 +546,7 @@
                        foreach ($options['sortfield'] as $i => $sortfield) {
                                // validate sortfield
                                if (!str_in_array($sortfield, $sortColumns)) {
-                                       throw new APIException(ZBX_API_ERROR_INTERNAL, _s('Sorting by field "%s" not allowed.', $sortfield));
+                                       throw new APIException(ZBX_API_ERROR_INTERNAL, _s('Sorting by field "%1$s" not allowed.', $sortfield));
                                }

                                // add sort field to order
@@ -1369,7 +1369,7 @@
                                $hostsStatusFlags = 0x0;
                                foreach ($expressionData->data['hosts'] as $host) {
                                        if (!isset($hosts[$host])) {
-                                               self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect trigger expression. Host "%s" does not exist or you have no access to this host.', $host));
+                                               self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect trigger expression. Host "%1$s" does not exist or you have no access to this host.', $host));
                                        }

                                        // find out if both templates and hosts are referenced in expression
@@ -1835,7 +1835,7 @@
                                        }
                                }
                                if ($triggerExist && bccomp($triggerExist['triggerid'], $trigger['triggerid']) != 0) {
-                                       self::exception(ZBX_API_ERROR_PARAMETERS, _s('Trigger "%s" already exists.', $trigger['description']));
+                                       self::exception(ZBX_API_ERROR_PARAMETERS, _s('Trigger "%1$s" already exists.', $trigger['description']));
                                }
                        }

Index: api/classes/CDRule.php
===================================================================
--- api/classes/CDRule.php      (revision 27175)
+++ api/classes/CDRule.php      (working copy)
@@ -484,7 +484,7 @@

                                        $itemKey = new CItemKey($dCheck['key_']);
                                        if (!$itemKey->isValid())
-                                               self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect key: %s', $itemKey->getError()));
+                                               self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect key: "%1$s".', $itemKey->getError()));
                                        break;
                                case SVC_SNMPv1:
                                case SVC_SNMPv2c:
@@ -660,7 +660,7 @@
                        // checking to the duplicate names
                        if (strcmp($dRulesDb[$dRule['druleid']]['name'], $dRule['name']) != 0) {
                                if ($this->exists($dRule)) {
-                                       self::exception(ZBX_API_ERROR_PARAMETERS, _s('Discovery rule [%s] already exists', $dRule['name']));
+                                       self::exception(ZBX_API_ERROR_PARAMETERS, _s('Discovery rule "%s" already exists.', $dRule['name']));
                                }
                        }

Index: api/classes/CHost.php
===================================================================
--- api/classes/CHost.php       (revision 27175)
+++ api/classes/CHost.php       (working copy)
@@ -1687,7 +1687,7 @@

                foreach ($data['hosts'] as $host) {
                        if (!isset($updHosts[$host['hostid']])) {
-                               self::exception(ZBX_API_ERROR_PERMISSIONS, _('You do not have enough rights for operation.'));
+                               self::exception(ZBX_API_ERROR_PERMISSIONS, _('You do not have permission to perform this operation.'));
                        }
                }

Index: api/classes/CMaintenance.php
===================================================================
--- api/classes/CMaintenance.php        (revision 27175)
+++ api/classes/CMaintenance.php        (working copy)
@@ -438,7 +438,7 @@
        public function create(array $maintenances) {
                $maintenances = zbx_toArray($maintenances);
                if (self::$userData['type'] == USER_TYPE_ZABBIX_USER) {
-                       self::exception(ZBX_API_ERROR_PERMISSIONS, _('You do not have permission to perform this operation'));
+                       self::exception(ZBX_API_ERROR_PERMISSIONS, _('You do not have permission to perform this operation.'));
                }

                $hostids = array();
Index: charts.php
===================================================================
--- charts.php  (revision 27175)
+++ charts.php  (working copy)
@@ -80,7 +80,7 @@
                        if ('add' == $_REQUEST['favaction']) {
                                $result = add2favorites('web.favorite.graphids', $_REQUEST['favid'], $_REQUEST['favobj']);
                                if($result){
-                                       print('$("addrm_fav").title = "'._('Remove from favourites.').'";'."\n");
+                                       print('$("addrm_fav").title = "'._('Remove from Favourites').'";'."\n");
                                        print('$("addrm_fav").onclick = function(){rm4favorites("graphid","'.$_REQUEST['favid'].'",0);}'."\n");
                                }
                        }
@@ -88,7 +88,7 @@
                                $result = rm4favorites('web.favorite.graphids',$_REQUEST['favid'],$_REQUEST['favobj']);

                                if($result){
-                                       print('$("addrm_fav").title = "'._('Add to favourites.').'";'."\n");
+                                       print('$("addrm_fav").title = "'._('Add to Favourites').'";'."\n");
                                        print('$("addrm_fav").onclick = function(){ add2favorites("graphid","'.$_REQUEST['favid'].'");}'."\n");
                                }
                        }