diff --git a/fetchmail_notify_error_to_sender/i18n/ca.po b/fetchmail_notify_error_to_sender/i18n/ca.po
index 8dd65f68d..7d09be4c8 100644
--- a/fetchmail_notify_error_to_sender/i18n/ca.po
+++ b/fetchmail_notify_error_to_sender/i18n/ca.po
@@ -40,14 +40,14 @@ msgid "Email Thread"
 msgstr "Tema del Correu electrònic "
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid "Error notice template"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:ir.model,name:fetchmail_notify_error_to_sender.model_fetchmail_server
-msgid "POP/IMAP Server"
-msgstr "Servidor POP/IMAP"
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:mail.template,subject:fetchmail_notify_error_to_sender.email_template_error_notice
@@ -55,8 +55,11 @@ msgid "Receiving error with: ${ctx.get('sender_message').get('subject')|safe}"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid ""
 "Set here the template to use to send notice to sender when errors occur "
 "while fetching email"
 msgstr ""
+
+#~ msgid "POP/IMAP Server"
+#~ msgstr "Servidor POP/IMAP"
diff --git a/fetchmail_notify_error_to_sender/i18n/de.po b/fetchmail_notify_error_to_sender/i18n/de.po
index 0aad357f2..0a7184246 100644
--- a/fetchmail_notify_error_to_sender/i18n/de.po
+++ b/fetchmail_notify_error_to_sender/i18n/de.po
@@ -40,14 +40,14 @@ msgid "Email Thread"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid "Error notice template"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:ir.model,name:fetchmail_notify_error_to_sender.model_fetchmail_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP-Server"
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:mail.template,subject:fetchmail_notify_error_to_sender.email_template_error_notice
@@ -55,8 +55,11 @@ msgid "Receiving error with: ${ctx.get('sender_message').get('subject')|safe}"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid ""
 "Set here the template to use to send notice to sender when errors occur "
 "while fetching email"
 msgstr ""
+
+#~ msgid "POP/IMAP Server"
+#~ msgstr "POP/IMAP-Server"
diff --git a/fetchmail_notify_error_to_sender/i18n/es.po b/fetchmail_notify_error_to_sender/i18n/es.po
index 2bf299d00..eadeb0fb0 100644
--- a/fetchmail_notify_error_to_sender/i18n/es.po
+++ b/fetchmail_notify_error_to_sender/i18n/es.po
@@ -82,14 +82,14 @@ msgid "Email Thread"
 msgstr "Hilo correo electrónico"
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid "Error notice template"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:ir.model,name:fetchmail_notify_error_to_sender.model_fetchmail_server
-msgid "POP/IMAP Server"
-msgstr "Servidor POP/IMAP"
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:mail.template,subject:fetchmail_notify_error_to_sender.email_template_error_notice
@@ -97,8 +97,11 @@ msgid "Receiving error with: ${ctx.get('sender_message').get('subject')|safe}"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid ""
 "Set here the template to use to send notice to sender when errors occur "
 "while fetching email"
 msgstr ""
+
+#~ msgid "POP/IMAP Server"
+#~ msgstr "Servidor POP/IMAP"
diff --git a/fetchmail_notify_error_to_sender/i18n/fr.po b/fetchmail_notify_error_to_sender/i18n/fr.po
index bff5d8789..42be2cf03 100644
--- a/fetchmail_notify_error_to_sender/i18n/fr.po
+++ b/fetchmail_notify_error_to_sender/i18n/fr.po
@@ -51,14 +51,14 @@ msgid "Email Thread"
 msgstr "Discussion de courriel"
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid "Error notice template"
 msgstr "Erreur dans le modèle de notice"
 
 #. module: fetchmail_notify_error_to_sender
 #: model:ir.model,name:fetchmail_notify_error_to_sender.model_fetchmail_server
-msgid "POP/IMAP Server"
-msgstr "Serveur POP/IMAP"
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:mail.template,subject:fetchmail_notify_error_to_sender.email_template_error_notice
@@ -67,10 +67,13 @@ msgstr ""
 "Reçu une erreur avec : ${ctx.get('sender_message').get('subject')|safe}"
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid ""
 "Set here the template to use to send notice to sender when errors occur "
 "while fetching email"
 msgstr ""
 "Choisissez ici le modèle à utiliser pour informer l'expéditeur lorsque des "
 "erreurs surviennent lors de la récupération du courriel. "
