diff --git a/resources/locales/ar/cake.po b/resources/locales/ar/cake.po
index 0fd13930..3c675493 100644
--- a/resources/locales/ar/cake.po
+++ b/resources/locales/ar/cake.po
@@ -22,10 +22,6 @@ msgstr "خطأ"
 msgid "The requested address %s was not found on this server."
 msgstr "العنوان المطلوب %s غير موجود"
 
-#: View/Errors/error500.ctp:20 Error/ExceptionRenderer.php:245
-msgid "An Internal Error Has Occurred."
-msgstr "حدث خطأ داخلي."
-
 #: Controller/Scaffold.php:127
 msgid "Scaffold :: "
 msgstr ""
@@ -62,10 +58,15 @@ msgstr ""
 msgid "You are not authorized to access that location."
 msgstr "لا تملك صلاحية الدخول إلى هذه الصفحة"
 
-#: Error/ExceptionRenderer.php:222
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "غير موجود"
 
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
+msgid "An Internal Error Has Occurred."
+msgstr "حدث خطأ داخلي."
+
 #: Model/Validator/CakeValidationSet.php:286
 msgid "This field cannot be left blank"
 msgstr "لا يمكن ترك هذا الحقل فارغا"
diff --git a/resources/locales/ar_TN/cake.po b/resources/locales/ar_TN/cake.po
index e446e86e..87fd0e78 100644
--- a/resources/locales/ar_TN/cake.po
+++ b/resources/locales/ar_TN/cake.po
@@ -22,10 +22,6 @@ msgstr "خطأ"
 msgid "The requested address %s was not found on this server."
 msgstr "العنوان المطلوب %s غير موجود"
 
-#: View/Errors/error500.ctp:20 Error/ExceptionRenderer.php:245
-msgid "An Internal Error Has Occurred."
-msgstr "حدث خطأ داخلي."
-
 #: Controller/Scaffold.php:127
 msgid "Scaffold :: "
 msgstr ""
@@ -62,10 +58,15 @@ msgstr "حدث خطأ أثناء حذف %1$s ذات رمز التعريف %2$s"
 msgid "You are not authorized to access that location."
 msgstr "لا تملك صلاحية الدخول إلى هذه الصفحة"
 
-#: Error/ExceptionRenderer.php:222
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "غير موجود"
 
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
+msgid "An Internal Error Has Occurred."
+msgstr "حدث خطأ داخلي."
+
 #: Model/Validator/CakeValidationSet.php:286
 msgid "This field cannot be left blank"
 msgstr "لا يمكن ترك هذا الحقل فارغا"
diff --git a/resources/locales/ca_ES/cake.po b/resources/locales/ca_ES/cake.po
index dd8c1630..2351c041 100644
--- a/resources/locales/ca_ES/cake.po
+++ b/resources/locales/ca_ES/cake.po
@@ -21,10 +21,6 @@ msgstr "Error"
 msgid "The requested address %s was not found on this server."
 msgstr "L'adreça sol·licitada %s no s'ha pogut trobar en aquest servidor."
 
-#: Template/Error/error500.ctp:39
-msgid "An Internal Error Has Occurred"
-msgstr "Hi Ha Hagut Un Error Intern"
-
 #: Controller/Component/AuthComponent.php:454
 msgid "You are not authorized to access that location."
 msgstr "No tens permisos per accedir aquesta ubicació."
@@ -37,11 +33,12 @@ msgstr "Manca la cookie del token CSRF"
 msgid "CSRF token mismatch."
 msgstr "Els tokens CSRF no coincideixen."
 
-#: Error/ExceptionRenderer.php:247
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "No Trobat"
 
-#: Error/ExceptionRenderer.php:249
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Hi Ha Hagut Un Error Intern."
 
diff --git a/resources/locales/cake.pot b/resources/locales/cake.pot
index a30e0015..b9c6dec2 100644
--- a/resources/locales/cake.pot
+++ b/resources/locales/cake.pot
@@ -23,19 +23,16 @@ msgstr ""
 msgid "The requested address {0} was not found on this server."
 msgstr ""
 
-#: Error/error500.php:38
-msgid "An Internal Error Has Occurred"
-msgstr ""
-
 #: Controller/Component/AuthComponent.php:462
 msgid "You are not authorized to access that location."
 msgstr ""
 
-#: Error/ExceptionRenderer.php:304
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr ""
 
-#: Error/ExceptionRenderer.php:306
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr ""
 
diff --git a/resources/locales/cs/cake.po b/resources/locales/cs/cake.po
index b25d7e78..63bbce9f 100644
--- a/resources/locales/cs/cake.po
+++ b/resources/locales/cs/cake.po
@@ -23,19 +23,16 @@ msgstr "Chyba"
 msgid "The requested address {0} was not found on this server."
 msgstr "Soubor neexistuje."
 
-#: Error/error500.php:38
-msgid "An Internal Error Has Occurred"
-msgstr "Chyba systému, prosím kontaktujte administrátora"
-
 #: Controller/Component/AuthComponent.php:462
 msgid "You are not authorized to access that location."
 msgstr "Přihlašte se prosím."
 
-#: Error/ExceptionRenderer.php:304
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Nenalezeno"
 
-#: Error/ExceptionRenderer.php:306
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Chyba systému, prosím kontaktujte administrátora."
 
diff --git a/resources/locales/da/cake.po b/resources/locales/da/cake.po
index d112e880..6b6eb786 100644
--- a/resources/locales/da/cake.po
+++ b/resources/locales/da/cake.po
@@ -48,11 +48,12 @@ msgstr "Der opstod en fejl i forbindelse med sletning af %1$s med id: %2$s"
 msgid "You are not authorized to access that location."
 msgstr "Du har ikke tilladelse til at se den side."
 
-#: Error/ExceptionRenderer.php:205
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Ikke fundet"
 
-#: Error/ExceptionRenderer.php:227
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Der er sket en intern fejl."
 
