diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index f5c8aae2cd8525f0b7f2de6a6dd32ceb97f340de..53b05aa7c38c526aee6a9c100c06b090a2fe4c18 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -134,7 +134,7 @@ class LDAP
 
     /* Sadly we've no proper return values here. Use the error message instead. */
     if (!$ldap->success()) {
-      throw new FatalError(htmlescape(sprintf(_('FATAL: Error when connecting the LDAP. Server said "%s".'), $ldap->get_error())));
+      throw new FatalError(htmlescape(sprintf(_('FATAL: Error when connecting to LDAP. Server said "%s".'), $ldap->get_error())));
     }
 
     /* Preset connection base to $base and return to caller */
diff --git a/locale/af_ZA/fusiondirectory.po b/locale/af_ZA/fusiondirectory.po
index 23b86108c601c93f5eb2fca462302624cf79cc27..f1b128fa48b719a4c74dd21e00a3c8cfbf416560 100644
--- a/locale/af_ZA/fusiondirectory.po
+++ b/locale/af_ZA/fusiondirectory.po
@@ -836,7 +836,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/ar/fusiondirectory.po b/locale/ar/fusiondirectory.po
index 61d78d3f42da4a21b6845bb336c19920998f8713..a724aa3cb5827e5e10a1a8576a6d4f824e2ce30e 100644
--- a/locale/ar/fusiondirectory.po
+++ b/locale/ar/fusiondirectory.po
@@ -840,7 +840,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/ca/fusiondirectory.po b/locale/ca/fusiondirectory.po
index 30d271a66a16bce964de5c42e66d42fee61bf950..ee889b49ef3e2b164746138dca0905960eeeebc8 100644
--- a/locale/ca/fusiondirectory.po
+++ b/locale/ca/fusiondirectory.po
@@ -843,7 +843,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/cs_CZ/fusiondirectory.po b/locale/cs_CZ/fusiondirectory.po
index 5b85e9f6de933a6cb2c7aa93946e1b7c39353259..8f99deff58f110c7e134b66ecd108cd655fd204d 100644
--- a/locale/cs_CZ/fusiondirectory.po
+++ b/locale/cs_CZ/fusiondirectory.po
@@ -868,7 +868,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr "FATÁLNÍ: chyba při připojování do LDAPu. Server ohlásil '%s'."
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/de/fusiondirectory.po b/locale/de/fusiondirectory.po
index 7ba0a360686a78a04dd97ef15d720134c8575df2..29e8b29e1ee153909683d5994356cbd75a0f798b 100644
--- a/locale/de/fusiondirectory.po
+++ b/locale/de/fusiondirectory.po
@@ -857,7 +857,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 "FATAL: Fehler beim Verbinden mit dem LDAP-Server. Die Meldung lautet '%s'."
 
diff --git a/locale/el_GR/fusiondirectory.po b/locale/el_GR/fusiondirectory.po
index 922d8c6ca0e34deab065d350070f05ecf65f8b79..445d2bb32f29fe1bd362b213899965601860a8af 100644
--- a/locale/el_GR/fusiondirectory.po
+++ b/locale/el_GR/fusiondirectory.po
@@ -842,7 +842,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 "ΣΦΑΛΜΑ: Σφάλμα σύνδεσης στον διακομιστή LDAP. Ο διακομιστής αποκρίθηκε '%s'."
 
diff --git a/locale/en/fusiondirectory.po b/locale/en/fusiondirectory.po
index e493922577379a96c351761771d2723409d0f7f4..0bec8937b816c915010496c7be353b8e4b1af536 100644
--- a/locale/en/fusiondirectory.po
+++ b/locale/en/fusiondirectory.po
@@ -1398,7 +1398,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/es/fusiondirectory.po b/locale/es/fusiondirectory.po
index 33457a5b97701829444ce67cc1684d087e78a68d..e0b40c8b0f9001b5d3f6e922183c9e47d2c60377 100644
--- a/locale/es/fusiondirectory.po
+++ b/locale/es/fusiondirectory.po
@@ -854,7 +854,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 "FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
 
diff --git a/locale/es_CO/fusiondirectory.po b/locale/es_CO/fusiondirectory.po
index e2a7774e776380a300a3cfa165125df70f4b4dff..01c098567813f9b8d948beafaa8c9854bbf1d679 100644
--- a/locale/es_CO/fusiondirectory.po
+++ b/locale/es_CO/fusiondirectory.po
@@ -853,7 +853,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr "FATAL: Error conectándose a LDAP. El servidor dijo: '%s'"
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/es_VE/fusiondirectory.po b/locale/es_VE/fusiondirectory.po
index af05cd46339cd4d8b1ce3fa89c41b3eba809edca..f0b22707754b771d704a74e8aefded8f8066524d 100644
--- a/locale/es_VE/fusiondirectory.po
+++ b/locale/es_VE/fusiondirectory.po
@@ -854,7 +854,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 "FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
 