+
+#~ msgid "POP/IMAP Server"
+#~ msgstr "Serveur POP/IMAP"
diff --git a/fetchmail_notify_error_to_sender/i18n/hr.po b/fetchmail_notify_error_to_sender/i18n/hr.po
index a5f844993..d5b5395ce 100644
--- a/fetchmail_notify_error_to_sender/i18n/hr.po
+++ b/fetchmail_notify_error_to_sender/i18n/hr.po
@@ -41,14 +41,14 @@ msgid "Email Thread"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid "Error notice template"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:ir.model,name:fetchmail_notify_error_to_sender.model_fetchmail_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP Server"
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:mail.template,subject:fetchmail_notify_error_to_sender.email_template_error_notice
@@ -56,8 +56,11 @@ msgid "Receiving error with: ${ctx.get('sender_message').get('subject')|safe}"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid ""
 "Set here the template to use to send notice to sender when errors occur "
 "while fetching email"
 msgstr ""
+
+#~ msgid "POP/IMAP Server"
+#~ msgstr "POP/IMAP Server"
diff --git a/fetchmail_notify_error_to_sender/i18n/it.po b/fetchmail_notify_error_to_sender/i18n/it.po
index 88c083c4a..f96d01544 100644
--- a/fetchmail_notify_error_to_sender/i18n/it.po
+++ b/fetchmail_notify_error_to_sender/i18n/it.po
@@ -52,14 +52,14 @@ msgid "Email Thread"
 msgstr "Discussione Mail"
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid "Error notice template"
 msgstr "Template Notifica Errore"
 
 #. module: fetchmail_notify_error_to_sender
 #: model:ir.model,name:fetchmail_notify_error_to_sender.model_fetchmail_server
-msgid "POP/IMAP Server"
-msgstr "Server POP/IMAP"
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:mail.template,subject:fetchmail_notify_error_to_sender.email_template_error_notice
@@ -67,10 +67,13 @@ msgid "Receiving error with: ${ctx.get('sender_message').get('subject')|safe}"
 msgstr "Ricezione errore con: ${ctx.get('sender_message').get('subject')|safe}"
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid ""
 "Set here the template to use to send notice to sender when errors occur "
 "while fetching email"
 msgstr ""
 "Imposta qui il template da usare per inviare una notifica al mittente quando "
 "si verificano errori durante il recupero dell'e-mail"
+
+#~ msgid "POP/IMAP Server"
+#~ msgstr "Server POP/IMAP"
diff --git a/fetchmail_notify_error_to_sender/i18n/pt_BR.po b/fetchmail_notify_error_to_sender/i18n/pt_BR.po
index 590644505..719529547 100644
--- a/fetchmail_notify_error_to_sender/i18n/pt_BR.po
+++ b/fetchmail_notify_error_to_sender/i18n/pt_BR.po
@@ -41,14 +41,14 @@ msgid "Email Thread"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid "Error notice template"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:ir.model,name:fetchmail_notify_error_to_sender.model_fetchmail_server
-msgid "POP/IMAP Server"
-msgstr "Servidor POP/IMAP"
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:mail.template,subject:fetchmail_notify_error_to_sender.email_template_error_notice
@@ -56,8 +56,11 @@ msgid "Receiving error with: ${ctx.get('sender_message').get('subject')|safe}"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid ""
 "Set here the template to use to send notice to sender when errors occur "
 "while fetching email"
 msgstr ""