diff --git a/resources/locales/de/cake.po b/resources/locales/de/cake.po
index f550a208..f15703a7 100644
--- a/resources/locales/de/cake.po
+++ b/resources/locales/de/cake.po
@@ -21,10 +21,6 @@ msgstr "Fehler"
 msgid "The requested address %s was not found on this server."
 msgstr "Die angeforderte Adresse %s wurde auf diesem Server nicht gefunden."
 
-#: Template/Error/error500.ctp:39
-msgid "An Internal Error Has Occurred"
-msgstr "Ein interner Fehler ist aufgetreten"
-
 #: Controller/Component/AuthComponent.php:496
 msgid "You are not authorized to access that location."
 msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen."
@@ -39,11 +35,12 @@ msgstr "Fehlendes CSRF-Token-Cookie"
 msgid "CSRF token mismatch."
 msgstr "Ungültiges CSRF-Token."
 
-#: Error/ExceptionRenderer.php:258
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Seite nicht gefunden"
 
-#: Error/ExceptionRenderer.php:260
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Ein interner Fehler ist aufgetreten."
 
diff --git a/resources/locales/es/cake.po b/resources/locales/es/cake.po
index 6638fd9b..95886466 100644
--- a/resources/locales/es/cake.po
+++ b/resources/locales/es/cake.po
@@ -20,10 +20,6 @@ msgstr ""
 msgid "The requested address %s was not found on this server."
 msgstr "La dirección solicitada %s no se encontró en el servidor."
 
-#: Template/Error/error500.ctp:33
-msgid "An Internal Error Has Occurred"
-msgstr "Ha ocurrido un error interno"
-
 #: Controller/Component/AuthComponent.php:461
 msgid "You are not authorized to access that location."
 msgstr "No tienes permisos para acceder a dicha ubicación."
@@ -36,11 +32,12 @@ msgstr "Falta la cookie del CSRF token"
 msgid "CSRF token mismatch."
 msgstr "Los token CSRF no concuerdan."
 
-#: Error/ExceptionRenderer.php:251
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "No encontrado"
 
-#: Error/ExceptionRenderer.php:253
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Ha ocurrido un error interno."
 
diff --git a/resources/locales/fa_IR/cake.po b/resources/locales/fa_IR/cake.po
index f2d0c68b..599c606b 100644
--- a/resources/locales/fa_IR/cake.po
+++ b/resources/locales/fa_IR/cake.po
@@ -23,10 +23,6 @@ msgstr "خطا"
 msgid "The requested address %s was not found on this server."
 msgstr "آدرس درخواستی %s در این سرور یافت نشد."
 
-#: Template/Error/error500.ctp:33
-msgid "An Internal Error Has Occurred"
-msgstr "یک خطای داخلی رخ داده است."
-
 #: Controller/Component/AuthComponent.php:461
 msgid "You are not authorized to access that location."
 msgstr "شما مجاز به دسترسی به آن مکان نمیباشید."
@@ -39,11 +35,12 @@ msgstr "کوکی رمز CSRF از دست رفته"
 msgid "CSRF token mismatch."
 msgstr "عدم تطابق رمز CSRF."
 
-#: Error/ExceptionRenderer.php:251
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "پیدا نشد"
 
-#: Error/ExceptionRenderer.php:253
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "یک خطای داخلی رخ داده است."
 
diff --git a/resources/locales/fr_CA/cake.po b/resources/locales/fr_CA/cake.po
index 5b192136..cdfa26b8 100644
--- a/resources/locales/fr_CA/cake.po
+++ b/resources/locales/fr_CA/cake.po
@@ -23,29 +23,29 @@ msgstr "Erreur"
 msgid "The requested address {0} was not found on this server."
 msgstr "L'adresse demandée {0} n'a pas été trouvée sur ce serveur."
 
-#: templates/Error/error500.php:41
-#: vendor/cakephp/cakephp/src/Error/ExceptionRenderer.php:340
-msgid "An Internal Error Has Occurred."
-msgstr "Une Erreur Interne s'est produite."
-
-#: vendor/cakephp/cakephp/src/Controller/Component/AuthComponent.php:462
+#: Controller/Component/AuthComponent.php:462
 msgid "You are not authorized to access that location."
 msgstr "Vous n'êtes pas autorisé à accéder à cet endroit."
 
-#: vendor/cakephp/cakephp/src/Error/ExceptionRenderer.php:338
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Non trouvé"
 
-#: vendor/cakephp/cakephp/src/Http/Middleware/CsrfProtectionMiddleware.php:390
+#: templates/Error/error500.php:41
+#: Error/ExceptionRenderer.php:340
+msgid "An Internal Error Has Occurred."
+msgstr "Une Erreur Interne s'est produite."
+
+#: Http/Middleware/CsrfProtectionMiddleware.php:390
 msgid "Missing or incorrect CSRF cookie type."
 msgstr "Il manque le Cookie avec le token CSRF."
 
-#: vendor/cakephp/cakephp/src/Http/Middleware/CsrfProtectionMiddleware.php:394
+#: Http/Middleware/CsrfProtectionMiddleware.php:394
 msgid "Missing or invalid CSRF cookie."
 msgstr "Il manque le Cookie avec le token CSRF."
 
-#: vendor/cakephp/cakephp/src/Http/Middleware/CsrfProtectionMiddleware.php:417
-#: vendor/cakephp/cakephp/src/Http/Middleware/SessionCsrfProtectionMiddleware.php:265
+#: Http/Middleware/CsrfProtectionMiddleware.php:417
+#: Http/Middleware/SessionCsrfProtectionMiddleware.php:265
 msgid ""
 "CSRF token from either the request body or request headers did not match or "
 "is missing."
@@ -53,232 +53,232 @@ msgstr ""
 "Le jeton CSRF du corps de la demande ou des en-têtes de la demande ne "
 "correspond pas ou est manquant."
 
-#: vendor/cakephp/cakephp/src/Http/Middleware/SessionCsrfProtectionMiddleware.php:247
+#: Http/Middleware/SessionCsrfProtectionMiddleware.php:247
 msgid "Missing or incorrect CSRF session key"
 msgstr "Clé de session CSRF manquante ou incorrecte"
 