diff --git a/locale/fa_IR/fusiondirectory.po b/locale/fa_IR/fusiondirectory.po
index b3bf1c6d18090ae6c79b8adb4fcc649caab7e8a5..a6d991d3d852114ba79e6a14bbd5debc856f608d 100644
--- a/locale/fa_IR/fusiondirectory.po
+++ b/locale/fa_IR/fusiondirectory.po
@@ -840,7 +840,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/fi_FI/fusiondirectory.po b/locale/fi_FI/fusiondirectory.po
index 77496c4725e22ca7290789061660267d126260e6..09853471aecb12e485301cfa9ccf541308750cb8 100644
--- a/locale/fi_FI/fusiondirectory.po
+++ b/locale/fi_FI/fusiondirectory.po
@@ -840,7 +840,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/fr/fusiondirectory.po b/locale/fr/fusiondirectory.po
index 0b028285d27eb7b87fec3392e56d0799d28e065e..277b21c5b8906b94ea51596789929cc6fd5492bd 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr/fusiondirectory.po
@@ -892,7 +892,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 "FATAL : Erreur lors de la connexion au serveur LDAP. Le serveur a répondu "
 "'%s'."
diff --git a/locale/hu_HU/fusiondirectory.po b/locale/hu_HU/fusiondirectory.po
index 549648f02ad6a1171755b61f968bb889ced73b0d..83fc7a15f0a72bf9f023b43f639400a3ed0e5845 100644
--- a/locale/hu_HU/fusiondirectory.po
+++ b/locale/hu_HU/fusiondirectory.po
@@ -840,7 +840,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/id/fusiondirectory.po b/locale/id/fusiondirectory.po
index 27b0c01781eb544aad1583e5376daba3e822d436..d7788fc742b610af9ee8696c7958f657a3b90f82 100644
--- a/locale/id/fusiondirectory.po
+++ b/locale/id/fusiondirectory.po
@@ -836,7 +836,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/it_IT/fusiondirectory.po b/locale/it_IT/fusiondirectory.po
index bb54c2a99e12f654b783cb4c65523aa72248ab31..686dd34bd4be19af59fe63bac670940427d8d35c 100644
--- a/locale/it_IT/fusiondirectory.po
+++ b/locale/it_IT/fusiondirectory.po
@@ -890,7 +890,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 "Fatale: Errore durante la connessione al server LDAP. Il server dice: '%s'"
 
diff --git a/locale/ja/fusiondirectory.po b/locale/ja/fusiondirectory.po
index 3c9fb09bb5bdefaa9164d6bc8efbf90a5edebb4d..4328482d01cd99b5d6d1b7c40fe120d78e3ce2b3 100644
--- a/locale/ja/fusiondirectory.po
+++ b/locale/ja/fusiondirectory.po
@@ -836,7 +836,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/ko/fusiondirectory.po b/locale/ko/fusiondirectory.po
index 473f720b38bc0ef94f91b8120127aaa9305d0823..f1ca5e854cbf965a5e969d3d8ef4cabb0ab2d816 100644
--- a/locale/ko/fusiondirectory.po
+++ b/locale/ko/fusiondirectory.po
@@ -843,7 +843,7 @@ msgstr "치명적인 오류 : 클래스 '1%s'을 (를) 인스턴스화 할 수 
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr "치명적 : LDAP 연결시 오류가 발생했습니다. 서버 오류 '%s'."
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/lv/fusiondirectory.po b/locale/lv/fusiondirectory.po
index a1057f94c36770049a39f1c366440b8a12c53f1a..b037fc6ba7a632ae4c5894a53dfcc594dd8f2a94 100644
--- a/locale/lv/fusiondirectory.po
+++ b/locale/lv/fusiondirectory.po
@@ -840,7 +840,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/nb/fusiondirectory.po b/locale/nb/fusiondirectory.po
index bc5073e0273b668e68b0083af55913e94e2a10c2..f415c40d222fca4851e2d34532966c29bbf75ec7 100644
--- a/locale/nb/fusiondirectory.po
+++ b/locale/nb/fusiondirectory.po
@@ -840,7 +840,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/nl/fusiondirectory.po b/locale/nl/fusiondirectory.po
index 83ecca89f2880c967b32f938a28e5c95521742d2..c6c2c497d8246685d6d02e9cb01ddbe29ee5c13c 100644
--- a/locale/nl/fusiondirectory.po
+++ b/locale/nl/fusiondirectory.po
@@ -870,7 +870,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 "FATAAL: Fout bij het verbinden van de LDAP server. De server meldt: '%s'."
 