+
+#~ msgid "POP/IMAP Server"
+#~ msgstr "Servidor POP/IMAP"
diff --git a/fetchmail_notify_error_to_sender/i18n/pt_PT.po b/fetchmail_notify_error_to_sender/i18n/pt_PT.po
index c0d428066..c9895bf50 100644
--- a/fetchmail_notify_error_to_sender/i18n/pt_PT.po
+++ b/fetchmail_notify_error_to_sender/i18n/pt_PT.po
@@ -40,13 +40,13 @@ msgid "Email Thread"
 msgstr "Tópico de Email"
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid "Error notice template"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:ir.model,name:fetchmail_notify_error_to_sender.model_fetchmail_server
-msgid "POP/IMAP Server"
+msgid "Incoming Mail Server"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
@@ -55,7 +55,7 @@ msgid "Receiving error with: ${ctx.get('sender_message').get('subject')|safe}"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid ""
 "Set here the template to use to send notice to sender when errors occur "
 "while fetching email"
diff --git a/fetchmail_notify_error_to_sender/i18n/sl.po b/fetchmail_notify_error_to_sender/i18n/sl.po
index ab29add9f..e7fff1922 100644
--- a/fetchmail_notify_error_to_sender/i18n/sl.po
+++ b/fetchmail_notify_error_to_sender/i18n/sl.po
@@ -41,14 +41,14 @@ msgid "Email Thread"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid "Error notice template"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:ir.model,name:fetchmail_notify_error_to_sender.model_fetchmail_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP strežnik"
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:mail.template,subject:fetchmail_notify_error_to_sender.email_template_error_notice
@@ -56,8 +56,11 @@ msgid "Receiving error with: ${ctx.get('sender_message').get('subject')|safe}"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid ""
 "Set here the template to use to send notice to sender when errors occur "
 "while fetching email"
 msgstr ""
+
+#~ msgid "POP/IMAP Server"
+#~ msgstr "POP/IMAP strežnik"
diff --git a/fetchmail_notify_error_to_sender/i18n/tr.po b/fetchmail_notify_error_to_sender/i18n/tr.po
index ffaa7b0db..b0c7b84d0 100644
--- a/fetchmail_notify_error_to_sender/i18n/tr.po
+++ b/fetchmail_notify_error_to_sender/i18n/tr.po
@@ -52,14 +52,14 @@ msgid "Email Thread"
 msgstr "Eposta konuşması"
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid "Error notice template"
 msgstr "Hata bildirim şablonu"
 
 #. module: fetchmail_notify_error_to_sender
 #: model:ir.model,name:fetchmail_notify_error_to_sender.model_fetchmail_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP sunucu"
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:mail.template,subject:fetchmail_notify_error_to_sender.email_template_error_notice
@@ -67,10 +67,13 @@ msgid "Receiving error with: ${ctx.get('sender_message').get('subject')|safe}"
 msgstr "Alınan hata : ${ctx.get('sender_message').get('subject')|safe}"
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid ""
 "Set here the template to use to send notice to sender when errors occur "
 "while fetching email"
 msgstr ""
 "E-posta alınırken oluşan hatalarda gönderilecek bildirim mesajı için şablonu "
 "belirleyin."
+
+#~ msgid "POP/IMAP Server"
+#~ msgstr "POP/IMAP sunucu"
diff --git a/fetchmail_notify_error_to_sender/i18n/zh_CN.po b/fetchmail_notify_error_to_sender/i18n/zh_CN.po
index aea4420f2..631e26285 100644
--- a/fetchmail_notify_error_to_sender/i18n/zh_CN.po
+++ b/fetchmail_notify_error_to_sender/i18n/zh_CN.po
@@ -41,14 +41,14 @@ msgid "Email Thread"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,field_description:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid "Error notice template"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:ir.model,name:fetchmail_notify_error_to_sender.model_fetchmail_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP 服务器"
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
 #: model:mail.template,subject:fetchmail_notify_error_to_sender.email_template_error_notice
@@ -56,8 +56,11 @@ msgid "Receiving error with: ${ctx.get('sender_message').get('subject')|safe}"
 msgstr ""
 
 #. module: fetchmail_notify_error_to_sender
-#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server_error_notice_template_id
+#: model:ir.model.fields,help:fetchmail_notify_error_to_sender.field_fetchmail_server__error_notice_template_id
 msgid ""
 "Set here the template to use to send notice to sender when errors occur "
 "while fetching email"
 msgstr ""
+
+#~ msgid "POP/IMAP Server"
+#~ msgstr "POP/IMAP 服务器"