-#: vendor/cakephp/cakephp/src/Http/Response.php:1490
+#: Http/Response.php:1490
 msgid "The requested file contains `..` and will not be read."
 msgstr "Le fichier demandé contient `..` et ne sera pas lu."
 
-#: vendor/cakephp/cakephp/src/Http/Response.php:1498
+#: Http/Response.php:1498
 msgid "The requested file was not found"
 msgstr "Le fichier demandé n'a pas été trouvé"
 
-#: vendor/cakephp/cakephp/src/I18n/Number.php:116
+#: I18n/Number.php:116
 msgid "{0,number,#,###.##} KB"
 msgstr "{0,number,#,###.##} KB"
 
-#: vendor/cakephp/cakephp/src/I18n/Number.php:118
+#: I18n/Number.php:118
 msgid "{0,number,#,###.##} MB"
 msgstr "{0,number,#,###.##} MB"
 
-#: vendor/cakephp/cakephp/src/I18n/Number.php:120
+#: I18n/Number.php:120
 msgid "{0,number,#,###.##} GB"
 msgstr "{0,number,#,###.##} GB"
 
-#: vendor/cakephp/cakephp/src/I18n/Number.php:122
+#: I18n/Number.php:122
 msgid "{0,number,#,###.##} TB"
 msgstr "{0,number,#,###.##} TB"
 
-#: vendor/cakephp/cakephp/src/I18n/Number.php:114
+#: I18n/Number.php:114
 msgid "{0,number,integer} Byte"
 msgid_plural "{0,number,integer} Bytes"
 msgstr[0] "{0,number,integer} Octet"
 msgstr[1] "{0,number,integer} Octets"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:86
+#: I18n/RelativeTimeFormatter.php:86
 msgid "{0} from now"
 msgstr "{0} à partir de maintenant"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:86
+#: I18n/RelativeTimeFormatter.php:86
 msgid "{0} ago"
 msgstr "il y a {0}"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:89
+#: I18n/RelativeTimeFormatter.php:89
 msgid "{0} after"
 msgstr "{0} après"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:89
+#: I18n/RelativeTimeFormatter.php:89
 msgid "{0} before"
 msgstr "{0} avant"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:120
+#: I18n/RelativeTimeFormatter.php:120
 msgid "just now"
 msgstr "a l'instant"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:157
+#: I18n/RelativeTimeFormatter.php:157
 msgid "about a second ago"
 msgstr "il y a environ une seconde"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:158
+#: I18n/RelativeTimeFormatter.php:158
 msgid "about a minute ago"
 msgstr "il y a environ une minute"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:159
+#: I18n/RelativeTimeFormatter.php:159
 msgid "about an hour ago"
 msgstr "il y a environ une heure"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:160
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:370
+#: I18n/RelativeTimeFormatter.php:160
+#: I18n/RelativeTimeFormatter.php:370
 msgid "about a day ago"
 msgstr "il y a environ un jour"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:161
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:371
+#: I18n/RelativeTimeFormatter.php:161
+#: I18n/RelativeTimeFormatter.php:371
 msgid "about a week ago"
 msgstr "il y a environ une semaine"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:162
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:372
+#: I18n/RelativeTimeFormatter.php:162
+#: I18n/RelativeTimeFormatter.php:372
 msgid "about a month ago"
 msgstr "il y a environ un mois"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:163
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:373
+#: I18n/RelativeTimeFormatter.php:163
+#: I18n/RelativeTimeFormatter.php:373
 msgid "about a year ago"
 msgstr "il y a environ un an"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:174
+#: I18n/RelativeTimeFormatter.php:174
 msgid "in about a second"
 msgstr "dans environ une seconde"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:175
+#: I18n/RelativeTimeFormatter.php:175
 msgid "in about a minute"
 msgstr "dans environ une minute"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:176
+#: I18n/RelativeTimeFormatter.php:176
 msgid "in about an hour"
 msgstr "dans environ une heure"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:177
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:384
+#: I18n/RelativeTimeFormatter.php:177
+#: I18n/RelativeTimeFormatter.php:384
 msgid "in about a day"
 msgstr "dans environ un jour"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:178
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:385
+#: I18n/RelativeTimeFormatter.php:178
+#: I18n/RelativeTimeFormatter.php:385
 msgid "in about a week"
 msgstr "dans environ une semaine"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:179
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:386
+#: I18n/RelativeTimeFormatter.php:179
+#: I18n/RelativeTimeFormatter.php:386
 msgid "in about a month"
 msgstr "dans environ un mois"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:180
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:387
+#: I18n/RelativeTimeFormatter.php:180
+#: I18n/RelativeTimeFormatter.php:387
 msgid "in about a year"
 msgstr "dans environ un an"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:342
+#: I18n/RelativeTimeFormatter.php:342
 msgid "today"
 msgstr "aujourd'hui"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:409
+#: I18n/RelativeTimeFormatter.php:409
 msgid "%s ago"
 msgstr "il y a %s"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:410
