Commits
Rihards Olups authored 8aa655c6636
A.F....... [ZBX-5321] unified some translation strings, fixed typo and sql query formatting the following changes have been made : 1. previusly we had : include/views/configuration.template.edit.php: $tmp_label .= SPACE._('(Only superadmins can create group)'); include/views/configuration.host.edit.php: $tmp_label .= SPACE._('(Only superadmins can create group)'); include/views/configuration.hostgroups.list.php: $tmp_item = new CSubmit('form', _('Create host group').SPACE._('(Only Super Admins can create group)')); these have been unified to "Only super admins can create group" 2. previously we had : include/views/configuration.graph.edit.php: $graphFormList->addRow(_('Percentile line (left)'), array($percentLeftCheckbox, SPACE, $percentLeftTextBox)); include/views/configuration.graph.edit.php: $graphFormList->addRow(_('Percentile line (right)'), array($percentRightCheckbox, SPACE, $percentRightTextBox)); graphs.php: 'percent_left' => array(T_ZBX_DBL, O_OPT, null, BETWEEN(0, 100), null, _('Percentile line (Left)')), graphs.php: 'percent_right' => array(T_ZBX_DBL, O_OPT, null, BETWEEN(0, 100), null, _('Percentile line (Right)')), these have been unified to "left" and "right" respectively 3. a typo ("uploade") was fixed classes/helpers/CUploadFile.php: throw new Exception(_('Unable to uploade file because "file_uploads" is disabled.')); 4. previously we had : include/classes/import/CConfigurationImport.php: throw new Exception(_s('No permission for Graph "%1$s".', $graph['name'])); include/classes/import/CConfigurationImport.php: throw new Exception(_s('No permission for Graph "%1$s".', $graph['name'])); include/classes/import/CXmlImport18.php: throw new Exception(_s('No permission for graph "%1$s".', $graph_db['name'])); these have been unified to "graph" 5. several sql queries were reformatted to avoid including tabs in actual queries (thanks to pavels) svn merge -c 33769 ^/branches/2.0 . svn merge -c 33770 ^/branches/2.0 .