Merge branch 'master' into 'master'

Marius Cramer

2014-03-25 f2851d17638c18984387c1bcca3b80152ad4b21a

 Merge branch 'master' into 'master'

Bad french translation on SSL page

State was translated country

 interface/web/sites/lib/lang/fr_web_childdomain.lng

@@ -1,5 +1,5 @@
<?php
$wb['ssl_state_txt'] = 'Pays';
$wb['ssl_state_txt'] = 'État/département';
$wb['ssl_locality_txt'] = 'Lieu';
$wb['ssl_organisation_txt'] = 'Organisation';
$wb['ssl_organisation_unit_txt'] = 'Unité dorganisation';
@@ -116,4 +116,4 @@
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';

?>
?>

 interface/web/sites/lib/lang/fr_web_vhost_domain.lng

@@ -1,5 +1,5 @@
<?php
$wb['ssl_state_txt'] = 'Pays';
$wb['ssl_state_txt'] = 'État/département';
$wb['ssl_locality_txt'] = 'Localité';
$wb['ssl_organisation_txt'] = 'Organisation';
$wb['ssl_organisation_unit_txt'] = 'Unité dorganisation';
@@ -134,4 +134,4 @@
$wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas. Example: web/cache/*,web/backup)';
$wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid characters.';
$wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings';
?>
?>