+#: I18n/RelativeTimeFormatter.php:410
 msgid "on %s"
 msgstr "sur %s"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:53
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:132
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:354
+#: I18n/RelativeTimeFormatter.php:53
+#: I18n/RelativeTimeFormatter.php:132
+#: I18n/RelativeTimeFormatter.php:354
 msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] "{0} année"
 msgstr[1] "{0} années"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:57
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:135
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:357
+#: I18n/RelativeTimeFormatter.php:57
+#: I18n/RelativeTimeFormatter.php:135
+#: I18n/RelativeTimeFormatter.php:357
 msgid "{0} month"
 msgid_plural "{0} months"
 msgstr[0] "{0} mois"
 msgstr[1] "{0} mois"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:63
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:138
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:360
+#: I18n/RelativeTimeFormatter.php:63
+#: I18n/RelativeTimeFormatter.php:138
+#: I18n/RelativeTimeFormatter.php:360
 msgid "{0} week"
 msgid_plural "{0} weeks"
 msgstr[0] "{0} semaine"
 msgstr[1] "{0} semaines"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:65
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:141
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:363
+#: I18n/RelativeTimeFormatter.php:65
+#: I18n/RelativeTimeFormatter.php:141
+#: I18n/RelativeTimeFormatter.php:363
 msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] "{0} jour"
 msgstr[1] "{0} jours"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:70
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:144
+#: I18n/RelativeTimeFormatter.php:70
+#: I18n/RelativeTimeFormatter.php:144
 msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} heure"
 msgstr[1] "{0} heures"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:74
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:147
+#: I18n/RelativeTimeFormatter.php:74
+#: I18n/RelativeTimeFormatter.php:147
 msgid "{0} minute"
 msgid_plural "{0} minutes"
 msgstr[0] "{0} minute"
 msgstr[1] "{0} minutes"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:78
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:150
+#: I18n/RelativeTimeFormatter.php:78
+#: I18n/RelativeTimeFormatter.php:150
 msgid "{0} second"
 msgid_plural "{0} seconds"
 msgstr[0] "{0} seconde"
 msgstr[1] "{0} secondes"
 
-#: vendor/cakephp/cakephp/src/ORM/RulesChecker.php:63
+#: ORM/RulesChecker.php:63
 msgid "This value is already in use"
 msgstr "Cette valeur est déjà utilisée"
 
-#: vendor/cakephp/cakephp/src/ORM/RulesChecker.php:110
+#: ORM/RulesChecker.php:110
 msgid "This value does not exist"
 msgstr "Cette valeur n'existe pas"
 
-#: vendor/cakephp/cakephp/src/ORM/RulesChecker.php:232
+#: ORM/RulesChecker.php:232
 msgid "Cannot modify row: a constraint for the `{0}` association fails."
 msgstr ""
 "Impossible de modifier la ligne : une contrainte pour l'association `{0}` "
 "échoue."
 
-#: vendor/cakephp/cakephp/src/ORM/RulesChecker.php:270
+#: ORM/RulesChecker.php:270
 msgid "The count does not match {0}{1}"
 msgstr "The count does not match {0}{1}"
 
-#: vendor/cakephp/cakephp/src/Utility/Text.php:924
+#: Utility/Text.php:924
 msgid "and"
 msgstr "et"
 
-#: vendor/cakephp/cakephp/src/Validation/Validator.php:2539
+#: Validation/Validator.php:2539
 msgid "This field is required"
 msgstr "Ce champ est requis"
 
-#: vendor/cakephp/cakephp/src/Validation/Validator.php:2559
-#: vendor/cakephp/cakephp/src/View/Form/ArrayContext.php:249
+#: Validation/Validator.php:2559
+#: View/Form/ArrayContext.php:249
 msgid "This field cannot be left empty"
 msgstr "Ce champ ne peut être laissé vide"
 
-#: vendor/cakephp/cakephp/src/Validation/Validator.php:2711
+#: Validation/Validator.php:2711
 msgid "The provided value is invalid"
 msgstr "La valeur fournie n'est pas correcte"
 
-#: vendor/cakephp/cakephp/src/View/Helper/FormHelper.php:981
+#: View/Helper/FormHelper.php:981
 msgid "Edit {0}"
 msgstr "Modifier %s"
 
-#: vendor/cakephp/cakephp/src/View/Helper/FormHelper.php:983
+#: View/Helper/FormHelper.php:983
 msgid "New {0}"
 msgstr "Nouveau %s"
 
-#: vendor/cakephp/cakephp/src/View/Helper/FormHelper.php:1911
+#: View/Helper/FormHelper.php:1911
 msgid "Submit"
 msgstr "Envoyer"
diff --git a/resources/locales/fr_FR/cake.po b/resources/locales/fr_FR/cake.po
index ddff0539..17bbaac6 100644
--- a/resources/locales/fr_FR/cake.po
+++ b/resources/locales/fr_FR/cake.po
@@ -23,10 +23,6 @@ msgstr "Erreur"
 msgid "The requested address {0} was not found on this server."
 msgstr "L'adresse demandée {0} n'a pas été trouvée sur ce serveur."
 
-#: Template/Error/error500.ctp:39
-msgid "An Internal Error Has Occurred"
-msgstr "Une Erreur Interne s'est produite"
-
 #: Controller/Component/AuthComponent.php:496
 msgid "You are not authorized to access that location."
 msgstr "Vous n'êtes pas autorisé à accéder à cet endroit."
@@ -39,11 +35,12 @@ msgstr "Il manque le Cookie avec le token CSRF"
 msgid "CSRF token mismatch."
 msgstr "Le token CRSF ne correspond pas."
 
-#: Error/ExceptionRenderer.php:258
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Non trouvé"
 
-#: Error/ExceptionRenderer.php:260
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Une Erreur Interne s'est produite."
 
diff --git a/resources/locales/hu/cake.po b/resources/locales/hu/cake.po
index 69395fa9..b4e045c5 100644
--- a/resources/locales/hu/cake.po
+++ b/resources/locales/hu/cake.po
@@ -23,10 +23,6 @@ msgstr "Hiba"
 msgid "The requested address %s was not found on this server."
 msgstr "A kért cím (%s) nem található a kiszolgálón."
 
-#: View/Errors/error500.ctp:20 Error/ExceptionRenderer.php:245
-msgid "An Internal Error Has Occurred."
-msgstr "Belső hiba történt!"
-
 #: Controller/Scaffold.php:127
 msgid "Scaffold :: "
 msgstr "Scaffold ::"
@@ -64,10 +60,15 @@ msgstr "Hiba történt a %2$s azonosítójú %1$s  törlése közben."
 msgid "You are not authorized to access that location."
 msgstr "Ön nem jogosult hozzáférni ahhoz a helyhez."
 