diff --git a/locale/pl/fusiondirectory.po b/locale/pl/fusiondirectory.po
index 22e9fc4afc0836847a900de175fa18b4a0eba554..b4039d010cb3749d0092d3bdc5e85bb17d442a53 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl/fusiondirectory.po
@@ -844,7 +844,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr "BŁĄD: Nie można połączyć się z serwerem LDAP. Odpowiedź serwera '%s'."
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/pt/fusiondirectory.po b/locale/pt/fusiondirectory.po
index a196fe02a29da45d2bc63c4af4bbf9f4028f11f2..48a12b545164aa54eadd74785434f8ebd3b45255 100644
--- a/locale/pt/fusiondirectory.po
+++ b/locale/pt/fusiondirectory.po
@@ -844,7 +844,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/pt_BR/fusiondirectory.po b/locale/pt_BR/fusiondirectory.po
index 56b4ebab12f927b780b9ec160205da7560ea9f62..5d104b44134ec04331f799c5ea474ad7d1e046ea 100644
--- a/locale/pt_BR/fusiondirectory.po
+++ b/locale/pt_BR/fusiondirectory.po
@@ -845,7 +845,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/ru/fusiondirectory.po b/locale/ru/fusiondirectory.po
index 20f05ae9c361eb2a818169c71f2620ede7a2c490..d3bfaa64a4edf857c0345c3fe09f9cdd08a8cd6a 100644
--- a/locale/ru/fusiondirectory.po
+++ b/locale/ru/fusiondirectory.po
@@ -853,7 +853,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr "FATAL: Ошибка при подключении к LDAP. Сервер сообщил '%s'."
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/ru@petr1708/fusiondirectory.po b/locale/ru@petr1708/fusiondirectory.po
index 7e6cb1375c32d5d3e290d4936a66503523230395..216f8b89fd34a04426d3e6699c1aaf4a8b573a6c 100644
--- a/locale/ru@petr1708/fusiondirectory.po
+++ b/locale/ru@petr1708/fusiondirectory.po
@@ -836,7 +836,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/sv/fusiondirectory.po b/locale/sv/fusiondirectory.po
index 61b40d57a839bded6933b26cb787906865ddb9f9..5af586e66546a785bf44a8b441cc247033e09e08 100644
--- a/locale/sv/fusiondirectory.po
+++ b/locale/sv/fusiondirectory.po
@@ -851,7 +851,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr "ALLVARLIGT: Fel vid försöka att koppla mot LDAP. Servern sa '%s'."
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/tr_TR/fusiondirectory.po b/locale/tr_TR/fusiondirectory.po
index 1395b611d7ba97769809e587e74cbaf1bceee87f..1767e664191a8f280f1188bee46d77785f575612 100644
--- a/locale/tr_TR/fusiondirectory.po
+++ b/locale/tr_TR/fusiondirectory.po
@@ -840,7 +840,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/ug/fusiondirectory.po b/locale/ug/fusiondirectory.po
index c0c4a271a835e4bf2aa03a5ed64133b6e97f2c40..0fa53f0eca7478935d077e801ae004e32f13f602 100644
--- a/locale/ug/fusiondirectory.po
+++ b/locale/ug/fusiondirectory.po
@@ -836,7 +836,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/vi_VN/fusiondirectory.po b/locale/vi_VN/fusiondirectory.po
index 6c344090c1e54a39358b553721de82ec5c93cf78..e3ef1a9940eddbb945b8c40f6c813f62b5dfaf26 100644
--- a/locale/vi_VN/fusiondirectory.po
+++ b/locale/vi_VN/fusiondirectory.po
@@ -850,7 +850,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 "LỖI NGHIÊM TRỌNG: Lỗi khi đang kết nối với LDAP. Server thông báo '%s'."
 
diff --git a/locale/zh/fusiondirectory.po b/locale/zh/fusiondirectory.po
index 6596e59f41518adb7eb9cf46dd0bbd066217c285..4424d6970ff43e7bffa7e33d073a28d7b9b86dae 100644
--- a/locale/zh/fusiondirectory.po
+++ b/locale/zh/fusiondirectory.po
@@ -840,7 +840,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr "致命错误：连接 LDAP 错误。服务器返回 '%s'。"
 
 #: include/functions.inc:402 include/functions.inc:531
diff --git a/locale/zh_TW/fusiondirectory.po b/locale/zh_TW/fusiondirectory.po
index a27b01467513f755b075d25e402638bc61eddf6a..862e0383ffa4d42e32ade540ac405e6d211e370e 100644
--- a/locale/zh_TW/fusiondirectory.po
+++ b/locale/zh_TW/fusiondirectory.po
@@ -836,7 +836,7 @@ msgstr ""
 
 #: include/functions.inc:354
 #, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
 msgstr ""
 
 #: include/functions.inc:402 include/functions.inc:531