From dbf57dddf7ef07a0168ad0c1d64de0735a9c5804 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 31 Mar 2016 02:09:24 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
server/conf/mail/web_quota_ok_notification_es.txt | 14 +++++++
server/conf/mail/mail_quota_notification_es.txt | 14 +++++++
server/conf/mail/welcome_email_es.txt | 4 ++
server/conf/mail/db_quota_notification_en.txt | 2
server/conf/mail/db_quota_ok_notification_es.txt | 13 ++++++
server/conf/mail/mail_quota_ok_notification_es.txt | 14 +++++++
server/conf/mail/db_quota_notification_es.txt | 13 ++++++
server/conf/mail/db_quota_notification_de.txt | 2
server/conf/mail/web_quota_notification_es.txt | 14 +++++++
server/conf/mail/web_traffic_notification_es.txt | 8 ++++
10 files changed, 96 insertions(+), 2 deletions(-)
diff --git a/server/conf/mail/db_quota_notification_de.txt b/server/conf/mail/db_quota_notification_de.txt
index b290428..56f0642 100644
--- a/server/conf/mail/db_quota_notification_de.txt
+++ b/server/conf/mail/db_quota_notification_de.txt
@@ -1,4 +1,4 @@
-ME-Version: 1.0
+MIME-Version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
From: {admin_mail}
diff --git a/server/conf/mail/db_quota_notification_en.txt b/server/conf/mail/db_quota_notification_en.txt
index e98b725..558c4d6 100644
--- a/server/conf/mail/db_quota_notification_en.txt
+++ b/server/conf/mail/db_quota_notification_en.txt
@@ -1,4 +1,4 @@
-ME-Version: 1.0
+MIME-Version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
From: {admin_mail}
diff --git a/server/conf/mail/db_quota_notification_es.txt b/server/conf/mail/db_quota_notification_es.txt
new file mode 100644
index 0000000..50cd614
--- /dev/null
+++ b/server/conf/mail/db_quota_notification_es.txt
@@ -0,0 +1,13 @@
+MIME-Version: 1.0
+Content-type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+From: {admin_mail}
+Reply-To: {admin_mail}
+Subject: Notificación de cuota de base de datos
+
+La base de datos {database_name} esta cerca o ha superado su cuota.
+
+Base de datos: {database_name}
+Espacio usado: {used}
+Cuota: {quota}
+Razón de uso: {ratio}
diff --git a/server/conf/mail/db_quota_ok_notification_es.txt b/server/conf/mail/db_quota_ok_notification_es.txt
new file mode 100644
index 0000000..aedf155
--- /dev/null
+++ b/server/conf/mail/db_quota_ok_notification_es.txt
@@ -0,0 +1,13 @@
+MIME-Version: 1.0
+Content-type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+From: {admin_mail}
+Reply-To: {admin_mail}
+Subject: Cuota de base de datos correcta
+
+La base de datos {database_name} ya no esta cerca o ha superado su cuota.
+
+Base de datos: {database_name}
+Espacio usado: {used}
+Cuota: {quota}
+Razón de uso: {ratio}
diff --git a/server/conf/mail/mail_quota_notification_es.txt b/server/conf/mail/mail_quota_notification_es.txt
new file mode 100644
index 0000000..5946785
--- /dev/null
+++ b/server/conf/mail/mail_quota_notification_es.txt
@@ -0,0 +1,14 @@
+MIME-Version: 1.0
+Content-type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+From: {admin_mail}
+Reply-To: {admin_mail}
+Subject: Notificación de cuota de bandeja de correo
+
+La bandeja de correo de {email} esta cerca o ha superado su cuota.
+
+Bandeja de correo: {email}
+Nombre: {name}
+Espacio usado: {used}
+Cuota: {quota}
+Razón de uso: {ratio}
diff --git a/server/conf/mail/mail_quota_ok_notification_es.txt b/server/conf/mail/mail_quota_ok_notification_es.txt
new file mode 100644
index 0000000..842b696
--- /dev/null
+++ b/server/conf/mail/mail_quota_ok_notification_es.txt
@@ -0,0 +1,14 @@
+MIME-Version: 1.0
+Content-type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+From: {admin_mail}
+Reply-To: {admin_mail}
+Subject: Cuota de bandeja de correo correcta
+
+La bandeja de correo de {email} ya no esta cerca o ha superado su cuota.
+
+Bandeja de correo: {email}
+Nombre: {name}
+Espacio usado: {used}
+Cuota: {quota}
+Razón de uso: {ratio}
diff --git a/server/conf/mail/web_quota_notification_es.txt b/server/conf/mail/web_quota_notification_es.txt
new file mode 100644
index 0000000..1df4f74
--- /dev/null
+++ b/server/conf/mail/web_quota_notification_es.txt
@@ -0,0 +1,14 @@
+MIME-Version: 1.0
+Content-type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+From: {admin_mail}
+Reply-To: {admin_mail}
+Subject: Notificación de cuota de sitio web
+
+El sitio {domain} esta cerca o ha superado su cuota.
+
+Dominio: {domain}
+Espacio usado: {used}
+Límite suave: {soft}
+Limite duro: {hard}
+Razón de uso: {ratio}
diff --git a/server/conf/mail/web_quota_ok_notification_es.txt b/server/conf/mail/web_quota_ok_notification_es.txt
new file mode 100644
index 0000000..125f1db
--- /dev/null
+++ b/server/conf/mail/web_quota_ok_notification_es.txt
@@ -0,0 +1,14 @@
+MIME-Version: 1.0
+Content-type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+From: {admin_mail}
+Reply-To: {admin_mail}
+Subject: Cuota de sitio web correcta
+
+El sitio {domain} ya no esta cerca o ha superado su cuota.
+
+Dominio: {domain}
+Espacio usado: {used}
+Límite suave: {soft}
+Limite duro: {hard}
+Razón de uso: {ratio}
diff --git a/server/conf/mail/web_traffic_notification_es.txt b/server/conf/mail/web_traffic_notification_es.txt
new file mode 100644
index 0000000..afe52d9
--- /dev/null
+++ b/server/conf/mail/web_traffic_notification_es.txt
@@ -0,0 +1,8 @@
+MIME-Version: 1.0
+Content-type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+From: {admin_mail}
+Reply-To: {admin_mail}
+Subject: Notificación de tráfico de sitio web
+
+El sitio {domain} está por encima de su trafico permitido y a sido deshabilitado.
diff --git a/server/conf/mail/welcome_email_es.txt b/server/conf/mail/welcome_email_es.txt
new file mode 100644
index 0000000..4bcab80
--- /dev/null
+++ b/server/conf/mail/welcome_email_es.txt
@@ -0,0 +1,4 @@
+From: ISPConfig <postmaster@localhost.localdomain>
+Subject: Bienvenido a su nueva cuenta de correo
+
+Bienvenido a su nueva cuenta de correo. Su administrador.
--
Gitblit v1.9.1