-#: Error/ExceptionRenderer.php:222
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Nem található"
 
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
+msgid "An Internal Error Has Occurred."
+msgstr "Belső hiba történt!"
+
 #: Model/Validator/CakeValidationSet.php:286
 msgid "This field cannot be left blank"
 msgstr "Ez a mező nem lehet üres"
diff --git a/resources/locales/it/cake.po b/resources/locales/it/cake.po
index ec44242a..19bcfb96 100644
--- a/resources/locales/it/cake.po
+++ b/resources/locales/it/cake.po
@@ -47,11 +47,12 @@ msgstr "Si è verificato un errore eliminando l'elemento %1$s con id: %2$s"
 msgid "You are not authorized to access that location."
 msgstr "Accesso negato."
 
-#: Error/ExceptionRenderer.php:209
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Pagina non trovata"
 
-#: Error/ExceptionRenderer.php:231
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Errore interno del server"
 
diff --git a/resources/locales/ja_JP/cake.po b/resources/locales/ja_JP/cake.po
index f8ee22da..fa7ed3a3 100644
--- a/resources/locales/ja_JP/cake.po
+++ b/resources/locales/ja_JP/cake.po
@@ -23,10 +23,6 @@ msgstr "エラー"
 msgid "The requested address %s was not found on this server."
 msgstr "要求されたアドレス %s はこのサーバー上に見つかりませんでした。"
 
-#: Template/Error/error500.ctp:33
-msgid "An Internal Error Has Occurred"
-msgstr "内部エラーが発生しました"
-
 #: Controller/Component/AuthComponent.php:454
 msgid "You are not authorized to access that location."
 msgstr "アクセスするための権限がありません。"
@@ -39,11 +35,12 @@ msgstr "CSRFトークンのクッキーが見つかりません"
 msgid "CSRF token mismatch."
 msgstr "CSRFトークンが一致しません。"
 
-#: Error/ExceptionRenderer.php:248
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "見つかりません"
 
-#: Error/ExceptionRenderer.php:250
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "内部エラーが発生しました。"
 
diff --git a/resources/locales/nb/cake.po b/resources/locales/nb/cake.po
index 27b74bea..3c066846 100644
--- a/resources/locales/nb/cake.po
+++ b/resources/locales/nb/cake.po
@@ -48,11 +48,12 @@ msgstr "Det oppstod en feil i forbinnelse med slettingen av %1$s med id: %2$s"
 msgid "You are not authorized to access that location."
 msgstr "Du har ikke tilrekkelig tillatelse til å se den siden."
 
-#: Error/ExceptionRenderer.php:205
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Ikke funnet"
 
-#: Error/ExceptionRenderer.php:227
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Det oppsto en intern feil."
 
diff --git a/resources/locales/nl/cake.po b/resources/locales/nl/cake.po
index 88727c84..5d21327b 100644
--- a/resources/locales/nl/cake.po
+++ b/resources/locales/nl/cake.po
@@ -20,281 +20,278 @@ msgstr "Fout"
 msgid "The requested address {0} was not found on this server."
 msgstr "Het opgegeven pad {0} is niet gevonden op deze server."
 
-#: src/Template/Error/error500.ctp:41
-msgid "An Internal Error Has Occurred"
-msgstr "Er is een interne fout opgetreden"
-
-#: vendor/cakephp/cakephp/src/Controller/Component/AuthComponent.php:496
+#: Controller/Component/AuthComponent.php:496
 msgid "You are not authorized to access that location."
 msgstr "U heeft geen toestemming om die locatie te bekijken."
 
-#: vendor/cakephp/cakephp/src/Controller/Component/CsrfComponent.php:157
-#: vendor/cakephp/cakephp/src/Http/Middleware/CsrfProtectionMiddleware.php:190
+#: Controller/Component/CsrfComponent.php:157
+#: Http/Middleware/CsrfProtectionMiddleware.php:190
 msgid "Missing CSRF token cookie"
 msgstr "CSRF token cookie mist"
 
-#: vendor/cakephp/cakephp/src/Controller/Component/CsrfComponent.php:161
-#: vendor/cakephp/cakephp/src/Http/Middleware/CsrfProtectionMiddleware.php:194
+#: Controller/Component/CsrfComponent.php:161
+#: Http/Middleware/CsrfProtectionMiddleware.php:194
 msgid "CSRF token mismatch."
 msgstr "CSRF komt niet overeen."
 
-#: vendor/cakephp/cakephp/src/Error/ExceptionRenderer.php:258
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Niet gevonden"
 
-#: vendor/cakephp/cakephp/src/Error/ExceptionRenderer.php:260
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Er is een interne fout opgetreden."
 
-#: vendor/cakephp/cakephp/src/Http/Response.php:2400
+#: Http/Response.php:2400
 msgid "The requested file contains `..` and will not be read."
 msgstr "Het opgevraagde bestand bevat `..` en zal daarom niet worden geopent."
 
-#: vendor/cakephp/cakephp/src/Http/Response.php:2411
+#: Http/Response.php:2411
 msgid "The requested file was not found"
 msgstr "Het gevraagde bestand werd niet gevonden"
 
-#: vendor/cakephp/cakephp/src/I18n/Number.php:90
+#: I18n/Number.php:90
 msgid "{0,number,#,###.##} KB"
 msgstr "{0,number,#,###.##} KB"
 
-#: vendor/cakephp/cakephp/src/I18n/Number.php:92
+#: I18n/Number.php:92
 msgid "{0,number,#,###.##} MB"
 msgstr "{0,number,#,###.##} MB"
 
-#: vendor/cakephp/cakephp/src/I18n/Number.php:94
+#: I18n/Number.php:94
 msgid "{0,number,#,###.##} GB"
 msgstr "{0,number,#,###.##} GB"
 
-#: vendor/cakephp/cakephp/src/I18n/Number.php:96
+#: I18n/Number.php:96
 msgid "{0,number,#,###.##} TB"
 msgstr "{0,number,#,###.##} TB"
 
