Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-26 6028e4692d172b63f8af79c4460f9dbff5a9a01c

 interface/web/admin/lib/lang/ro_language_import.lng

@@ -5,4 +5,5 @@
$wb['language_overwrite_txt'] = 'suprascrie  file, daca exista';
$wb['btn_cancel_txt'] = 'inapoi';
$wb['ignore_version_txt'] = 'Skip ISPConfig version check';
$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.';
?>