summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorAdam <Adam@drink-coca-cola.info>2010-05-09 19:02:50 -0400
committerAdam <Adam@anope.org>2010-06-18 21:01:09 -0400
commit4e1286ca109d079f32d32f07c344a1ab93899032 (patch)
treeef55488a4cc068f8954a8862ab2e67f2d1872281 /lang
parent4149afd45d2c0b9f464d1b4434f7bdaa61873d44 (diff)
Rewrote the mail system to use threading
Diffstat (limited to 'lang')
-rw-r--r--lang/cat.l49
-rw-r--r--lang/de.l53
-rw-r--r--lang/en_us.l56
-rw-r--r--lang/es.l59
-rw-r--r--lang/fr.l59
-rw-r--r--lang/gr.l53
-rw-r--r--lang/hun.l53
-rw-r--r--lang/it.l59
-rw-r--r--lang/nl.l59
-rw-r--r--lang/pl.l71
-rw-r--r--lang/pt.l59
-rw-r--r--lang/ru.l59
-rw-r--r--lang/tr.l49
13 files changed, 331 insertions, 407 deletions
diff --git a/lang/cat.l b/lang/cat.l
index 48cb0bbbc..40fc7e58d 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -866,18 +866,15 @@ NICK_SENDPASS_UNAVAILABLE
La comanda SENDPASS no esta disponible per l'us d'encriptació.
NICK_SENDPASS_SUBJECT
Clau pel Nickname (%s)
-NICK_SENDPASS_HEAD
- Hola,
-NICK_SENDPASS_LINE_1
- El teu has demanat rebre la clau pel nickname %s via e-mail.
-NICK_SENDPASS_LINE_2
- La clau es %s Per raons de seguretat hauries de canviar-la quant rebis aquest mail.
-NICK_SENDPASS_LINE_3
- Si no saps per que aquest mail t'ha estat enviat, per favor ignora'l.
-NICK_SENDPASS_LINE_4
- Per favor NO RESPONGUIS a aquest EMAIL!
-NICK_SENDPASS_LINE_5
- Administradors de %s.
+NICK_SENDPASS
+ Hi,
+
+ You have requested to receive the password of nickname %s by e-mail.
+ The password is %s. For security purposes, you should change it as soon as you receive this mail.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_SENDPASS_OK
La clau de %s ha estat enviada.
@@ -891,9 +888,8 @@ NICK_RESETPASS_MESSAGE
You have requested to have the password for %s reset.
To reset your password, type %R%s CONFIRM %s
- If you don't know why this mail is sent to you, please ignore it silently.
- PLEASE DON'T ANSWER TO THIS MAIL!
+ If you don't know why this mail was sent to you, please ignore it silently.
%s administrators.
NICK_RESETPASS_COMPLETE
@@ -944,17 +940,14 @@ NICK_ENTER_REG_CODE
A passcode has been sent to %s, please type %R%s confirm <passcode> to complete registration
NICK_REG_MAIL_SUBJECT
Nickname Registration (%s)
-NICK_REG_MAIL_HEAD
+NICK_REG_MAIL
Hi,
-NICK_REG_MAIL_LINE_1
- You have requested to register the following nickname %s.
-NICK_REG_MAIL_LINE_2
+
+ You have requested to register the nickname %s on %s.
Please type " %R%s confirm %s " to complete registration.
-NICK_REG_MAIL_LINE_3
- If you don't know why this mail is sent to you, please ignore it silently.
-NICK_REG_MAIL_LINE_4
- PLEASE DON'T ANSWER TO THIS MAIL!
-NICK_REG_MAIL_LINE_5
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
%s administrators.
NICK_GETPASS_PASSCODE_IS
Passcode for %s is %s.
@@ -2040,12 +2033,14 @@ MEMO_INFO_X_NOTIFY_SIGNON
# Standard responses
MEMO_MAIL_SUBJECT
New memo
-MEMO_MAIL_TEXT1
+NICK_MAIL_TEXT
Hi %s
-MEMO_MAIL_TEXT2
+
You've just received a new memo from %s. This is memo number %d.
-MEMO_MAIL_TEXT3
- Memo Text:
+
+ Memo text:
+
+ %s
###########################################################################
#
diff --git a/lang/de.l b/lang/de.l
index 70849c49e..663e6079e 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -885,18 +885,15 @@ NICK_SENDPASS_UNAVAILABLE
SENDPASS Befehl nicht verfügbar, da die Verschlüsselung aktiviert ist.
NICK_SENDPASS_SUBJECT
Nick-Passwort (%s)
-NICK_SENDPASS_HEAD
+NICK_SENDPASS
Hi,
-NICK_SENDPASS_LINE_1
- Du wolltest dir dein Passwort von dem Nicknamen %s via eMail schicken lassen.
-NICK_SENDPASS_LINE_2
- Das Passwort ist %s Aus Sicherheitsgründen solltest du das Passwort nach Erhalt dieser eMail ändern.
-NICK_SENDPASS_LINE_3
- Wenn du nicht weisst, warum du diese Mail erhalten hast, ignoriere sie bitte.
-NICK_SENDPASS_LINE_4
- BITTE NICHT AUF DIESE NACHRICHT ANTWORTEN!
-NICK_SENDPASS_LINE_5
- %s Administratoren.
+
+ You have requested to receive the password of nickname %s by e-mail.
+ The password is %s. For security purposes, you should change it as soon as you receive this mail.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_SENDPASS_OK
Das Passwort von %s wurde per eMail verschickt.
@@ -910,9 +907,8 @@ NICK_RESETPASS_MESSAGE
You have requested to have the password for %s reset.
To reset your password, type %R%s CONFIRM %s
- If you don't know why this mail is sent to you, please ignore it silently.
- PLEASE DON'T ANSWER TO THIS MAIL!
+ If you don't know why this mail was sent to you, please ignore it silently.
%s administrators.
NICK_RESETPASS_COMPLETE
@@ -957,18 +953,15 @@ NICK_ENTER_REG_CODE
Ein Password wurde zu %s gesendet, bitte tippe %R%s confirm <passcode> um die Registrierung abzuschließen.
NICK_REG_MAIL_SUBJECT
Nickname Registrierung (%s)
-NICK_REG_MAIL_HEAD
+NICK_REG_MAIL
Hi,
-NICK_REG_MAIL_LINE_1
- Du hast die Registrierung des Nicknamen %s angefordert.
-NICK_REG_MAIL_LINE_2
- Bitte tippe " %R%s confirm %s " zum Abschluß der Registrierung ein.
-NICK_REG_MAIL_LINE_3
- Wenn du nicht weisst, warum du diese Mail erhalten hast, ignoriere sie bitte.
-NICK_REG_MAIL_LINE_4
- BITTE NICHT AUF DIESE NACHRICHT ANTWORTEN!
-NICK_REG_MAIL_LINE_5
- Die %s Administratoren.
+
+ You have requested to register the nickname %s on %s.
+ Please type " %R%s confirm %s " to complete registration.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_GETPASS_PASSCODE_IS
Passcode für %s ist %s.
NICK_FORCE_REG
@@ -2037,13 +2030,15 @@ MEMO_INFO_X_NOTIFY_SIGNON
# Memo2Mail
MEMO_MAIL_SUBJECT
Neue Memo
-MEMO_MAIL_TEXT1
+NICK_MAIL_TEXT
Hi %s
-MEMO_MAIL_TEXT2
- Du hast gerade eine neue Memo von %s erhalten. Dies ist Memo Nummer %d.
-MEMO_MAIL_TEXT3
- Memo Text:
+ You've just received a new memo from %s. This is memo number %d.
+
+ Memo text:
+
+ %s
+
# Standard responses
MEMO_RSEND_PLEASE_WAIT
Bitte warte %d Sekunden bevor der RSEND Befehl wieder funktioniert.
diff --git a/lang/en_us.l b/lang/en_us.l
index 11cfffc84..42cdc9865 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -850,17 +850,14 @@ NICK_SENDPASS_UNAVAILABLE
SENDPASS command unavailable because encryption is in use.
NICK_SENDPASS_SUBJECT
Nickname password (%s)
-NICK_SENDPASS_HEAD
+NICK_SENDPASS
Hi,
-NICK_SENDPASS_LINE_1
+
You have requested to receive the password of nickname %s by e-mail.
-NICK_SENDPASS_LINE_2
- The password is %s for security purposes, you should change it as soon as you receive this mail.
-NICK_SENDPASS_LINE_3
- If you don't know why this mail is sent to you, please ignore it silently.
-NICK_SENDPASS_LINE_4
- PLEASE DON'T ANSWER TO THIS MAIL!
-NICK_SENDPASS_LINE_5
+ The password is %s. For security purposes, you should change it as soon as you receive this mail.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
%s administrators.
NICK_SENDPASS_OK
Password of %s has been sent.
@@ -872,12 +869,12 @@ NICK_RESETPASS_SUBJECT
Reset password request for %s
NICK_RESETPASS_MESSAGE
Hi,
-
+
You have requested to have the password for %s reset.
To reset your password, type %R%s CONFIRM %s
- If you don't know why this mail is sent to you, please ignore it silently.
- PLEASE DON'T ANSWER TO THIS MAIL!
-
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
%s administrators.
NICK_RESETPASS_COMPLETE
Password reset email for %s has been sent.
@@ -919,24 +916,21 @@ NICK_IS_PREREG
This nick is awaiting an e-mail verification code before completing registration.
NICK_ENTER_REG_CODE
A passcode has been sent to %s, please type %R%s confirm <passcode> to complete registration
+NICK_GETPASS_PASSCODE_IS
+ Passcode for %s is %s.
+NICK_FORCE_REG
+ Nickname %s confirmed
NICK_REG_MAIL_SUBJECT
Nickname Registration (%s)
-NICK_REG_MAIL_HEAD
+NICK_REG_MAIL
Hi,
-NICK_REG_MAIL_LINE_1
- You have requested to register the following nickname %s.
-NICK_REG_MAIL_LINE_2
+
+ You have requested to register the nickname %s on %s.
Please type " %R%s confirm %s " to complete registration.
-NICK_REG_MAIL_LINE_3
- If you don't know why this mail is sent to you, please ignore it silently.
-NICK_REG_MAIL_LINE_4
- PLEASE DON'T ANSWER TO THIS MAIL!
-NICK_REG_MAIL_LINE_5
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
%s administrators.
-NICK_GETPASS_PASSCODE_IS
- Passcode for %s is %s.
-NICK_FORCE_REG
- Nickname %s confirmed
# Confirm responses
NICK_CONFIRM_NOT_FOUND
@@ -1994,12 +1988,14 @@ MEMO_INFO_X_NOTIFY_SIGNON
# Memo2Mail responses
MEMO_MAIL_SUBJECT
New memo
-MEMO_MAIL_TEXT1
+NICK_MAIL_TEXT
Hi %s
-MEMO_MAIL_TEXT2
+
You've just received a new memo from %s. This is memo number %d.
-MEMO_MAIL_TEXT3
- Memo Text:
+
+ Memo text:
+
+ %s
# RSEND responses
MEMO_RSEND_PLEASE_WAIT
diff --git a/lang/es.l b/lang/es.l
index 9a91be68a..f1e4a6f64 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -870,18 +870,15 @@ NICK_SENDPASS_UNAVAILABLE
El comando SENDPASS no esta disponible por el uso de encriptacion.
NICK_SENDPASS_SUBJECT
Clave para el Nickname (%s)
-NICK_SENDPASS_HEAD
- Hola,
-NICK_SENDPASS_LINE_1
- Tu has pedido recibir la clave para el nickname %s por e-mail.
-NICK_SENDPASS_LINE_2
- La clave es %s Por razones de seguridad deberas cambiarla en cuanto recibas este mail.
-NICK_SENDPASS_LINE_3
- Si no sabes porque este mail ha sido enviado a ti, por favor ignoralo.
-NICK_SENDPASS_LINE_4
- POR FAVOR NO RESPONDER A ESTE EMAIL!
-NICK_SENDPASS_LINE_5
- Administradores de %s.
+NICK_SENDPASS
+ Hi,
+
+ You have requested to receive the password of nickname %s by e-mail.
+ The password is %s. For security purposes, you should change it as soon as you receive this mail.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_SENDPASS_OK
La clave de %s ha sido enviada.
@@ -895,9 +892,8 @@ NICK_RESETPASS_MESSAGE
You have requested to have the password for %s reset.
To reset your password, type %R%s CONFIRM %s
- If you don't know why this mail is sent to you, please ignore it silently.
- PLEASE DON'T ANSWER TO THIS MAIL!
+ If you don't know why this mail was sent to you, please ignore it silently.
%s administrators.
NICK_RESETPASS_COMPLETE
@@ -942,18 +938,15 @@ NICK_ENTER_REG_CODE
El password ha sido enviado a %s, tipea %R%s confirm <password> para completar el registro.
NICK_REG_MAIL_SUBJECT
Registro de Nick (%s)
-NICK_REG_MAIL_HEAD
- Hola,
-NICK_REG_MAIL_LINE_1
- Tu has pedido registrar el nickname %s.
-NICK_REG_MAIL_LINE_2
- Tipea " %R%s confirm %s " para completar el registro.
-NICK_REG_MAIL_LINE_3
- Si no sabes por que has recibido este email, por favor ignorarlo.
-NICK_REG_MAIL_LINE_4
- NO RESPONDAS A ESTE MAIL!
-NICK_REG_MAIL_LINE_5
- Administradores de %s.
+NICK_REG_MAIL
+ Hi,
+
+ You have requested to register the nickname %s on %s.
+ Please type " %R%s confirm %s " to complete registration.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_GETPASS_PASSCODE_IS
El password para %s es %s.
NICK_FORCE_REG
@@ -2032,12 +2025,14 @@ MEMO_INFO_X_NOTIFY_SIGNON
# Standard responses
MEMO_MAIL_SUBJECT
Nuevo memo
-MEMO_MAIL_TEXT1
- Hola %s
-MEMO_MAIL_TEXT2
- Acabas de recibir un nuevo memo de %s. Es el memo numero %d.
-MEMO_MAIL_TEXT3
- Texto del Memo:
+NICK_MAIL_TEXT
+ Hi %s
+
+ You've just received a new memo from %s. This is memo number %d.
+
+ Memo text:
+
+ %s
# Standard responses
MEMO_RSEND_PLEASE_WAIT
diff --git a/lang/fr.l b/lang/fr.l
index 23b7bc8aa..8172746ad 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -877,18 +877,15 @@ NICK_SENDPASS_UNAVAILABLE
La commande SENDPASS est indisponible car le cryptage est utilisé.
NICK_SENDPASS_SUBJECT
Mot de passe du pseudo %s
-NICK_SENDPASS_HEAD
- Bonjour,
-NICK_SENDPASS_LINE_1
- Vous avez demandé à recevoir le mot de passe du pseudo %s par e-mail.
-NICK_SENDPASS_LINE_2
- Le mot de passe est %s . Pour des raisons de sécurité, vous devriez le changer dès que vous lisez cet e-mail.
-NICK_SENDPASS_LINE_3
- Si vous ne savez pas de quoi il retourne dans cet e-mail, il s'agit probablement d'une erreur, nous vous prions de nous excuser et vous demandons d'ignorer cet e-mail.
-NICK_SENDPASS_LINE_4
- NE REPONDEZ PAS À CE MAIL!
-NICK_SENDPASS_LINE_5
- Les administrateurs de %s.
+NICK_SENDPASS
+ Hi,
+
+ You have requested to receive the password of nickname %s by e-mail.
+ The password is %s. For security purposes, you should change it as soon as you receive this mail.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_SENDPASS_OK
Le mot de passe de %s a été envoyé.
@@ -902,9 +899,8 @@ NICK_RESETPASS_MESSAGE
You have requested to have the password for %s reset.
To reset your password, type %R%s CONFIRM %s
- If you don't know why this mail is sent to you, please ignore it silently.
- PLEASE DON'T ANSWER TO THIS MAIL!
+ If you don't know why this mail was sent to you, please ignore it silently.
%s administrators.
NICK_RESETPASS_COMPLETE
@@ -955,18 +951,15 @@ NICK_ENTER_REG_CODE
Un passcode a été envoyé à %s, merci de taper %R%s confirm <passcode> une fois que vous l'aurez reçu pour compléter l'enregistrement.
NICK_REG_MAIL_SUBJECT
Enregistrement d'un pseudo (%s)
-NICK_REG_MAIL_HEAD
- Bonjour,
-NICK_REG_MAIL_LINE_1
- Vous venez de demander l'enregistrement du pseudo %s.
-NICK_REG_MAIL_LINE_2
- Veuillez tapez " %R%s confirm %s " sur IRC afin de valider l'enregistrement.
-NICK_REG_MAIL_LINE_3
- Si vous ne savez pas pourquoi vous avez reçu cet email, ignorez-le.
-NICK_REG_MAIL_LINE_4
- NE REPONDEZ PAS À CE MESSAGE.
-NICK_REG_MAIL_LINE_5
- Les administrateurs de %s.
+NICK_REG_MAIL
+ Hi,
+
+ You have requested to register the nickname %s on %s.
+ Please type " %R%s confirm %s " to complete registration.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_GETPASS_PASSCODE_IS
Le passcode pour %s est %s.
NICK_FORCE_REG
@@ -2047,12 +2040,14 @@ MEMO_INFO_X_NOTIFY_SIGNON
# Standard responses
MEMO_MAIL_SUBJECT
Nouveau mémo
-MEMO_MAIL_TEXT1
- Bonjour %s,
-MEMO_MAIL_TEXT2
- Vous venez de recevoir un mémo de %s. Le numéro de ce mémo est %d.
-MEMO_MAIL_TEXT3
- Mémo:
+NICK_MAIL_TEXT
+ Hi %s
+
+ You've just received a new memo from %s. This is memo number %d.
+
+ Memo text:
+
+ %s
###########################################################################
#
diff --git a/lang/gr.l b/lang/gr.l
index 15a40c8e0..8ab9a5fda 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -865,18 +865,15 @@ NICK_SENDPASS_UNAVAILABLE
Ç SENDPASS åíôïëÞ äåí åßíáé äéáèÝóéìç ãéáôß ÷ñçóéìïðïéåßôáé ç êùäéêïðïßçóç.
NICK_SENDPASS_SUBJECT
Ï êùäéêüò ôïõ øåõäþíõìïõ (%s)
-NICK_SENDPASS_HEAD
- ÃåéÜ,
-NICK_SENDPASS_LINE_1
- Åßóáé óôçí ëßóôá ãéá íá ëÜâåéò ôïí êùäéêü ôïõ øåõäþíõìïý óïõ %s ìÝóù e-mail.
-NICK_SENDPASS_LINE_2
- Ï êùäéêü óïõ åßíáé %s Ãéá ðåñéóóüôåñç áóöÜëåéá, èá ðñÝðåé íá áëëÜîåéò üóï óýíôïìá ãßíåôáé ôïí êùäéêü óïõ áöïý ëÜâåéò ôïí êùäéêü óïõ óå e-mail.
-NICK_SENDPASS_LINE_3
- Áí äåí ãíùñßæåéò ãéáôß áõôü ôï e-mail óôÜëèçêå óå óÝíá, ðáñáêáëþ áãíüçóÝ ôï ÷ùñßò åñùôÞóåéò êëð.
-NICK_SENDPASS_LINE_4
- ÐÁÑÁÊÁËÙ ÌÇÍ ÁÐÁÍÔÇÓÅÉÓ ÓÅ ÁÕÔÏ ÔÏ E-MAIL!
-NICK_SENDPASS_LINE_5
- %s åðéêåöáëåßò õðçñåóéþí.
+NICK_SENDPASS
+ Hi,
+
+ You have requested to receive the password of nickname %s by e-mail.
+ The password is %s. For security purposes, you should change it as soon as you receive this mail.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_SENDPASS_OK
Ï êùäéêüò ôïõ %s Ý÷åé óôáëèåß.
@@ -890,10 +887,9 @@ NICK_RESETPASS_MESSAGE
You have requested to have the pasword for %s reset.
To reset your password, type %R%s CONFIRM %s
- If you don't know why this mail is sent to you, please ignore it silently.
-
- PLEASE DON'T ANSWER TO THIS MAIL!
-
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
%s administrators.
NICK_RESETPASS_COMPLETE
Password reset email for %s has been sent.
@@ -943,17 +939,14 @@ NICK_ENTER_REG_CODE
A passcode has been sent to %s, please type %R%s confirm <passcode> to complete registration
NICK_REG_MAIL_SUBJECT
Nickname Registration (%s)
-NICK_REG_MAIL_HEAD
+NICK_REG_MAIL
Hi,
-NICK_REG_MAIL_LINE_1
- You have requested to register the following nickname %s.
-NICK_REG_MAIL_LINE_2
+
+ You have requested to register the nickname %s on %s.
Please type " %R%s confirm %s " to complete registration.
-NICK_REG_MAIL_LINE_3
- If you don't know why this mail is sent to you, please ignore it silently.
-NICK_REG_MAIL_LINE_4
- PLEASE DON'T ANSWER TO THIS MAIL!
-NICK_REG_MAIL_LINE_5
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
%s administrators.
NICK_GETPASS_PASSCODE_IS
Passcode for %s is %s.
@@ -2042,12 +2035,14 @@ MEMO_INFO_X_NOTIFY_SIGNON
# Standard responses
MEMO_MAIL_SUBJECT
New memo
-MEMO_MAIL_TEXT1
+NICK_MAIL_TEXT
Hi %s
-MEMO_MAIL_TEXT2
+
You've just received a new memo from %s. This is memo number %d.
-MEMO_MAIL_TEXT3
- Memo Text:
+
+ Memo text:
+
+ %s
###########################################################################
#
diff --git a/lang/hun.l b/lang/hun.l
index 815e5b57b..1e277bd25 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -862,18 +862,15 @@ NICK_SENDPASS_UNAVAILABLE
SENDPASS nem elérhetõ, amíg az encryption használatban van.
NICK_SENDPASS_SUBJECT
Nicknév jelszó (%s)
-NICK_SENDPASS_HEAD
+NICK_SENDPASS
Hi,
-NICK_SENDPASS_LINE_1
- Azt kérted, hogy a %s nicknév jelszavát küldjük el e-mailben.
-NICK_SENDPASS_LINE_2
- A jelszavad %s Ezt a biztosnág miatt meg kell váltóztatni, miután megkaptad ezt a levelet.
-NICK_SENDPASS_LINE_3
- Ha nem tudod miért kaptad ezt a levelet, akkor kérlek hagyd figyelmen kivül!
-NICK_SENDPASS_LINE_4
- ERRE A LEVÉLRE NE VÁLASZOLJ!!!
-NICK_SENDPASS_LINE_5
- %s adminisztrátorok.
+
+ You have requested to receive the password of nickname %s by e-mail.
+ The password is %s. For security purposes, you should change it as soon as you receive this mail.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_SENDPASS_OK
%s nick jelszava elküldve.
@@ -887,9 +884,8 @@ NICK_RESETPASS_MESSAGE
You have requested to have the password for %s reset.
To reset your password, type %R%s CONFIRM %s
- If you don't know why this mail is sent to you, please ignore it silently.
- PLEASE DON'T ANSWER TO THIS MAIL
+ If you don't know why this mail was sent to you, please ignore it silently.
%s administrators.
NICK_RESETPASS_COMPLETE
@@ -934,18 +930,15 @@ NICK_ENTER_REG_CODE
A kód a %s címre lett küldve, írd be %R%s confirm <kód> a regisztráció befejezéséhez.
NICK_REG_MAIL_SUBJECT
Nicknév Regisztráció (%s)
-NICK_REG_MAIL_HEAD
+NICK_REG_MAIL
Hi,
-NICK_REG_MAIL_LINE_1
- Te kérelmeztad a %s nick regisztrálását.
-NICK_REG_MAIL_LINE_2
- Írd be: " %R%s confirm %s ", hogy befejezd a regisztrációt.
-NICK_REG_MAIL_LINE_3
- Ha nem tudod miért kaptad a levelet, kérlek hagyd figyelmen kívül!
-NICK_REG_MAIL_LINE_4
- NE VÁLASZOLJ A LEVÉLRE!
-NICK_REG_MAIL_LINE_5
- %s adminisztrátorok.
+
+ You have requested to register the nickname %s on %s.
+ Please type " %R%s confirm %s " to complete registration.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_GETPASS_PASSCODE_IS
Kód a %s nickhez: %s.
NICK_FORCE_REG
@@ -2027,12 +2020,14 @@ MEMO_INFO_X_NOTIFY_SIGNON
# Memo2Mail válaszok
MEMO_MAIL_SUBJECT
Új memo
-MEMO_MAIL_TEXT1
+NICK_MAIL_TEXT
Hi %s
-MEMO_MAIL_TEXT2
- Kaptál egy új memo üzenetet %s nicktõl. Ez a memo a %d sorszámú.
-MEMO_MAIL_TEXT3
- Memo Szöveg:
+
+ You've just received a new memo from %s. This is memo number %d.
+
+ Memo text:
+
+ %s
# RSEND válaszok
MEMO_RSEND_PLEASE_WAIT
diff --git a/lang/it.l b/lang/it.l
index 493e651ee..86b16f786 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -852,18 +852,15 @@ NICK_SENDPASS_UNAVAILABLE
Il comando SENDPASS non è disponibile perché è in uso la criptazione dei dati.
NICK_SENDPASS_SUBJECT
Password del nick (%s)
-NICK_SENDPASS_HEAD
- Salve,
-NICK_SENDPASS_LINE_1
- Hai richiesto di ricevere via e-mail la password del nick %s.
-NICK_SENDPASS_LINE_2
- La password è %s Per ragioni di sicurezza, ti invitiamo a cambiarla il più presto possibile con il comando "/ns set password".
-NICK_SENDPASS_LINE_3
- Se non sai perché hai ricevuto questa mail, ignorala.
-NICK_SENDPASS_LINE_4
- IMPORTANTE! Non rispondere a questa mail!
-NICK_SENDPASS_LINE_5
- Gli amministratori di %s.
+NICK_SENDPASS
+ Hi,
+
+ You have requested to receive the password of nickname %s by e-mail.
+ The password is %s. For security purposes, you should change it as soon as you receive this mail.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_SENDPASS_OK
La password di %s è stata inviata.
@@ -877,9 +874,8 @@ NICK_RESETPASS_MESSAGE
You have requested to have the password for %s reset.
To reset your password, type %R%s CONFRM %s
- If you don't know why this mail is sent to you, please ignore it silently.
- PLEASE DON'T ANSWER TO THIS MAIL!
+ If you don't know why this mail was sent to you, please ignore it silently.
%s administrators.
NICK_RESETPASS_COMPLETE
@@ -924,18 +920,15 @@ NICK_ENTER_REG_CODE
Un codice di attivazione è stato inviato a %s. Digita %R%s CONFIRM <codice> per completare la registrazione.
NICK_REG_MAIL_SUBJECT
Registrazione del nick (%s)
-NICK_REG_MAIL_HEAD
- Salve,
-NICK_REG_MAIL_LINE_1
- Hai richiesto la registrazione del nick %s.
-NICK_REG_MAIL_LINE_2
- Digita " %R%s CONFIRM %s " (senza virgolette) per completare la registrazione.
-NICK_REG_MAIL_LINE_3
- Se non sai perché hai ricevuto questa e-mail, ignorala.
-NICK_REG_MAIL_LINE_4
- NON RISPONDERE A QUESTA MAIL!
-NICK_REG_MAIL_LINE_5
- Gli amministratori di %s.
+NICK_REG_MAIL
+ Hi,
+
+ You have requested to register the nickname %s on %s.
+ Please type " %R%s confirm %s " to complete registration.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_GETPASS_PASSCODE_IS
Il codice di attivazione per %s is %s.
NICK_FORCE_REG
@@ -2000,12 +1993,14 @@ MEMO_INFO_X_NOTIFY_SIGNON
# Memo2Mail responses
MEMO_MAIL_SUBJECT
Nuovo memo
-MEMO_MAIL_TEXT1
- Ciao %s
-MEMO_MAIL_TEXT2
- Hai appena ricevuto un nuovo memo da %s. Questo è il memo numero %d.
-MEMO_MAIL_TEXT3
- Testo del memo:
+NICK_MAIL_TEXT
+ Hi %s
+
+ You've just received a new memo from %s. This is memo number %d.
+
+ Memo text:
+
+ %s
# RSEND responses
MEMO_RSEND_PLEASE_WAIT
diff --git a/lang/nl.l b/lang/nl.l
index 3c7c86e46..b63e98377 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -869,18 +869,15 @@ NICK_SENDPASS_UNAVAILABLE
SENDPASS commando is onbeschikbaar omdat encryptie aanstaat.
NICK_SENDPASS_SUBJECT
Nick wachtwoord (%s)
-NICK_SENDPASS_HEAD
- Hoi,
-NICK_SENDPASS_LINE_1
- Je hebt het wachtwoord van nick %s via e-mail aangevraagd.
-NICK_SENDPASS_LINE_2
- Het wachtwoord is %s Wegens veiligheidsredenen kun je dit het beste zo snel mogelijk veranderen.
-NICK_SENDPASS_LINE_3
- Als je niet weet waarom deze email gestuurd is, negeer deze dan.
-NICK_SENDPASS_LINE_4
- ANTWOORD NIET OP DEZE E-MAIL!
-NICK_SENDPASS_LINE_5
- %s beheerders.
+NICK_SENDPASS
+ Hi,
+
+ You have requested to receive the password of nickname %s by e-mail.
+ The password is %s. For security purposes, you should change it as soon as you receive this mail.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_SENDPASS_OK
Wachtwoord %s is verstuurd.
@@ -893,9 +890,8 @@ NICK_RESETPASS_MESSAGE
You have requested to have the password for %s reset.
To reset your password, type %R%s CONFIRM %s
- If you don't know why this mail is sent to you, please ignore it silently.
- PLEASE DON'T ANSWER TO THIS MAIL
+ If you don't know why this mail was sent to you, please ignore it silently.
%s administrators.
@@ -941,18 +937,15 @@ NICK_ENTER_REG_CODE
Een verificatiecode is verstuurd naar %s. Type %R%s confirm <verificatiecode> om de registratie te voltooien.
NICK_REG_MAIL_SUBJECT
Nickname Registratie (%s)
-NICK_REG_MAIL_HEAD
- Hoi,
-NICK_REG_MAIL_LINE_1
- Je hebt een aanvraag ingediend om de nickname %s te registreren.
-NICK_REG_MAIL_LINE_2
- Type " %R%s confirm %s " om de registratie te voltooien.
-NICK_REG_MAIL_LINE_3
- Als je niet weet waarom deze e-mail naar je gestuurd is, negeer deze dan.
-NICK_REG_MAIL_LINE_4
- REAGEER NIET OP DEZE MAIL!
-NICK_REG_MAIL_LINE_5
- %s administrators.
+NICK_REG_MAIL
+ Hi,
+
+ You have requested to register the nickname %s on %s.
+ Please type " %R%s confirm %s " to complete registration.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_GETPASS_PASSCODE_IS
Verificatiecode voor %s is %s.
NICK_FORCE_REG
@@ -2025,12 +2018,14 @@ MEMO_INFO_X_NOTIFY_SIGNON
# Standard responses
MEMO_MAIL_SUBJECT
Nieuwe memo
-MEMO_MAIL_TEXT1
- Hoi %s
-MEMO_MAIL_TEXT2
- Je hebt zojuist een memo ontvangen van %s. Het gaat om memo nummer %d.
-MEMO_MAIL_TEXT3
- Inhoud van de memo:
+NICK_MAIL_TEXT
+ Hi %s
+
+ You've just received a new memo from %s. This is memo number %d.
+
+ Memo text:
+
+ %s
###########################################################################
#
diff --git a/lang/pl.l b/lang/pl.l
index d91c2a375..4898de720 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -1096,24 +1096,15 @@ NICK_SENDPASS_UNAVAILABLE
NICK_SENDPASS_SUBJECT
Has³o do nicka %s
-NICK_SENDPASS_HEAD
- Witaj!
-
-NICK_SENDPASS_LINE_1
- Za¿±da³e¶(a¶) wys³ania has³a do nicka %s na e-mail.
-
-NICK_SENDPASS_LINE_2
- Twoje has³o to: %s
- Dla w³asnego bezpieczeñstwa nale¿y to has³o natychmiast zmieniæ na inne.
-
-NICK_SENDPASS_LINE_3
- Je¶li nie wiesz dlaczego ta wiadomo¶æ dotar³a do Ciebie zignoruj j±. Je¶li ta sytuacja bêdzie siê powtarzaæ skontaktuj siê z administratorem sieci.
-
-NICK_SENDPASS_LINE_4
- PROSZÊ NIE ODPOWIADAÆ NA T¡ WIADOMO¦Æ!
-
-NICK_SENDPASS_LINE_5
- Administratorzy sieci %s.
+NICK_SENDPASS
+ Hi,
+
+ You have requested to receive the password of nickname %s by e-mail.
+ The password is %s. For security purposes, you should change it as soon as you receive this mail.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_SENDPASS_OK
Has³o do nicka %s zosta³o wys³ane.
@@ -1128,9 +1119,8 @@ NICK_RESETPASS_MESSAGE
You have requested to have the password for %s reset.
To reset your password, type %R%s CONFIRM %s
- If you don't know why this mail is sent to you, please ignore it silently.
- PLEASE DON'T ANSWER TO THIS MAIL!
+ If you don't know why this mail was sent to you, please ignore it silently.
%s administrators.
NICK_RESETPASS_COMPLETE
@@ -1189,22 +1179,15 @@ NICK_ENTER_REG_CODE
NICK_REG_MAIL_SUBJECT
Rejestracja nicka %s
-NICK_REG_MAIL_HEAD
- Witaj!
-
-NICK_REG_MAIL_LINE_1
- Chcesz zarejestrowaæ nastêpuj±cy nick: %s.
-
-NICK_REG_MAIL_LINE_2
- Proszê napisaæ %R%s CONFIRM %s aby dokoñczyæ rejestracjê.
-
-NICK_REG_MAIL_LINE_3
- Je¶li nie wiesz dlaczego ta wiadomo¶æ dotar³a do Ciebie zignoruj j±. Je¶li sytuacja bêdzie siê powtarzaæ skontaktuj siê z administratorem sieci.
-NICK_REG_MAIL_LINE_4
- PROSZÊ NIE ODPOWIADAÆ NA T¡ WIADOMO¦Æ!
-
-NICK_REG_MAIL_LINE_5
- Administratorzy sieci %s.
+NICK_REG_MAIL
+ Hi,
+
+ You have requested to register the nickname %s on %s.
+ Please type " %R%s confirm %s " to complete registration.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_GETPASS_PASSCODE_IS
Kod rejestracyjny dla %s to %s.
@@ -2640,14 +2623,14 @@ MEMO_INFO_X_NOTIFY_SIGNON
MEMO_MAIL_SUBJECT
Nowa wiadomo¶æ
-MEMO_MAIL_TEXT1
- Witaj %s!
-
-MEMO_MAIL_TEXT2
- W³a¶nie nadesz³a now± wiadomo¶æ od %s, ma numer %d.
-
-MEMO_MAIL_TEXT3
- Tre¶æ wiadomo¶ci:
+NICK_MAIL_TEXT
+ Hi %s
+
+ You've just received a new memo from %s. This is memo number %d.
+
+ Memo text:
+
+ %s
# RSEND responses
MEMO_RSEND_PLEASE_WAIT
diff --git a/lang/pt.l b/lang/pt.l
index e1fc58e23..a26479ce3 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -871,18 +871,15 @@ NICK_SENDPASS_UNAVAILABLE
Comando SENDPASS não disponível: modo de encriptação ativado.
NICK_SENDPASS_SUBJECT
Senha do nick (%s)
-NICK_SENDPASS_HEAD
- Olá,
-NICK_SENDPASS_LINE_1
- Você pediu para que a senha do nick %s fosse enviada por e-mail.
-NICK_SENDPASS_LINE_2
- A senha é %s. Por motivos de segurança, recomendamos que você mude sua senha após ler este e-mail.
-NICK_SENDPASS_LINE_3
- Se você não souba porque este e-mail lhe foi enviado, por favor ignore-o.
-NICK_SENDPASS_LINE_4
- NÃO RESPONDA A ESTE E-MAIL!
-NICK_SENDPASS_LINE_5
- Administradores %s.
+NICK_SENDPASS
+ Hi,
+
+ You have requested to receive the password of nickname %s by e-mail.
+ The password is %s. For security purposes, you should change it as soon as you receive this mail.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_SENDPASS_OK
Senha para %s foi enviada.
@@ -896,9 +893,8 @@ NICK_RESETPASS_MESSAGE
You have requested to have the password for %s reset.
To reset your password, type %R%s CONFIRM %s
- If you don't know why this mail is sent to you, please ignore it silently.
- PLEASE DON'T ANSWER TO THIS MAIL!
+ If you don't know why this mail was sent to you, please ignore it silently.
%s administrators.
NICK_RESETPASS_COMPLETE
@@ -943,18 +939,15 @@ NICK_ENTER_REG_CODE
O passcode foi enviado para %s, por favor digite %R%s confirm <passcode> para completar o registro.
NICK_REG_MAIL_SUBJECT
Registro de nick (%s)
-NICK_REG_MAIL_HEAD
- Olá,
-NICK_REG_MAIL_LINE_1
- Você solicitou o registro do seguinte nick: %s.
-NICK_REG_MAIL_LINE_2
- Por favor digite %R%s confirm %s para completar o registro.
-NICK_REG_MAIL_LINE_3
- Se você não sabe porque este e-mail lhe foi enviado, por favor ignore-o com sigilo.
-NICK_REG_MAIL_LINE_4
- POR FAVOR NÃO RESPONDA A ESTE E-MAIL!
-NICK_REG_MAIL_LINE_5
- Administradores %s.
+NICK_REG_MAIL
+ Hi,
+
+ You have requested to register the nickname %s on %s.
+ Please type " %R%s confirm %s " to complete registration.
+
+ If you don't know why this mail was sent to you, please ignore it silently.
+
+ %s administrators.
NICK_GETPASS_PASSCODE_IS
Passcode para %s é %s.
NICK_FORCE_REG
@@ -2018,12 +2011,14 @@ MEMO_INFO_X_NOTIFY_SIGNON
# Memo2Mail responses
MEMO_MAIL_SUBJECT
Novo memo
-MEMO_MAIL_TEXT1
- Olá %s
-MEMO_MAIL_TEXT2
- Você recebeu um novo memo de %s. Este é seu memo número %d.
-MEMO_MAIL_TEXT3
- Mensagem do memo:
+NICK_MAIL_TEXT
+ Hi %s
+
+ You've just received a new memo from %s. This is memo number %d.
+
+ Memo text:
+
+ %s
# RSEND responses
MEMO_RSEND_PLEASE_WAIT
diff --git a/lang/ru.l b/lang