-#: vendor/cakephp/cakephp/src/I18n/Number.php:88
+#: I18n/Number.php:88
 msgid "{0,number,integer} Byte"
 msgid_plural "{0,number,integer} Bytes"
 msgstr[0] "{0,number,integer} byte"
 msgstr[1] "{0,number,integer} bytes"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:80
+#: I18n/RelativeTimeFormatter.php:80
 msgid "{0} from now"
 msgstr "{0} vanaf nu"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:80
+#: I18n/RelativeTimeFormatter.php:80
 msgid "{0} ago"
 msgstr "{0} geleden"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:83
+#: I18n/RelativeTimeFormatter.php:83
 msgid "{0} after"
 msgstr "{0} later"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:83
+#: I18n/RelativeTimeFormatter.php:83
 msgid "{0} before"
 msgstr "{0} ervoor"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:114
+#: I18n/RelativeTimeFormatter.php:114
 msgid "just now"
 msgstr "zojuist"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:151
+#: I18n/RelativeTimeFormatter.php:151
 msgid "about a second ago"
 msgstr "ongeveer een seconde geleden"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:152
+#: I18n/RelativeTimeFormatter.php:152
 msgid "about a minute ago"
 msgstr "ongeveer een minuut geleden"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:153
+#: I18n/RelativeTimeFormatter.php:153
 msgid "about an hour ago"
 msgstr "ongeveer een uur geleden"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:154;332
+#: I18n/RelativeTimeFormatter.php:154;332
 msgid "about a day ago"
 msgstr "ongeveer een dag geleden"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:155;333
+#: I18n/RelativeTimeFormatter.php:155;333
 msgid "about a week ago"
 msgstr "ongeveer een week geleden"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:156;334
+#: I18n/RelativeTimeFormatter.php:156;334
 msgid "about a month ago"
 msgstr "ongeveer een maand geleden"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:157;335
+#: I18n/RelativeTimeFormatter.php:157;335
 msgid "about a year ago"
 msgstr "ongeveer een jaar geleden"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:168
+#: I18n/RelativeTimeFormatter.php:168
 msgid "in about a second"
 msgstr "over ongeveer een seconde"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:169
+#: I18n/RelativeTimeFormatter.php:169
 msgid "in about a minute"
 msgstr "over ongeveer een minuut"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:170
+#: I18n/RelativeTimeFormatter.php:170
 msgid "in about an hour"
 msgstr "over ongeveer een uur"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:171;346
+#: I18n/RelativeTimeFormatter.php:171;346
 msgid "in about a day"
 msgstr "over ongeveer een dag"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:172;347
+#: I18n/RelativeTimeFormatter.php:172;347
 msgid "in about a week"
 msgstr "over ongeveer een week"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:173;348
+#: I18n/RelativeTimeFormatter.php:173;348
 msgid "in about a month"
 msgstr "over ongeveer een maand"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:174;349
+#: I18n/RelativeTimeFormatter.php:174;349
 msgid "in about a year"
 msgstr "over ongeveer een jaar"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:304
+#: I18n/RelativeTimeFormatter.php:304
 msgid "today"
 msgstr "vandaag"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:370
+#: I18n/RelativeTimeFormatter.php:370
 msgid "%s ago"
 msgstr "%s geleden"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:371
+#: I18n/RelativeTimeFormatter.php:371
 msgid "on %s"
 msgstr "op %s"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:47;126;316
+#: I18n/RelativeTimeFormatter.php:47;126;316
 msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] "{0} jaar"
 msgstr[1] "{0} jaren"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:51;129;319
+#: I18n/RelativeTimeFormatter.php:51;129;319
 msgid "{0} month"
 msgid_plural "{0} months"
 msgstr[0] "{0} maand"
 msgstr[1] "{0} maanden"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:57;132;322
+#: I18n/RelativeTimeFormatter.php:57;132;322
 msgid "{0} week"
 msgid_plural "{0} weeks"
 msgstr[0] "{0} week"
 msgstr[1] "{0} weken"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:59;135;325
+#: I18n/RelativeTimeFormatter.php:59;135;325
 msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] "{0} dag"
 msgstr[1] "{0} dagen"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:64;138
+#: I18n/RelativeTimeFormatter.php:64;138
 msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} uur"
 msgstr[1] "{0} uren"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:68;141
+#: I18n/RelativeTimeFormatter.php:68;141
 msgid "{0} minute"
 msgid_plural "{0} minutes"
 msgstr[0] "{0} minuut"
 msgstr[1] "{0} minuten"
 
-#: vendor/cakephp/cakephp/src/I18n/RelativeTimeFormatter.php:72;144
+#: I18n/RelativeTimeFormatter.php:72;144
 msgid "{0} second"
 msgid_plural "{0} seconds"
 msgstr[0] "{0} seconde"
 msgstr[1] "{0} seconden"
 
-#: vendor/cakephp/cakephp/src/ORM/RulesChecker.php:57
+#: ORM/RulesChecker.php:57
 msgid "This value is already in use"
 msgstr "Deze waarde is al in gebruik"
 
-#: vendor/cakephp/cakephp/src/ORM/RulesChecker.php:104
+#: ORM/RulesChecker.php:104
 msgid "This value does not exist"
 msgstr "Deze waarde bestaat niet"
 
-#: vendor/cakephp/cakephp/src/ORM/RulesChecker.php:128
+#: ORM/RulesChecker.php:128
 msgid "The count does not match {0}{1}"
 msgstr "Het aantal komt niet overeen {0}{1}"
 
-#: vendor/cakephp/cakephp/src/Utility/Text.php:902
+#: Utility/Text.php:902
 msgid "and"
 msgstr "en"
 
-#: vendor/cakephp/cakephp/src/Validation/Validator.php:111
+#: Validation/Validator.php:111
 msgid "This field is required"
 msgstr "Dit veld is verplicht"
 
-#: vendor/cakephp/cakephp/src/Validation/Validator.php:112
+#: Validation/Validator.php:112
 msgid "This field cannot be left empty"
 msgstr "Dit veld mag niet leeg zijn"
 
