Merge branch 'master' into 'master'

Marius Cramer

2014-01-27 e4e2a430bbbf2cd9516f4d01f2b49a10ff981d5c

 interface/web/client/lib/lang/pt_client.lng

@@ -144,4 +144,9 @@
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
$wb['locked_txt'] = 'Locked (disables all webs etc.)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
$wb['gender_f_txt'] = 'Ms.';
?>