-#: vendor/cakephp/cakephp/src/Validation/Validator.php:1885
+#: Validation/Validator.php:1885
 msgid "The provided value is invalid"
 msgstr "De opgegeven waarde is niet geldig"
 
-#: vendor/cakephp/cakephp/src/View/Helper/FormHelper.php:1039
+#: View/Helper/FormHelper.php:1039
 msgid "New %s"
 msgstr "Nieuw %s"
 
-#: vendor/cakephp/cakephp/src/View/Helper/FormHelper.php:1042
+#: View/Helper/FormHelper.php:1042
 msgid "Edit %s"
 msgstr "Bewerk %s"
 
-#: vendor/cakephp/cakephp/src/View/Helper/FormHelper.php:1919
+#: View/Helper/FormHelper.php:1919
 msgid "Submit"
 msgstr "Verzenden"
 
-#: vendor/cakephp/cakephp/src/View/Helper/HtmlHelper.php:795
+#: View/Helper/HtmlHelper.php:795
 msgid "Home"
 msgstr "Home"
 
-#: vendor/cakephp/cakephp/src/View/Widget/DateTimeWidget.php:540
+#: View/Widget/DateTimeWidget.php:540
 msgid "January"
 msgstr "januari"
 
-#: vendor/cakephp/cakephp/src/View/Widget/DateTimeWidget.php:541
+#: View/Widget/DateTimeWidget.php:541
 msgid "February"
 msgstr "februari"
 
-#: vendor/cakephp/cakephp/src/View/Widget/DateTimeWidget.php:542
+#: View/Widget/DateTimeWidget.php:542
 msgid "March"
 msgstr "maart"
 
-#: vendor/cakephp/cakephp/src/View/Widget/DateTimeWidget.php:543
+#: View/Widget/DateTimeWidget.php:543
 msgid "April"
 msgstr "april"
 
-#: vendor/cakephp/cakephp/src/View/Widget/DateTimeWidget.php:544
+#: View/Widget/DateTimeWidget.php:544
 msgid "May"
 msgstr "mei"
 
-#: vendor/cakephp/cakephp/src/View/Widget/DateTimeWidget.php:545
+#: View/Widget/DateTimeWidget.php:545
 msgid "June"
 msgstr "juni"
 
-#: vendor/cakephp/cakephp/src/View/Widget/DateTimeWidget.php:546
+#: View/Widget/DateTimeWidget.php:546
 msgid "July"
 msgstr "juli"
 
-#: vendor/cakephp/cakephp/src/View/Widget/DateTimeWidget.php:547
+#: View/Widget/DateTimeWidget.php:547
 msgid "August"
 msgstr "augustus"
 
-#: vendor/cakephp/cakephp/src/View/Widget/DateTimeWidget.php:548
+#: View/Widget/DateTimeWidget.php:548
 msgid "September"
 msgstr "september"
 
-#: vendor/cakephp/cakephp/src/View/Widget/DateTimeWidget.php:549
+#: View/Widget/DateTimeWidget.php:549
 msgid "October"
 msgstr "oktober"
 
-#: vendor/cakephp/cakephp/src/View/Widget/DateTimeWidget.php:550
+#: View/Widget/DateTimeWidget.php:550
 msgid "November"
 msgstr "november"
 
-#: vendor/cakephp/cakephp/src/View/Widget/DateTimeWidget.php:551
+#: View/Widget/DateTimeWidget.php:551
 msgid "December"
 msgstr "december"
 
diff --git a/resources/locales/no/cake.po b/resources/locales/no/cake.po
index d7ae63c9..507f7bdc 100644
--- a/resources/locales/no/cake.po
+++ b/resources/locales/no/cake.po
@@ -48,11 +48,12 @@ msgstr "Det oppstod en feil i forbinnelse med slettingen av %1$s med id: %2$s"
 msgid "You are not authorized to access that location."
 msgstr "Du har ikke tilrekkelig tillatelse til å se den siden."
 
-#: Error/ExceptionRenderer.php:205
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Ikke funnet"
 
-#: Error/ExceptionRenderer.php:227
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Det oppsto en intern feil."
 
diff --git a/resources/locales/pl/cake.po b/resources/locales/pl/cake.po
index 1a1ccbb6..1007316c 100644
--- a/resources/locales/pl/cake.po
+++ b/resources/locales/pl/cake.po
@@ -23,10 +23,6 @@ msgstr "Błąd"
 msgid "The requested address %s was not found on this server."
 msgstr "Żądany adres %s nie został odnaleziony na tym serwerze."
 
-#: Template/Error/error500.ctp:39
-msgid "An Internal Error Has Occurred"
-msgstr "Wystąpił błąd wewnętrzny"
-
 #: Controller/Component/AuthComponent.php:454
 msgid "You are not authorized to access that location."
 msgstr "Nie masz uprawnień, aby przeglądać te lokalizację."
@@ -39,11 +35,12 @@ msgstr "Brakuje tokena CSRF"
 msgid "CSRF token mismatch."
 msgstr "Token CSRF nie pasuje"
 
-#: Error/ExceptionRenderer.php:247
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Nie znaleziono"
 
-#: Error/ExceptionRenderer.php:249
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Wystąpił błąd wewnętrzny"
 
diff --git a/resources/locales/pt/cake.po b/resources/locales/pt/cake.po
index 4117d7e7..73b04aba 100644
--- a/resources/locales/pt/cake.po
+++ b/resources/locales/pt/cake.po
@@ -48,11 +48,12 @@ msgstr "Houve um erro excluindo %1$s com id: %2$s"
 msgid "You are not authorized to access that location."
 msgstr "Você não pode visualizar esta página."
 
-#: Error/ExceptionRenderer.php:205
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Não encontrado"
 
-#: Error/ExceptionRenderer.php:227
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Houve um problema com o sistema."
 
diff --git a/resources/locales/ro_RO/cake.po b/resources/locales/ro_RO/cake.po
index 0283a50e..4c65f0e6 100644
--- a/resources/locales/ro_RO/cake.po
+++ b/resources/locales/ro_RO/cake.po
@@ -48,11 +48,12 @@ msgstr "Nu s-a putut sterge %1$s cu codul %2$s"
 msgid "You are not authorized to access that location."
 msgstr "Nu sunteți autorizat să accesați această locație"
 
-#: Error/ExceptionRenderer.php:209
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Nu a fost găsit"
 
-#: Error/ExceptionRenderer.php:231
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "A apărut o eroare internă."
 
diff --git a/resources/locales/ru/cake.po b/resources/locales/ru/cake.po
index 5461f59a..33cdbc95 100644
--- a/resources/locales/ru/cake.po
+++ b/resources/locales/ru/cake.po
@@ -22,8 +22,8 @@ msgstr "Ошибка"
 msgid "The requested address %s was not found on this server."
 msgstr "Запрошенный адрес %s не был найден на этом сервере"
 
-#: View/Errors/error500.ctp:23
-#: Error/ExceptionRenderer.php:234
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Произошла внутренняя ошибка"
 
@@ -63,7 +63,7 @@ msgstr "При удалении %1$s с идентификатором %2$s пр
 msgid "You are not authorized to access that location."
 msgstr "У вас нет доступа к этой странице."
 
-#: Error/ExceptionRenderer.php:212
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Не найдено"
 
diff --git a/resources/locales/tr/cake.po b/resources/locales/tr/cake.po
index dccba5a2..3e520f4e 100644
--- a/resources/locales/tr/cake.po
+++ b/resources/locales/tr/cake.po
@@ -23,10 +23,6 @@ msgstr "Hata"
 msgid "The requested address %s was not found on this server."
 msgstr "Aradığınız adres %s bu sunucuda bulunamadı."
 
-#: Template/Error/error500.ctp:33
-msgid "An Internal Error Has Occurred"
-msgstr "İçsel Bir Hata Oluştu"
-
 #: Controller/Component/AuthComponent.php:461
 msgid "You are not authorized to access that location."
 msgstr "Bu alana erişim yetkiniz bulunmamaktadır."
@@ -39,11 +35,12 @@ msgstr "Eksik CSRF belirteci tanımlama bilgisi"
 msgid "CSRF token mismatch."
 msgstr "CSRF belirteci uyuşmazlığı."
 
-#: Error/ExceptionRenderer.php:251
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Bulunamadı"
 
-#: Error/ExceptionRenderer.php:253
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Dahili bir hata oluştu."
 
diff --git a/resources/locales/uk/cake.po b/resources/locales/uk/cake.po
index 16a81c38..108b8c4d 100644
--- a/resources/locales/uk/cake.po
+++ b/resources/locales/uk/cake.po
@@ -24,10 +24,6 @@ msgstr "Помилка"
 msgid "The requested address %s was not found on this server."
 msgstr "Запитувана адреса %s не була знайдена на цьому сервері."
 
-#: Template/Error/error500.ctp:35
-msgid "An Internal Error Has Occurred"
-msgstr "Сталася внутрішня помилка"
-
 #: Controller/Component/AuthComponent.php:454
 msgid "You are not authorized to access that location."
 msgstr "Ви не маєте права доступу до цієї сторінки."
@@ -40,11 +36,12 @@ msgstr "Відсутня кука з CSRF  токеном"
 msgid "CSRF token mismatch."
 msgstr "Невідповідність CSRF токену."
 
-#: Error/ExceptionRenderer.php:247
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Не знайдено"
 
-#: Error/ExceptionRenderer.php:249
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Сталася внутрішня помилка"
 
diff --git a/resources/locales/vi/cake.po b/resources/locales/vi/cake.po
index 22b6b877..ec778e19 100644
--- a/resources/locales/vi/cake.po
+++ b/resources/locales/vi/cake.po
@@ -23,10 +23,6 @@ msgstr "Lỗi"
 msgid "The requested address %s was not found on this server."
 msgstr "Địa chỉ yêu cầu %s không tồn tại"
 
-#: Template/Error/error500.ctp:33
-msgid "An Internal Error Has Occurred"
-msgstr "Đã xảy ra lỗi cục bộ"
-
 #: Controller/Component/AuthComponent.php:454
 msgid "You are not authorized to access that location."
 msgstr "Bạn không đủ quyền truy cập khu vực đó."
@@ -39,11 +35,12 @@ msgstr "Thiếu mã token CSRF"
 msgid "CSRF token mismatch."
 msgstr "Mã token CSRF không phù hợp"
 
-#: Error/ExceptionRenderer.php:233
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "Không tìm thấy"
 
-#: Error/ExceptionRenderer.php:235
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "Đã xảy ra lỗi cục bộ"
 
diff --git a/resources/locales/zh_CN/cake.po b/resources/locales/zh_CN/cake.po
index d206b55d..64e4b29c 100644
--- a/resources/locales/zh_CN/cake.po
+++ b/resources/locales/zh_CN/cake.po
@@ -23,10 +23,6 @@ msgstr "错误"
 msgid "The requested address {0} was not found on this server."
 msgstr "你请求的地址{0}在服务器上找不到"
 
-#: Template/Error/error500.ctp:39
-msgid "An Internal Error Has Occurred"
-msgstr "发生内部错误"
-
 #: Controller/Component/AuthComponent.php:463
 msgid "You are not authorized to access that location."
 msgstr "你没有访问权限"
@@ -39,11 +35,12 @@ msgstr "缺少CSRF令牌cookie"
 msgid "CSRF token mismatch."
 msgstr "CSRF令牌不匹配"
 
-#: Error/ExceptionRenderer.php:251
+#: Error/Renderer/WebExceptionRenderer.php:367
 msgid "Not Found"
 msgstr "找不到"
 
-#: Error/ExceptionRenderer.php:253
+#: Error/error500.php:41
+#: Error/Renderer/WebExceptionRenderer.php:369
 msgid "An Internal Error Has Occurred."
 msgstr "发生了内部错误"