From ba2c2f17509ffd7d52e706172a16985d8e11b551 Mon Sep 17 00:00:00 2001
From: furun <furun@arcor.de>
Date: Fri, 27 Mar 2015 17:15:56 +0100
Subject: [PATCH] Cleanup of the mail text signature.

Done:
Cleanup of the mail text signature.
The signature is deleted from the txt files and moved in to lang.php
Mailer.class.php updated to insert the signature

Fix:
- Cleaner text
- no more "-- "  "--" "---" "----" problems.
- mailwrap.html is not needed anymore an can be deleted (?)

Changed files in all languages:
lang.php
mailtext.txt
password.txt
registermail.txt
subscr_digest.txt
subscr_list.txt
subscr_single.txt
uploadmail.txt
pwconfirm.txt
showrev.txt

delete?:
mailwrap.html
---
 inc/Mailer.class.php                   | 12 ++++++---
 inc/lang/ar/lang.php                   |  1 +
 inc/lang/ar/mailtext.txt               |  5 ----
 inc/lang/ar/password.txt               |  4 ---
 inc/lang/ar/pwconfirm.txt              |  6 ++---
 inc/lang/ar/registermail.txt           |  4 ---
 inc/lang/ar/subscr_digest.txt          |  4 ---
 inc/lang/ar/subscr_list.txt            |  4 ---
 inc/lang/ar/subscr_single.txt          |  6 +----
 inc/lang/ar/uploadmail.txt             |  4 ---
 inc/lang/az/lang.php                   |  1 +
 inc/lang/az/mailtext.txt               |  6 -----
 inc/lang/az/password.txt               |  5 ----
 inc/lang/az/pwconfirm.txt              |  5 ----
 inc/lang/az/registermail.txt           |  5 ----
 inc/lang/az/uploadmail.txt             |  5 ----
 inc/lang/bg/lang.php                   |  1 +
 inc/lang/bg/mailtext.txt               |  4 ---
 inc/lang/bg/password.txt               |  3 ---
 inc/lang/bg/pwconfirm.txt              |  3 ---
 inc/lang/bg/registermail.txt           |  3 ---
 inc/lang/bg/subscr_digest.txt          |  3 ---
 inc/lang/bg/subscr_list.txt            |  3 ---
 inc/lang/bg/subscr_single.txt          |  4 ---
 inc/lang/bg/uploadmail.txt             |  3 ---
 inc/lang/ca-valencia/lang.php          |  1 +
 inc/lang/ca-valencia/mailtext.txt      |  5 ----
 inc/lang/ca-valencia/password.txt      |  4 ---
 inc/lang/ca-valencia/pwconfirm.txt     |  4 ---
 inc/lang/ca-valencia/registermail.txt  |  4 ---
 inc/lang/ca-valencia/uploadmail.txt    |  4 ---
 inc/lang/ca/lang.php                   |  1 +
 inc/lang/ca/mailtext.txt               |  5 ----
 inc/lang/ca/password.txt               |  4 ---
 inc/lang/ca/pwconfirm.txt              |  4 ---
 inc/lang/ca/registermail.txt           |  4 ---
 inc/lang/ca/subscr_digest.txt          |  5 ----
 inc/lang/ca/subscr_list.txt            |  5 ----
 inc/lang/ca/uploadmail.txt             |  4 ---
 inc/lang/cs/lang.php                   |  1 +
 inc/lang/cs/mailtext.txt               |  5 ----
 inc/lang/cs/password.txt               |  4 ---
 inc/lang/cs/pwconfirm.txt              |  4 ---
 inc/lang/cs/registermail.txt           |  4 ---
 inc/lang/cs/showrev.txt                |  1 -
 inc/lang/cs/subscr_digest.txt          | 12 +++------
 inc/lang/cs/subscr_list.txt            | 12 +++------
 inc/lang/cs/subscr_single.txt          | 12 +++------
 inc/lang/cs/uploadmail.txt             |  4 ---
 inc/lang/da/lang.php                   |  1 +
 inc/lang/da/mailtext.txt               |  5 ----
 inc/lang/da/password.txt               |  5 ----
 inc/lang/da/pwconfirm.txt              |  4 ---
 inc/lang/da/registermail.txt           |  4 ---
 inc/lang/da/subscr_digest.txt          |  4 ---
 inc/lang/da/subscr_list.txt            |  4 ---
 inc/lang/da/subscr_single.txt          |  6 +----
 inc/lang/da/uploadmail.txt             |  4 ---
 inc/lang/de-informal/lang.php          |  1 +
 inc/lang/de-informal/registermail.txt  |  4 ---
 inc/lang/de-informal/subscr_digest.txt |  5 ----
 inc/lang/de-informal/subscr_list.txt   |  8 ++----
 inc/lang/de-informal/subscr_single.txt |  5 ----
 inc/lang/de-informal/uploadmail.txt    |  5 ----
 inc/lang/de/lang.php                   |  1 +
 inc/lang/de/mailtext.txt               |  5 ----
 inc/lang/de/password.txt               |  4 ---
 inc/lang/de/pwconfirm.txt              |  4 ---
 inc/lang/de/registermail.txt           |  4 ---
 inc/lang/de/subscr_digest.txt          |  5 ----
 inc/lang/de/subscr_list.txt            |  5 ----
 inc/lang/de/subscr_single.txt          |  5 ----
 inc/lang/de/uploadmail.txt             |  4 ---
 inc/lang/el/lang.php                   |  1 +
 inc/lang/el/mailtext.txt               |  4 ---
 inc/lang/el/password.txt               |  4 ---
 inc/lang/el/pwconfirm.txt              |  4 ---
 inc/lang/el/registermail.txt           |  4 ---
 inc/lang/el/subscr_digest.txt          | 10 +++-----
 inc/lang/el/subscr_list.txt            | 12 +++------
 inc/lang/el/subscr_single.txt          | 10 +++-----
 inc/lang/el/uploadmail.txt             |  4 ---
 inc/lang/en/lang.php                   |  1 +
 inc/lang/en/mailtext.txt               |  5 ----
 inc/lang/en/password.txt               |  4 ---
 inc/lang/en/pwconfirm.txt              |  4 ---
 inc/lang/en/registermail.txt           |  4 ---
 inc/lang/en/subscr_digest.txt          |  4 ---
 inc/lang/en/subscr_list.txt            |  4 ---
 inc/lang/en/subscr_single.txt          |  4 ---
 inc/lang/en/uploadmail.txt             |  4 ---
 inc/lang/eo/lang.php                   |  1 +
 inc/lang/eo/mailtext.txt               |  3 ---
 inc/lang/eo/password.txt               |  3 ---
 inc/lang/eo/pwconfirm.txt              |  3 ---
 inc/lang/eo/registermail.txt           |  3 ---
 inc/lang/eo/subscr_digest.txt          |  3 ---
 inc/lang/eo/subscr_list.txt            |  3 ---
 inc/lang/eo/subscr_single.txt          |  3 ---
 inc/lang/eo/uploadmail.txt             |  3 ---
 inc/lang/es/lang.php                   |  1 +
 inc/lang/es/mailtext.txt               |  5 ----
 inc/lang/es/password.txt               |  3 ---
 inc/lang/es/pwconfirm.txt              |  5 ----
 inc/lang/es/registermail.txt           |  4 ---
 inc/lang/es/subscr_digest.txt          |  4 ---
 inc/lang/es/subscr_list.txt            |  4 ---
 inc/lang/es/subscr_single.txt          |  4 ---
 inc/lang/es/uploadmail.txt             |  4 ---
 inc/lang/et/lang.php                   |  1 +
 inc/lang/et/mailtext.txt               |  4 ---
 inc/lang/et/password.txt               |  3 ---
 inc/lang/et/pwconfirm.txt              |  4 ---
 inc/lang/et/registermail.txt           |  4 ---
 inc/lang/et/subscr_digest.txt          |  6 +----
 inc/lang/et/subscr_list.txt            |  6 +----
 inc/lang/et/subscr_single.txt          | 34 ++++++++++++--------------
 inc/lang/et/uploadmail.txt             |  4 ---
 inc/lang/eu/lang.php                   |  1 +
 inc/lang/eu/mailtext.txt               |  5 ----
 inc/lang/eu/password.txt               |  4 ---
 inc/lang/eu/pwconfirm.txt              |  3 ---
 inc/lang/eu/registermail.txt           |  3 ---
 inc/lang/eu/subscr_digest.txt          |  6 +----
 inc/lang/eu/subscr_list.txt            |  6 +----
 inc/lang/eu/subscr_single.txt          |  6 +----
 inc/lang/eu/uploadmail.txt             |  3 ---
 inc/lang/fa/lang.php                   |  1 +
 inc/lang/fa/mailtext.txt               |  5 ----
 inc/lang/fa/password.txt               |  4 ---
 inc/lang/fa/pwconfirm.txt              |  4 ---
 inc/lang/fa/registermail.txt           |  4 ---
 inc/lang/fa/subscr_digest.txt          |  3 ---
 inc/lang/fa/subscr_list.txt            |  3 ---
 inc/lang/fa/subscr_single.txt          |  3 ---
 inc/lang/fa/uploadmail.txt             |  4 ---
 inc/lang/fi/lang.php                   |  1 +
 inc/lang/fi/mailtext.txt               |  5 ----
 inc/lang/fi/password.txt               |  4 ---
 inc/lang/fi/pwconfirm.txt              |  4 ---
 inc/lang/fi/registermail.txt           |  4 ---
 inc/lang/fi/subscr_digest.txt          |  4 ---
 inc/lang/fi/subscr_list.txt            |  5 ----
 inc/lang/fi/subscr_single.txt          |  4 ---
 inc/lang/fi/uploadmail.txt             |  4 ---
 inc/lang/fo/lang.php                   |  1 +
 inc/lang/fo/mailtext.txt               |  5 ----
 inc/lang/fo/password.txt               |  4 ---
 inc/lang/fo/subscr_digest.txt          |  4 ---
 inc/lang/fr/lang.php                   |  1 +
 inc/lang/fr/mailtext.txt               |  5 ----
 inc/lang/fr/password.txt               |  4 ---
 inc/lang/fr/pwconfirm.txt              |  4 ---
 inc/lang/fr/registermail.txt           |  4 ---
 inc/lang/fr/subscr_digest.txt          |  4 ---
 inc/lang/fr/subscr_list.txt            |  4 ---
 inc/lang/fr/subscr_single.txt          |  4 ---
 inc/lang/fr/uploadmail.txt             |  4 ---
 inc/lang/gl/lang.php                   |  1 +
 inc/lang/gl/mailtext.txt               |  5 ----
 inc/lang/gl/password.txt               |  4 ---
 inc/lang/gl/pwconfirm.txt              |  4 ---
 inc/lang/gl/registermail.txt           |  4 ---
 inc/lang/gl/subscr_digest.txt          |  4 ---
 inc/lang/gl/subscr_list.txt            |  4 ---
 inc/lang/gl/subscr_single.txt          |  4 ---
 inc/lang/gl/uploadmail.txt             |  4 ---
 inc/lang/he/lang.php                   |  1 +
 inc/lang/he/mailtext.txt               |  5 ----
 inc/lang/he/password.txt               |  4 ---
 inc/lang/he/pwconfirm.txt              |  4 ---
 inc/lang/he/registermail.txt           |  4 ---
 inc/lang/he/subscr_digest.txt          |  4 ---
 inc/lang/he/subscr_single.txt          |  4 ---
 inc/lang/he/uploadmail.txt             |  4 ---
 inc/lang/hr/lang.php                   |  1 +
 inc/lang/hr/mailtext.txt               |  4 ---
 inc/lang/hr/password.txt               |  3 ---
 inc/lang/hr/pwconfirm.txt              |  4 ---
 inc/lang/hr/registermail.txt           | 10 +++-----
 inc/lang/hr/subscr_digest.txt          |  4 ---
 inc/lang/hr/subscr_list.txt            |  4 ---
 inc/lang/hr/subscr_single.txt          |  4 ---
 inc/lang/hr/uploadmail.txt             |  4 ---
 inc/lang/hu-formal/lang.php            |  1 +
 inc/lang/hu/lang.php                   |  1 +
 inc/lang/hu/mailtext.txt               |  4 ---
 inc/lang/hu/password.txt               |  4 ---
 inc/lang/hu/pwconfirm.txt              |  3 ---
 inc/lang/hu/registermail.txt           |  3 ---
 inc/lang/hu/subscr_digest.txt          |  3 ---
 inc/lang/hu/subscr_list.txt            |  3 ---
 inc/lang/hu/subscr_single.txt          |  4 ---
 inc/lang/hu/uploadmail.txt             |  3 ---
 inc/lang/ia/lang.php                   |  1 +
 inc/lang/ia/mailtext.txt               |  5 ----
 inc/lang/ia/password.txt               |  4 ---
 inc/lang/ia/pwconfirm.txt              |  4 ---
 inc/lang/ia/registermail.txt           |  4 ---
 inc/lang/ia/subscr_digest.txt          |  4 ---
 inc/lang/ia/subscr_list.txt            |  4 ---
 inc/lang/ia/subscr_single.txt          |  7 ------
 inc/lang/ia/uploadmail.txt             |  4 ---
 inc/lang/id/lang.php                   |  1 +
 inc/lang/id/mailtext.txt               |  5 ----
 inc/lang/id/password.txt               |  4 ---
 inc/lang/id/pwconfirm.txt              |  4 ---
 inc/lang/id/registermail.txt           |  4 ---
 inc/lang/id/subscr_digest.txt          | 17 ++++++-------
 inc/lang/id/uploadmail.txt             |  4 ---
 inc/lang/it/lang.php                   |  1 +
 inc/lang/it/mailtext.txt               |  5 ----
 inc/lang/it/password.txt               |  4 ---
 inc/lang/it/pwconfirm.txt              |  4 ---
 inc/lang/it/registermail.txt           |  4 ---
 inc/lang/it/subscr_digest.txt          |  8 ++----
 inc/lang/it/subscr_list.txt            |  8 ++----
 inc/lang/it/subscr_single.txt          |  8 ++----
 inc/lang/it/uploadmail.txt             |  4 ---
 inc/lang/ja/lang.php                   |  1 +
 inc/lang/ja/mailtext.txt               |  5 ----
 inc/lang/ja/password.txt               |  4 ---
 inc/lang/ja/pwconfirm.txt              |  4 ---
 inc/lang/ja/registermail.txt           |  4 ---
 inc/lang/ja/subscr_digest.txt          |  4 ---
 inc/lang/ja/subscr_list.txt            |  4 ---
 inc/lang/ja/subscr_single.txt          |  4 ---
 inc/lang/ja/uploadmail.txt             |  4 ---
 inc/lang/km/lang.php                   |  1 +
 inc/lang/km/password.txt               |  4 ---
 inc/lang/km/pwconfirm.txt              |  4 ---
 inc/lang/ko/mailtext.txt               |  4 ---
 inc/lang/ko/password.txt               |  3 ---
 inc/lang/ko/pwconfirm.txt              |  3 ---
 inc/lang/ko/registermail.txt           |  3 ---
 inc/lang/ko/subscr_digest.txt          |  3 ---
 inc/lang/ko/subscr_list.txt            |  3 ---
 inc/lang/ko/subscr_single.txt          |  3 ---
 inc/lang/ko/uploadmail.txt             |  3 ---
 inc/lang/ku/mailtext.txt               |  5 ----
 inc/lang/ku/password.txt               |  4 ---
 inc/lang/la/lang.php                   |  1 +
 inc/lang/la/mailtext.txt               |  5 ----
 inc/lang/la/password.txt               |  4 ---
 inc/lang/la/pwconfirm.txt              |  4 ---
 inc/lang/la/registermail.txt           |  4 ---
 inc/lang/la/subscr_digest.txt          |  4 ---
 inc/lang/la/subscr_list.txt            |  4 ---
 inc/lang/la/subscr_single.txt          |  4 ---
 inc/lang/la/uploadmail.txt             |  4 ---
 inc/lang/lb/lang.php                   |  1 +
 inc/lang/lb/mailtext.txt               |  5 ----
 inc/lang/lb/password.txt               |  4 ---
 inc/lang/lb/pwconfirm.txt              |  6 +----
 inc/lang/lb/registermail.txt           |  4 ---
 inc/lang/lb/uploadmail.txt             |  4 ---
 inc/lang/lt/lang.php                   |  1 +
 inc/lang/lt/mailtext.txt               |  4 ---
 inc/lang/lt/password.txt               |  3 ---
 inc/lang/lv/lang.php                   |  1 +
 inc/lang/lv/mailtext.txt               |  6 -----
 inc/lang/lv/password.txt               |  3 ---
 inc/lang/lv/pwconfirm.txt              |  4 ---
 inc/lang/lv/registermail.txt           |  4 ---
 inc/lang/lv/subscr_digest.txt          |  8 ++----
 inc/lang/lv/subscr_list.txt            |  8 ++----
 inc/lang/lv/subscr_single.txt          |  8 ++----
 inc/lang/lv/uploadmail.txt             |  4 ---
 inc/lang/mg/lang.php                   |  1 +
 inc/lang/mg/mailtext.txt               |  5 ----
 inc/lang/mg/password.txt               |  5 ----
 inc/lang/mr/lang.php                   |  1 +
 inc/lang/mr/mailtext.txt               |  3 ---
 inc/lang/mr/password.txt               |  3 ---
 inc/lang/mr/pwconfirm.txt              |  3 ---
 inc/lang/mr/registermail.txt           |  3 ---
 inc/lang/mr/showrev.txt                |  2 +-
 inc/lang/mr/uploadmail.txt             |  3 ---
 inc/lang/ne/lang.php                   |  1 +
 inc/lang/ne/pwconfirm.txt              |  3 ---
 inc/lang/ne/uploadmail.txt             |  4 ---
 inc/lang/nl/lang.php                   |  1 +
 inc/lang/nl/mailtext.txt               |  5 ----
 inc/lang/nl/password.txt               |  4 ---
 inc/lang/nl/pwconfirm.txt              |  4 ---
 inc/lang/nl/registermail.txt           |  4 ---
 inc/lang/nl/subscr_digest.txt          |  3 ---
 inc/lang/nl/subscr_list.txt            |  3 ---
 inc/lang/nl/subscr_single.txt          |  5 +---
 inc/lang/nl/uploadmail.txt             |  4 ---
 inc/lang/no/lang.php                   |  1 +
 inc/lang/no/mailtext.txt               |  5 ----
 inc/lang/no/password.txt               |  4 ---
 inc/lang/no/pwconfirm.txt              |  4 ---
 inc/lang/no/registermail.txt           |  4 ---
 inc/lang/no/subscr_digest.txt          |  6 +----
 inc/lang/no/subscr_list.txt            |  6 +----
 inc/lang/no/subscr_single.txt          |  6 +----
 inc/lang/no/uploadmail.txt             |  4 ---
 inc/lang/pl/lang.php                   |  1 +
 inc/lang/pl/mailtext.txt               |  5 ----
 inc/lang/pl/password.txt               |  4 ---
 inc/lang/pl/pwconfirm.txt              |  4 ---
 inc/lang/pl/registermail.txt           |  4 ---
 inc/lang/pl/subscr_digest.txt          |  4 ---
 inc/lang/pl/subscr_list.txt            |  4 ---
 inc/lang/pl/subscr_single.txt          |  4 ---
 inc/lang/pl/uploadmail.txt             |  4 ---
 inc/lang/pt-br/lang.php                |  1 +
 inc/lang/pt-br/mailtext.txt            |  5 ----
 inc/lang/pt-br/password.txt            |  4 ---
 inc/lang/pt-br/pwconfirm.txt           |  4 ---
 inc/lang/pt-br/registermail.txt        |  4 ---
 inc/lang/pt-br/subscr_digest.txt       |  4 ---
 inc/lang/pt-br/subscr_list.txt         |  8 +++---
 inc/lang/pt-br/subscr_single.txt       |  3 ---
 inc/lang/pt-br/uploadmail.txt          |  4 ---
 inc/lang/pt/lang.php                   |  1 +
 inc/lang/pt/mailtext.txt               |  6 -----
 inc/lang/pt/pwconfirm.txt              |  4 ---
 inc/lang/pt/subscr_digest.txt          |  4 ---
 inc/lang/pt/subscr_list.txt            |  6 +----
 inc/lang/pt/subscr_single.txt          |  4 ---
 inc/lang/pt/uploadmail.txt             |  4 ---
 inc/lang/ro/lang.php                   |  1 +
 inc/lang/ro/mailtext.txt               |  4 ---
 inc/lang/ro/password.txt               |  4 ---
 inc/lang/ro/pwconfirm.txt              |  4 ---
 inc/lang/ro/registermail.txt           |  4 ---
 inc/lang/ro/subscr_digest.txt          |  4 ---
 inc/lang/ro/subscr_list.txt            |  4 ---
 inc/lang/ro/subscr_single.txt          |  4 ---
 inc/lang/ro/uploadmail.txt             |  4 ---
 inc/lang/ru/lang.php                   |  1 +
 inc/lang/ru/mailtext.txt               |  5 ----
 inc/lang/ru/password.txt               |  4 ---
 inc/lang/ru/pwconfirm.txt              |  4 ---
 inc/lang/ru/registermail.txt           |  4 ---
 inc/lang/ru/subscr_digest.txt          |  4 ---
 inc/lang/ru/subscr_list.txt            |  4 ---
 inc/lang/ru/subscr_single.txt          |  4 ---
 inc/lang/ru/uploadmail.txt             |  4 ---
 inc/lang/sk/lang.php                   |  1 +
 inc/lang/sk/mailtext.txt               |  5 ----
 inc/lang/sk/password.txt               |  4 ---
 inc/lang/sk/pwconfirm.txt              |  4 ---
 inc/lang/sk/registermail.txt           |  4 ---
 inc/lang/sk/showrev.txt                |  1 -
 inc/lang/sk/subscr_digest.txt          |  4 ---
 inc/lang/sk/subscr_list.txt            |  4 ---
 inc/lang/sk/subscr_single.txt          |  4 ---
 inc/lang/sk/uploadmail.txt             |  4 ---
 inc/lang/sl/lang.php                   |  1 +
 inc/lang/sl/mailtext.txt               |  3 ---
 inc/lang/sl/password.txt               |  3 ---
 inc/lang/sl/pwconfirm.txt              |  3 ---
 inc/lang/sl/registermail.txt           |  3 ---
 inc/lang/sl/subscr_digest.txt          |  3 ---
 inc/lang/sl/subscr_list.txt            |  3 ---
 inc/lang/sl/subscr_single.txt          |  3 ---
 inc/lang/sl/uploadmail.txt             |  3 ---
 inc/lang/sq/lang.php                   |  1 +
 inc/lang/sq/mailtext.txt               |  4 +--
 inc/lang/sq/password.txt               |  4 +--
 inc/lang/sq/pwconfirm.txt              |  4 ---
 inc/lang/sq/registermail.txt           |  4 ---
 inc/lang/sq/subscr_digest.txt          |  4 ---
 inc/lang/sq/subscr_list.txt            |  4 ---
 inc/lang/sq/subscr_single.txt          |  4 ---
 inc/lang/sr/lang.php                   |  1 +
 inc/lang/sr/mailtext.txt               |  5 ----
 inc/lang/sr/password.txt               |  4 ---
 inc/lang/sr/pwconfirm.txt              |  4 ---
 inc/lang/sr/registermail.txt           |  5 ----
 inc/lang/sr/subscr_digest.txt          |  4 ---
 inc/lang/sr/subscr_list.txt            |  4 ---
 inc/lang/sr/subscr_single.txt          |  4 ---
 inc/lang/sr/uploadmail.txt             |  4 ---
 inc/lang/sv/lang.php                   |  1 +
 inc/lang/sv/mailtext.txt               |  5 ----
 inc/lang/sv/password.txt               |  4 ---
 inc/lang/sv/pwconfirm.txt              |  4 ---
 inc/lang/sv/registermail.txt           |  4 ---
 inc/lang/sv/subscr_digest.txt          |  8 ++----
 inc/lang/sv/subscr_single.txt          |  4 ---
 inc/lang/sv/uploadmail.txt             |  4 ---
 inc/lang/th/lang.php                   |  1 +
 inc/lang/th/mailtext.txt               |  5 ----
 inc/lang/th/password.txt               |  4 ---
 inc/lang/th/pwconfirm.txt              |  4 ---
 inc/lang/th/registermail.txt           |  4 ---
 inc/lang/th/uploadmail.txt             |  4 ---
 inc/lang/tr/lang.php                   |  1 +
 inc/lang/tr/mailtext.txt               |  4 ---
 inc/lang/tr/password.txt               |  3 ---
 inc/lang/tr/pwconfirm.txt              |  4 ---
 inc/lang/tr/registermail.txt           |  3 ---
 inc/lang/tr/uploadmail.txt             |  3 ---
 inc/lang/uk/lang.php                   |  1 +
 inc/lang/uk/mailtext.txt               |  5 ----
 inc/lang/uk/password.txt               |  4 ---
 inc/lang/uk/pwconfirm.txt              |  3 ---
 inc/lang/uk/registermail.txt           |  3 ---
 inc/lang/uk/subscr_digest.txt          |  3 ---
 inc/lang/uk/subscr_list.txt            |  3 ---
 inc/lang/uk/subscr_single.txt          |  3 ---
 inc/lang/uk/uploadmail.txt             |  4 ---
 inc/lang/vi/lang.php                   |  1 +
 inc/lang/vi/mailtext.txt               |  4 ---
 inc/lang/vi/password.txt               |  3 ---
 inc/lang/zh-tw/lang.php                |  1 +
 inc/lang/zh-tw/mailtext.txt            |  5 ----
 inc/lang/zh-tw/password.txt            |  4 ---
 inc/lang/zh-tw/pwconfirm.txt           |  4 ---
 inc/lang/zh-tw/registermail.txt        |  4 ---
 inc/lang/zh-tw/subscr_digest.txt       |  4 ---
 inc/lang/zh-tw/subscr_list.txt         |  4 ---
 inc/lang/zh-tw/subscr_single.txt       |  4 ---
 inc/lang/zh-tw/uploadmail.txt          |  4 ---
 inc/lang/zh/lang.php                   |  1 +
 inc/lang/zh/mailtext.txt               |  5 ----
 inc/lang/zh/password.txt               |  5 ----
 inc/lang/zh/pwconfirm.txt              |  6 -----
 inc/lang/zh/registermail.txt           |  6 -----
 inc/lang/zh/subscr_digest.txt          |  4 ---
 inc/lang/zh/subscr_list.txt            |  4 ---
 inc/lang/zh/subscr_single.txt          |  4 ---
 inc/lang/zh/uploadmail.txt             |  8 ------
 428 files changed, 148 insertions(+), 1565 deletions(-)

diff --git a/inc/Mailer.class.php b/inc/Mailer.class.php
index 087d82c99..2fc728a6c 100644
--- a/inc/Mailer.class.php
+++ b/inc/Mailer.class.php
@@ -190,22 +190,26 @@ class Mailer {
         global $conf;
         /* @var Input $INPUT */
         global $INPUT;
+        global $lang;
 
         $htmlrep = (array)$htmlrep;
         $textrep = (array)$textrep;
 
+        $text = trim($text);
+
         // create HTML from text if not given
         if(is_null($html)) {
             $html = $text;
             $html = hsc($html);
-            $html = preg_replace('/^-----*$/m', '<hr >', $html);
+            $html = preg_replace('/^----+$/m', '<hr >', $html);
             $html = nl2br($html);
+            $html .= '<br /><br /><br /><br /><hr /><small>' . $lang['email_signature'] . ':<br />@DOKUWIKIURL@</small>';
         }
         if($wrap) {
-            $wrap = rawLocale('mailwrap', 'html');
-            $html = preg_replace('/\n-- <br \/>.*$/s', '', $html); //strip signature
-            $html = str_replace('@HTMLBODY@', $html, $wrap);
+            $html = '<html><head><title>' . hsc($conf['title']) . '</title><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body>' . $html . '</body></html>';
         }
+		
+        $text .= "\n\n\n\n-- \n" . $lang['email_signature'] . ":\n@DOKUWIKIURL@\n";
 
         // copy over all replacements missing for HTML (autolink URLs)
         foreach($textrep as $key => $value) {
diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index 50984e630..a6574dab0 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -351,3 +351,4 @@ $lang['currentns']             = 'مساحة الاسم الحالية';
 $lang['searchresult']          = 'نتيجة البحث';
 $lang['plainhtml']             = 'نص HTML غير منسق';
 $lang['wikimarkup']            = 'علامات الوكي';
+$lang['email_signature'] = 'أنشئت هذه الرسالة من دوكو ويكي في';
diff --git a/inc/lang/ar/mailtext.txt b/inc/lang/ar/mailtext.txt
index 21d416566..132e36ef3 100644
--- a/inc/lang/ar/mailtext.txt
+++ b/inc/lang/ar/mailtext.txt
@@ -10,8 +10,3 @@
 مستخدم        : @USER@
 
 @DIFF@
-
-
--- 
-تم أرسال هذه الرسالة من دوكو ويكي فى
-@DOKUWIKIURL@
diff --git a/inc/lang/ar/password.txt b/inc/lang/ar/password.txt
index c8530bb02..2489800ad 100644
--- a/inc/lang/ar/password.txt
+++ b/inc/lang/ar/password.txt
@@ -4,7 +4,3 @@
 
 أسم المستخدم    : @LOGIN@
 كلمة السر : @PASSWORD@
-
--- 
-تم أرسال هذه الرسالة من دوكو ويكي
-@DOKUWIKIURL@
diff --git a/inc/lang/ar/pwconfirm.txt b/inc/lang/ar/pwconfirm.txt
index 401053ea0..6e971d367 100644
--- a/inc/lang/ar/pwconfirm.txt
+++ b/inc/lang/ar/pwconfirm.txt
@@ -2,7 +2,5 @@
 
 شخص ما طلب كلمة سر جديدة لـحسابك @TITLE@ في @DOKUWIKIURL@
 إذا لم تكن قد طلبت كلمة سر جديدة رجاء قم بتجاهل هذه الرسالة .
-لتأكيد أنك أنت قمت بطلب كلمة السر الجديدة . نرجو منك الضغط على الرابط في الأسفل . 
-@CONFIRM@ 
- -- 
-لقد تم عمل هذه الرسالة من قبل DokuWiki .. في @DOKUWIKIURL@
+لتأكيد أنك أنت قمت بطلب كلمة السر الجديدة . نرجو منك الضغط على الرابط في الأسفل .
+@CONFIRM@
diff --git a/inc/lang/ar/registermail.txt b/inc/lang/ar/registermail.txt
index f04801f20..7c1cae08a 100644
--- a/inc/lang/ar/registermail.txt
+++ b/inc/lang/ar/registermail.txt
@@ -8,7 +8,3 @@
 المتصفح : @BROWSER@
 عنوان-IP: @IPADDRESS@
 اسم المضيف: @HOSTNAME@
-
--- 
-وُلد هذا البريد من دوكو ويكي في
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ar/subscr_digest.txt b/inc/lang/ar/subscr_digest.txt
index 6e8c2fa94..58256f5bb 100644
--- a/inc/lang/ar/subscr_digest.txt
+++ b/inc/lang/ar/subscr_digest.txt
@@ -14,7 +14,3 @@
 @DOKUWIKIURL@ ثم زُر
 @SUBSCRIBE@
 وألغ اشتراكك من الصفحات أو النظاقات
-
---
-أنشئت هذه الرسالة من دوكو ويكي في
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ar/subscr_list.txt b/inc/lang/ar/subscr_list.txt
index 22773a8e4..681fed24d 100644
--- a/inc/lang/ar/subscr_list.txt
+++ b/inc/lang/ar/subscr_list.txt
@@ -11,7 +11,3 @@
 @DOKUWIKIURL@ ثم زُر
 @SUBSCRIBE@
 ثم ألغ اشتراك تغييرات الصفحة و/أو النطاق.
-
---
-وُلد هذا البريد من دوكو ويكي في
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ar/subscr_single.txt b/inc/lang/ar/subscr_single.txt
index 611688415..6ac7d21d3 100644
--- a/inc/lang/ar/subscr_single.txt
+++ b/inc/lang/ar/subscr_single.txt
@@ -13,11 +13,7 @@
 الاصدار القديم: @OLDPAGE@
 الاصدار الحديث: @NEWPAGE@
 
-لإلغاء إشعارات الصفحة,لُج الويكي في 
+لإلغاء إشعارات الصفحة,لُج الويكي في
 @DOKUWIKIURL@ ثم زُر
 @SUBSCRIBE@
 وألغ الاشتراك من تغييرات الصفحة و/أو النطاق.
-
---
-ولد هذا البريد باستخدام دوكو ويكي في
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ar/uploadmail.txt b/inc/lang/ar/uploadmail.txt
index e4f16c7a5..bc61e6efc 100644
--- a/inc/lang/ar/uploadmail.txt
+++ b/inc/lang/ar/uploadmail.txt
@@ -8,7 +8,3 @@
 الحجم : @SIZE@
 نوع MIME : @MIME@
 المستخدم: @USER@
-
--- 
-ولد هذا البريد من دوكو ويكي في
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php
index bcec31dae..1f8d983f9 100644
--- a/inc/lang/az/lang.php
+++ b/inc/lang/az/lang.php
@@ -216,3 +216,4 @@ $lang['days']                  = '%d gün əvvəl';
 $lang['hours']                 = '%d saat əvvəl';
 $lang['minutes']               = '%d dəqiqə əvvəl';
 $lang['seconds']               = '%d saniyə əvvəl';
+$lang['email_signature'] = 'DokuWiki aşağıdakı adresdə yerləşir';
diff --git a/inc/lang/az/mailtext.txt b/inc/lang/az/mailtext.txt
index 439458658..97cb68d03 100644
--- a/inc/lang/az/mailtext.txt
+++ b/inc/lang/az/mailtext.txt
@@ -10,9 +10,3 @@ Dəyişiklərin xülasəsi : @SUMMARY@
 İstifadəçi            : @USER@
 
 @DIFF@
-
-
--- 
-Bu məktub DokuWiki tərəfindən yaradıldı.
-DokuWiki aşağıdakı adresdə yerləşir:
-@DOKUWIKIURL@
diff --git a/inc/lang/az/password.txt b/inc/lang/az/password.txt
index 31bf387da..6424161fa 100644
--- a/inc/lang/az/password.txt
+++ b/inc/lang/az/password.txt
@@ -4,8 +4,3 @@ Sizin @TITLE@ (@DOKUWIKIURL@) üçün olan məlumatlarınız
 
 İstifadəçi adı  : @LOGIN@
 ÅžifrÉ™ : @PASSWORD@
-
--- 
-Bu məktub DokuWiki tərəfindən yaradıldı.
-DokuWiki aşağıdakı adresdə yerləşir:
-@DOKUWIKIURL@
diff --git a/inc/lang/az/pwconfirm.txt b/inc/lang/az/pwconfirm.txt
index 177e5a1fa..582124af8 100644
--- a/inc/lang/az/pwconfirm.txt
+++ b/inc/lang/az/pwconfirm.txt
@@ -7,8 +7,3 @@ Kimsə @DOKUWIKIURL@ adresində yerləşən @TITLE@ adlı wiki-yə giriş üçü
 Tələbi təsdiq etmək üçün, aşağıdakı link-ə keçin.
 
 @CONFIRM@
-
--- 
-Bu məktub DokuWiki tərəfindən yaradıldı.
-DokuWiki aşağıdakı adresdə yerləşir:
-@DOKUWIKIURL@
diff --git a/inc/lang/az/registermail.txt b/inc/lang/az/registermail.txt
index 51919756f..b080e9b57 100644
--- a/inc/lang/az/registermail.txt
+++ b/inc/lang/az/registermail.txt
@@ -8,8 +8,3 @@ Tarix        : @DATE@
 Brauzer     : @BROWSER@
 IP adres    : @IPADDRESS@
 Host        : @HOSTNAME@
-
--- 
-Bu məktub DokuWiki tərəfindən yaradıldı.
-DokuWiki aşağıdakı adresdə yerləşir:
-@DOKUWIKIURL@
diff --git a/inc/lang/az/uploadmail.txt b/inc/lang/az/uploadmail.txt
index d538f8258..88103fd8f 100644
--- a/inc/lang/az/uploadmail.txt
+++ b/inc/lang/az/uploadmail.txt
@@ -8,8 +8,3 @@ Host        : @HOSTNAME@
 Həcm        : @SIZE@
 MIME Növ    : @MIME@
 İstifadəçi  : @USER@
-
--- 
-Bu məktub DokuWiki tərəfindən yaradıldı.
-DokuWiki aşağıdakı adresdə yerləşir:
-@DOKUWIKIURL@
diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php
index cfacd09aa..cf78c3ee5 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -331,3 +331,4 @@ $lang['media_update']          = 'Качване на нова версия';
 $lang['media_restore']         = 'Възстановяване на тази версия';
 $lang['searchresult']          = 'Резултати от търсенето';
 $lang['plainhtml']             = 'Обикновен HTML';
+$lang['email_signature'] = 'Писмото е генерирано от DokuWiki на адрес';
diff --git a/inc/lang/bg/mailtext.txt b/inc/lang/bg/mailtext.txt
index a5f0cbd92..60cffed22 100644
--- a/inc/lang/bg/mailtext.txt
+++ b/inc/lang/bg/mailtext.txt
@@ -10,7 +10,3 @@ IP адрес : @IPADDRESS@
 Потребител : @USER@
 
 @DIFF@
-
-
--- 
-Писмото е генерирано от DokuWiki на адрес @DOKUWIKIURL@
diff --git a/inc/lang/bg/password.txt b/inc/lang/bg/password.txt
index 7a70ef1d8..77fa48b95 100644
--- a/inc/lang/bg/password.txt
+++ b/inc/lang/bg/password.txt
@@ -4,6 +4,3 @@
 
 Потребител : @LOGIN@
 Парола : @PASSWORD@
-
--- 
-Писмото е генерирано от DokuWiki на адрес @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/bg/pwconfirm.txt b/inc/lang/bg/pwconfirm.txt
index 802153fd4..3d0a9671c 100644
--- a/inc/lang/bg/pwconfirm.txt
+++ b/inc/lang/bg/pwconfirm.txt
@@ -8,6 +8,3 @@
 За да потвърдите, че искането е наистина от вас, моля ползвайте следния линк:
 
 @CONFIRM@
-
--- 
-Писмото е генерирано от DokuWiki на адрес @DOKUWIKIURL@
diff --git a/inc/lang/bg/registermail.txt b/inc/lang/bg/registermail.txt
index 4b0828c7b..3c555f54a 100644
--- a/inc/lang/bg/registermail.txt
+++ b/inc/lang/bg/registermail.txt
@@ -8,6 +8,3 @@ E. поща : @NEWEMAIL@
 Браузър : @BROWSER@
 IP адрес : @IPADDRESS@
 Име на хоста : @HOSTNAME@
-
--- 
-Писмото е генерирано от DokuWiki на адрес @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/bg/subscr_digest.txt b/inc/lang/bg/subscr_digest.txt
index f0533daf4..8f8cfeaa1 100644
--- a/inc/lang/bg/subscr_digest.txt
+++ b/inc/lang/bg/subscr_digest.txt
@@ -13,6 +13,3 @@
 Ако желаете да прекратите уведомяването за страницата трябва да се впишете на адрес @DOKUWIKIURL@, да посетите
 @SUBSCRIBE@
 и да прекратите абонамента за промени по страницата или именното пространство.
-
---
-Писмото е генерирано от DokuWiki на адрес @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/bg/subscr_list.txt b/inc/lang/bg/subscr_list.txt
index e9e65bc39..1e2b9817d 100644
--- a/inc/lang/bg/subscr_list.txt
+++ b/inc/lang/bg/subscr_list.txt
@@ -10,6 +10,3 @@
 Ако желаете да прекратите уведомяването за страницата трябва да се впишете на адрес @DOKUWIKIURL@, да посетите
 @SUBSCRIBE@
 и да прекратите абонамента за промени по страницата или именното пространство.
-
---
-Писмото е генерирано от DokuWiki на адрес @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/bg/subscr_single.txt b/inc/lang/bg/subscr_single.txt
index a74a21fb8..36b2df3eb 100644
--- a/inc/lang/bg/subscr_single.txt
+++ b/inc/lang/bg/subscr_single.txt
@@ -16,7 +16,3 @@
 Ако желаете да прекратите уведомяването за страницата трябва да се впишете на адрес @DOKUWIKIURL@, да посетите
 @SUBSCRIBE@
 и да прекратите абонамента за промени по страницата или именното пространство.
-
---
-Писмото е генерирано от DokuWiki на адрес
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/bg/uploadmail.txt b/inc/lang/bg/uploadmail.txt
index ebd8d9112..0c14437b0 100644
--- a/inc/lang/bg/uploadmail.txt
+++ b/inc/lang/bg/uploadmail.txt
@@ -8,6 +8,3 @@ IP адрес : @IPADDRESS@
 Размер : @SIZE@
 MIME тип : @MIME@
 Потребител : @USER@
-
--- 
-Писмото е генерирано от DokuWiki на адрес @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php
index 3a4e30923..e95f0ce51 100644
--- a/inc/lang/ca-valencia/lang.php
+++ b/inc/lang/ca-valencia/lang.php
@@ -221,3 +221,4 @@ $lang['days']                  = 'fa %d dies';
 $lang['hours']                 = 'fa %d hores';
 $lang['minutes']               = 'fa %d minuts';
 $lang['seconds']               = 'fa %d segons';
+$lang['email_signature'] = 'Este correu ha segut generat per DokuWiki en';
diff --git a/inc/lang/ca-valencia/mailtext.txt b/inc/lang/ca-valencia/mailtext.txt
index e8da6f8de..b9de236dc 100644
--- a/inc/lang/ca-valencia/mailtext.txt
+++ b/inc/lang/ca-valencia/mailtext.txt
@@ -10,8 +10,3 @@ Resum: @SUMMARY@
 Usuari: @USER@
 
 @DIFF@
-
-
--- 
-Este correu l'ha generat DokuWiki en
-@DOKUWIKIURL@
diff --git a/inc/lang/ca-valencia/password.txt b/inc/lang/ca-valencia/password.txt
index 73e14e51b..d9a781e0f 100644
--- a/inc/lang/ca-valencia/password.txt
+++ b/inc/lang/ca-valencia/password.txt
@@ -4,7 +4,3 @@ Estes són les seues senyes d'usuari per a @TITLE@ en @DOKUWIKIURL@
 
 Usuari      : @LOGIN@
 Contrasenya : @PASSWORD@
-
--- 
-Este correu l'ha generat DokuWiki en
-@DOKUWIKIURL@
diff --git a/inc/lang/ca-valencia/pwconfirm.txt b/inc/lang/ca-valencia/pwconfirm.txt
index 919c3d89d..a537567a7 100644
--- a/inc/lang/ca-valencia/pwconfirm.txt
+++ b/inc/lang/ca-valencia/pwconfirm.txt
@@ -9,7 +9,3 @@ Per a confirmar que la petició ha segut feta realment per vosté
 utilise el següent víncul.
 
 @CONFIRM@
-
--- 
-Este correu l'ha generat DokuWiki en
-@DOKUWIKIURL@
diff --git a/inc/lang/ca-valencia/registermail.txt b/inc/lang/ca-valencia/registermail.txt
index 47b9318bd..02f2c1a3b 100644
--- a/inc/lang/ca-valencia/registermail.txt
+++ b/inc/lang/ca-valencia/registermail.txt
@@ -8,7 +8,3 @@ Data : @DATE@
 Navegador : @BROWSER@
 Direcció IP : @IPADDRESS@
 Nom de la màquina : @HOSTNAME@
-
--- 
-Este correu l'ha generat DokuWiki en
-@DOKUWIKIURL@
diff --git a/inc/lang/ca-valencia/uploadmail.txt b/inc/lang/ca-valencia/uploadmail.txt
index c5a330274..73837d07d 100644
--- a/inc/lang/ca-valencia/uploadmail.txt
+++ b/inc/lang/ca-valencia/uploadmail.txt
@@ -8,7 +8,3 @@ Nom de la màquina: @HOSTNAME@
 Tamany: @SIZE@
 Tipo MIME: @MIME@
 Usuari: @USER@
-
--- 
-Este correu ha segut generat per DokuWiki en
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index 31c16ee23..0c5175d6b 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -314,3 +314,4 @@ $lang['media_perm_read']       = 'No teniu permisos suficients per a llegir arxi
 $lang['media_perm_upload']     = 'No teniu permisos suficients per a pujar arxius';
 $lang['media_update']          = 'Puja la nova versió';
 $lang['media_restore']         = 'Restaura aquesta versió';
+$lang['email_signature'] = 'Aquest mail ha estat generat per DokuWiki a';
diff --git a/inc/lang/ca/mailtext.txt b/inc/lang/ca/mailtext.txt
index eda330954..dd7f0c567 100644
--- a/inc/lang/ca/mailtext.txt
+++ b/inc/lang/ca/mailtext.txt
@@ -9,8 +9,3 @@ Resum d'edició : @SUMMARY@
 Usuari         : @USER@
 
 @DIFF@
-
-
--- 
-Missatge generat per DokuWiki en
-@DOKUWIKIURL@
diff --git a/inc/lang/ca/password.txt b/inc/lang/ca/password.txt
index 4735fda3f..d4bd9f964 100644
--- a/inc/lang/ca/password.txt
+++ b/inc/lang/ca/password.txt
@@ -4,7 +4,3 @@ Aquestes són les teves dades per a entrar en @TITLE@ en l'adreça @DOKUWIKIURL@
 
 Usuari      : @LOGIN@
 Contrasenya : @PASSWORD@
-
--- 
-Missatge generat per DokuWiki en
-@DOKUWIKIURL@
diff --git a/inc/lang/ca/pwconfirm.txt b/inc/lang/ca/pwconfirm.txt
index 119c4292d..226e12623 100644
--- a/inc/lang/ca/pwconfirm.txt
+++ b/inc/lang/ca/pwconfirm.txt
@@ -9,7 +9,3 @@ Per confirmar que realment heu sol·licitat una nova contrasenya, utilitzeu
 l'enllaç següent:
 
 @CONFIRM@
-
--- 
-Missatge generat per DokuWiki en
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ca/registermail.txt b/inc/lang/ca/registermail.txt
index 84bf5f1a4..a15351a5e 100644
--- a/inc/lang/ca/registermail.txt
+++ b/inc/lang/ca/registermail.txt
@@ -8,7 +8,3 @@ Data: @DATE@
 Navegador: @BROWSER@
 Adreça IP: @IPADDRESS@
 Ordinador: @HOSTNAME@
-
--- 
-Missatge generat per DokuWiki en
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ca/subscr_digest.txt b/inc/lang/ca/subscr_digest.txt
index 2b95f97a5..c5666d25e 100644
--- a/inc/lang/ca/subscr_digest.txt
+++ b/inc/lang/ca/subscr_digest.txt
@@ -14,8 +14,3 @@ Si voleu cancel·lar les notificacions per a la pàgina, accediu al wiki a
 @DOKUWIKIURL@, visiteu
 @SUBSCRIBE@
 i doneu-vos de baixa dels canvis de la pàgina o de l'espai.
-
-
---
-Aquest mail ha estat generat per DokuWiki a
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ca/subscr_list.txt b/inc/lang/ca/subscr_list.txt
index 56bcad545..56b9ee976 100644
--- a/inc/lang/ca/subscr_list.txt
+++ b/inc/lang/ca/subscr_list.txt
@@ -14,8 +14,3 @@ Si voleu cancel·lar les notificacions per a la pàgina, accediu al wiki a
 @DOKUWIKIURL@, visiteu
 @SUBSCRIBE@
 i doneu-vos de baixa dels canvis de la pàgina o de l'espai.
-
-
---
-Aquest mail ha estat generat per DokuWiki a
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ca/uploadmail.txt b/inc/lang/ca/uploadmail.txt
index c282f1f37..01b764822 100644
--- a/inc/lang/ca/uploadmail.txt
+++ b/inc/lang/ca/uploadmail.txt
@@ -8,7 +8,3 @@ Ordinador: @HOSTNAME@
 Mida: @SIZE@
 Tipus MIME: @MIME@
 Usuari: @USER@
-
--- 
-Missatge generat per DokuWiki en
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index 1dd4def5a..bdc134a6c 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -353,3 +353,4 @@ $lang['plainhtml']             = 'Čisté HTML';
 $lang['wikimarkup']            = 'Wiki jazyk';
 $lang['page_nonexist_rev']     = 'Stránka neexistovala na %s. Byla vytvořena dodatečne na <a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'Nelze rozebrat parametr "%s".';
+$lang['email_signature'] = 'Tento e-mail byl automaticky vygenerován systémem DokuWiki';
diff --git a/inc/lang/cs/mailtext.txt b/inc/lang/cs/mailtext.txt
index 443fc3e98..8036ebec3 100644
--- a/inc/lang/cs/mailtext.txt
+++ b/inc/lang/cs/mailtext.txt
@@ -10,8 +10,3 @@ Komentář    : @SUMMARY@
 Uživatel    : @USER@
 
 @DIFF@
-
-
--- 
-Tento e-mail byl automaticky vygenerován systémem DokuWiki
-@DOKUWIKIURL@
diff --git a/inc/lang/cs/password.txt b/inc/lang/cs/password.txt
index 1b9f77778..6b7c68273 100644
--- a/inc/lang/cs/password.txt
+++ b/inc/lang/cs/password.txt
@@ -5,7 +5,3 @@ Zde jsou přihlašovací informace pro wiki @TITLE@ (@DOKUWIKIURL@)
 Jméno             : @FULLNAME@
 Uživatelské jméno : @LOGIN@
 Heslo             : @PASSWORD@
-
--- 
-Tento e-mail byl automaticky vygenerován systémem DokuWiki
-@DOKUWIKIURL@
diff --git a/inc/lang/cs/pwconfirm.txt b/inc/lang/cs/pwconfirm.txt
index 4fcc0ab26..2605b488a 100644
--- a/inc/lang/cs/pwconfirm.txt
+++ b/inc/lang/cs/pwconfirm.txt
@@ -7,7 +7,3 @@ Pokud jste o nové heslo nežádali, ignorujte prosím tento e-mail.
 Pro potvrzení, že jste tento požadavek poslali opravdu vy, prosím otevřete následující odkaz.
 
 @CONFIRM@
-
--- 
-Tento e-mail byl automaticky vygenerován systémem DokuWiki
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/cs/registermail.txt b/inc/lang/cs/registermail.txt
index f44189941..3c449bca1 100644
--- a/inc/lang/cs/registermail.txt
+++ b/inc/lang/cs/registermail.txt
@@ -8,7 +8,3 @@ Datum : @DATE@
 Prohlížeč : @BROWSER@
 IP adresa : @IPADDRESS@
 Hostitel : @HOSTNAME@
-
--- 
-Tento e-mail byl automaticky vygenerován systémem DokuWiki
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/cs/showrev.txt b/inc/lang/cs/showrev.txt
index 48be467b2..971f836cc 100644
--- a/inc/lang/cs/showrev.txt
+++ b/inc/lang/cs/showrev.txt
@@ -1,3 +1,2 @@
 **Toto je starší verze dokumentu!**
 ----
-
diff --git a/inc/lang/cs/subscr_digest.txt b/inc/lang/cs/subscr_digest.txt
index 128d91931..49869b315 100644
--- a/inc/lang/cs/subscr_digest.txt
+++ b/inc/lang/cs/subscr_digest.txt
@@ -11,12 +11,8 @@ Stará revize: @OLDPAGE@
 Nová revize: @NEWPAGE@
 
 Pro odhlášení z odebírání změn na této webové stránce
-se prosím přihlašte do wiki na adrese 
-@DOKUWIKIURL@, pak navštivte 
-@SUBSCRIBE@ 
-a odhlaste se z odebírání změn na stránce či 
+se prosím přihlašte do wiki na adrese
+@DOKUWIKIURL@, pak navštivte
+@SUBSCRIBE@
+a odhlaste se z odebírání změn na stránce či
 ve jmenném prostoru.
-
--- 
-Tento e-mail byl automaticky vygenerován systémem DokuWiki
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/cs/subscr_list.txt b/inc/lang/cs/subscr_list.txt
index 81b344dc8..d76998863 100644
--- a/inc/lang/cs/subscr_list.txt
+++ b/inc/lang/cs/subscr_list.txt
@@ -8,12 +8,8 @@ Zde jsou:
 --------------------------------------------------------
 
 Pro odhlášení z odebírání změn
-se prosím příhlašte do wiki na adrese 
-@DOKUWIKIURL@, pak navštivte 
-@SUBSCRIBE@ 
-a odhlaste se z odebírání změn na stránce či 
+se prosím příhlašte do wiki na adrese
+@DOKUWIKIURL@, pak navštivte
+@SUBSCRIBE@
+a odhlaste se z odebírání změn na stránce či
 ve jmenném prostoru.
-
--- 
-Tento e-mail byl automaticky vygenerován systémem DokuWiki
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/cs/subscr_single.txt b/inc/lang/cs/subscr_single.txt
index 6f3774cd9..ea6b4bd9b 100644
--- a/inc/lang/cs/subscr_single.txt
+++ b/inc/lang/cs/subscr_single.txt
@@ -14,12 +14,8 @@ Stará revize: @OLDPAGE@
 Nová revize: @NEWPAGE@
 
 Pro odhlášení z odebírání změn na této webové stránce
-se prosím přihlašte do wiki na adrese 
-@DOKUWIKIURL@, pak navštivte 
-@SUBSCRIBE@ 
-a odhlaste se z odebírání změn na stránce či 
+se prosím přihlašte do wiki na adrese
+@DOKUWIKIURL@, pak navštivte
+@SUBSCRIBE@
+a odhlaste se z odebírání změn na stránce či
 ve jmenném prostoru.
-
--- 
-Tento e-mail byl automaticky vygenerován systémem DokuWiki
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/cs/uploadmail.txt b/inc/lang/cs/uploadmail.txt
index 28f4e2895..d66ae2689 100644
--- a/inc/lang/cs/uploadmail.txt
+++ b/inc/lang/cs/uploadmail.txt
@@ -8,7 +8,3 @@ Hostitel : @HOSTNAME@
 Velikost : @SIZE@
 MIME typ : @MIME@
 Uživatel : @USER@
-
--- 
-Tento e-mail byl automaticky vygenerován systémem DokuWiki
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index e7c597f2b..b4f3157de 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -354,3 +354,4 @@ $lang['searchresult']          = 'Søgsresultat';
 $lang['plainhtml']             = 'Ren HTML';
 $lang['wikimarkup']            = 'Wiki Opmærkning';
 $lang['page_nonexist_rev']     = 'Siden blev ikke fundet ved %s. Den blev efterfølgende oprettet ved <a href="%s">%s</a>.';
+$lang['email_signature'] = 'Denne e-mail blev genereret af DokuWiki på';
diff --git a/inc/lang/da/mailtext.txt b/inc/lang/da/mailtext.txt
index 948a265fb..bea9cd3e4 100644
--- a/inc/lang/da/mailtext.txt
+++ b/inc/lang/da/mailtext.txt
@@ -10,8 +10,3 @@ Redigerings resumé : @SUMMARY@
 Bruger             : @USER@
 
 @DIFF@
-
-
--- 
-Denne e-mail blev genereret af DokuWiki på:
-@DOKUWIKIURL@
diff --git a/inc/lang/da/password.txt b/inc/lang/da/password.txt
index 051564cb6..b129bb9b1 100644
--- a/inc/lang/da/password.txt
+++ b/inc/lang/da/password.txt
@@ -4,8 +4,3 @@ Her er dine brugeroplysninger @TITLE@ at @DOKUWIKIURL@
 
 Brugernavn  : @LOGIN@
 Adgangskode : @PASSWORD@
-
--- 
-Denne e-mail blev genereret af DokuWiki på
-@DOKUWIKIURL@
- 
\ No newline at end of file
diff --git a/inc/lang/da/pwconfirm.txt b/inc/lang/da/pwconfirm.txt
index 3df556e68..25c20a4a3 100644
--- a/inc/lang/da/pwconfirm.txt
+++ b/inc/lang/da/pwconfirm.txt
@@ -8,7 +8,3 @@ Hvis du ikke bad om dette, så ignorer venligst denne email.
 For at bekræfte at det var dig der bad om dette, benyt venligst det følgende henvisning.
 
 @CONFIRM@
-
--- 
-Denne e-mail blev genereret af DokuWiki på
-@DOKUWIKIURL@
diff --git a/inc/lang/da/registermail.txt b/inc/lang/da/registermail.txt
index d431f7591..8ce3b54dc 100644
--- a/inc/lang/da/registermail.txt
+++ b/inc/lang/da/registermail.txt
@@ -8,7 +8,3 @@ Dato       : @DATE@
 Browser    : @BROWSER@
 IP-adresse : @IPADDRESS@
 Værtsnavn  : @HOSTNAME@
-
--- 
-Denne mail blev genereret af DokuWiki på
-@DOKUWIKIURL@
diff --git a/inc/lang/da/subscr_digest.txt b/inc/lang/da/subscr_digest.txt
index 0aa19ac07..06a28d681 100644
--- a/inc/lang/da/subscr_digest.txt
+++ b/inc/lang/da/subscr_digest.txt
@@ -14,7 +14,3 @@ For at stoppe notifikationer om sideændringer, login på wikien på
 @DOKUWIKIURL@ og besøg så
 @SUBSCRIBE@
 for at afmelde side og/eller navneområde ændringer.
-
--- 
-Denne mail blev sendt af DokuWiki på
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/da/subscr_list.txt b/inc/lang/da/subscr_list.txt
index 02a34d255..62f8f66bb 100644
--- a/inc/lang/da/subscr_list.txt
+++ b/inc/lang/da/subscr_list.txt
@@ -11,7 +11,3 @@ For at stoppe notifikationer om sideændringer, login på wikien på
 @DOKUWIKIURL@ og besøg så
 @SUBSCRIBE@
 for at afmelde side og/eller navneområde ændringer.
-
--- 
-Denne mail blev sendt af DokuWiki på
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/da/subscr_single.txt b/inc/lang/da/subscr_single.txt
index cdc554513..fb5052368 100644
--- a/inc/lang/da/subscr_single.txt
+++ b/inc/lang/da/subscr_single.txt
@@ -13,11 +13,7 @@ Summering: @SUMMARY@
 Gammel Revision: @OLDPAGE@
 Ny Revision: @NEWPAGE@
 
-For at slå side notifikationer fra, skal du logge ind på 
+For at slå side notifikationer fra, skal du logge ind på
 @DOKUWIKIURL@ og besøge
 @SUBSCRIBE@
 og slå abonnoment for side / navnerum ændringer fra.
-
---
-Denne email blev generet af DokuWiki på
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/da/uploadmail.txt b/inc/lang/da/uploadmail.txt
index 316463fee..87a087589 100644
--- a/inc/lang/da/uploadmail.txt
+++ b/inc/lang/da/uploadmail.txt
@@ -8,7 +8,3 @@ Værtsnavn   : @HOSTNAME@
 Størrelse   : @SIZE@
 MIME Type   : @MIME@
 Bruger      : @USER@
-
--- 
-Denne e-mail blev genereret af DokuWiki på
-@DOKUWIKIURL@
diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index 1a1491f6b..f0f16b54a 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -344,3 +344,4 @@ $lang['media_update']          = 'Neue Version hochladen';
 $lang['media_restore']         = 'Diese Version wiederherstellen';
 $lang['currentns']             = 'Aktueller Namensraum';
 $lang['searchresult']          = 'Suchergebnis';
+$lang['email_signature'] = 'Diese E-Mail wurde erzeugt vom DokuWiki unter';
diff --git a/inc/lang/de-informal/registermail.txt b/inc/lang/de-informal/registermail.txt
index ed37a9505..e19fb8f65 100644
--- a/inc/lang/de-informal/registermail.txt
+++ b/inc/lang/de-informal/registermail.txt
@@ -8,7 +8,3 @@ Date         : @DATE@
 Browser      : @BROWSER@
 IP-Address   : @IPADDRESS@
 Hostname     : @HOSTNAME@
-
--- 
-Diese Mail kommt vom DokuWiki auf
-@DOKUWIKIURL@
diff --git a/inc/lang/de-informal/subscr_digest.txt b/inc/lang/de-informal/subscr_digest.txt
index f8cab210f..1e2913745 100644
--- a/inc/lang/de-informal/subscr_digest.txt
+++ b/inc/lang/de-informal/subscr_digest.txt
@@ -14,8 +14,3 @@ Um das Abonnement für diese Seite aufzulösen, melde dich im Wiki an
 @DOKUWIKIURL@, besuchen dann
 @SUBSCRIBE@
 und klicke auf den Link 'Aboverwaltung'.
-
---
-Diese Mail kommt vom DokuWiki auf
-@DOKUWIKIURL@
-
diff --git a/inc/lang/de-informal/subscr_list.txt b/inc/lang/de-informal/subscr_list.txt
index 5f99cf9dd..0bc7a6a57 100644
--- a/inc/lang/de-informal/subscr_list.txt
+++ b/inc/lang/de-informal/subscr_list.txt
@@ -7,11 +7,7 @@ Nachfolgenden findest du die geänderten Seiten:
 @DIFF@
 --------------------------------------------------------
 
-Um die Benachrichtigungen zu deaktivieren, melde dich am Wiki unter 
-@DOKUWIKIURL@ an, gehe zur Seite 
+Um die Benachrichtigungen zu deaktivieren, melde dich am Wiki unter
+@DOKUWIKIURL@ an, gehe zur Seite
 @SUBSCRIBE@
 und deaktiviere das Abonnement für die Seite und/oder den Namensraum.
-
---
-Diese E-Mail wurde erzeugt vom DokuWiki unter
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/de-informal/subscr_single.txt b/inc/lang/de-informal/subscr_single.txt
index 6e3f58b9f..7ab02ccc9 100644
--- a/inc/lang/de-informal/subscr_single.txt
+++ b/inc/lang/de-informal/subscr_single.txt
@@ -17,8 +17,3 @@ Um das Abonnement für diese Seite aufzulösen, melde dich im Wiki an
 @DOKUWIKIURL@, besuche dann
 @SUBSCRIBE@
 und klicke auf den Link 'Aboverwaltung'.
-
---
-Diese Mail kommt vom DokuWiki auf
-@DOKUWIKIURL@
-
diff --git a/inc/lang/de-informal/uploadmail.txt b/inc/lang/de-informal/uploadmail.txt
index 69f11400f..d608cd562 100644
--- a/inc/lang/de-informal/uploadmail.txt
+++ b/inc/lang/de-informal/uploadmail.txt
@@ -9,8 +9,3 @@ Hostname    : @HOSTNAME@
 Größe       : @SIZE@
 MIME-Typ    : @MIME@
 Benutzer    : @USER@
-
--- 
-Diese Mail wurde vom DokuWiki auf
-@DOKUWIKIURL@
-erzeugt.
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 2725c247a..c38708efe 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -360,3 +360,4 @@ $lang['plainhtml']             = 'HTML Klartext';
 $lang['wikimarkup']            = 'Wiki Markup';
 $lang['page_nonexist_rev']     = 'DIe Seite exitiert nicht unter %s. Sie wurde aber unter <a herf="%s">%s</a>';
 $lang['unable_to_parse_date']  = 'Parameter "%s" kann nicht geparsed werden.';
+$lang['email_signature'] = 'Diese E-Mail wurde erzeugt vom DokuWiki unter';
diff --git a/inc/lang/de/mailtext.txt b/inc/lang/de/mailtext.txt
index fee88d4d8..5968a704e 100644
--- a/inc/lang/de/mailtext.txt
+++ b/inc/lang/de/mailtext.txt
@@ -10,8 +10,3 @@ Zusammenfassung: @SUMMARY@
 Benutzer       : @USER@
 
 @DIFF@
-
-
--- 
-Diese Mail kommt vom DokuWiki auf
-@DOKUWIKIURL@
diff --git a/inc/lang/de/password.txt b/inc/lang/de/password.txt
index cce3b8ea6..e6ab83c3e 100644
--- a/inc/lang/de/password.txt
+++ b/inc/lang/de/password.txt
@@ -4,7 +4,3 @@ Hier sind Ihre Benutzerdaten für @TITLE@ auf @DOKUWIKIURL@
 
 Benutzername: @LOGIN@
 Passwort    : @PASSWORD@
-
--- 
-Diese Mail kommt vom DokuWiki auf
-@DOKUWIKIURL@
diff --git a/inc/lang/de/pwconfirm.txt b/inc/lang/de/pwconfirm.txt
index 3aa81bf77..b571163ed 100644
--- a/inc/lang/de/pwconfirm.txt
+++ b/inc/lang/de/pwconfirm.txt
@@ -10,7 +10,3 @@ Um die Anforderung zu bestätigen, folgen Sie bitte dem unten angegebenen
 Bestätigungslink.
 
 @CONFIRM@
-
--- 
-Diese Mail kommt vom DokuWiki auf
-@DOKUWIKIURL@
diff --git a/inc/lang/de/registermail.txt b/inc/lang/de/registermail.txt
index ed37a9505..e19fb8f65 100644
--- a/inc/lang/de/registermail.txt
+++ b/inc/lang/de/registermail.txt
@@ -8,7 +8,3 @@ Date         : @DATE@
 Browser      : @BROWSER@
 IP-Address   : @IPADDRESS@
 Hostname     : @HOSTNAME@
-
--- 
-Diese Mail kommt vom DokuWiki auf
-@DOKUWIKIURL@
diff --git a/inc/lang/de/subscr_digest.txt b/inc/lang/de/subscr_digest.txt
index 7cc79bba2..75d923619 100644
--- a/inc/lang/de/subscr_digest.txt
+++ b/inc/lang/de/subscr_digest.txt
@@ -14,8 +14,3 @@ Um das Abonnement für diese Seite aufzulösen, melden Sie sich im Wiki an
 @DOKUWIKIURL@, besuchen dann
 @SUBSCRIBE@
 und klicken auf den Link 'Aboverwaltung'.
-
---
-Diese Mail kommt vom DokuWiki auf
-@DOKUWIKIURL@
-
diff --git a/inc/lang/de/subscr_list.txt b/inc/lang/de/subscr_list.txt
index 98ec4c2ab..2da939f8d 100644
--- a/inc/lang/de/subscr_list.txt
+++ b/inc/lang/de/subscr_list.txt
@@ -11,8 +11,3 @@ Um das Abonnement für diese Seite aufzulösen, melde Sie sich im Wiki an
 @DOKUWIKIURL@, besuchen dann
 @SUBSCRIBE@
 und klicken auf die Taste 'Änderungen abbestellen'.
-
---
-Diese Mail kommt vom DokuWiki auf
-@DOKUWIKIURL@
-
diff --git a/inc/lang/de/subscr_single.txt b/inc/lang/de/subscr_single.txt
index da9914e50..087ad5af5 100644
--- a/inc/lang/de/subscr_single.txt
+++ b/inc/lang/de/subscr_single.txt
@@ -17,8 +17,3 @@ Um das Abonnement für diese Seite aufzulösen, melden Sie sich im Wiki an
 @DOKUWIKIURL@, besuchen dann
 @SUBSCRIBE@
 und klicken auf die Taste 'Aboverwaltung'.
-
---
-Diese Mail kommt vom DokuWiki auf
-@DOKUWIKIURL@
-
diff --git a/inc/lang/de/uploadmail.txt b/inc/lang/de/uploadmail.txt
index 977e7561c..3646bcc2c 100644
--- a/inc/lang/de/uploadmail.txt
+++ b/inc/lang/de/uploadmail.txt
@@ -9,7 +9,3 @@ Hostname    : @HOSTNAME@
 Größe       : @SIZE@
 MIME-Typ    : @MIME@
 Benutzer    : @USER@
-
--- 
-Diese Mail kommt vom DokuWiki auf
-@DOKUWIKIURL@
diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php
index e5371c9f3..a766a6284 100644
--- a/inc/lang/el/lang.php
+++ b/inc/lang/el/lang.php
@@ -330,3 +330,4 @@ $lang['media_perm_upload']     = 'Συγνώμη, δεν έχετε επαρκή
 $lang['media_update']          = 'Φόρτωση νέας έκδοσης';
 $lang['media_restore']         = 'Επαναφορά αυτή της έκδοσης';
 $lang['searchresult']          = 'Αποτέλεσμα έρευνας';
+$lang['email_signature'] = 'Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση';
diff --git a/inc/lang/el/mailtext.txt b/inc/lang/el/mailtext.txt
index a5059ca4d..cc2a22f05 100644
--- a/inc/lang/el/mailtext.txt
+++ b/inc/lang/el/mailtext.txt
@@ -11,7 +11,3 @@ IP-Διεύθυνση    : @IPADDRESS@
 Χρήστης         : @USER@
 
 @DIFF@
-
--- 
-Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
-@DOKUWIKIURL@
diff --git a/inc/lang/el/password.txt b/inc/lang/el/password.txt
index d27fbb3c3..c664cb006 100644
--- a/inc/lang/el/password.txt
+++ b/inc/lang/el/password.txt
@@ -4,7 +4,3 @@
 
 Όνομα       : @LOGIN@
 Συνθηματικό : @PASSWORD@
-
--- 
-Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
-@DOKUWIKIURL@
diff --git a/inc/lang/el/pwconfirm.txt b/inc/lang/el/pwconfirm.txt
index a9e58be7d..4c1559c3b 100644
--- a/inc/lang/el/pwconfirm.txt
+++ b/inc/lang/el/pwconfirm.txt
@@ -8,7 +8,3 @@
 Αν όντως εσείς ζητήσατε την δημιουργία νέου συνθηματικού, ακολουθήστε τον παρακάτω σύνδεσμο για να το επιβεβαιώσετε.
 
 @CONFIRM@
-
--- 
-Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
-@DOKUWIKIURL@
diff --git a/inc/lang/el/registermail.txt b/inc/lang/el/registermail.txt
index 0b3e0b78b..5266fc195 100644
--- a/inc/lang/el/registermail.txt
+++ b/inc/lang/el/registermail.txt
@@ -8,7 +8,3 @@ e-mail          : @NEWEMAIL@
 Φυλλομετρητής   : @BROWSER@
 IP-Διεύθυνση    : @IPADDRESS@
 Όνομα υπολογιστή: @HOSTNAME@
-
--- 
-Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
-@DOKUWIKIURL@
diff --git a/inc/lang/el/subscr_digest.txt b/inc/lang/el/subscr_digest.txt
index 7dd0345d7..5ee54d3ea 100644
--- a/inc/lang/el/subscr_digest.txt
+++ b/inc/lang/el/subscr_digest.txt
@@ -10,11 +10,7 @@
 Παλιά έκδοση: @OLDPAGE@
 Νέα έκδοση: @NEWPAGE@
 
-Για να σταματήσουν αυτές οι ειδοποιήσεις συνδεθείτε 
-στο wiki στην διεύθυνση @DOKUWIKIURL@ 
-και στην συνέχεια επισκεφθείτε το @SUBSCRIBE@ 
+Για να σταματήσουν αυτές οι ειδοποιήσεις συνδεθείτε
+στο wiki στην διεύθυνση @DOKUWIKIURL@
+και στην συνέχεια επισκεφθείτε το @SUBSCRIBE@
 και διαγραφείτε από τις ειδοποιήσεις της σελίδας ή του φακέλου.
-
---
-Αυτό το μήνυμα παράχθηκε απο το DokuWiki στην 
-διεύθυνση @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/el/subscr_list.txt b/inc/lang/el/subscr_list.txt
index 97b8dc47d..11ebf1567 100644
--- a/inc/lang/el/subscr_list.txt
+++ b/inc/lang/el/subscr_list.txt
@@ -2,7 +2,7 @@
 
 Η σελίδα @PAGE@ στο @TITLE@ άλλαξε.
 
-Κάποιες σελίδες στον φάκελο @PAGE@ του wiki 
+Κάποιες σελίδες στον φάκελο @PAGE@ του wiki
 @TITLE@ έχουν αλλάξει.
 Ορίστε οι αλλαγμένες σελίδες:
 
@@ -10,11 +10,7 @@
 @DIFF@
 --------------------------------------------------------
 
-Για να σταματήσουν αυτές οι ειδοποιήσεις συνδεθείτε στο wiki 
-στην διεύθυνση @DOKUWIKIURL@ 
-και στην συνέχεια επισκεφθείτε το @SUBSCRIBE@ 
+Για να σταματήσουν αυτές οι ειδοποιήσεις συνδεθείτε στο wiki
+στην διεύθυνση @DOKUWIKIURL@
+και στην συνέχεια επισκεφθείτε το @SUBSCRIBE@
 και διαγραφείτε από τις ειδοποιήσεις της σελίδας ή του φακέλου.
-
---
-Αυτό το μήνυμα παράχθηκε απο το DokuWiki στην 
-διεύθυνση @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/el/subscr_single.txt b/inc/lang/el/subscr_single.txt
index 610af49a2..b67631c7e 100644
--- a/inc/lang/el/subscr_single.txt
+++ b/inc/lang/el/subscr_single.txt
@@ -12,11 +12,7 @@
 Παλιά έκδοση: @OLDPAGE@
 Νέα έκδοση: @NEWPAGE@
 
-Για να σταματήσουν αυτές οι ειδοποιήσεις συνδεθείτε στο wiki 
-στην διεύθυνση @DOKUWIKIURL@ 
-και στην συνέχεια επισκεφθείτε το @SUBSCRIBE@ 
+Για να σταματήσουν αυτές οι ειδοποιήσεις συνδεθείτε στο wiki
+στην διεύθυνση @DOKUWIKIURL@
+και στην συνέχεια επισκεφθείτε το @SUBSCRIBE@
 και διαγραφείτε από τις ειδοποιήσεις της σελίδας ή του φακέλου.
-
---
-Αυτό το μήνυμα παράχθηκε απο το DokuWiki στην 
-διεύθυνση @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/el/uploadmail.txt b/inc/lang/el/uploadmail.txt
index 52d2f1f53..c9cfca926 100644
--- a/inc/lang/el/uploadmail.txt
+++ b/inc/lang/el/uploadmail.txt
@@ -9,7 +9,3 @@ IP-Διεύθυνση    : @IPADDRESS@
 Μέγεθος         : @SIZE@
 MIME Type       : @MIME@
 Χρήστης         : @USER@
-
--- 
-Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
-@DOKUWIKIURL@
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index a5347e026..56d6a31d1 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -370,4 +370,5 @@ $lang['plainhtml']             = 'Plain HTML';
 $lang['wikimarkup']            = 'Wiki Markup';
 $lang['page_nonexist_rev']     = 'Page did not exist at %s. It was subsequently created at <a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'Unable to parse at parameter "%s".';
+$lang['email_signature'] = 'This mail was generated by DokuWiki at';
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/en/mailtext.txt b/inc/lang/en/mailtext.txt
index 44a3f6553..aea14d459 100644
--- a/inc/lang/en/mailtext.txt
+++ b/inc/lang/en/mailtext.txt
@@ -10,8 +10,3 @@ Edit Summary: @SUMMARY@
 User        : @USER@
 
 @DIFF@
-
-
--- 
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
diff --git a/inc/lang/en/password.txt b/inc/lang/en/password.txt
index 6d5cbe678..0a0dfb52b 100644
--- a/inc/lang/en/password.txt
+++ b/inc/lang/en/password.txt
@@ -4,7 +4,3 @@ Here is your userdata for @TITLE@ at @DOKUWIKIURL@
 
 Login    : @LOGIN@
 Password : @PASSWORD@
-
--- 
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
diff --git a/inc/lang/en/pwconfirm.txt b/inc/lang/en/pwconfirm.txt
index a342ff95a..3732d8a03 100644
--- a/inc/lang/en/pwconfirm.txt
+++ b/inc/lang/en/pwconfirm.txt
@@ -9,7 +9,3 @@ To confirm that the request was really sent by you please use the
 following link.
 
 @CONFIRM@
-
--- 
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
diff --git a/inc/lang/en/registermail.txt b/inc/lang/en/registermail.txt
index f02015767..5517ca11b 100644
--- a/inc/lang/en/registermail.txt
+++ b/inc/lang/en/registermail.txt
@@ -8,7 +8,3 @@ Date        : @DATE@
 Browser     : @BROWSER@
 IP-Address  : @IPADDRESS@
 Hostname    : @HOSTNAME@
-
--- 
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
diff --git a/inc/lang/en/subscr_digest.txt b/inc/lang/en/subscr_digest.txt
index 35011b6e6..cc42e08da 100644
--- a/inc/lang/en/subscr_digest.txt
+++ b/inc/lang/en/subscr_digest.txt
@@ -14,7 +14,3 @@ To cancel the page notifications, log into the wiki at
 @DOKUWIKIURL@ then visit
 @SUBSCRIBE@
 and unsubscribe page and/or namespace changes.
-
--- 
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
diff --git a/inc/lang/en/subscr_list.txt b/inc/lang/en/subscr_list.txt
index 4c38b9326..dcf800045 100644
--- a/inc/lang/en/subscr_list.txt
+++ b/inc/lang/en/subscr_list.txt
@@ -11,7 +11,3 @@ To cancel the page notifications, log into the wiki at
 @DOKUWIKIURL@ then visit
 @SUBSCRIBE@
 and unsubscribe page and/or namespace changes.
-
--- 
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
diff --git a/inc/lang/en/subscr_single.txt b/inc/lang/en/subscr_single.txt
index 0bc310e04..8f097dc3e 100644
--- a/inc/lang/en/subscr_single.txt
+++ b/inc/lang/en/subscr_single.txt
@@ -17,7 +17,3 @@ To cancel the page notifications, log into the wiki at
 @DOKUWIKIURL@ then visit
 @SUBSCRIBE@
 and unsubscribe page and/or namespace changes.
-
--- 
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
diff --git a/inc/lang/en/uploadmail.txt b/inc/lang/en/uploadmail.txt
index 16bb6989c..dca8e3344 100644
--- a/inc/lang/en/uploadmail.txt
+++ b/inc/lang/en/uploadmail.txt
@@ -9,7 +9,3 @@ Hostname    : @HOSTNAME@
 Size        : @SIZE@
 MIME Type   : @MIME@
 User        : @USER@
-
--- 
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index 0cb84a2de..48bd0ea7b 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -341,3 +341,4 @@ $lang['currentns']             = 'Aktuala nomspaco';
 $lang['searchresult']          = 'Serĉrezulto';
 $lang['plainhtml']             = 'Plena HTML';
 $lang['wikimarkup']            = 'Vikiteksto';
+$lang['email_signature'] = 'Tiu ĉi mesaĝo kreiĝis de DokuWiki ĉe';
diff --git a/inc/lang/eo/mailtext.txt b/inc/lang/eo/mailtext.txt
index 2765301ea..6c5b80c85 100644
--- a/inc/lang/eo/mailtext.txt
+++ b/inc/lang/eo/mailtext.txt
@@ -10,6 +10,3 @@ Bulteno de ŝanĝoj: @SUMMARY@
 Uzanto: @USER@
 
 @DIFF@
-
--- 
-Tiu ĉi mesaĝo kreiĝis de DokuWiki, kiu lokiĝas ĉe @DOKUWIKIURL@
diff --git a/inc/lang/eo/password.txt b/inc/lang/eo/password.txt
index 6dc42a9de..6995ec5d4 100644
--- a/inc/lang/eo/password.txt
+++ b/inc/lang/eo/password.txt
@@ -4,6 +4,3 @@ Jen viaj uzantodatumoj por @TITLE@ ĉe @DOKUWIKIURL@
 
 Ensalutnomo: @LOGIN@
 Pasvorto: @PASSWORD@
-
--- 
-Tiu ĉi mesaĝo kreiĝis de DokuWiki ĉe @DOKUWIKIURL@
diff --git a/inc/lang/eo/pwconfirm.txt b/inc/lang/eo/pwconfirm.txt
index 5abc3d13e..d6cde8dcb 100644
--- a/inc/lang/eo/pwconfirm.txt
+++ b/inc/lang/eo/pwconfirm.txt
@@ -8,6 +8,3 @@ Se ne vi petis tion, ignoru tiun ĉi mesaĝon.
 Por konfirmi, ke la peto estis vere via, bonvolu musklaki jenan ligilon:
 
 @CONFIRM@
-
--- 
-Tiu ĉi mesaĝo kreiĝis de DokuWiki ĉe @DOKUWIKIURL@
diff --git a/inc/lang/eo/registermail.txt b/inc/lang/eo/registermail.txt
index 9ef6013c0..b9c3870d5 100644
--- a/inc/lang/eo/registermail.txt
+++ b/inc/lang/eo/registermail.txt
@@ -8,6 +8,3 @@ Dato: @DATE@
 Foliumilo: @BROWSER@
 IP-Adreso: @IPADDRESS@
 Provizanto: @HOSTNAME@
-
--- 
-Tiu ĉi mesaĝo kreiĝis de DokuWiki ĉe @DOKUWIKIURL@
diff --git a/inc/lang/eo/subscr_digest.txt b/inc/lang/eo/subscr_digest.txt
index 42fc79ad1..7e5310a1e 100644
--- a/inc/lang/eo/subscr_digest.txt
+++ b/inc/lang/eo/subscr_digest.txt
@@ -14,6 +14,3 @@ Por nuligi la paĝinformojn, ensalutu la vikion ĉe
 @DOKUWIKIURL@, poste iru al
 @SUBSCRIBE@
 kaj malabonu la paĝajn kaj/aŭ nomspacajn ŝanĝojn.
-
---
-Tiu retpoŝtaĵo kreiĝis de DokuWiki ĉe @DOKUWIKIURL@
diff --git a/inc/lang/eo/subscr_list.txt b/inc/lang/eo/subscr_list.txt
index 1957e85e0..ed0c809bb 100644
--- a/inc/lang/eo/subscr_list.txt
+++ b/inc/lang/eo/subscr_list.txt
@@ -11,6 +11,3 @@ Por nuligi la paĝinformojn, ensalutu la vikion ĉe
 @DOKUWIKIURL@, poste iru al
 @SUBSCRIBE@
 kaj malabonu la paĝajn kaj/aŭ nomspacajn ŝanĝojn.
-
---
-Tiu retpoŝtaĵo kreiĝis de DokuWiki ĉe @DOKUWIKIURL@
diff --git a/inc/lang/eo/subscr_single.txt b/inc/lang/eo/subscr_single.txt
index e4847e8ab..56d489c6a 100644
--- a/inc/lang/eo/subscr_single.txt
+++ b/inc/lang/eo/subscr_single.txt
@@ -17,6 +17,3 @@ Por nuligi la paĝinformojn, ensalutu la vikion ĉe
 @DOKUWIKIURL@, poste iru al
 @SUBSCRIBE@
 kaj malabonu la paĝajn kaj/aŭ nomspacajn ŝanĝojn.
-
---
-Tiu retpoŝtaĵo kreiĝis de DokuWiki ĉe @DOKUWIKIURL@
diff --git a/inc/lang/eo/uploadmail.txt b/inc/lang/eo/uploadmail.txt
index 1cb48ade6..6268824c5 100644
--- a/inc/lang/eo/uploadmail.txt
+++ b/inc/lang/eo/uploadmail.txt
@@ -8,6 +8,3 @@ Ret-nodo: @HOSTNAME@
 Grandeco: @SIZE@
 Dosier-tipo: @MIME@
 Uzanto: @USER@
-
--- 
-Tiu ĉi mesaĝo kreiĝis de DokuWiki ĉe @DOKUWIKIURL@
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 865110ab9..214b29cb1 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -371,3 +371,4 @@ $lang['searchresult']          = 'Resultado de la búsqueda';
 $lang['plainhtml']             = 'HTML sencillo';
 $lang['wikimarkup']            = 'Etiquetado Wiki';
 $lang['page_nonexist_rev']     = 'La página no existía en %s. Por tanto fue creada en <a href="%s">%s</a>.';
+$lang['email_signature'] = 'Este mail ha sido generado por DokuWiki en';
diff --git a/inc/lang/es/mailtext.txt b/inc/lang/es/mailtext.txt
index 893ec1cb9..e74d3eb83 100644
--- a/inc/lang/es/mailtext.txt
+++ b/inc/lang/es/mailtext.txt
@@ -10,8 +10,3 @@ Resumen de la edición: @SUMMARY@
 Usuario : @USER@
 
 @DIFF@
-
-
--- 
-Este correo ha sido generado por DokuWiki en
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/es/password.txt b/inc/lang/es/password.txt
index 1312ed0a6..64bded46a 100644
--- a/inc/lang/es/password.txt
+++ b/inc/lang/es/password.txt
@@ -4,6 +4,3 @@ Estos son los datos de usuario para @TITLE@ en @DOKUWIKIURL@
 
 Usuario : @LOGIN@
 Contraseña : @PASSWORD@
-
--- 
-Este correo ha sido generado por DokuWiki en @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/es/pwconfirm.txt b/inc/lang/es/pwconfirm.txt
index c3dad116e..b03d309ec 100644
--- a/inc/lang/es/pwconfirm.txt
+++ b/inc/lang/es/pwconfirm.txt
@@ -9,8 +9,3 @@ Para confirmar que la solicitud fue realizada realmente por usted,
 por favor use el siguiente enlace.
 
 @CONFIRM@
-
-
--- 
-Este mail ha sido generado por DokuWiki en
-@DOKUWIKIURL@
diff --git a/inc/lang/es/registermail.txt b/inc/lang/es/registermail.txt
index e773e3200..b9208a1af 100644
--- a/inc/lang/es/registermail.txt
+++ b/inc/lang/es/registermail.txt
@@ -8,7 +8,3 @@ Fecha : @DATE@
 Navegador : @BROWSER@
 Dirección-IP : @IPADDRESS@
 Nombre del host : @HOSTNAME@
-
--- 
-Este mail ha sido generado por DokuWiki en
-@DOKUWIKIURL@
diff --git a/inc/lang/es/subscr_digest.txt b/inc/lang/es/subscr_digest.txt
index df03fcafc..5bb5012ad 100644
--- a/inc/lang/es/subscr_digest.txt
+++ b/inc/lang/es/subscr_digest.txt
@@ -14,7 +14,3 @@ Para cancelar la página de notificaciones, entra a la wiki en
 @DOKUWIKIURL@ luego visita
 @SUBSCRIBE@
 y date de baja en la página y/o cambios en el espacio de nombre.
-
---
-Este correo ha sido generado por DokuWiki en
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/es/subscr_list.txt b/inc/lang/es/subscr_list.txt
index 80e8dc8a1..4c58a2d63 100644
--- a/inc/lang/es/subscr_list.txt
+++ b/inc/lang/es/subscr_list.txt
@@ -11,7 +11,3 @@ Para cancelar la página de notificaciones, entra a la wiki en
 @DOKUWIKIURL@ luego visita
 @SUBSCRIBE@
 y date de baja en la página y/o cambios en el espacio de nombre.
-
---
-Este correo ha sido generado por DokuWiki en
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/es/subscr_single.txt b/inc/lang/es/subscr_single.txt
index abddeeb21..a974cc957 100644
--- a/inc/lang/es/subscr_single.txt
+++ b/inc/lang/es/subscr_single.txt
@@ -17,7 +17,3 @@ Para cancelar la página de notificaciones, entra a la wiki en
 @DOKUWIKIURL@ luego visita
 @SUBSCRIBE@
 y date de baja en la página y/o cambios en el espacio de nombre.
-
---
-Este correo ha sido generado por DokuWiki en
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/es/uploadmail.txt b/inc/lang/es/uploadmail.txt
index cf70d00d4..eb1c5df2a 100644
--- a/inc/lang/es/uploadmail.txt
+++ b/inc/lang/es/uploadmail.txt
@@ -9,7 +9,3 @@ Hostname : @HOSTNAME@
 Tamaño : @SIZE@
 MIME Type : @MIME@
 Usuario : @USER@
-
--- 
-Este correo fue generado por DokuWiki en
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index d3c510c43..21437e1d9 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -337,3 +337,4 @@ $lang['currentns']             = 'Hetke nimeruum';
 $lang['searchresult']          = 'Otsingu tulemus';
 $lang['plainhtml']             = 'Liht-HTML';
 $lang['wikimarkup']            = 'Wiki märgistus';
+$lang['email_signature'] = 'See meil on saadetud DokuWiki poolt';
diff --git a/inc/lang/et/mailtext.txt b/inc/lang/et/mailtext.txt
index 3214584f5..f1a62029d 100644
--- a/inc/lang/et/mailtext.txt
+++ b/inc/lang/et/mailtext.txt
@@ -10,7 +10,3 @@ Toimeta kokkuvõtet: @SUMMARY@
 Kasutaja          : @USER@
 
 @DIFF@
-
-
--- 
-Selle e-posti tekitas Sulle DokuWiki @DOKUWIKIURL@
diff --git a/inc/lang/et/password.txt b/inc/lang/et/password.txt
index 19db86d78..9d75bb8db 100644
--- a/inc/lang/et/password.txt
+++ b/inc/lang/et/password.txt
@@ -4,6 +4,3 @@ Siin on sinu kasutajaandmed @TITLE@ks @DOKUWIKIURL@s
 
 Sisse logimisnimi : @LOGIN@
 Parool : @PASSWORD@
-
--- 
-Selle kirja saatis DokuWiki @DOKUWIKIURL@st
diff --git a/inc/lang/et/pwconfirm.txt b/inc/lang/et/pwconfirm.txt
index 4f17140e0..ee3b31334 100644
--- a/inc/lang/et/pwconfirm.txt
+++ b/inc/lang/et/pwconfirm.txt
@@ -6,7 +6,3 @@ Kui see ei olnud Sina, siis võid seda meili lihtsalt ignoreerida.
 Kinnitamaks uue parooli saamise soovi mine aadressile:
 
 @CONFIRM@
-
--- 
-See meil on saadetud DokuWiki poolt
-@DOKUWIKIURL@
diff --git a/inc/lang/et/registermail.txt b/inc/lang/et/registermail.txt
index 47d2ef14c..3b7896377 100644
--- a/inc/lang/et/registermail.txt
+++ b/inc/lang/et/registermail.txt
@@ -8,7 +8,3 @@ Kuupäev      : @DATE@
 Lehitseja    : @BROWSER@
 IP-Aaddress  : @IPADDRESS@
 Hosti nimi   : @HOSTNAME@
-
--- 
-See meil on saadetud DokuWiki poolt
-@DOKUWIKIURL@
diff --git a/inc/lang/et/subscr_digest.txt b/inc/lang/et/subscr_digest.txt
index 7446fd9f4..d3829125c 100644
--- a/inc/lang/et/subscr_digest.txt
+++ b/inc/lang/et/subscr_digest.txt
@@ -12,10 +12,6 @@ Endine: @OLDPAGE@
 Uus: @NEWPAGE@
 
 Lehekülje teavituste katkestamiseks, sisene wiki-sse aadressil @DOKUWIKIURL@
-ja mine: 
+ja mine:
 @SUBSCRIBE@
 ning loobu lehekülje ja/või nimeruumi muudatuste teavitustest.
-
---
-Selle e-kirja lõi DokuWiki aadressilt
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/et/subscr_list.txt b/inc/lang/et/subscr_list.txt
index 0629651b7..ec32a6bb7 100644
--- a/inc/lang/et/subscr_list.txt
+++ b/inc/lang/et/subscr_list.txt
@@ -10,10 +10,6 @@ Endine: @OLDPAGE@
 Uus: @NEWPAGE@
 
 Lehekülje teavituste katkestamiseks, sisene wiki-sse aadressil @DOKUWIKIURL@
-ja mine: 
+ja mine:
 @SUBSCRIBE@
 ning loobu lehekülje ja/või nimeruumi muudatuste teavitustest.
-
---
-Selle e-kirja lõi DokuWiki aadressilt
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/et/subscr_single.txt b/inc/lang/et/subscr_single.txt
index fff069f65..02069a637 100644
--- a/inc/lang/et/subscr_single.txt
+++ b/inc/lang/et/subscr_single.txt
@@ -1,23 +1,19 @@
-Tere! 
+Tere!
 
-Wiki-s @TITLE@ toimetati lehekülge @PAGE@. 
-Muudatustest lähemalt: 
- 
--------------------------------------------------------- 
-@DIFF@ 
--------------------------------------------------------- 
+Wiki-s @TITLE@ toimetati lehekülge @PAGE@.
+Muudatustest lähemalt:
 
-Kuupäev : @DATE@ 
-Kasutaja : @USER@ 
-Kokkuvõte: @SUMMARY@ 
-Endine: @OLDPAGE@ 
-Uus: @NEWPAGE@ 
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
 
-Lehekülje teavituste katkestamiseks, sisene wiki-sse aadressil @DOKUWIKIURL@ 
-ja mine: 
-@SUBSCRIBE@ 
+Kuupäev : @DATE@
+Kasutaja : @USER@
+Kokkuvõte: @SUMMARY@
+Endine: @OLDPAGE@
+Uus: @NEWPAGE@
+
+Lehekülje teavituste katkestamiseks, sisene wiki-sse aadressil @DOKUWIKIURL@
+ja mine:
+@SUBSCRIBE@
 ning loobu lehekülje ja/või nimeruumi muudatuste teavitustest.
- 
--- 
-Selle e-kirja lõi DokuWiki aadressilt 
-@DOKUWIKIURL@ 
\ No newline at end of file
diff --git a/inc/lang/et/uploadmail.txt b/inc/lang/et/uploadmail.txt
index 2d3a6aa7e..2c21926e2 100644
--- a/inc/lang/et/uploadmail.txt
+++ b/inc/lang/et/uploadmail.txt
@@ -10,7 +10,3 @@ Lähemalt:
   Suurus            : @SIZE@
   MIME liik         : @MIME@
   Kasutaja          : @ USER@
-
--- 
-Selle e-kirja lõi DokuWiki aadressilt 
-@DOKUWIKIURL@ 
\ No newline at end of file
diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php
index fcf45b946..3ddd59ca1 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -310,3 +310,4 @@ $lang['media_viewold']         = '%s -n %s';
 $lang['media_edit']            = '%s editatu';
 $lang['media_update']          = 'Bertsio berria igo';
 $lang['media_restore']         = 'Bertsio hau berrezarri';
+$lang['email_signature'] = 'Email hau DokuWiki erabiliz sortu da';
diff --git a/inc/lang/eu/mailtext.txt b/inc/lang/eu/mailtext.txt
index 86ab1a3a7..ad0ff2f20 100644
--- a/inc/lang/eu/mailtext.txt
+++ b/inc/lang/eu/mailtext.txt
@@ -10,8 +10,3 @@ Aldatu laburpena    : @SUMMARY@
 Erabiltzailea       : @USER@
 
 @DIFF@
-
-
--- 
-Email hau DokuWiki erabiliz sortu da;
-@DOKUWIKIURL@
diff --git a/inc/lang/eu/password.txt b/inc/lang/eu/password.txt
index cf2a01711..a9c079f23 100644
--- a/inc/lang/eu/password.txt
+++ b/inc/lang/eu/password.txt
@@ -4,7 +4,3 @@ Hau da zure erabiltzailea @TITLE@ -rentzako @DOKUWIKIURL@
 
 Erabiltzailea    : @LOGIN@
 Pasahitza : @PASSWORD@
-
--- 
-eMail hau DokuWikiren bitartez sortu da;
-@DOKUWIKIURL@
diff --git a/inc/lang/eu/pwconfirm.txt b/inc/lang/eu/pwconfirm.txt
index 0f0fd5e8f..ee4e4f836 100644
--- a/inc/lang/eu/pwconfirm.txt
+++ b/inc/lang/eu/pwconfirm.txt
@@ -7,6 +7,3 @@ Ez baduzu zuk eskatu pasahitz berria, ez kasurik egin posta honi.
 Eskakizuna zuk bidalia dela egiaztatzeko, mesedez, ondorengo esteka erabili.
 
 @CONFIRM@
-
--- 
-Posta hau @DOKUWIKIURL@ gunean DokuWikik sortua izan da.
\ No newline at end of file
diff --git a/inc/lang/eu/registermail.txt b/inc/lang/eu/registermail.txt
index a0154444e..a2897e6dd 100644
--- a/inc/lang/eu/registermail.txt
+++ b/inc/lang/eu/registermail.txt
@@ -8,6 +8,3 @@ Data : @DATE@
 Nabigatzailea : @BROWSER@
 IP-Helbidea : @IPADDRESS@
 Hostalari izena : @HOSTNAME@
-
--- 
-Posta hau @DOKUWIKIURL@ gunean DokuWikik sortua izan da.
\ No newline at end of file
diff --git a/inc/lang/eu/subscr_digest.txt b/inc/lang/eu/subscr_digest.txt
index e7962ca22..d4c32d7a3 100644
--- a/inc/lang/eu/subscr_digest.txt
+++ b/inc/lang/eu/subscr_digest.txt
@@ -10,11 +10,7 @@ Hemen aldaketak:
 Berrikuste zaharra: @OLDPAGE@
 Berrikuste berria: @NEWPAGE@
 
-Orri jakinarazpenak ezeztatzeko, sartu wikian 
+Orri jakinarazpenak ezeztatzeko, sartu wikian
 @DOKUWIKIURL@ helbidean, bisitatu
 @SUBSCRIBE@
 eta ezabatu orri eta/edo izen-espazio aldaketen harpidetza.
-
---
-E-posta hau DokuWiki-k sortua izan da helbide honetan:
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/eu/subscr_list.txt b/inc/lang/eu/subscr_list.txt
index 950cd352b..10037c371 100644
--- a/inc/lang/eu/subscr_list.txt
+++ b/inc/lang/eu/subscr_list.txt
@@ -7,11 +7,7 @@ Hemen aldatutako orriak:
 @DIFF@
 --------------------------------------------------------
 
-Orri jakinarazpenak ezeztatzeko, sartu wikian 
+Orri jakinarazpenak ezeztatzeko, sartu wikian
 @DOKUWIKIURL@ helbidean, bisitatu
 @SUBSCRIBE@
 eta ezabatu orri eta/edo izen-espazio aldaketen harpidetza.
-
---
-E-posta hau DokuWiki-k sortua izan da helbide honetan:
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/eu/subscr_single.txt b/inc/lang/eu/subscr_single.txt
index 490211784..13b178730 100644
--- a/inc/lang/eu/subscr_single.txt
+++ b/inc/lang/eu/subscr_single.txt
@@ -13,11 +13,7 @@ Aldaketaren Laburpena: @SUMMARY@
 Berrikuste Zaharra: @OLDPAGE@
 Berrikuste Berria: @NEWPAGE@
 
-Orri jakinarazpenak ezeztatzeko, sartu wikian 
+Orri jakinarazpenak ezeztatzeko, sartu wikian
 @DOKUWIKIURL@ helbidean, bisitatu
 @SUBSCRIBE@
 eta ezabatu orri eta/edo izen-espazio aldaketen harpidetza.
-
---
-E-posta hau DokuWiki-k sortua izan da helbide honetan:
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/eu/uploadmail.txt b/inc/lang/eu/uploadmail.txt
index 639f3d95a..7b685e046 100644
--- a/inc/lang/eu/uploadmail.txt
+++ b/inc/lang/eu/uploadmail.txt
@@ -8,6 +8,3 @@ Hostalari izena : @HOSTNAME@
 Tamaina : @SIZE@
 MIME Mota : @MIME@
 Erabiltzailea : @USER@
-
--- 
-Posta hau @DOKUWIKIURL@ gunean DokuWikik sortua izan da.
\ No newline at end of file
diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php
index 25de5c92e..46f64a9c3 100644
--- a/inc/lang/fa/lang.php
+++ b/inc/lang/fa/lang.php
@@ -347,3 +347,4 @@ $lang['currentns']             = 'فضای نام جاری';
 $lang['searchresult']          = 'نتیجه‌ی جستجو';
 $lang['plainhtml']             = 'HTML ساده';
 $lang['wikimarkup']            = 'نشانه‌گذاری ویکی';
+$lang['email_signature'] = 'این ایمیل توسط DokuWiki تولید شده است';
diff --git a/inc/lang/fa/mailtext.txt b/inc/lang/fa/mailtext.txt
index 44e98db06..b51be6ba7 100644
--- a/inc/lang/fa/mailtext.txt
+++ b/inc/lang/fa/mailtext.txt
@@ -10,8 +10,3 @@
 کاربر: @USER@
 
 @DIFF@
-
-
--- 
-این ایمیل توسط DokuWiki تولید شده است
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fa/password.txt b/inc/lang/fa/password.txt
index 3f552c585..5b404123a 100644
--- a/inc/lang/fa/password.txt
+++ b/inc/lang/fa/password.txt
@@ -4,7 +4,3 @@
 
 نام کاربری: @LOGIN@
 گذرواژه: @PASSWORD@
-
--- 
-این ایمیل توسط DokuWiki تولید شده است
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fa/pwconfirm.txt b/inc/lang/fa/pwconfirm.txt
index fd76b7ddd..ddde4e794 100644
--- a/inc/lang/fa/pwconfirm.txt
+++ b/inc/lang/fa/pwconfirm.txt
@@ -7,7 +7,3 @@
 اگر این درخواست توسط شما داده شده است، باید آن را تایید کنید، پس روی پیوند زیر کلیک کنید.
 
 @CONFIRM@
-
--- 
-این ایمیل توسط DokuWiki تولید شده است
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fa/registermail.txt b/inc/lang/fa/registermail.txt
index e22c2d0ad..f69460f36 100644
--- a/inc/lang/fa/registermail.txt
+++ b/inc/lang/fa/registermail.txt
@@ -8,7 +8,3 @@
 مرورگر: @BROWSER@
 آدرس IP: @IPADDRESS@
 نام هوست: @HOSTNAME@
-
--- 
-این ایمیل توسط DokuWiki تولید شده است
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fa/subscr_digest.txt b/inc/lang/fa/subscr_digest.txt
index 0ba4c898d..c5ac51534 100644
--- a/inc/lang/fa/subscr_digest.txt
+++ b/inc/lang/fa/subscr_digest.txt
@@ -11,6 +11,3 @@
 نگارش نو: @NEWPAGE@
 
 برای از بین بردن آگاهی‌های این صفحه، از طریق آدرس @DOKUWIKIURL@ وارد ویکی شده و صفحه‌ی @SUBSCRIBE@ را مرور کنید و عضویت خود را از صفحه یا فضای‌نام پاک کنید.
-
---
-این رای‌نامه با نرم‌افزار DokuWiki در آدرس @DOKUWIKIURL@ ساخته شده است.
\ No newline at end of file
diff --git a/inc/lang/fa/subscr_list.txt b/inc/lang/fa/subscr_list.txt
index 92ac92b74..6970997c4 100644
--- a/inc/lang/fa/subscr_list.txt
+++ b/inc/lang/fa/subscr_list.txt
@@ -11,6 +11,3 @@
 نگارش نو: @NEWPAGE@
 
 برای از بین بردن آگاهی‌های این صفحه، از طریق آدرس @DOKUWIKIURL@ وارد ویکی شده و صفحه‌ی @SUBSCRIBE@ را مرور کنید و عضویت خود را از صفحه یا فضای‌نام پاک کنید.
-
---
-این رای‌نامه با نرم‌افزار DokuWiki در آدرس @DOKUWIKIURL@ ساخته شده است.
\ No newline at end of file
diff --git a/inc/lang/fa/subscr_single.txt b/inc/lang/fa/subscr_single.txt
index a0d2a5d49..75ffb24b1 100644
--- a/inc/lang/fa/subscr_single.txt
+++ b/inc/lang/fa/subscr_single.txt
@@ -14,6 +14,3 @@
 نگارش نو: @NEWPAGE@
 
 برای از بین بردن آگاهی‌های این صفحه، از طریق آدرس @DOKUWIKIURL@ وارد ویکی شده و صفحه‌ی @NEWPAGE@ را مرور کنید و عضویت خود را از صفحه یا فضای‌نام پاک کنید.
-
---
-این رای‌نامه با نرم‌افزار DokuWiki در آدرس @DOKUWIKIURL@ ساخته شده است.
\ No newline at end of file
diff --git a/inc/lang/fa/uploadmail.txt b/inc/lang/fa/uploadmail.txt
index 625df73dc..e9218b6b1 100644
--- a/inc/lang/fa/uploadmail.txt
+++ b/inc/lang/fa/uploadmail.txt
@@ -8,7 +8,3 @@
 اندازه: @SIZE@
 MIME: @MIME@
 کاربر: @USER@
-
--- 
-این ایمیل توسط DokuWiki تولید شده است
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 9bf4aad19..3f964b759 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -341,3 +341,4 @@ $lang['searchresult']          = 'Haun tulokset';
 $lang['plainhtml']             = 'pelkkä HTML';
 $lang['wikimarkup']            = 'Wiki markup';
 $lang['unable_to_parse_date']  = 'Parametrin "%s" jäsennys ei onnistu.';
+$lang['email_signature'] = 'Tämän postin loi DokuWiki osoitteessa';
diff --git a/inc/lang/fi/mailtext.txt b/inc/lang/fi/mailtext.txt
index 1808ebc38..015b3c325 100644
--- a/inc/lang/fi/mailtext.txt
+++ b/inc/lang/fi/mailtext.txt
@@ -10,8 +10,3 @@ Yhteenveto: @SUMMARY@
 Käyttäjä : @USER@
 
 @DIFF@
-
-
--- 
-Tämän postin loi DokuWiki osoitteessa
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fi/password.txt b/inc/lang/fi/password.txt
index 51e16046c..e088166f6 100644
--- a/inc/lang/fi/password.txt
+++ b/inc/lang/fi/password.txt
@@ -4,7 +4,3 @@ Tässä käyttäjätietosi sivulla @TITLE@ osoitteessa @DOKUWIKIURL@
 
 Käyttäjätunnus : @LOGIN@
 Salasana : @PASSWORD@
-
--- 
-Tämän postin loi DokuWiki osoitteessa
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fi/pwconfirm.txt b/inc/lang/fi/pwconfirm.txt
index e552f5cdc..de6780ca8 100644
--- a/inc/lang/fi/pwconfirm.txt
+++ b/inc/lang/fi/pwconfirm.txt
@@ -7,7 +7,3 @@ Jos sinä ei pyytänyt uutta salasanaa, niin voit unohtaa tämän postin.
 Käytä alla olevaa linkkiä vahvistaaksesi, että pyynnön lähettäjä todella olet sinä.
 
 @CONFIRM@
-
--- 
-Tämän postin loi DokuWiki
-@DOKUWIKIURL@
diff --git a/inc/lang/fi/registermail.txt b/inc/lang/fi/registermail.txt
index c276873f0..07c35be0a 100644
--- a/inc/lang/fi/registermail.txt
+++ b/inc/lang/fi/registermail.txt
@@ -8,7 +8,3 @@ Päivämäärä : @DATE@
 Selain : @BROWSER@
 IP-osoite : @IPADDRESS@
 Hostname : @HOSTNAME@
-
--- 
-Tämän postin loi DokuWiki osoitteessa
-@DOKUWIKIURL@
diff --git a/inc/lang/fi/subscr_digest.txt b/inc/lang/fi/subscr_digest.txt
index 466484486..e395e07e1 100644
--- a/inc/lang/fi/subscr_digest.txt
+++ b/inc/lang/fi/subscr_digest.txt
@@ -14,7 +14,3 @@ Peruttaaksesi sivuilmoitukset kirjaudu wikiin osoitteessa
 @DOKUWIKIURL@ , jonka jälkeen katso
 @SUBSCRIBE@
 ja peruuta tilauksesi sivun ja/tai nimiavaruuden muutoksista.
-
---
-Tämän postin loi DokuWiki osoitteessa
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fi/subscr_list.txt b/inc/lang/fi/subscr_list.txt
index cd39014e8..255f1239b 100644
--- a/inc/lang/fi/subscr_list.txt
+++ b/inc/lang/fi/subscr_list.txt
@@ -11,8 +11,3 @@ Peruuttaaksesi sivuilmoitukset kirjaudu wikiin osoitteessa
 @DOKUWIKIURL@ , jonka jälkeen katso
 @SUBSCRIBE@
 ja peruuta tilauksesi sivun ja/tai nimiavaruuden muutoksista.
-
-
--- 
-Tämän postin loi DokuWiki osoitteessa
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fi/subscr_single.txt b/inc/lang/fi/subscr_single.txt
index 0fd83e266..f373ff3ee 100644
--- a/inc/lang/fi/subscr_single.txt
+++ b/inc/lang/fi/subscr_single.txt
@@ -17,7 +17,3 @@ Peruttaaksesi sivuilmoitukset kirjaudu wikiin osoitteessa
 @DOKUWIKIURL@ , jonka jälkeen katso
 @SUBSCRIBE@
 ja peruuta tilauksesi sivun ja/tai nimiavaruuden muutoksista.
-
--- 
-Tämän postin loi DokuWiki osoitteessa
-@DOKUWIKIURL@
diff --git a/inc/lang/fi/uploadmail.txt b/inc/lang/fi/uploadmail.txt
index 0c116a78b..e7b9abfe8 100644
--- a/inc/lang/fi/uploadmail.txt
+++ b/inc/lang/fi/uploadmail.txt
@@ -8,7 +8,3 @@ Hostname : @HOSTNAME@
 Koko : @SIZE@
 MIME Type : @MIME@
 Käyttäjä : @USER@
-
--- 
-Tämän postin loi DokuWiki osoitteessa
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php
index 0aee76e01..c04031af7 100644
--- a/inc/lang/fo/lang.php
+++ b/inc/lang/fo/lang.php
@@ -170,3 +170,4 @@ $lang['img_format']            = 'Snið:';
 $lang['img_camera']            = 'Fototól:';
 $lang['img_keywords']          = 'Evnisorð:';
 $lang['authtempfail']          = 'Validering av brúkara virkar fyribils ikki. Um hetta er varandi, fá so samband við umboðsstjóran á hesi wiki.';
+$lang['email_signature'] = 'Hesin t-postur var skaptur av DokuWiki á';
diff --git a/inc/lang/fo/mailtext.txt b/inc/lang/fo/mailtext.txt
index 358a23be0..331edfefc 100644
--- a/inc/lang/fo/mailtext.txt
+++ b/inc/lang/fo/mailtext.txt
@@ -10,8 +10,3 @@ Rætti samandráttur : @SUMMARY@
 Brúkari            : @USER@
 
 @DIFF@
-
-
--- 
-Hesin t-postur var skaptur av DokuWiki á:
-@DOKUWIKIURL@
diff --git a/inc/lang/fo/password.txt b/inc/lang/fo/password.txt
index 1e4797ba1..df8b6e71e 100644
--- a/inc/lang/fo/password.txt
+++ b/inc/lang/fo/password.txt
@@ -4,7 +4,3 @@ Her eru tínar brúkaraupplýsingar @TITLE@ at @DOKUWIKIURL@
 
 Brúkaranavn : @LOGIN@
 Loyniorð    : @PASSWORD@
-
--- 
-Hesin t-postur var skaptur av DokuWiki á:
-@DOKUWIKIURL@
diff --git a/inc/lang/fo/subscr_digest.txt b/inc/lang/fo/subscr_digest.txt
index 3d9f097ad..ff76e53d9 100644
--- a/inc/lang/fo/subscr_digest.txt
+++ b/inc/lang/fo/subscr_digest.txt
@@ -14,7 +14,3 @@ Fyri at avmelda síðu kunngerðir, logga inn í wikiina á
 @DOKUWIKIURL@ vitja so
 @SUBSCRIBE@
 og avmelda hald á síðu og/ella navnaøkis broytingar.
-
---
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index fb3890c9e..10fed9e03 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -368,3 +368,4 @@ $lang['plainhtml']             = 'HTML brut';
 $lang['wikimarkup']            = 'Wiki balise';
 $lang['page_nonexist_rev']     = 'La page n\'existait pas le %s. Elle a été créée le <a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'Ne peut analyser le paramètre date "%s".';
+$lang['email_signature'] = 'Ce courriel a été généré par DokuWiki depuis';
diff --git a/inc/lang/fr/mailtext.txt b/inc/lang/fr/mailtext.txt
index 3f191756a..d93eb1e8a 100644
--- a/inc/lang/fr/mailtext.txt
+++ b/inc/lang/fr/mailtext.txt
@@ -11,8 +11,3 @@ Résumé            : @SUMMARY@
 Utilisateur       : @USER@
 
 @DIFF@
-
-
--- 
-Ce courriel a été généré par DokuWiki depuis
-@DOKUWIKIURL@
diff --git a/inc/lang/fr/password.txt b/inc/lang/fr/password.txt
index 47cb391d2..2ffe71586 100644
--- a/inc/lang/fr/password.txt
+++ b/inc/lang/fr/password.txt
@@ -4,7 +4,3 @@ Voici vos identifiants pour @TITLE@ sur @DOKUWIKIURL@
 
 Utilisateur  : @LOGIN@
 Mot de passe : @PASSWORD@
-
--- 
-Ce courriel a été envoyé par DokuWiki depuis
-@DOKUWIKIURL@
diff --git a/inc/lang/fr/pwconfirm.txt b/inc/lang/fr/pwconfirm.txt
index 5cbfb2241..187ec0bd0 100644
--- a/inc/lang/fr/pwconfirm.txt
+++ b/inc/lang/fr/pwconfirm.txt
@@ -9,7 +9,3 @@ passe, ignorez simplement ce message.
 Pour confirmer que cette requête émane bien de vous, merci de cliquer sur le lien ci-dessous.
 
 @CONFIRM@
-
--- 
-Ce courriel a été généré par DokuWiki depuis
-@DOKUWIKIURL@
diff --git a/inc/lang/fr/registermail.txt b/inc/lang/fr/registermail.txt
index 43d72dba9..fe39c2db5 100644
--- a/inc/lang/fr/registermail.txt
+++ b/inc/lang/fr/registermail.txt
@@ -8,7 +8,3 @@ Date                : @DATE@
 Navigateur internet         : @BROWSER@
 Adresse IP          : @IPADDRESS@
 Nom d'hôte          : @HOSTNAME@
-
--- 
-Ce courriel a été généré par DokuWiki depuis
-@DOKUWIKIURL@
diff --git a/inc/lang/fr/subscr_digest.txt b/inc/lang/fr/subscr_digest.txt
index 7ec75ca76..c1fa4637e 100644
--- a/inc/lang/fr/subscr_digest.txt
+++ b/inc/lang/fr/subscr_digest.txt
@@ -13,7 +13,3 @@ Pour annuler les notifications de page, connectez-vous au wiki à l'adresse
 @DOKUWIKIURL@ puis visitez
 @SUBSCRIBE@
 et désabonnez-vous de la page ou de la catégorie.
-
---
-Ce courriel a été généré par DokuWiki depuis
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fr/subscr_list.txt b/inc/lang/fr/subscr_list.txt
index d8c6b68e4..4c5c55d16 100644
--- a/inc/lang/fr/subscr_list.txt
+++ b/inc/lang/fr/subscr_list.txt
@@ -10,7 +10,3 @@ Pour annuler les notifications de page, connectez-vous au wiki à l'adresse
 @DOKUWIKIURL@ puis visitez
 @SUBSCRIBE@
 et désabonnez-vous de la page ou de la catégorie.
-
---
-Ce courriel a été généré par Dokuwiki :
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fr/subscr_single.txt b/inc/lang/fr/subscr_single.txt
index 236d45e8f..a13bd00ec 100644
--- a/inc/lang/fr/subscr_single.txt
+++ b/inc/lang/fr/subscr_single.txt
@@ -16,7 +16,3 @@ Pour annuler les notifications de page, connectez-vous au wiki à l'adresse
 @DOKUWIKIURL@ puis visitez
 @SUBSCRIBE@
 et désabonnez-vous de la page ou de la catégorie.
-
---
-Ce courriel a été généré par Dokuwiki depuis
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fr/uploadmail.txt b/inc/lang/fr/uploadmail.txt
index 80be0de8c..37273d954 100644
--- a/inc/lang/fr/uploadmail.txt
+++ b/inc/lang/fr/uploadmail.txt
@@ -8,7 +8,3 @@ Nom d'hôte  : @HOSTNAME@
 Taille      : @SIZE@
 Type MIME   : @MIME@
 Utilisateur : @USER@
-
--- 
-Ce message a été généré par DokuWiki depuis
-@DOKUWIKIURL@
diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php
index 82cbbbfab..9efa43354 100644
--- a/inc/lang/gl/lang.php
+++ b/inc/lang/gl/lang.php
@@ -319,3 +319,4 @@ $lang['media_perm_read']       = 'Sentímolo, non tes permisos suficientes para
 $lang['media_perm_upload']     = 'Sentímolo, non tes permisos suficientes para subir arquivos.';
 $lang['media_update']          = 'Subir nova versión';
 $lang['media_restore']         = 'Restaurar esta versión';
+$lang['email_signature'] = 'Este correo foi xerado polo DokuWiki en';
diff --git a/inc/lang/gl/mailtext.txt b/inc/lang/gl/mailtext.txt
index a6799d697..bf102e18b 100644
--- a/inc/lang/gl/mailtext.txt
+++ b/inc/lang/gl/mailtext.txt
@@ -10,8 +10,3 @@ Resumo da Edición : @SUMMARY@
 Usuario         : @USER@
 
 @DIFF@
-
-
--- 
-Este correo foi xerado polo DokuWiki en
-@DOKUWIKIURL@
diff --git a/inc/lang/gl/password.txt b/inc/lang/gl/password.txt
index 652a55828..36f8562b3 100644
--- a/inc/lang/gl/password.txt
+++ b/inc/lang/gl/password.txt
@@ -4,7 +4,3 @@ Aquí tes os teus datos de usuario para @TITLE@ en @DOKUWIKIURL@
 
 Usuario    : @LOGIN@
 Contrasinal : @PASSWORD@
-
--- 
-Este correo foi xerado polo DokuWiki en
-@DOKUWIKIURL@
diff --git a/inc/lang/gl/pwconfirm.txt b/inc/lang/gl/pwconfirm.txt
index ef20212ff..8185560bd 100644
--- a/inc/lang/gl/pwconfirm.txt
+++ b/inc/lang/gl/pwconfirm.txt
@@ -9,7 +9,3 @@ Para confirmares que esta solicitude foi realmente enviada por ti,
 por favor, visita a seguinte ligazón.
 
 @CONFIRM@
-
---
-Este correo-e foi xerado polo DokuWiki de
-@DOKUWIKIURL@
diff --git a/inc/lang/gl/registermail.txt b/inc/lang/gl/registermail.txt
index 7d4017481..aad8481ba 100644
--- a/inc/lang/gl/registermail.txt
+++ b/inc/lang/gl/registermail.txt
@@ -8,7 +8,3 @@ Data	        : @DATE@
 Navegador     	: @BROWSER@
 Enderezo IP		: @IPADDRESS@
 Nome do Host	: @HOSTNAME@
-
--- 
-Este correo-e foi xerado polo DokuWiki de
-@DOKUWIKIURL@
diff --git a/inc/lang/gl/subscr_digest.txt b/inc/lang/gl/subscr_digest.txt
index 4ebd14dd9..275a7d53d 100644
--- a/inc/lang/gl/subscr_digest.txt
+++ b/inc/lang/gl/subscr_digest.txt
@@ -14,7 +14,3 @@ Para cancelares as notificacións da páxina inicia sesión no wiki en
 @DOKUWIKIURL@ e logo visita
 @SUBSCRIBE@
 e desubscríbete do seguimento dos trocos da páxina e/ou nome de espazo.
-
---
-Este correo-e foi xerado polo DokuWiki de
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/gl/subscr_list.txt b/inc/lang/gl/subscr_list.txt
index b62aae35d..8ee1a7a22 100644
--- a/inc/lang/gl/subscr_list.txt
+++ b/inc/lang/gl/subscr_list.txt
@@ -11,7 +11,3 @@ Para cancelares as notificacións da páxina inicia sesión no wiki en
 @DOKUWIKIURL@ e logo visita
 @SUBSCRIBE@
 e desubscríbete do seguimento dos trocos da páxina e/ou nome de espazo.
-
---
-Este correo-e foi xerado polo DokuWiki de
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/gl/subscr_single.txt b/inc/lang/gl/subscr_single.txt
index 77102d470..b30c8172e 100644
--- a/inc/lang/gl/subscr_single.txt
+++ b/inc/lang/gl/subscr_single.txt
@@ -17,7 +17,3 @@ Para cancelares as notificacións da páxina inicia sesión no wiki en
 @DOKUWIKIURL@ e logo visita
 @SUBSCRIBE@
 e desubscríbete do seguimento dos trocos da páxina e/ou nome de espazo.
-
---
-Este correo-e foi xerado polo DokuWiki de
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/gl/uploadmail.txt b/inc/lang/gl/uploadmail.txt
index 2a7c24762..c01bc7df4 100644
--- a/inc/lang/gl/uploadmail.txt
+++ b/inc/lang/gl/uploadmail.txt
@@ -8,7 +8,3 @@ Nome do Host : @HOSTNAME@
 Tamaño : @SIZE@
 Tipo MIME : @MIME@
 Usuario : @USER@
-
---
-Este correo foi xerado polo DokuWiki en
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 1b8710df9..76743f897 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -348,3 +348,4 @@ $lang['searchresult']          = 'תוצאות חיפוש';
 $lang['plainhtml']             = 'HTML פשוט';
 $lang['page_nonexist_rev']     = 'העמוד לא קיים ב%s. העמוד נוצר במקום זאת ב<a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'לא ניתן לפענח פרמטר "%s".';
+$lang['email_signature'] = 'הודעת דוא״ל זו נוצרה על ידי ה־DokuWiki הזמין בכתובת';
diff --git a/inc/lang/he/mailtext.txt b/inc/lang/he/mailtext.txt
index 222ee1b6d..f752fb796 100644
--- a/inc/lang/he/mailtext.txt
+++ b/inc/lang/he/mailtext.txt
@@ -10,8 +10,3 @@
 משתמש        : @USER@
 
 @DIFF@
-
--- 
-
-דף זה נוצר ע״י ה־DokuWiki הזמין בכתובת
-@DOKUWIKIURL@
diff --git a/inc/lang/he/password.txt b/inc/lang/he/password.txt
index 745c5cb5c..bfa29b680 100644
--- a/inc/lang/he/password.txt
+++ b/inc/lang/he/password.txt
@@ -4,7 +4,3 @@
 
 שם כניסה     : @LOGIN@
 ססמה     : @PASSWORD@
-
--- 
-מכתב זה נוצר על ידי ה־DokuWiki הזמין בכתובת
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/he/pwconfirm.txt b/inc/lang/he/pwconfirm.txt
index 7dc46c340..3fa786c09 100644
--- a/inc/lang/he/pwconfirm.txt
+++ b/inc/lang/he/pwconfirm.txt
@@ -7,7 +7,3 @@
 כדי לאשר שהבקשה באמת נשלחה על ידך עליך השתמש בקישור הבא.
 
 @CONFIRM@
-
--- 
-הודעת דוא״ל זו נוצרה על ידי ה־DokuWiki הזמין בכתובת
-@DOKUWIKIURL@
diff --git a/inc/lang/he/registermail.txt b/inc/lang/he/registermail.txt
index 3edca3fa0..5d21c95fe 100644
--- a/inc/lang/he/registermail.txt
+++ b/inc/lang/he/registermail.txt
@@ -8,7 +8,3 @@
 דפדפן      : @BROWSER@
 כתובת IP&rlm;  : @IPADDRESS@
 שם המארח   : @HOSTNAME@
-
--- 
-הודעת דוא״ל זו נוצרה על ידי ה־DokuWiki הזמין בכתובת
-@DOKUWIKIURL@
diff --git a/inc/lang/he/subscr_digest.txt b/inc/lang/he/subscr_digest.txt
index af5220229..5548a7082 100644
--- a/inc/lang/he/subscr_digest.txt
+++ b/inc/lang/he/subscr_digest.txt
@@ -14,7 +14,3 @@
 @DOKUWIKIURL@ ואז לבקר באגף
 @SUBSCRIBE@
 ולבטל את המינוי לשינויים בדף ו/או במרחב השם.
-
---
-הודעת דוא״ל זו נוצרה על ידי ה־DokuWiki שבכתובת
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/he/subscr_single.txt b/inc/lang/he/subscr_single.txt
index 78b551e2f..c2ddb7238 100644
--- a/inc/lang/he/subscr_single.txt
+++ b/inc/lang/he/subscr_single.txt
@@ -16,7 +16,3 @@
 @DOKUWIKIURL@ ואז לבקר בדף
 @SUBSCRIBE@
 ולבטל את המינוי לקבלת שינויים בדף ו/או במרחב השם.
-
---
-הודעת דוא״ל זו נוצרה על ידי ה־DokuWiki הזמין בכתובת
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/he/uploadmail.txt b/inc/lang/he/uploadmail.txt
index fd670796c..9c06f133b 100644
--- a/inc/lang/he/uploadmail.txt
+++ b/inc/lang/he/uploadmail.txt
@@ -8,7 +8,3 @@
 גודל : @SIZE@
 סיווג : @MIME@
 משתמש : @USER@
-
--- 
-דואר זה נוצר על ידי דוקוויקי בתובת
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php
index 6e4e48e36..4339f3f18 100644
--- a/inc/lang/hr/lang.php
+++ b/inc/lang/hr/lang.php
@@ -342,3 +342,4 @@ $lang['plainhtml']             = 'ÄŒisti HTML';
 $lang['wikimarkup']            = 'Wiki kod';
 $lang['page_nonexist_rev']     = 'Stranica ne postoji na %s. Ona je naknadno napravljena na <a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'Ne mogu analizirati parametar "%s".';
+$lang['email_signature'] = 'Ovaj email je poslan na';
diff --git a/inc/lang/hr/mailtext.txt b/inc/lang/hr/mailtext.txt
index 911f8eade..9988efc0b 100644
--- a/inc/lang/hr/mailtext.txt
+++ b/inc/lang/hr/mailtext.txt
@@ -10,7 +10,3 @@ Opis izmjene      : @SUMMARY@
 Korisnik          : @USER@
 
 @DIFF@
-
-
--- 
-Ovaj email je poslan na: @DOKUWIKIURL@
diff --git a/inc/lang/hr/password.txt b/inc/lang/hr/password.txt
index bb156c290..76cccbd2e 100644
--- a/inc/lang/hr/password.txt
+++ b/inc/lang/hr/password.txt
@@ -4,6 +4,3 @@ Slijede podaci za @TITLE@ sa @DOKUWIKIURL@
 
 Korisničko ime : @LOGIN@
 Lozinka        : @PASSWORD@
-
--- 
-@DOKUWIKIURL@
diff --git a/inc/lang/hr/pwconfirm.txt b/inc/lang/hr/pwconfirm.txt
index b2d9fa3ad..506e98e94 100644
--- a/inc/lang/hr/pwconfirm.txt
+++ b/inc/lang/hr/pwconfirm.txt
@@ -7,7 +7,3 @@ Ako to niste bili Vi, molimo da samo ignorirate ovu poruku.
 Da bi ste potvrdili da ste to ipak bili Vi, molimo slijedite link u nastavku:
 
 @CONFIRM@
-
--- 
-Ova poruka je generirana od strane DokuWiki dostupnog na
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/hr/registermail.txt b/inc/lang/hr/registermail.txt
index ceaf3fb83..9c556d9e3 100644
--- a/inc/lang/hr/registermail.txt
+++ b/inc/lang/hr/registermail.txt
@@ -2,13 +2,9 @@ Novi korisnik je registriran. Ovdje su detalji:
 
 Korisničko ime : @NEWUSER@
 Puno ime       : @NEWNAME@
-e-pošta        : @NEWEMAIL@ 
+e-pošta        : @NEWEMAIL@
 
-Datum      : @DATE@ 
+Datum      : @DATE@
 Preglednik : @BROWSER@
-IP-Adresa  : @IPADDRESS@ 
+IP-Adresa  : @IPADDRESS@
 Računalo   : @HOSTNAME@
-
--- 
-Ova poruka je generirana od strane DokuWiki dostupnog na
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/hr/subscr_digest.txt b/inc/lang/hr/subscr_digest.txt
index fad158d76..8a13c01bc 100644
--- a/inc/lang/hr/subscr_digest.txt
+++ b/inc/lang/hr/subscr_digest.txt
@@ -13,7 +13,3 @@ Nova verzija: @NEWPAGE@
 Da poništite obavijesti o izmjenama prijavite se na wiki @DOKUWIKIURL@ i zatim posjetite
 @SUBSCRIBE@
 i odjavite se s promjena na stranici i/ili imeničkom prostoru.
-
--- 
-Ova poruka je generirana od strane DokuWiki dostupnog na
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/hr/subscr_list.txt b/inc/lang/hr/subscr_list.txt
index 611c76938..75a434042 100644
--- a/inc/lang/hr/subscr_list.txt
+++ b/inc/lang/hr/subscr_list.txt
@@ -9,7 +9,3 @@ Stranice u imeničkom prostoru @PAGE@ na @TITLE@ wiki-u su izmijenjene. Ovo su i
 Da poništite obavijesti o izmjenama prijavite se na wiki @DOKUWIKIURL@ i zatim posjetite
 @SUBSCRIBE@
 i odjavite se s promjena na stranici i/ili imeničkom prostoru.
-
--- 
-Ova poruka je generirana od strane DokuWiki dostupnog na
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/hr/subscr_single.txt b/inc/lang/hr/subscr_single.txt
index 18f66901c..31d492f1a 100644
--- a/inc/lang/hr/subscr_single.txt
+++ b/inc/lang/hr/subscr_single.txt
@@ -16,7 +16,3 @@ Nova verzija : @NEWPAGE@
 Da poništite obavijesti o izmjenama prijavite se na wiki @DOKUWIKIURL@ i zatim posjetite
 @SUBSCRIBE@
 i odjavite se s promjena na stranici i/ili imeničkom prostoru.
-
--- 
-Ova poruka je generirana od strane DokuWiki dostupnog na
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/hr/uploadmail.txt b/inc/lang/hr/uploadmail.txt
index 5b18b2ba3..51fe80380 100644
--- a/inc/lang/hr/uploadmail.txt
+++ b/inc/lang/hr/uploadmail.txt
@@ -9,7 +9,3 @@ Računalo     : @HOSTNAME@
 Veličina     : @SIZE@
 MIME Tip     : @MIME@
 Korisnik     : @USER@
-
--- 
-Ova poruka je generirana od strane DokuWiki dostupnog na
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/hu-formal/lang.php b/inc/lang/hu-formal/lang.php
index a98bdc0d3..7d6d69d89 100644
--- a/inc/lang/hu-formal/lang.php
+++ b/inc/lang/hu-formal/lang.php
@@ -25,3 +25,4 @@ $lang['btn_older']             = 'régebbi >>';
 $lang['btn_revs']              = 'Korábbi változatok';
 $lang['btn_recent']            = 'Legújabb változások';
 $lang['btn_upload']            = 'Feltöltés';
+$lang['email_signature'] = 'Ezt a levelet a DokuWiki generálta';
diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php
index bdc78f68d..0e2667e92 100644
--- a/inc/lang/hu/lang.php
+++ b/inc/lang/hu/lang.php
@@ -345,3 +345,4 @@ $lang['currentns']             = 'Aktuális névtér';
 $lang['searchresult']          = 'Keresés eredménye';
 $lang['plainhtml']             = 'Sima HTML';
 $lang['wikimarkup']            = 'Wiki-jelölőnyelv';
+$lang['email_signature'] = 'Ezt a levelet a DokuWiki generálta';
diff --git a/inc/lang/hu/mailtext.txt b/inc/lang/hu/mailtext.txt
index 9b0c2921e..d8d0336ce 100644
--- a/inc/lang/hu/mailtext.txt
+++ b/inc/lang/hu/mailtext.txt
@@ -10,7 +10,3 @@ Előző változat: @OLDPAGE@
 Felhasználó: @USER@
 
 @DIFF@
-
-
--- 
-Ezt a levelet a @DOKUWIKIURL@ DokuWiki generálta.
diff --git a/inc/lang/hu/password.txt b/inc/lang/hu/password.txt
index db24b9009..49cf69fed 100644
--- a/inc/lang/hu/password.txt
+++ b/inc/lang/hu/password.txt
@@ -4,7 +4,3 @@ A felhasználói adataid a @TITLE@ wikihez, a következő helyen:  @DOKUWIKIURL@
 
 Azonosító: @LOGIN@
 Jelszó: @PASSWORD@
-
--- 
-Ezt a levelet @DOKUWIKIURL@ DokuWiki generálta.
-
diff --git a/inc/lang/hu/pwconfirm.txt b/inc/lang/hu/pwconfirm.txt
index da677d151..203dc3975 100644
--- a/inc/lang/hu/pwconfirm.txt
+++ b/inc/lang/hu/pwconfirm.txt
@@ -9,6 +9,3 @@ Ha Te voltál, az új jelszó kérelmed megerősítéséhez kattints a
 következő linkre vagy másold a böngésződbe:
 
 @CONFIRM@
-
--- 
-Ezt a levelet a @DOKUWIKIURL@ címen lévő DokuWiki generálta.
diff --git a/inc/lang/hu/registermail.txt b/inc/lang/hu/registermail.txt
index d45ef0d38..d37d59b81 100644
--- a/inc/lang/hu/registermail.txt
+++ b/inc/lang/hu/registermail.txt
@@ -8,6 +8,3 @@ Dátum: @DATE@
 Böngésző: @BROWSER@
 IP-cím : @IPADDRESS@
 Gép neve: @HOSTNAME@
-
--- 
-Ezt a levelet @DOKUWIKIURL@ DokuWiki generálta.
\ No newline at end of file
diff --git a/inc/lang/hu/subscr_digest.txt b/inc/lang/hu/subscr_digest.txt
index b00e0bba7..874c934af 100644
--- a/inc/lang/hu/subscr_digest.txt
+++ b/inc/lang/hu/subscr_digest.txt
@@ -11,6 +11,3 @@ Régi verzió: @OLDPAGE@
 Új verzió: @NEWPAGE@
 
 Ha nem szeretnél értesítéseket kapni, jelentkezz be a wiki-be itt: @DOKUWIKIURL@, majd ezen az oldalon tudsz leiratkozni: @SUBSCRIBE@.
-
---
-Ezt a levelet a @DOKUWIKIURL@ DokuWiki generálta.
\ No newline at end of file
diff --git a/inc/lang/hu/subscr_list.txt b/inc/lang/hu/subscr_list.txt
index 13295ff41..c87d6dc4a 100644
--- a/inc/lang/hu/subscr_list.txt
+++ b/inc/lang/hu/subscr_list.txt
@@ -8,6 +8,3 @@ A módosított oldalak a következők:
 --------------------------------------------------------
 
 Ha nem szeretnél értesítéseket kapni, jelentkezz be a wiki-be itt: @DOKUWIKIURL@, majd ezen az oldalon tudsz leiratkozni: @SUBSCRIBE@.
-
---
-Ezt a levelet a @DOKUWIKIURL@ DokuWiki generálta.
\ No newline at end of file
diff --git a/inc/lang/hu/subscr_single.txt b/inc/lang/hu/subscr_single.txt
index e28226de5..8d36def99 100644
--- a/inc/lang/hu/subscr_single.txt
+++ b/inc/lang/hu/subscr_single.txt
@@ -14,7 +14,3 @@ Régi verzió: @OLDPAGE@
 Új verzió: @NEWPAGE@
 
 Ha nem szeretnél értesítéseket kapni, jelentkezz be a wiki-be itt: @DOKUWIKIURL@, majd ezen az oldalon tudsz leiratkozni: @NEWPAGE@.
-
---
-Ezt a levelet a DokuWiki generálta
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/hu/uploadmail.txt b/inc/lang/hu/uploadmail.txt
index c772ab220..62e0c2e56 100644
--- a/inc/lang/hu/uploadmail.txt
+++ b/inc/lang/hu/uploadmail.txt
@@ -8,6 +8,3 @@ Gépnév: @HOSTNAME@
 Méret: @SIZE@
 MIME-típus: @MIME@
 Felhasználó: @USER@
-
--- 
-Ezt a levelet @DOKUWIKIURL@ DokuWiki generálta.
\ No newline at end of file
diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php
index a533883b6..a7d3542d5 100644
--- a/inc/lang/ia/lang.php
+++ b/inc/lang/ia/lang.php
@@ -261,3 +261,4 @@ $lang['days']                  = '%d dies retro';
 $lang['hours']                 = '%d horas retro';
 $lang['minutes']               = '%d minutas retro';
 $lang['seconds']               = '%d secundas retro';
+$lang['email_signature'] = 'Iste message ha essite generate per DokuWiki a';
diff --git a/inc/lang/ia/mailtext.txt b/inc/lang/ia/mailtext.txt
index 14c1a3a60..ed3eb2512 100644
--- a/inc/lang/ia/mailtext.txt
+++ b/inc/lang/ia/mailtext.txt
@@ -10,8 +10,3 @@ Summario: @SUMMARY@
 Usator : @USER@
 
 @DIFF@
-
-
--- 
-Iste e-mail ha essite generate per DokuWiki a
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ia/password.txt b/inc/lang/ia/password.txt
index 9ad93d6ed..bf0e40080 100644
--- a/inc/lang/ia/password.txt
+++ b/inc/lang/ia/password.txt
@@ -4,7 +4,3 @@ Ecce tu datos de usator pro @TITLE@ a @DOKUWIKIURL@
 
 Nomine de usator : @LOGIN@
 Contrasigno : @PASSWORD@
-
--- 
-Iste message ha essite generate per DokuWiki a
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ia/pwconfirm.txt b/inc/lang/ia/pwconfirm.txt
index a490f7929..c8e3d002c 100644
--- a/inc/lang/ia/pwconfirm.txt
+++ b/inc/lang/ia/pwconfirm.txt
@@ -8,7 +8,3 @@ Si tu non ha requestate un nove contrasigno, alora simplemente ignora iste messa
 Pro confirmar que le requesta realmente ha essite inviate per te, per favor usa le ligamine sequente.
 
 @CONFIRM@
-
--- 
-Iste message ha essite generate per DokuWiki a
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ia/registermail.txt b/inc/lang/ia/registermail.txt
index c4e9d56bc..b6fa332aa 100644
--- a/inc/lang/ia/registermail.txt
+++ b/inc/lang/ia/registermail.txt
@@ -8,7 +8,3 @@ Data : @DATE@
 Navigator : @BROWSER@
 Adresse IP : @IPADDRESS@
 Nomine host : @HOSTNAME@
-
--- 
-Iste message ha essite generate per DokuWiki a
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ia/subscr_digest.txt b/inc/lang/ia/subscr_digest.txt
index ba7b92d8b..b2cac2c15 100644
--- a/inc/lang/ia/subscr_digest.txt
+++ b/inc/lang/ia/subscr_digest.txt
@@ -14,7 +14,3 @@ Pro cancellar le notificationes de paginas, aperi un session al wiki a
 @DOKUWIKIURL@ postea visita
 @SUBSCRIBE@
 e cancella tu subscription al modificationes in paginas e/o spatios de nomines.
-
---
-Iste message ha essite generate per DokuWiki a
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ia/subscr_list.txt b/inc/lang/ia/subscr_list.txt
index 9f93db252..01ff3507c 100644
--- a/inc/lang/ia/subscr_list.txt
+++ b/inc/lang/ia/subscr_list.txt
@@ -11,7 +11,3 @@ Pro cancellar le notificationes de paginas, aperi un session al wiki a
 @DOKUWIKIURL@ postea visita
 @SUBSCRIBE@
 e cancella tu subscription al modificationes in paginas e/o spatios de nomines.
-
---
-Iste message ha essite generate per DokuWiki a
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ia/subscr_single.txt b/inc/lang/ia/subscr_single.txt
index 445df197c..da670ca69 100644
--- a/inc/lang/ia/subscr_single.txt
+++ b/inc/lang/ia/subscr_single.txt
@@ -17,10 +17,3 @@ Pro cancellar le notificationes de paginas, aperi un session al wiki a
 @DOKUWIKIURL@ postea visita
 @SUBSCRIBE@
 e cancella tu subscription al modificationes in paginas e/o spatios de nomines.
-
---
-Iste message ha essite generate per DokuWiki a
-@DOKUWIKIURL@
---
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ia/uploadmail.txt b/inc/lang/ia/uploadmail.txt
index 8f120f25b..c406d4b31 100644
--- a/inc/lang/ia/uploadmail.txt
+++ b/inc/lang/ia/uploadmail.txt
@@ -8,7 +8,3 @@ Nomine host: @HOSTNAME@
 Dimension : @SIZE@
 Typo MIME : @MIME@
 Usator : @USER@
-
--- 
-Iste message ha essite generate per DokuWiki a
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php
index dc4ca00e0..5a4dc20ea 100644
--- a/inc/lang/id/lang.php
+++ b/inc/lang/id/lang.php
@@ -327,3 +327,4 @@ $lang['media_restore']         = 'Kembalikan versi ini';
 $lang['currentns']             = 'Namespace saat ini';
 $lang['searchresult']          = 'Hasil Pencarian';
 $lang['wikimarkup']            = 'Markah Wiki';
+$lang['email_signature'] = 'Email ini dibuat otomatis oleh DokuWiki';
diff --git a/inc/lang/id/mailtext.txt b/inc/lang/id/mailtext.txt
index 7eede9b3c..df9699ee4 100644
--- a/inc/lang/id/mailtext.txt
+++ b/inc/lang/id/mailtext.txt
@@ -10,8 +10,3 @@ Edit Summary: @SUMMARY@
 User        : @USER@
 
 @DIFF@
-
-
--- 
-Email ini digenerate oleh DokuWiki di
-@DOKUWIKIURL@
diff --git a/inc/lang/id/password.txt b/inc/lang/id/password.txt
index 2e64b8dc3..285915ccf 100644
--- a/inc/lang/id/password.txt
+++ b/inc/lang/id/password.txt
@@ -4,7 +4,3 @@ Berikut data Anda untuk @TITLE@ di @DOKUWIKIURL@
 
 Login    : @LOGIN@
 Password : @PASSWORD@
-
--- 
-Email ini dibuat otomatis oleh DokuWiki
-@DOKUWIKIURL@
diff --git a/inc/lang/id/pwconfirm.txt b/inc/lang/id/pwconfirm.txt
index 19131ee47..a7877926e 100644
--- a/inc/lang/id/pwconfirm.txt
+++ b/inc/lang/id/pwconfirm.txt
@@ -7,7 +7,3 @@ Jika Anda tidak meminta password baru, mohon mengacuhkan email ini.
 Untuk mengkonfirmasi bahwa permintaan tersebut adalah benar dari Anda, silahkan gunakan link dibawah.
 
 @CONFIRM@
-
--- 
-Email ini dibuat otomatis  oleh DokuWiki
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/id/registermail.txt b/inc/lang/id/registermail.txt
index ed8c97ca3..5943e35a5 100644
--- a/inc/lang/id/registermail.txt
+++ b/inc/lang/id/registermail.txt
@@ -8,7 +8,3 @@ Date : @DATE@
 Browser : @BROWSER@
 IP-Address : @IPADDRESS@
 Hostname : @HOSTNAME@
-
--- 
-Email ini dibuat otomatis oleh DokuWIki
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/id/subscr_digest.txt b/inc/lang/id/subscr_digest.txt
index 5e1041c04..2a5176bae 100644
--- a/inc/lang/id/subscr_digest.txt
+++ b/inc/lang/id/subscr_digest.txt
@@ -1,17 +1,14 @@
-Hei! 
+Hei!
 
-Halaman @PAGE@ di wiki @TITLE@ telah disunting. 
+Halaman @PAGE@ di wiki @TITLE@ telah disunting.
 Berikut perubahannya:
 
--------------------------------------------------------- 
-@DIFF@ 
--------------------------------------------------------- 
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
 
-Revisi lama: @OLDPAGE@ 
+Revisi lama: @OLDPAGE@
 
-Revisi baru: @NEWPAGE@ 
+Revisi baru: @NEWPAGE@
 
 Untuk menonaktifkan pemberitahuan ini, masuk ke wiki di @DOKUWIKIURL@ kemudian kunjungi @SUBSCRIBE@ dan halaman batal berlangganan dan/atau namespace yang diubah.
-
--- 
-Email ini dibuat oleh DokuWiki di @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/id/uploadmail.txt b/inc/lang/id/uploadmail.txt
index dc628fc11..bb5f5e81f 100644
--- a/inc/lang/id/uploadmail.txt
+++ b/inc/lang/id/uploadmail.txt
@@ -8,7 +8,3 @@ Hostname : @HOSTNAME@
 Size : @SIZE@
 MIME Type : @MIME@
 User : @USER@
-
--- 
-Email ini dibuat otomatis oleh DokuWiki
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index c6b99d5b5..ab0f68542 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -354,3 +354,4 @@ $lang['currentns']             = 'Namespace corrente';
 $lang['searchresult']          = 'Risultati della ricerca';
 $lang['plainhtml']             = 'HTML';
 $lang['page_nonexist_rev']     = 'Pagina non esistente a %s. E\' stata creata successivamente a <a href="%s">%s</a>.';
+$lang['email_signature'] = 'Questa email è stata generata dal DokuWiki all'indirizzo';
diff --git a/inc/lang/it/mailtext.txt b/inc/lang/it/mailtext.txt
index 3a326961e..3374d37dd 100644
--- a/inc/lang/it/mailtext.txt
+++ b/inc/lang/it/mailtext.txt
@@ -10,8 +10,3 @@ Oggetto della modifica : @SUMMARY@
 Utente : @USER@
 
 @DIFF@
-
-
--- 
-Questa email è stata generata dal DokuWiki all'indirizzo
-@DOKUWIKIURL@
diff --git a/inc/lang/it/password.txt b/inc/lang/it/password.txt
index 670d5ae44..f7ca9e98d 100644
--- a/inc/lang/it/password.txt
+++ b/inc/lang/it/password.txt
@@ -4,7 +4,3 @@ Questi sono i tuoi dati di accesso per @TITLE@ su @DOKUWIKIURL@
 
 Nome utente : @LOGIN@
 Password    : @PASSWORD@
-
--- 
-Questa email è stata generata dal DokuWiki all'indirizzo
-@DOKUWIKIURL@
diff --git a/inc/lang/it/pwconfirm.txt b/inc/lang/it/pwconfirm.txt
index 8a594ded8..3eb36fb67 100644
--- a/inc/lang/it/pwconfirm.txt
+++ b/inc/lang/it/pwconfirm.txt
@@ -9,7 +9,3 @@ Per confermare che la richiesta è stata realmente inviata da te usa il
 seguente collegamento.
 
 @CONFIRM@
-
--- 
-Questa email è stata generata dal DokuWiki all'indirizzo
-@DOKUWIKIURL@
diff --git a/inc/lang/it/registermail.txt b/inc/lang/it/registermail.txt
index 30a6fed48..77454cd3f 100644
--- a/inc/lang/it/registermail.txt
+++ b/inc/lang/it/registermail.txt
@@ -8,7 +8,3 @@ Data : @DATE@
 Browser : @BROWSER@
 Indirizzo IP : @IPADDRESS@
 Nome host : @HOSTNAME@
-
--- 
-Questa email è stata generata dal DokuWiki all'indirizzo
-@DOKUWIKIURL@
diff --git a/inc/lang/it/subscr_digest.txt b/inc/lang/it/subscr_digest.txt
index a19128702..29fd4bcc5 100644
--- a/inc/lang/it/subscr_digest.txt
+++ b/inc/lang/it/subscr_digest.txt
@@ -10,11 +10,7 @@ Queste sono le modifiche:
 Vecchia revisione: @OLDPAGE@
 Nuova revisione: @NEWPAGE@
 
-Per non ricevere più queste notifiche collegati al 
+Per non ricevere più queste notifiche collegati al
 wiki @DOKUWIKIURL@ e poi visita @SUBSCRIBE@
-e rimuovi la sottoscrizione alle modifiche delle 
+e rimuovi la sottoscrizione alle modifiche delle
 pagine e/o categorie.
-
---
-Questa email è stata generata dal DokuWiki all'indirizzo
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/it/subscr_list.txt b/inc/lang/it/subscr_list.txt
index 8eb7acd3c..f8703885b 100644
--- a/inc/lang/it/subscr_list.txt
+++ b/inc/lang/it/subscr_list.txt
@@ -8,11 +8,7 @@ Queste sono le pagine modificate:
 @DIFF@
 --------------------------------------------------------
 
-Per non ricevere più queste notifiche collegati al 
+Per non ricevere più queste notifiche collegati al
 wiki @DOKUWIKIURL@ e poi visita @SUBSCRIBE@
-e rimuovi la sottoscrizione alle modifiche delle 
+e rimuovi la sottoscrizione alle modifiche delle
 pagine e/o categorie.
-
---
-Questa email è stata generata dal DokuWiki all'indirizzo
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/it/subscr_single.txt b/inc/lang/it/subscr_single.txt
index a8649a4ef..421a156bc 100644
--- a/inc/lang/it/subscr_single.txt
+++ b/inc/lang/it/subscr_single.txt
@@ -13,12 +13,8 @@ Sommario modifica: @SUMMARY@
 Vecchia revisione: @OLDPAGE@
 Nuova revisione: @NEWPAGE@
 
-Per non ricevere più queste notifiche, collegati al 
+Per non ricevere più queste notifiche, collegati al
 wiki all'indirizzo @DOKUWIKIURL@ e poi visita
 @SUBSCRIBE@
-e rimuovi la sottoscrizione alle modifiche della 
+e rimuovi la sottoscrizione alle modifiche della
 pagina o categoria.
-
---
-Questa email è stata generata dal DokuWiki all'indirizzo
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/it/uploadmail.txt b/inc/lang/it/uploadmail.txt
index da3dacd36..4dd7cd463 100644
--- a/inc/lang/it/uploadmail.txt
+++ b/inc/lang/it/uploadmail.txt
@@ -8,7 +8,3 @@ Hostname : @HOSTNAME@
 Dimensione : @SIZE@
 Tipo MIME : @MIME@
 Utente : @USER@
-
--- 
-Questa email è stata generata dal DokuWiki all'indirizzo
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index 3a5f169e7..400395408 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -346,3 +346,4 @@ $lang['plainhtml']             = 'プレーンHTML';
 $lang['wikimarkup']            = 'Wikiマークアップ';
 $lang['page_nonexist_rev']     = '指定ページ %s はありません。このリンク <a href="%s">%s</a> から作成できます。';
 $lang['unable_to_parse_date']  = 'パラメータ "%s" を処理できません。';
+$lang['email_signature'] = 'このメールは次のDokuWikiより自動的に送信されています。';
diff --git a/inc/lang/ja/mailtext.txt b/inc/lang/ja/mailtext.txt
index 09688cbb7..4bad3d945 100644
--- a/inc/lang/ja/mailtext.txt
+++ b/inc/lang/ja/mailtext.txt
@@ -10,8 +10,3 @@ IPアドレス  : @IPADDRESS@
 ユーザー名  : @USER@
 
 @DIFF@
-
-
--- 
-このメールは次のDokuWikiより自動的に送信されています。
-@DOKUWIKIURL@
diff --git a/inc/lang/ja/password.txt b/inc/lang/ja/password.txt
index c00fe0bc2..fa11b1044 100644
--- a/inc/lang/ja/password.txt
+++ b/inc/lang/ja/password.txt
@@ -4,7 +4,3 @@
 
 ユーザー名 : @LOGIN@
 パスワード : @PASSWORD@
-
--- 
-このメールは次のDokuWikiより自動的に送信されています。
-@DOKUWIKIURL@
diff --git a/inc/lang/ja/pwconfirm.txt b/inc/lang/ja/pwconfirm.txt
index 98ccfcdea..c53b784f5 100644
--- a/inc/lang/ja/pwconfirm.txt
+++ b/inc/lang/ja/pwconfirm.txt
@@ -7,7 +7,3 @@
 このリクエストを行った本人であれば、以下のリンクから作業を完了させてください。
 
 @CONFIRM@
-
--- 
-このメールは次のDokuWikiより自動的に送信されています。
-@DOKUWIKIURL@
diff --git a/inc/lang/ja/registermail.txt b/inc/lang/ja/registermail.txt
index 2b272de40..ad5241a0b 100644
--- a/inc/lang/ja/registermail.txt
+++ b/inc/lang/ja/registermail.txt
@@ -8,7 +8,3 @@
 ブラウザ       : @BROWSER@
 IPアドレス     : @IPADDRESS@
 ホスト名       : @HOSTNAME@
-
--- 
-このメールは次のDokuWikiより自動的に送信されています。
-@DOKUWIKIURL@
diff --git a/inc/lang/ja/subscr_digest.txt b/inc/lang/ja/subscr_digest.txt
index b6c91a3a6..026a2fe89 100644
--- a/inc/lang/ja/subscr_digest.txt
+++ b/inc/lang/ja/subscr_digest.txt
@@ -15,7 +15,3 @@
 その後、
 @SUBSCRIBE@
 ページと名前空間の変更に対する購読を解除してください。
-
--- 
-このメールは次の DokuWiki によって生成されました:
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ja/subscr_list.txt b/inc/lang/ja/subscr_list.txt
index 9869fb811..dbe37c7f8 100644
--- a/inc/lang/ja/subscr_list.txt
+++ b/inc/lang/ja/subscr_list.txt
@@ -13,7 +13,3 @@
 その後、
 @SUBSCRIBE@
 ページと名前空間の変更に対する購読を解除してください。
-
--- 
-このメールは次の DokuWiki によって生成されました:
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ja/subscr_single.txt b/inc/lang/ja/subscr_single.txt
index 4620f73d6..4dac31e02 100644
--- a/inc/lang/ja/subscr_single.txt
+++ b/inc/lang/ja/subscr_single.txt
@@ -18,7 +18,3 @@
 その後、
 @SUBSCRIBE@
 ページと名前空間の変更に対する購読を解除してください。
-
--- 
-このメールは次の DokuWiki によって生成されました:
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ja/uploadmail.txt b/inc/lang/ja/uploadmail.txt
index 53f30db61..8734c91df 100644
--- a/inc/lang/ja/uploadmail.txt
+++ b/inc/lang/ja/uploadmail.txt
@@ -8,7 +8,3 @@ IPアドレス  : @IPADDRESS@
 サイズ      : @SIZE@
 MIMEタイプ  : @MIME@
 ユーザー名  : @USER@
-
--- 
-このメールは次のDokuWikiより自動的に送信されています。
-@DOKUWIKIURL@
diff --git a/inc/lang/km/lang.php b/inc/lang/km/lang.php
index 749fa419c..fb3fc3343 100644
--- a/inc/lang/km/lang.php
+++ b/inc/lang/km/lang.php
@@ -204,3 +204,4 @@ $lang['i_pol2']       = 'វីគីបិទជិត';
 $lang['i_retry']      = 'ម្តងទៀត';
 
 //Setup VIM: ex: et ts=2 :
+$lang['email_signature'] = 'អ៊ីមេលនេះបន្ចេអពីឌោគូវីគីនៅ';
diff --git a/inc/lang/km/password.txt b/inc/lang/km/password.txt
index a3495e7ae..8cdfcd81b 100644
--- a/inc/lang/km/password.txt
+++ b/inc/lang/km/password.txt
@@ -4,7 +4,3 @@
 
 នាមបង្រើ៖  @LOGIN@
 ពាក្សសម្ងាត៖ @PASSWORD@
-
--- 
-អ៊ីមេលនេះបន្ចេអពីឌោគូវីគីនៅ
-@DOKUWIKIURL@
diff --git a/inc/lang/km/pwconfirm.txt b/inc/lang/km/pwconfirm.txt
index 7c6a3ac97..34051aa4c 100644
--- a/inc/lang/km/pwconfirm.txt
+++ b/inc/lang/km/pwconfirm.txt
@@ -7,7 +7,3 @@
 សុំអះអាងដែលសំណើនេះដោយទៅតាមខ្សែ
 
 @CONFIRM@
-
--- 
-អ៊ីមេលនេះបង្កើតពីឌក្គូវីគីនៅ
-@DOKUWIKIURL@
diff --git a/inc/lang/ko/mailtext.txt b/inc/lang/ko/mailtext.txt
index c97f446e2..2b2225851 100644
--- a/inc/lang/ko/mailtext.txt
+++ b/inc/lang/ko/mailtext.txt
@@ -10,7 +10,3 @@ IP 주소: @IPADDRESS@
 사용자: @USER@
 
 @DIFF@
-
-
--- 
-이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/inc/lang/ko/password.txt b/inc/lang/ko/password.txt
index a60801ae1..1bd924668 100644
--- a/inc/lang/ko/password.txt
+++ b/inc/lang/ko/password.txt
@@ -4,6 +4,3 @@
 
 로그인: @LOGIN@
 비밀번호: @PASSWORD@
-
--- 
-이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/inc/lang/ko/pwconfirm.txt b/inc/lang/ko/pwconfirm.txt
index d820664f0..dfe32a0f4 100644
--- a/inc/lang/ko/pwconfirm.txt
+++ b/inc/lang/ko/pwconfirm.txt
@@ -8,6 +8,3 @@
 정말로 당신이 요청을 해서 보내졌는지 확인하려면 다음 링크를 사용하세요.
 
 @CONFIRM@
-
--- 
-이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/inc/lang/ko/registermail.txt b/inc/lang/ko/registermail.txt
index afa66686a..adc5a088c 100644
--- a/inc/lang/ko/registermail.txt
+++ b/inc/lang/ko/registermail.txt
@@ -8,6 +8,3 @@
 브라우저: @BROWSER@
 IP 주소: @IPADDRESS@
 호스트 이름: @HOSTNAME@
-
--- 
-이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/inc/lang/ko/subscr_digest.txt b/inc/lang/ko/subscr_digest.txt
index d1f2d4b99..bdb46ad3d 100644
--- a/inc/lang/ko/subscr_digest.txt
+++ b/inc/lang/ko/subscr_digest.txt
@@ -13,6 +13,3 @@
 
 문서 알림을 취소하려면, @DOKUWIKIURL@에 로그인한 뒤
 @SUBSCRIBE@ 문서를 방문해 문서나 이름공간의 구독을 취소하세요.
-
--- 
-이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/inc/lang/ko/subscr_list.txt b/inc/lang/ko/subscr_list.txt
index 95133bbc7..69a2d5399 100644
--- a/inc/lang/ko/subscr_list.txt
+++ b/inc/lang/ko/subscr_list.txt
@@ -9,6 +9,3 @@
 
 문서의 알림을 취소하려면, @DOKUWIKIURL@에 로그인한 뒤
 @SUBSCRIBE@ 문서를 방문해 문서나 이름공간의 구독을 취소하세요.
-
--- 
-이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/inc/lang/ko/subscr_single.txt b/inc/lang/ko/subscr_single.txt
index 1c7e551f0..425d0d960 100644
--- a/inc/lang/ko/subscr_single.txt
+++ b/inc/lang/ko/subscr_single.txt
@@ -15,6 +15,3 @@
 
 문서의 알림을 취소하려면, @DOKUWIKIURL@에 로그인한 뒤
 @SUBSCRIBE@ 문서를 방문해 문서나 이름공간의 구독을 취소하세요.
-
--- 
-이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/inc/lang/ko/uploadmail.txt b/inc/lang/ko/uploadmail.txt
index 430a843b2..1b6e55cdc 100644
--- a/inc/lang/ko/uploadmail.txt
+++ b/inc/lang/ko/uploadmail.txt
@@ -9,6 +9,3 @@ IP 주소: @IPADDRESS@
 크기: @SIZE@
 MIME 유형: @MIME@
 사용자: @USER@
-
--- 
-이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/inc/lang/ku/mailtext.txt b/inc/lang/ku/mailtext.txt
index 44a3f6553..aea14d459 100644
--- a/inc/lang/ku/mailtext.txt
+++ b/inc/lang/ku/mailtext.txt
@@ -10,8 +10,3 @@ Edit Summary: @SUMMARY@
 User        : @USER@
 
 @DIFF@
-
-
--- 
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
diff --git a/inc/lang/ku/password.txt b/inc/lang/ku/password.txt
index 6d5cbe678..0a0dfb52b 100644
--- a/inc/lang/ku/password.txt
+++ b/inc/lang/ku/password.txt
@@ -4,7 +4,3 @@ Here is your userdata for @TITLE@ at @DOKUWIKIURL@
 
 Login    : @LOGIN@
 Password : @PASSWORD@
-
--- 
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php
index 66cd13967..207f1eb9c 100644
--- a/inc/lang/la/lang.php
+++ b/inc/lang/la/lang.php
@@ -260,3 +260,4 @@ $lang['hours']                 = 'a horis %d';
 $lang['minutes']               = 'a minutis %d';
 $lang['seconds']               = 'a secundis %d';
 $lang['wordblock']             = 'Mutationes non seruantur, eo quod mala uerba contenit';
+$lang['email_signature'] = 'Hic cursus generatus a';
diff --git a/inc/lang/la/mailtext.txt b/inc/lang/la/mailtext.txt
index 2d2504c8c..8348378dc 100644
--- a/inc/lang/la/mailtext.txt
+++ b/inc/lang/la/mailtext.txt
@@ -9,8 +9,3 @@ Summa recensere: @SUMMARY@
 Sodalis : @USER@
 
 @DIFF@
-
-
--- 
-Hic cursus generatus a(b)
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/la/password.txt b/inc/lang/la/password.txt
index f49f4b85d..05573576a 100644
--- a/inc/lang/la/password.txt
+++ b/inc/lang/la/password.txt
@@ -4,7 +4,3 @@ Hae res @TITLE@, i ad paginam: @DOKUWIKIURL@
 
 Sodalis nomen : @LOGIN@
 Tessera : @PASSWORD@
-
--- 
-Hic cursus generatus a(b)
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/la/pwconfirm.txt b/inc/lang/la/pwconfirm.txt
index 32e351a9c..ade0a1caf 100644
--- a/inc/lang/la/pwconfirm.txt
+++ b/inc/lang/la/pwconfirm.txt
@@ -8,7 +8,3 @@ Si nouam tesseram non petiuisti, hoc nuntium ignorat.
 Ut hoc nuntium petiuisti, premendo hunc nexum confirmas.
 
 @CONFIRM@
-
--- 
-Hic cursus generatus a
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/la/registermail.txt b/inc/lang/la/registermail.txt
index 73901950e..1f2865973 100644
--- a/inc/lang/la/registermail.txt
+++ b/inc/lang/la/registermail.txt
@@ -8,7 +8,3 @@ Dies : @DATE@
 Machina interretis : @BROWSER@
 IP-numerus : @IPADDRESS@
 Hostname : @HOSTNAME@
-
--- 
-Hic cursus generatus a
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/la/subscr_digest.txt b/inc/lang/la/subscr_digest.txt
index 32d378a7e..d4ca79ab6 100644
--- a/inc/lang/la/subscr_digest.txt
+++ b/inc/lang/la/subscr_digest.txt
@@ -14,7 +14,3 @@ Ut paginae adnotationes deleas, in uicem ineas in
 @DOKUWIKIURL@, deinde uideas
 @SUBSCRIBE@
 et paginarum generum optiones mutes.
-
---
-Hic cursus a uicis generatus
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/la/subscr_list.txt b/inc/lang/la/subscr_list.txt
index e6ff8d89d..3921ff6bc 100644
--- a/inc/lang/la/subscr_list.txt
+++ b/inc/lang/la/subscr_list.txt
@@ -11,7 +11,3 @@ Ut adnotationes deleas, preme hic
 @DOKUWIKIURL@ then visit
 @SUBSCRIBE@
 et paginarum et\aut generum mutationes tollis.
-
---
-Hic cursus generatus a(b)
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/la/subscr_single.txt b/inc/lang/la/subscr_single.txt
index 14285014c..4bfd7ef40 100644
--- a/inc/lang/la/subscr_single.txt
+++ b/inc/lang/la/subscr_single.txt
@@ -17,7 +17,3 @@ Ut paginae adnotationes deleas, in uicem ineas in
 @DOKUWIKIURL@, deinde uideas
 @SUBSCRIBE@
 et paginarum et\aut generum optiones mutasa.
-
---
-Hic cursus a uicis generatus
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/la/uploadmail.txt b/inc/lang/la/uploadmail.txt
index 044297973..329bf31a1 100644
--- a/inc/lang/la/uploadmail.txt
+++ b/inc/lang/la/uploadmail.txt
@@ -8,7 +8,3 @@ Hospes situs : @HOSTNAME@
 Pondus : @SIZE@
 MIME Genus : @MIME@
 Sodalis : @USER@
-
--- 
-Hic cursu generatus a(b)
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php
index 1090878e2..c1762af96 100644
--- a/inc/lang/lb/lang.php
+++ b/inc/lang/lb/lang.php
@@ -195,3 +195,4 @@ $lang['days']                  = 'virun %d Deeg';
 $lang['hours']                 = 'virun %d Stonnen';
 $lang['minutes']               = 'virun %d Minutten';
 $lang['seconds']               = 'virun %d Sekonnen';
+$lang['email_signature'] = 'Dës Mail gouf generéiert vun DokuWiki op';
diff --git a/inc/lang/lb/mailtext.txt b/inc/lang/lb/mailtext.txt
index 520cd8483..59c46e088 100644
--- a/inc/lang/lb/mailtext.txt
+++ b/inc/lang/lb/mailtext.txt
@@ -10,8 +10,3 @@ Zesummefaassung: @SUMMARY@
 Benotzer       : @USER@
 
 @DIFF@
-
-
--- 
-Dës Mail gouf generéiert vum DokuWiki op
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/lb/password.txt b/inc/lang/lb/password.txt
index bd8062e42..1d058323b 100644
--- a/inc/lang/lb/password.txt
+++ b/inc/lang/lb/password.txt
@@ -4,7 +4,3 @@ Hei sinn deng Benotzerdaten fir @TITLE@ op @DOKUWIKIURL@
 
 Benotzernumm : @LOGIN@
 Passwuert    : @PASSWORD@
-
--- 
-Dës Mail gouf generéiert vun DokuWiki op
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/lb/pwconfirm.txt b/inc/lang/lb/pwconfirm.txt
index 11246572b..efb0406e1 100644
--- a/inc/lang/lb/pwconfirm.txt
+++ b/inc/lang/lb/pwconfirm.txt
@@ -1,6 +1,6 @@
 Moien @FULLNAME@!
 
-Iergendeen huet e neit Passwuert fir däin @TITLE@ 
+Iergendeen huet e neit Passwuert fir däin @TITLE@
 login op @DOKUWIKIURL@ gefrot
 
 Wanns de kee nei Passwuert gefrot hues, dann ignoréier dës Mail.
@@ -9,7 +9,3 @@ Fir ze konfirméieren dass du wierklech en neit Passwuert gefrot hues,
 klick op folgende Link.
 
 @CONFIRM@
-
--- 
-Des Mail gouf generéiert vun DokuWiki op
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/lb/registermail.txt b/inc/lang/lb/registermail.txt
index 0f4fee8ec..5240dee84 100644
--- a/inc/lang/lb/registermail.txt
+++ b/inc/lang/lb/registermail.txt
@@ -8,7 +8,3 @@ Datum       : @DATE@
 Browser     : @BROWSER@
 IP-Adress   : @IPADDRESS@
 Hostnumm    : @HOSTNAME@
-
--- 
-Des Mail gouf generéiert vun DokuWiki op
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/lb/uploadmail.txt b/inc/lang/lb/uploadmail.txt
index 3c2587cb4..c4b9e8dff 100644
--- a/inc/lang/lb/uploadmail.txt
+++ b/inc/lang/lb/uploadmail.txt
@@ -8,7 +8,3 @@ Hostnumm    : @HOSTNAME@
 Gréisst     : @SIZE@
 MIME Typ    : @MIME@
 Benotzer    : @USER@
-
--- 
-Dës Mail gouf generéiert vun DokuWiki op
-@DOKUWIKIURL@
diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php
index d53a117f4..eeaec223b 100644
--- a/inc/lang/lt/lang.php
+++ b/inc/lang/lt/lang.php
@@ -182,3 +182,4 @@ $lang['i_wikiname']            = 'Wiki vardas';
 $lang['i_enableacl']           = 'Įjungti ACL (rekomenduojama)';
 $lang['i_superuser']           = 'Supervartotojas';
 $lang['i_problems']            = 'Instaliavimo metu buvo klaidų, kurios pateiktos žemiau. Tęsti negalima, kol nebus pašalintos priežastys.';
+$lang['email_signature'] = 'Šis laiškas buvo sugeneruotas DokuWiki';
diff --git a/inc/lang/lt/mailtext.txt b/inc/lang/lt/mailtext.txt
index 63b2f591e..2abd3ab81 100644
--- a/inc/lang/lt/mailtext.txt
+++ b/inc/lang/lt/mailtext.txt
@@ -12,7 +12,3 @@ Vartotojas        : @USER@
 Pakeitimo diff'as:
 
 @DIFF@
-
-
--- 
-Šis laiškas buvo sugeneruotas DokuWiki (@DOKUWIKIURL@).
diff --git a/inc/lang/lt/password.txt b/inc/lang/lt/password.txt
index 8c65cf8c5..0bcc8e7b5 100644
--- a/inc/lang/lt/password.txt
+++ b/inc/lang/lt/password.txt
@@ -4,6 +4,3 @@ Labas, @FULLNAME@!
 
 Prisijungimo vardas:  @LOGIN@
 Slaptažodis:          @PASSWORD@
-
--- 
-Šis laiškas sugeneruotas DokuWiki sistemos (@DOKUWIKIURL@).
diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php
index ddc97fa89..5ae29de2e 100644
--- a/inc/lang/lv/lang.php
+++ b/inc/lang/lv/lang.php
@@ -337,3 +337,4 @@ $lang['currentns']             = 'Pašreizējā sadaļa';
 $lang['searchresult']          = 'Meklēšanas rezultāti';
 $lang['plainhtml']             = 'TÄ«rs HTML';
 $lang['wikimarkup']            = 'Viki iezīmēšana valoda';
+$lang['email_signature'] = 'Vēstuli nosūtījusi DokuWiki programma no';
diff --git a/inc/lang/lv/mailtext.txt b/inc/lang/lv/mailtext.txt
index cd4a5d6d8..831600313 100644
--- a/inc/lang/lv/mailtext.txt
+++ b/inc/lang/lv/mailtext.txt
@@ -10,9 +10,3 @@ Anotācija    : @SUMMARY@
 Lietotājs    : @USER@
 
 @DIFF@
-
-
--- 
-Vēstuli nosūtījusi DokuWiki programma no
-@DOKUWIKIURL@ datora
-
diff --git a/inc/lang/lv/password.txt b/inc/lang/lv/password.txt
index be5e7e2a7..7cd7d8b25 100644
--- a/inc/lang/lv/password.txt
+++ b/inc/lang/lv/password.txt
@@ -4,6 +4,3 @@ Tavi  dati @TITLE@ lapām uz servera @DOKUWIKIURL@ ir
 
 Lietotājvārds:  @LOGIN@
 Parole:  @PASSWORD@
-
--- 
-Å o dokumentu izveidojusi DokuWiki programma uz servera @DOKUWIKIURL@
diff --git a/inc/lang/lv/pwconfirm.txt b/inc/lang/lv/pwconfirm.txt
index 308ca29a1..62c8bedc8 100644
--- a/inc/lang/lv/pwconfirm.txt
+++ b/inc/lang/lv/pwconfirm.txt
@@ -8,7 +8,3 @@ Ja paroli neesi prasījis, ignorē šo vēstuli.
 Lai apstiprinātu, ka esi paroli pieprasījis  lieto norādīto saiti.
 
 @CONFIRM@
-
--- 
-Šo vēstuli ģenerējusi DokuWiki no
-@DOKUWIKIURL
\ No newline at end of file
diff --git a/inc/lang/lv/registermail.txt b/inc/lang/lv/registermail.txt
index 50fd8a92b..2a2084c91 100644
--- a/inc/lang/lv/registermail.txt
+++ b/inc/lang/lv/registermail.txt
@@ -8,7 +8,3 @@ Datums      : @DATE@
 Pārlūks     : @BROWSER@
 IP aderese  : @IPADDRESS@
 Datora vārds: @HOSTNAME@
-
--- 
-Šo vēstuli ģenerējis DokuWiki no
-@DOKUWIKIURL
\ No newline at end of file
diff --git a/inc/lang/lv/subscr_digest.txt b/inc/lang/lv/subscr_digest.txt
index 98784050c..fb24a31b9 100644
--- a/inc/lang/lv/subscr_digest.txt
+++ b/inc/lang/lv/subscr_digest.txt
@@ -9,11 +9,7 @@ Labdien!
 Vecā versija: @OLDPAGE@
 Jaunā versija: @NEWPAGE@
 
-Lai atceltu izmaiņu paziņošanu, ielogojieties 
-@DOKUWIKIURL@, apmeklējiet 
+Lai atceltu izmaiņu paziņošanu, ielogojieties
+@DOKUWIKIURL@, apmeklējiet
 @SUBSCRIBE@
 un atsakieties no lapas vai nodaļas izmaiņu paziņojumiem .
-
---
-Šo vēstuli izveidoja DokuWiki no 
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/lv/subscr_list.txt b/inc/lang/lv/subscr_list.txt
index 986b3786a..9c0ecf800 100644
--- a/inc/lang/lv/subscr_list.txt
+++ b/inc/lang/lv/subscr_list.txt
@@ -6,11 +6,7 @@ Labdien!
 @DIFF@
 --------------------------------------------------------
 
-Lai atceltu izmaiņu paziņošanu, ielogojieties 
-@DOKUWIKIURL@, apmeklējiet 
+Lai atceltu izmaiņu paziņošanu, ielogojieties
+@DOKUWIKIURL@, apmeklējiet
 @SUBSCRIBE@
 un atsakieties no lapas vai nodaļas izmaiņu paziņojumiem .
-
---
-Šo vēstuli izveidoja DokuWiki no 
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/lv/subscr_single.txt b/inc/lang/lv/subscr_single.txt
index ca6177809..b5b05d33f 100644
--- a/inc/lang/lv/subscr_single.txt
+++ b/inc/lang/lv/subscr_single.txt
@@ -13,11 +13,7 @@ Vecā versija: @OLDPAGE@
 Jaunā versija: @NEWPAGE@
 
 
-Lai atceltu izmaiņu paziņošanu, ielogojieties 
-@DOKUWIKIURL@, apmeklējiet 
+Lai atceltu izmaiņu paziņošanu, ielogojieties
+@DOKUWIKIURL@, apmeklējiet
 @SUBSCRIBE@
 un atsakieties no lapas vai nodaļas izmaiņu paziņojumiem .
-
---
-Šo vēstuli izveidoja DokuWiki no 
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/lv/uploadmail.txt b/inc/lang/lv/uploadmail.txt
index 5975d5bd0..8d664d6b4 100644
--- a/inc/lang/lv/uploadmail.txt
+++ b/inc/lang/lv/uploadmail.txt
@@ -8,7 +8,3 @@ Datora vārds  : @HOSTNAME@
 Izmērs        : @SIZE@
 MIME tips     : @MIME@
 Lietotājs     : @USER@
-
--- 
-Vēstuli nosūtījusi DokuWiki programma no
-@DOKUWIKIURL@ datora.
\ No newline at end of file
diff --git a/inc/lang/mg/lang.php b/inc/lang/mg/lang.php
index b6e0cc6e0..01cb51adc 100644
--- a/inc/lang/mg/lang.php
+++ b/inc/lang/mg/lang.php
@@ -119,3 +119,4 @@ $lang['js']['del_confirm']= 'Hofafana ilay andalana?';
 $lang['admin_register']= 'Ampio mpampiasa vaovao...';
 $lang['searchcreatepage']      = "Raha tsy nahita izay notadiavinao ianao, dia afaka mamorona pejy vaovao avy amin'ny teny nanaovanao fikarohana; Ampiasao ny bokotra ''Hanova ny pejy''.";
 //Setup VIM: ex: et ts=2 :
+$lang['email_signature'] = 'Ity imailaka ity dia navoakan'ny wiki tao amin'ny';
diff --git a/inc/lang/mg/mailtext.txt b/inc/lang/mg/mailtext.txt
index ca919345a..c772686fd 100644
--- a/inc/lang/mg/mailtext.txt
+++ b/inc/lang/mg/mailtext.txt
@@ -10,8 +10,3 @@ Fiovana     : @SUMMARY@
 Novain'i    : @USER@
 
 @DIFF@
-
-
--- 
-Ity imailaka ity dia navoakan'ny wiki tao amin'ny
-@DOKUWIKIURL@
diff --git a/inc/lang/mg/password.txt b/inc/lang/mg/password.txt
index 000bd91c3..4ed28582f 100644
--- a/inc/lang/mg/password.txt
+++ b/inc/lang/mg/password.txt
@@ -4,8 +4,3 @@ Ireto ny momba anao ho an'ny @TITLE@ ao amin'ny @DOKUWIKIURL@
 
 Anarana    : @LOGIN@
 Alahidy    : @PASSWORD@
-
--- 
-Ity imailaka ity dia navoakan'ny wiki tao amin'ny
-@DOKUWIKIURL@
-
diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php
index 7ebb14b93..596c2700a 100644
--- a/inc/lang/mr/lang.php
+++ b/inc/lang/mr/lang.php
@@ -265,3 +265,4 @@ $lang['i_pol1']                = 'सार्वजनिक विकी ( स
 $lang['i_pol2']                = 'बंदिस्त विकी ( वाचन , लेखन व अपलोडची परवानगी फक्त नोंदणीकृत सदस्यांना ) ';
 $lang['i_retry']               = 'पुन्हा प्रयत्न';
 $lang['recent_global']         = 'तुम्ही सध्या <b>%s</b> या नेमस्पेस मधील बदल पाहात आहात.तुम्ही <a href="%s">पूर्ण विकी मधले बदल </a> सुद्धा पाहू शकता.';
+$lang['email_signature'] = 'हा ईमेल, येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे';
diff --git a/inc/lang/mr/mailtext.txt b/inc/lang/mr/mailtext.txt
index 18fa23846..826ab0c45 100644
--- a/inc/lang/mr/mailtext.txt
+++ b/inc/lang/mr/mailtext.txt
@@ -10,6 +10,3 @@ IP-पत्ता : @IPADDRESS@
 सदस्य : @USER@
 
 @DIFF@
-
--- 
-हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे.
\ No newline at end of file
diff --git a/inc/lang/mr/password.txt b/inc/lang/mr/password.txt
index 090c01dfd..a83f97e7c 100644
--- a/inc/lang/mr/password.txt
+++ b/inc/lang/mr/password.txt
@@ -4,6 +4,3 @@
 
 लॉगिन :  @LOGIN@
 पासवर्ड : @PASSWORD@
-
--- 
-हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे.
\ No newline at end of file
diff --git a/inc/lang/mr/pwconfirm.txt b/inc/lang/mr/pwconfirm.txt
index ec0b707a1..8c03f174d 100644
--- a/inc/lang/mr/pwconfirm.txt
+++ b/inc/lang/mr/pwconfirm.txt
@@ -6,6 +6,3 @@
 जर नक्की तुम्हीच हा पासवर्ड मागवला असेल तर खालील लिंकवर क्लिक करून ते नक्की करा.
 
 @CONFIRM@
-
--- 
-हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे.
\ No newline at end of file
diff --git a/inc/lang/mr/registermail.txt b/inc/lang/mr/registermail.txt
index a6fea4d06..ed3b92b42 100644
--- a/inc/lang/mr/registermail.txt
+++ b/inc/lang/mr/registermail.txt
@@ -8,6 +8,3 @@
 ब्राउजर : @BROWSER@
 IP-पत्ता : @IPADDRESS@
 होस्ट नाम : @HOSTNAME@
-
--- 
-हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे.
\ No newline at end of file
diff --git a/inc/lang/mr/showrev.txt b/inc/lang/mr/showrev.txt
index aeaeee500..dc058307f 100644
--- a/inc/lang/mr/showrev.txt
+++ b/inc/lang/mr/showrev.txt
@@ -1,2 +1,2 @@
 ** ही ह्या दस्तावेजची जुनी आवृत्ती आहे. **
---
\ No newline at end of file
+----
\ No newline at end of file
diff --git a/inc/lang/mr/uploadmail.txt b/inc/lang/mr/uploadmail.txt
index 66e736598..1aea97c33 100644
--- a/inc/lang/mr/uploadmail.txt
+++ b/inc/lang/mr/uploadmail.txt
@@ -8,6 +8,3 @@ IP-पत्ता : @IPADDRESS@
 साइज़ : @SIZE@
 MIME टाइप : @MIME@
 सदस्य : @USER@
-
--- 
-हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे.
\ No newline at end of file
diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php
index 88fb2a690..04a2bc1d5 100644
--- a/inc/lang/ne/lang.php
+++ b/inc/lang/ne/lang.php
@@ -204,3 +204,4 @@ $lang['i_pol1']                = 'Public विकि (पठन सवैका
 $lang['i_pol2']                = 'बन्द विकि (पठन , लेखन, अपलोड ) दर्ता भएका प्रयोगकर्ताका लागि मात्र ।';
 $lang['i_retry']               = 'पुन: प्रयास गर्नुहोस् ';
 $lang['recent_global']         = 'तपाई अहिले <b>%s</b> नेमस्पेस भित्र भएका परिवर्तन हेर्दैहुनुहुन्छ। तपाई <a href="%s">पुरै विकिमा भएको परिवर्तन हेर्न सक्नुहुन्छ</a>.';
+$lang['email_signature'] = 'यो पत्र DokuWiki ले, मा तयार पारेको हो ।';
diff --git a/inc/lang/ne/pwconfirm.txt b/inc/lang/ne/pwconfirm.txt
index 1d8cd9fd6..0552cc55e 100644
--- a/inc/lang/ne/pwconfirm.txt
+++ b/inc/lang/ne/pwconfirm.txt
@@ -7,6 +7,3 @@
 कृपया तपाईको माग साच्चै पठाइएको थियो भन्ने   यकिन गराउनाको लागि तलाको लिङ्कमा प्रयोग गर्नुहोस्  ।
 
 @CONFIRM@
-
--- 
-यो पत्र DokuWiki ले  @DOKUWIKIURL@ मा तयार पारेको हो ।
diff --git a/inc/lang/ne/uploadmail.txt b/inc/lang/ne/uploadmail.txt
index 74ea46407..a02379784 100644
--- a/inc/lang/ne/uploadmail.txt
+++ b/inc/lang/ne/uploadmail.txt
@@ -7,7 +7,3 @@
 आकार : @SIZE@
 MIME प्रकार : @MIME@
 प्रयोगकर्ता : @USER@
-
--- 
-यो पत्र  DokuWiki  ले
-@DOKUWIKIURL@मा स्वत: तयार पारेको हो।
\ No newline at end of file
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index 4c668557d..23f9483bc 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -357,3 +357,4 @@ $lang['currentns']             = 'Huidige namespace';
 $lang['searchresult']          = 'Zoekresultaat';
 $lang['plainhtml']             = 'Alleen HTML';
 $lang['wikimarkup']            = 'Wiki Opmaak';
+$lang['email_signature'] = 'Deze mail werd gegenereerd door DokuWiki op';
diff --git a/inc/lang/nl/mailtext.txt b/inc/lang/nl/mailtext.txt
index d12093a5b..32f6f635d 100644
--- a/inc/lang/nl/mailtext.txt
+++ b/inc/lang/nl/mailtext.txt
@@ -10,8 +10,3 @@ Samenvatting  : @SUMMARY@
 User          : @USER@
 
 @DIFF@
-
-
--- 
-Deze mail werd gegenereerd door DokuWiki op
-@DOKUWIKIURL@
diff --git a/inc/lang/nl/password.txt b/inc/lang/nl/password.txt
index 5041322db..94a180a94 100644
--- a/inc/lang/nl/password.txt
+++ b/inc/lang/nl/password.txt
@@ -4,7 +4,3 @@ Hier is je gebruikersinformatie voor @TITLE@ op @DOKUWIKIURL@
 
 Gebruikersnaam: @LOGIN@
 Wachtwoord    : @PASSWORD@
-
--- 
-Deze mail werd gegenereerd door DokuWiki op
-@DOKUWIKIURL@
diff --git a/inc/lang/nl/pwconfirm.txt b/inc/lang/nl/pwconfirm.txt
index ab72ae7c4..8b900b1ba 100644
--- a/inc/lang/nl/pwconfirm.txt
+++ b/inc/lang/nl/pwconfirm.txt
@@ -7,7 +7,3 @@ Als je geen nieuw wachtwoord hebt aangevraagd kun je deze e-mail negeren.
 Volg de volgende link om te bevestigen dat je inderdaad een nieuw wachtwoord wilt:
 
 @CONFIRM@
-
--- 
-Deze mail werd gegenereerd door DokuWiki op
-@DOKUWIKIURL@
diff --git a/inc/lang/nl/registermail.txt b/inc/lang/nl/registermail.txt
index 5efb25144..8d23efdb8 100644
--- a/inc/lang/nl/registermail.txt
+++ b/inc/lang/nl/registermail.txt
@@ -8,7 +8,3 @@ Datum         : @DATE@
 Browser       : @BROWSER@
 IP-adres      : @IPADDRESS@
 Hostname      : @HOSTNAME@
-
--- 
-Dit bericht is gegenereerd door DokuWiki op
-@DOKUWIKIURL@
diff --git a/inc/lang/nl/subscr_digest.txt b/inc/lang/nl/subscr_digest.txt
index 9f0fe878c..6a904a7c8 100644
--- a/inc/lang/nl/subscr_digest.txt
+++ b/inc/lang/nl/subscr_digest.txt
@@ -10,6 +10,3 @@ Vorige revisie: @OLDPAGE@
 Nieuwe revisie: @NEWPAGE@
 
 Om het verzenden van deze wijzigingsberichten te stoppen, logt u in op de wiki op @DOKUWIKIURL@ en bezoekt u @SUBSCRIBE@. Vervolgens kunt u zich voor elke gewenste pagina of namespace uitschrijven.
-
---
-Deze email is gegenereerd door DokuWiki op @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/nl/subscr_list.txt b/inc/lang/nl/subscr_list.txt
index 7cde7128e..b77b075e7 100644
--- a/inc/lang/nl/subscr_list.txt
+++ b/inc/lang/nl/subscr_list.txt
@@ -7,6 +7,3 @@ Pagina's in de namespace @PAGE@ van de @TITLE@ wiki zijn veranderd. Hier zijn de
 --------------------------------------------------------
 
 Om het verzenden van deze wijzigingsberichten te stoppen, logt u in op het wiki op @DOKUWIKIURL@ en navigeert u naar @SUBSCRIBE@. Vervolgens kunt u zich voor elke gewenste pagina of namespace uitschrijven.
-
---
-Deze email is gegenereerd door DokuWiki op @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/nl/subscr_single.txt b/inc/lang/nl/subscr_single.txt
index 1cd0c85d4..fe761f0f9 100644
--- a/inc/lang/nl/subscr_single.txt
+++ b/inc/lang/nl/subscr_single.txt
@@ -1,6 +1,6 @@
 Halllo!
 
-De pagina @PAGE@ in de @TITLE@ wiki is veranderd. 
+De pagina @PAGE@ in de @TITLE@ wiki is veranderd.
 Hier zijn de wijzigingen:
 
 --------------------------------------------------------
@@ -14,6 +14,3 @@ Vorige revisie: @OLDPAGE@
 Nieuwe revisie: @NEWPAGE@
 
 Om het verzenden van deze wijzigingsberichten te stoppen, logt u in op het wiki op @DOKUWIKIURL@ en navigeert u naar @NEWPAGE@. Vervolgens kunt u "Inschrijvingen wijzigen" gebruiken om inschrijvingen te stoppen.
-
---
-Deze email is gegenereerd door DokuWiki op @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/nl/uploadmail.txt b/inc/lang/nl/uploadmail.txt
index 59920ae3d..85a4b950a 100644
--- a/inc/lang/nl/uploadmail.txt
+++ b/inc/lang/nl/uploadmail.txt
@@ -9,7 +9,3 @@ Hostname : @HOSTNAME@
 Grootte  : @SIZE@
 MIME type: @MIME@
 Gebruiker: @USER@
-
--- 
-Dit bericht is gegenereerd door DokuWiki op
-@DOKUWIKIURL@
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index ecf10ff5b..8df5d4804 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -358,3 +358,4 @@ $lang['searchresult']          = 'Søk i resultat';
 $lang['plainhtml']             = 'Enkel HTML';
 $lang['wikimarkup']            = 'wiki-format';
 $lang['page_nonexist_rev']     = 'Finnes ingen side på %s. Den er derfor laget på <a href="%s">%s</a>';
+$lang['email_signature'] = 'Denne meldingen ble laget av DokuWiki';
diff --git a/inc/lang/no/mailtext.txt b/inc/lang/no/mailtext.txt
index 9c0714c2f..7260733a6 100644
--- a/inc/lang/no/mailtext.txt
+++ b/inc/lang/no/mailtext.txt
@@ -10,8 +10,3 @@ Redigeringskommentar : @SUMMARY@
 Bruker               : @USER@
 
 @DIFF@
-
-
--- 
-Denne meldingen ble laget av DokuWiki
-@DOKUWIKIURL@
diff --git a/inc/lang/no/password.txt b/inc/lang/no/password.txt
index bc4e89f2b..46023e330 100644
--- a/inc/lang/no/password.txt
+++ b/inc/lang/no/password.txt
@@ -4,7 +4,3 @@ Her er dine brukeropplysninger for @TITLE@ på @DOKUWIKIURL@
 
 Brukernavn : @LOGIN@
 Passord : @PASSWORD@
-
--- 
-Denne meldingen ble laget av DokuWiki
-@DOKUWIKIURL@
diff --git a/inc/lang/no/pwconfirm.txt b/inc/lang/no/pwconfirm.txt
index 36163c6e7..29ff6f20d 100644
--- a/inc/lang/no/pwconfirm.txt
+++ b/inc/lang/no/pwconfirm.txt
@@ -9,7 +9,3 @@ For å bekrefte at forespørselen virkelig kom fra deg kan du bruke
 følgende lenke:
 
 @CONFIRM@
-
--- 
-Denne e-posten ble generert av DokuWiki på
-@DOKUWIKIURL@
diff --git a/inc/lang/no/registermail.txt b/inc/lang/no/registermail.txt
index 35ed253ab..89022738f 100644
--- a/inc/lang/no/registermail.txt
+++ b/inc/lang/no/registermail.txt
@@ -8,7 +8,3 @@ Dato        : @DATE@
 Nettleser   : @BROWSER@
 IP-adresse  : @IPADDRESS@
 Tjener      : @HOSTNAME@
-
--- 
-Denne e-posten ble generert av DokuWiki på
-@DOKUWIKIURL@
diff --git a/inc/lang/no/subscr_digest.txt b/inc/lang/no/subscr_digest.txt
index 670d39d32..90da8e692 100644
--- a/inc/lang/no/subscr_digest.txt
+++ b/inc/lang/no/subscr_digest.txt
@@ -11,10 +11,6 @@ Gammel versjon : @OLDPAGE@
 Ny versjon: @NEWPAGE@
 
 For å avslutte varslingen, logg inn på
-@DOKUWIKIURL@ og gå til 
+@DOKUWIKIURL@ og gå til
 @SUBSCRIBE@
 og avslutt abonnementet på endringer av siden eller i navnerommet.
-
---
-Denne e-posten ble generert av DokuWiki på
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/no/subscr_list.txt b/inc/lang/no/subscr_list.txt
index 860d88d2a..d06bc2348 100644
--- a/inc/lang/no/subscr_list.txt
+++ b/inc/lang/no/subscr_list.txt
@@ -8,10 +8,6 @@ Her er endringene:
 --------------------------------------------------------
 
 For å avslutte varslinga, logg inn på
-@DOKUWIKIURL@ og gå til 
+@DOKUWIKIURL@ og gå til
 @SUBSCRIBE@
 og avslutt abonnementet på endringer av sida eller i navnerommet.
-
---
-Denne e-posten ble generert av DokuWiki på
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/no/subscr_single.txt b/inc/lang/no/subscr_single.txt
index b26b3a879..5fb77162a 100644
--- a/inc/lang/no/subscr_single.txt
+++ b/inc/lang/no/subscr_single.txt
@@ -14,10 +14,6 @@ Gammel versjon : @OLDPAGE@
 Ny versjon: @NEWPAGE@
 
 For å avslutte varslingen, logg inn på
-@DOKUWIKIURL@, gå til 
+@DOKUWIKIURL@, gå til
 @SUBSCRIBE@
 og avslutt abonnementet på endringer av siden eller i navnerommet.
-
---
-Denne e-posten ble generert av DokuWiki på
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/no/uploadmail.txt b/inc/lang/no/uploadmail.txt
index 2890d962d..237ec65bc 100644
--- a/inc/lang/no/uploadmail.txt
+++ b/inc/lang/no/uploadmail.txt
@@ -9,7 +9,3 @@ Vertnavn : @HOSTNAME@
 Størrelse : @SIZE@
 MIME-type : @MIME@
 Bruker : @USER@
-
--- 
-Denne e-posten ble generert av DokuWiki på
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index fa70db06c..94f32a5b4 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -349,3 +349,4 @@ $lang['currentns']             = 'Obecny katalog';
 $lang['searchresult']          = 'Wyniki wyszukiwania';
 $lang['plainhtml']             = 'Czysty HTML';
 $lang['wikimarkup']            = 'Znaczniki';
+$lang['email_signature'] = 'List został wygenerowany przez DokuWiki pod adresem';
diff --git a/inc/lang/pl/mailtext.txt b/inc/lang/pl/mailtext.txt
index 1180966bc..cae98db3e 100644
--- a/inc/lang/pl/mailtext.txt
+++ b/inc/lang/pl/mailtext.txt
@@ -11,8 +11,3 @@ Opis zmian   : @SUMMARY@
 Użytkownik   : @USER@
 
 @DIFF@
-
-
--- 
-List został wygenerowany przez DokuWiki pod adresem
-@DOKUWIKIURL@
diff --git a/inc/lang/pl/password.txt b/inc/lang/pl/password.txt
index 948472f1b..745556fa5 100644
--- a/inc/lang/pl/password.txt
+++ b/inc/lang/pl/password.txt
@@ -4,7 +4,3 @@ Dane użytkownika @TITLE@ pod adresem @DOKUWIKIURL@
 
 Użytkownik : @LOGIN@
 Hasło      : @PASSWORD@
-
--- 
-List został wygenerowany przez DokuWiki pod adresem
-@DOKUWIKIURL@
diff --git a/inc/lang/pl/pwconfirm.txt b/inc/lang/pl/pwconfirm.txt
index f6ccca47e..989de79e8 100644
--- a/inc/lang/pl/pwconfirm.txt
+++ b/inc/lang/pl/pwconfirm.txt
@@ -7,7 +7,3 @@ Jeśli to nie Ty prosiłeś(aś) o nowe hasło, zignoruj ten list.
 Aby potwierdzić prośbę o hasło, przejdź na następującą stronę.
 
 @CONFIRM@
-
--- 
-List został wygenerowany przez DokuWiki pod adresem
-@DOKUWIKIURL@
diff --git a/inc/lang/pl/registermail.txt b/inc/lang/pl/registermail.txt
index 18437fa0a..00229673e 100644
--- a/inc/lang/pl/registermail.txt
+++ b/inc/lang/pl/registermail.txt
@@ -9,7 +9,3 @@ Data            : @DATE@
 PrzeglÄ…darka    : @BROWSER@
 Adres IP        : @IPADDRESS@
 Nazwa DNS       : @HOSTNAME@
-
--- 
-List został wygenerowany przez DokuWiki pod adresem
-@DOKUWIKIURL@
diff --git a/inc/lang/pl/subscr_digest.txt b/inc/lang/pl/subscr_digest.txt
index 2b1f63c1b..7abbb359c 100644
--- a/inc/lang/pl/subscr_digest.txt
+++ b/inc/lang/pl/subscr_digest.txt
@@ -15,7 +15,3 @@ Aby zrezygnować z powiadomień o zmianach zaloguj się do wiki na
 @SUBSCRIBE@
 i anuluj otrzymywanie powiadomień o zmianach na stronach i/lub
 katalogach.
-
---
-Ta wiadomość została wygenerowana przez DokuWiki na
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/pl/subscr_list.txt b/inc/lang/pl/subscr_list.txt
index 9a74d757b..633225f8f 100644
--- a/inc/lang/pl/subscr_list.txt
+++ b/inc/lang/pl/subscr_list.txt
@@ -12,7 +12,3 @@ Aby zrezygnować z powiadomień o zmianach zaloguj się do wiki na
 @SUBSCRIBE@
 i anuluj otrzymywanie powiadomień o zmianach na stronach i/lub
 katalogach.
-
---
-Ta wiadomość została wygenerowana przez DokuWiki na
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/pl/subscr_single.txt b/inc/lang/pl/subscr_single.txt
index 3f4bc7314..0c8c3eaed 100644
--- a/inc/lang/pl/subscr_single.txt
+++ b/inc/lang/pl/subscr_single.txt
@@ -18,7 +18,3 @@ Aby zrezygnować z powiadomień o zmianach zaloguj się do wiki na
 @SUBSCRIBE@
 i anuluj otrzymywanie powiadomień o zmianach na stronach i/lub
 katalogach.
-
---
-Ta wiadomość została wygenerowana przez DokuWiki na
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/pl/uploadmail.txt b/inc/lang/pl/uploadmail.txt
index e76ec80e6..a8daa05e1 100644
--- a/inc/lang/pl/uploadmail.txt
+++ b/inc/lang/pl/uploadmail.txt
@@ -10,7 +10,3 @@ Nazwa DNS    : @HOSTNAME@
 Rozmiar      : @SIZE@
 Typ MIME     : @MIME@
 Użytkownik   : @USER@
-
--- 
-List został wygenerowany przez DokuWiki pod adresem
-@DOKUWIKIURL@
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index be62af6fe..1cf06c167 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -357,3 +357,4 @@ $lang['currentns']             = 'Domínio atual';
 $lang['searchresult']          = 'Resultado da Busca';
 $lang['plainhtml']             = 'HTML simples';
 $lang['wikimarkup']            = 'Marcação wiki';
+$lang['email_signature'] = 'Essa mensagem foi gerada pelo DokuWiki em';
diff --git a/inc/lang/pt-br/mailtext.txt b/inc/lang/pt-br/mailtext.txt
index e52535bf0..5bdbfdded 100644
--- a/inc/lang/pt-br/mailtext.txt
+++ b/inc/lang/pt-br/mailtext.txt
@@ -10,8 +10,3 @@ Resumo da edição: @SUMMARY@
 Usuário: @USER@
 
 @DIFF@
-
-
--- 
-Essa mensagem foi gerada pelo DokuWiki em
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/pt-br/password.txt b/inc/lang/pt-br/password.txt
index 199d6e137..0a7587a99 100644
--- a/inc/lang/pt-br/password.txt
+++ b/inc/lang/pt-br/password.txt
@@ -4,7 +4,3 @@ Aqui estão os seus dados de usuário para @TITLE@ em @DOKUWIKIURL@
 
 Usuário  : @LOGIN@
 Senha    : @PASSWORD@
-
--- 
-Essa mensagem foi gerada pelo DokuWiki em
-@DOKUWIKIURL@
diff --git a/inc/lang/pt-br/pwconfirm.txt b/inc/lang/pt-br/pwconfirm.txt
index 2a7c88531..324f9df22 100644
--- a/inc/lang/pt-br/pwconfirm.txt
+++ b/inc/lang/pt-br/pwconfirm.txt
@@ -7,7 +7,3 @@ Se não foi você quem fez essa requisição, simplesmente ignore essa mensagem.
 Se você realmente deseja receber uma nova senha, por favor, utilize o link abaixo, para confirmar sua requisição.
 
 @CONFIRM@
-
--- 
-Essa mensagem foi gerada pelo DokuWiki em
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/pt-br/registermail.txt b/inc/lang/pt-br/registermail.txt
index 9bb6a00ba..bbf2547ce 100644
--- a/inc/lang/pt-br/registermail.txt
+++ b/inc/lang/pt-br/registermail.txt
@@ -8,7 +8,3 @@ Data: @DATE@
 Navegador: @BROWSER@
 Endereço IP: @IPADDRESS@
 Nome do host: @HOSTNAME@
-
--- 
-Essa mensagem foi gerada pelo DokuWiki em
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/pt-br/subscr_digest.txt b/inc/lang/pt-br/subscr_digest.txt
index 77f76e1c3..8251651cb 100644
--- a/inc/lang/pt-br/subscr_digest.txt
+++ b/inc/lang/pt-br/subscr_digest.txt
@@ -14,7 +14,3 @@ Para cancelar as notificações de mudanças, entre em
 @DOKUWIKIURL@, vá até @SUBSCRIBE@
 e cancele o monitoramento da página e/ou do espaço de
 nomes.
-
---
-Este e-mail foi gerado pelo DokuWiki em
-@DOKUWIKIURL@
diff --git a/inc/lang/pt-br/subscr_list.txt b/inc/lang/pt-br/subscr_list.txt
index c6011d063..fb46777da 100644
--- a/inc/lang/pt-br/subscr_list.txt
+++ b/inc/lang/pt-br/subscr_list.txt
@@ -20,9 +20,7 @@ e então visite @SUBSCRIBE@ e cancele a inscrição de edição da página ou na
 
 Para cancelar a página de notificações, entre na wiki @DOKUWIKIURL@,
 visite a página de @SUBSCRIBE@ e cancele a inscrição de edição da página ou namespace.
---
-Este e-mail foi gerado pelo DokuWiki em
-@DOKUWIKIURL@
 
-  
-preview.txt ====== Preview ====== 
+
+
+preview.txt ====== Preview ======
diff --git a/inc/lang/pt-br/subscr_single.txt b/inc/lang/pt-br/subscr_single.txt
index b1c052e84..e59a1e1fc 100644
--- a/inc/lang/pt-br/subscr_single.txt
+++ b/inc/lang/pt-br/subscr_single.txt
@@ -17,6 +17,3 @@ Para cancelar as notificações de mudanças, entre em
 @DOKUWIKIURL@, vá até @NEWPAGE@
 e cancele o monitoramento da página e/ou do espaço de
 nomes.
---
-Este e-mail foi gerado pelo DokuWiki em
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/pt-br/uploadmail.txt b/inc/lang/pt-br/uploadmail.txt
index a3ac9bac7..8527f8e17 100644
--- a/inc/lang/pt-br/uploadmail.txt
+++ b/inc/lang/pt-br/uploadmail.txt
@@ -8,7 +8,3 @@ Nome do host: @HOSTNAME@
 Tamanho: @SIZE@
 Tipo MIME: @MIME@
 Usuário: @USER@
-
--- 
-Essa mensagem foi gerada pelo DokuWiki em
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 5d462e198..abf25499f 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -345,3 +345,4 @@ $lang['plainhtml']             = 'HTML simples';
 $lang['wikimarkup']            = 'Markup de Wiki';
 $lang['page_nonexist_rev']     = 'Página não existia no %s. Posteriormente, foi criado em <a href="%s">% s </a>.';
 $lang['unable_to_parse_date']  = 'Não é possível analisar o parâmetro "%s".';
+$lang['email_signature'] = 'Este email foi gerado por DokuWiki em';
diff --git a/inc/lang/pt/mailtext.txt b/inc/lang/pt/mailtext.txt
index 915a147ec..844f24617 100644
--- a/inc/lang/pt/mailtext.txt
+++ b/inc/lang/pt/mailtext.txt
@@ -12,9 +12,3 @@ Edit Summary  : @SUMMARY@
 User          : @USER@
 
 @DIFF@
-
-
-
-----
-
-Esta mensagem foi gerada automaticamente pelo motor DokuWiki em @DOKUWIKIURL@
diff --git a/inc/lang/pt/pwconfirm.txt b/inc/lang/pt/pwconfirm.txt
index 2848a116c..00fee3e4f 100644
--- a/inc/lang/pt/pwconfirm.txt
+++ b/inc/lang/pt/pwconfirm.txt
@@ -7,7 +7,3 @@ Se não foi você que efectuou o pedido então por favor ignore esta mensagem.
 Senão, para confirmar o pedido, por favor siga este link:
 
 @CONFIRM@
-
--- 
-
-Esta mensagem foi gerada automaticamente pelo motor DokuWiki em @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/pt/subscr_digest.txt b/inc/lang/pt/subscr_digest.txt
index 3f8a814c6..943bba8a6 100644
--- a/inc/lang/pt/subscr_digest.txt
+++ b/inc/lang/pt/subscr_digest.txt
@@ -14,7 +14,3 @@ Para cancelar as notificações de página, inicie sessão na wiki em
 @DOKUWIKIURL@, visite
 @SUBSCRIBE@
 e des-subscreva as alterações à página e/ou nome espaço de nome.
-
---
-Este email foi gerado por DokuWiki em
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/pt/subscr_list.txt b/inc/lang/pt/subscr_list.txt
index 65325b9ea..fdaef5e0d 100644
--- a/inc/lang/pt/subscr_list.txt
+++ b/inc/lang/pt/subscr_list.txt
@@ -7,11 +7,7 @@ Eis as páginas alteradas:
 @DIFF@
 --------------------------------------------------------
 
-Para cancelar as notificações de páginas, inicie sessão na wiki em 
+Para cancelar as notificações de páginas, inicie sessão na wiki em
 @DOKUWIKIURL@, visite
 @SUBSCRIBE@
 e des-subscreva às alterações da página e/ou espaço de nome.
-
---
-Este email foi gerado por DokuWiki em
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/pt/subscr_single.txt b/inc/lang/pt/subscr_single.txt
index 469c6bfb1..10674f75a 100644
--- a/inc/lang/pt/subscr_single.txt
+++ b/inc/lang/pt/subscr_single.txt
@@ -17,7 +17,3 @@ Para cancelar as notificações de página, inicie sessão no wiki em
 @DOKUWIKIURL@, visite
 @SUBSCRIBE@
 e des-subscreva às alterações de página e/ou espaço de nome.
-
---
-Este email foi gerado automaticamente por DokuWiki em
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/pt/uploadmail.txt b/inc/lang/pt/uploadmail.txt
index bb571ffae..09787e1db 100644
--- a/inc/lang/pt/uploadmail.txt
+++ b/inc/lang/pt/uploadmail.txt
@@ -9,7 +9,3 @@ Hostname       : @HOSTNAME@
 Tamanho        : @SIZE@
 MIME Type      : @MIME@
 Utilizador     : @USER@
-
--- 
-Esta mensagem foi gerada pelo DokuWiki em
-@DOKUWIKIURL@
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index 452a93ed0..34fe5629b 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -325,3 +325,4 @@ $lang['media_perm_read']       = 'Ne pare rău, dar nu ai suficiente permisiuni
 $lang['media_perm_upload']     = 'Ne pare rău, dar nu ai suficiente permisiuni pentru a putea încărca fișiere.';
 $lang['media_update']          = 'Încarcă noua versiune';
 $lang['media_restore']         = 'Restaurează această versiune';
+$lang['email_signature'] = 'Acest e-mail a fost generat de DokuWiki la';
diff --git a/inc/lang/ro/mailtext.txt b/inc/lang/ro/mailtext.txt
index 8d20a301d..14a15384c 100644
--- a/inc/lang/ro/mailtext.txt
+++ b/inc/lang/ro/mailtext.txt
@@ -11,7 +11,3 @@ Versiune curentă  : @NEWPAGE@
 Sumar editare: @SUMMARY@
 
 @DIFF@
-
---
-Acest e-mail a fost generat de DokuWiki la
-@DOKUWIKIURL@
diff --git a/inc/lang/ro/password.txt b/inc/lang/ro/password.txt
index eb325204b..3f8ae24bc 100644
--- a/inc/lang/ro/password.txt
+++ b/inc/lang/ro/password.txt
@@ -4,7 +4,3 @@ Aici se găsesc credențialele de utilizator pentru @TITLE@ la @DOKUWIKIURL@
 
 Login    : @LOGIN@
 Parola   : @PASSWORD@
-
---
-Acest e-mail a fost generat de DokuWiki la
-@DOKUWIKIURL@
diff --git a/inc/lang/ro/pwconfirm.txt b/inc/lang/ro/pwconfirm.txt
index 0728b2ef0..1123b8b96 100644
--- a/inc/lang/ro/pwconfirm.txt
+++ b/inc/lang/ro/pwconfirm.txt
@@ -8,7 +8,3 @@ Dacă nu ai solicitat o parolă nouă, ignoră acest e-mail.
 Pentru a confirma că cererea a fost într-adevăr trimisă de tine, folosește link-ul de mai jos.
 
 @CONFIRM@
-
--- 
-Acest e-mail a fost generat de DokuWiki la
-@DOKUWIKIURL@
diff --git a/inc/lang/ro/registermail.txt b/inc/lang/ro/registermail.txt
index 2aab247f7..599deabd5 100644
--- a/inc/lang/ro/registermail.txt
+++ b/inc/lang/ro/registermail.txt
@@ -9,7 +9,3 @@ Dată : @DATE@
 Browser : @BROWSER@
 Adresă IP : @IPADDRESS@
 Hostname : @HOSTNAME@
-
---
-Acest e-mail a fost generat de DokuWiki la
-@DOKUWIKIURL@
diff --git a/inc/lang/ro/subscr_digest.txt b/inc/lang/ro/subscr_digest.txt
index 8b0aac5c4..4e661b66d 100644
--- a/inc/lang/ro/subscr_digest.txt
+++ b/inc/lang/ro/subscr_digest.txt
@@ -14,7 +14,3 @@ Pentru a anula notificarea paginii, autentifică-te pe wiki la
 @DOKUWIKIURL@ apoi accesează
 @SUBSCRIBE@
 și dezabonează-te de la pagină și/sau modificările spațiului de nume.
-
---
-Acest e-mail a fost generat de DokuWiki la
-@DOKUWIKIURL@
diff --git a/inc/lang/ro/subscr_list.txt b/inc/lang/ro/subscr_list.txt
index c34334268..c56147845 100644
--- a/inc/lang/ro/subscr_list.txt
+++ b/inc/lang/ro/subscr_list.txt
@@ -11,7 +11,3 @@ Pentru a anula notificarea paginii, autentificcă-te pe wiki la
 @DOKUWIKIURL@ apoi accesează
 @SUBSCRIBE@
 și dezabonează-te de la pagină și/sau modificările spațiului de nume.
-
---
-Acest e-mail a fost generat de DokuWiki la
-@DOKUWIKIURL@
diff --git a/inc/lang/ro/subscr_single.txt b/inc/lang/ro/subscr_single.txt
index 0fee1a831..6f8b2f96d 100644
--- a/inc/lang/ro/subscr_single.txt
+++ b/inc/lang/ro/subscr_single.txt
@@ -17,7 +17,3 @@ Pentru a anula notificarea paginii, autentificcă-te pe wiki la
 @DOKUWIKIURL@ apoi accesează
 @SUBSCRIBE@
 și dezabonează-te de la pagină și/sau modificările spațiului de nume.
-
---
-Acest e-mail a fost generat de DokuWiki la
-@DOKUWIKIURL@
diff --git a/inc/lang/ro/uploadmail.txt b/inc/lang/ro/uploadmail.txt
index 81c2828e8..cf8e8e02a 100644
--- a/inc/lang/ro/uploadmail.txt
+++ b/inc/lang/ro/uploadmail.txt
@@ -10,7 +10,3 @@ Hostname : @HOSTNAME@
 Dimensiune : @SIZE@
 MIME Type : @MIME@
 Utilizator : @USER@
-
--- 
-Acest e-mail a fost generat de DokuWiki la
-@DOKUWIKIURL@
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 96278d53b..d9af788fc 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -365,3 +365,4 @@ $lang['plainhtml']             = 'Простой HTML';
 $lang['wikimarkup']            = 'вики-разметка';
 $lang['page_nonexist_rev']     = 'Эта страница ещё не существовала %s. Она была создана <a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'Невозможно обработать параметр "%s".';
+$lang['email_signature'] = 'Это письмо создано «Докувики» с сайта';
diff --git a/inc/lang/ru/mailtext.txt b/inc/lang/ru/mailtext.txt
index 929174910..0eb31a10a 100644
--- a/inc/lang/ru/mailtext.txt
+++ b/inc/lang/ru/mailtext.txt
@@ -10,8 +10,3 @@ IP-адрес: @IPADDRESS@
 Пользователь: @USER@
 
 @DIFF@
-
-
--- 
-Это письмо создано «Докувики» с сайта
-@DOKUWIKIURL@
diff --git a/inc/lang/ru/password.txt b/inc/lang/ru/password.txt
index 360201bd9..bee594e5f 100644
--- a/inc/lang/ru/password.txt
+++ b/inc/lang/ru/password.txt
@@ -4,7 +4,3 @@
 
 Имя пользователя: @LOGIN@
 Пароль: @PASSWORD@
-
--- 
-Это письмо создано «Докувики» с сайта
-@DOKUWIKIURL@
diff --git a/inc/lang/ru/pwconfirm.txt b/inc/lang/ru/pwconfirm.txt
index de31aa9a8..fff66946e 100644
--- a/inc/lang/ru/pwconfirm.txt
+++ b/inc/lang/ru/pwconfirm.txt
@@ -7,7 +7,3 @@
 Для подтверждения, что запрос был действительно сделан вами, пожалуйста, перейдите по следующей ссылке.
 
 @CONFIRM@
-
--- 
-Это письмо создано «Докувики» с сайта
-@DOKUWIKIURL@
diff --git a/inc/lang/ru/registermail.txt b/inc/lang/ru/registermail.txt
index d55296558..8e420aa42 100644
--- a/inc/lang/ru/registermail.txt
+++ b/inc/lang/ru/registermail.txt
@@ -8,7 +8,3 @@
 Браузер: @BROWSER@
 Адрес IP: @IPADDRESS@
 Хост: @HOSTNAME@
-
--- 
-Это письмо создано «Докувики» с сайта
-@DOKUWIKIURL@
diff --git a/inc/lang/ru/subscr_digest.txt b/inc/lang/ru/subscr_digest.txt
index ac0fc0528..ee313b95b 100644
--- a/inc/lang/ru/subscr_digest.txt
+++ b/inc/lang/ru/subscr_digest.txt
@@ -14,7 +14,3 @@
 @DOKUWIKIURL@ в раздел
 @SUBSCRIBE@
 и отмените подписку на страницу и/или пространство имен.
-
--- 
-Это письмо создано «Докувики» с сайта
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ru/subscr_list.txt b/inc/lang/ru/subscr_list.txt
index 984a25eb0..4b0fa5995 100644
--- a/inc/lang/ru/subscr_list.txt
+++ b/inc/lang/ru/subscr_list.txt
@@ -11,7 +11,3 @@
 @DOKUWIKIURL@ в раздел
 @SUBSCRIBE@
 и отмените подписку на страницу и/или пространство имён.
-
--- 
-Это письмо создано «Докувики» с сайта
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ru/subscr_single.txt b/inc/lang/ru/subscr_single.txt
index 679ca6fff..744da56cc 100644
--- a/inc/lang/ru/subscr_single.txt
+++ b/inc/lang/ru/subscr_single.txt
@@ -18,7 +18,3 @@
 @DOKUWIKIURL@ в раздел
 @SUBSCRIBE@
 и отмените подписку на страницу и/или пространство имён.
-
--- 
-Это письмо создано «Докувики» с сайта
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/ru/uploadmail.txt b/inc/lang/ru/uploadmail.txt
index 1cc5c6a5a..a92d85564 100644
--- a/inc/lang/ru/uploadmail.txt
+++ b/inc/lang/ru/uploadmail.txt
@@ -9,7 +9,3 @@
 Размер: @SIZE@
 Тип MIME: @MIME@
 Пользователь: @USER@
-
--- 
-Это письмо создано «Докувики» с сайта
-@DOKUWIKIURL@
diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index afbf79503..82f050e2f 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -333,3 +333,4 @@ $lang['currentns']             = 'Aktuálny menný priestor';
 $lang['searchresult']          = 'Výsledky hľadania';
 $lang['plainhtml']             = 'Jednoduché HTML';
 $lang['wikimarkup']            = 'Wiki formát';
+$lang['email_signature'] = 'Táto správa bola zaslaná DokuWiki';
diff --git a/inc/lang/sk/mailtext.txt b/inc/lang/sk/mailtext.txt
index 30b7f5c37..da2f441b1 100644
--- a/inc/lang/sk/mailtext.txt
+++ b/inc/lang/sk/mailtext.txt
@@ -10,8 +10,3 @@ Komentár : @SUMMARY@
 User : @USER@
 
 @DIFF@
-
-
--- 
-Táto správa bola zaslaná DokuWiki
-@DOKUWIKIURL@
diff --git a/inc/lang/sk/password.txt b/inc/lang/sk/password.txt
index 2b85e9c39..18ae1e713 100644
--- a/inc/lang/sk/password.txt
+++ b/inc/lang/sk/password.txt
@@ -5,7 +5,3 @@ Tu sú prihlasovacie informácie pre @TITLE@ (@DOKUWIKIURL@)
 Meno : @FULLNAME@
 Užívateľské meno : @LOGIN@
 Heslo : @PASSWORD@
-
--- 
-Táto správa bola zaslaná DokuWiki
-@DOKUWIKIURL@
diff --git a/inc/lang/sk/pwconfirm.txt b/inc/lang/sk/pwconfirm.txt
index 210740da7..f8ba97adf 100644
--- a/inc/lang/sk/pwconfirm.txt
+++ b/inc/lang/sk/pwconfirm.txt
@@ -9,7 +9,3 @@ Pre potvrdenie, že požiadavka bola skutočne odoslaná vami,
 použite prosím nasledujúci odkaz.
 
 @CONFIRM@
-
--- 
-Táto správa bola zaslaná DokuWiki
-@DOKUWIKIURL@
diff --git a/inc/lang/sk/registermail.txt b/inc/lang/sk/registermail.txt
index a0bf9e314..893ff54a1 100644
--- a/inc/lang/sk/registermail.txt
+++ b/inc/lang/sk/registermail.txt
@@ -8,7 +8,3 @@ Dátum            : @DATE@
 Prehliadač       : @BROWSER@
 IP adresa        : @IPADDRESS@
 Meno servera     : @HOSTNAME@
-
--- 
-Táto správa bola zaslaná DokuWiki
-@DOKUWIKIURL@
diff --git a/inc/lang/sk/showrev.txt b/inc/lang/sk/showrev.txt
index 036769694..b694c2376 100644
--- a/inc/lang/sk/showrev.txt
+++ b/inc/lang/sk/showrev.txt
@@ -1,3 +1,2 @@
 **Toto je staršia verzia dokumentu!**
 ----
-
diff --git a/inc/lang/sk/subscr_digest.txt b/inc/lang/sk/subscr_digest.txt
index 273cc7e26..6d336cb90 100644
--- a/inc/lang/sk/subscr_digest.txt
+++ b/inc/lang/sk/subscr_digest.txt
@@ -14,7 +14,3 @@ Ak si neprajete zasielať tieto správy, prihláste sa do wiki
 @DOKUWIKIURL@, potom prejdite na
 @SUBSCRIBE@
 a odhláste sa z informovania o zmenách stránky alebo menného priestoru.
-
---
-Táto správa bola zaslaná DokuWiki
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sk/subscr_list.txt b/inc/lang/sk/subscr_list.txt
index 3a5bfb572..7332e7740 100644
--- a/inc/lang/sk/subscr_list.txt
+++ b/inc/lang/sk/subscr_list.txt
@@ -11,7 +11,3 @@ Ak si neprajete zasielať tieto správy, prihláste sa do wiki
 @DOKUWIKIURL@, potom prejdite na
 @SUBSCRIBE@
 a odhláste sa z informovania o zmenách stránky alebo menného priestoru.
-
---
-Táto správa bola zaslaná DokuWiki
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sk/subscr_single.txt b/inc/lang/sk/subscr_single.txt
index 3abbc40b8..48825a49c 100644
--- a/inc/lang/sk/subscr_single.txt
+++ b/inc/lang/sk/subscr_single.txt
@@ -17,7 +17,3 @@ Ak si neprajete zasielať tieto správy, prihláste sa do wiki
 @DOKUWIKIURL@, potom prejdite na
 @SUBSCRIBE@
 a odhláste sa z informovania o zmenách stránky alebo menného priestoru.
-
---
-Táto správa bola zaslaná DokuWiki
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sk/uploadmail.txt b/inc/lang/sk/uploadmail.txt
index 18293799f..df409678f 100644
--- a/inc/lang/sk/uploadmail.txt
+++ b/inc/lang/sk/uploadmail.txt
@@ -8,7 +8,3 @@ Názov hostiteľa : @HOSTNAME@
 Veľkosť : @SIZE@
 MIME Typ : @MIME@
 Užívateľ : @USER@
-
--- 
-Táto správa bola zaslaná DokuWiki
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php
index b649d08cb..555161b20 100644
--- a/inc/lang/sl/lang.php
+++ b/inc/lang/sl/lang.php
@@ -335,3 +335,4 @@ $lang['currentns']             = 'Trenutni imenski prostor';
 $lang['searchresult']          = 'Rezultati iskanja';
 $lang['plainhtml']             = 'Zapis HTML';
 $lang['wikimarkup']            = 'Oblikovni jezik Wiki';
+$lang['email_signature'] = 'Sporočilo je samodejno ustvarjeno na spletišču';
diff --git a/inc/lang/sl/mailtext.txt b/inc/lang/sl/mailtext.txt
index e08d01d9e..9b333731d 100644
--- a/inc/lang/sl/mailtext.txt
+++ b/inc/lang/sl/mailtext.txt
@@ -10,6 +10,3 @@ Povzetek urejanja: @SUMMARY@
 Uporabnik        : @USER@
 
 @DIFF@
-
---
-Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
diff --git a/inc/lang/sl/password.txt b/inc/lang/sl/password.txt
index 61929dccd..d0e1f69b5 100644
--- a/inc/lang/sl/password.txt
+++ b/inc/lang/sl/password.txt
@@ -4,6 +4,3 @@ Spodaj so navedeni podatki za @TITLE@ na wiki spletišču @DOKUWIKIURL@
 
 Uporabniško ime: @LOGIN@
 Geslo          : @PASSWORD@
-
---
-Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
diff --git a/inc/lang/sl/pwconfirm.txt b/inc/lang/sl/pwconfirm.txt
index a621821e5..33f478714 100644
--- a/inc/lang/sl/pwconfirm.txt
+++ b/inc/lang/sl/pwconfirm.txt
@@ -6,6 +6,3 @@ S podatki vašega imena je bila poslana zahteva za pridobitev novega gesla za up
  - Za potrditev zahteve za pridobitev novega gesla, kliknite spodnjo povezavo.
 
 @CONFIRM@
-
---
-Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
diff --git a/inc/lang/sl/registermail.txt b/inc/lang/sl/registermail.txt
index 801b7d0db..255eb628c 100644
--- a/inc/lang/sl/registermail.txt
+++ b/inc/lang/sl/registermail.txt
@@ -9,6 +9,3 @@ Datum             : @DATE@
 Brskalnik         : @BROWSER@
 Naslov IP         : @IPADDRESS@
 Ime gostitelja    : @HOSTNAME@
-
--- 
-Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
diff --git a/inc/lang/sl/subscr_digest.txt b/inc/lang/sl/subscr_digest.txt
index aeb548beb..5da0042f4 100644
--- a/inc/lang/sl/subscr_digest.txt
+++ b/inc/lang/sl/subscr_digest.txt
@@ -14,6 +14,3 @@ Za odjavo prejemanja podrobnosti sprememb, se je treba prijaviti na spletišče
 @DOKUWIKIURL@ in med možnostmi naročanja
 @SUBSCRIBE@
 odjaviti prejemanje poročil sprememb strani ali imenskega prostora.
-
---
-Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
diff --git a/inc/lang/sl/subscr_list.txt b/inc/lang/sl/subscr_list.txt
index 253cb4104..914ae1543 100644
--- a/inc/lang/sl/subscr_list.txt
+++ b/inc/lang/sl/subscr_list.txt
@@ -11,6 +11,3 @@ Za odjavo prejemanja podrobnosti sprememb, se je treba prijaviti na spletišče
 @DOKUWIKIURL@ in med možnostmi naročanja
 @SUBSCRIBE@
 odjaviti prejemanje poročil sprememb strani ali imenskega prostora.
-
---
-Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
diff --git a/inc/lang/sl/subscr_single.txt b/inc/lang/sl/subscr_single.txt
index 9fd64be0e..4324b2d70 100644
--- a/inc/lang/sl/subscr_single.txt
+++ b/inc/lang/sl/subscr_single.txt
@@ -17,6 +17,3 @@ Preklic obveščanja o spremembah strani je mogoče določiti
 na Wiki naslovu @DOKUWIKIURL@ in z obiskom @NEWPAGE@,
 kjer se je mogoče odjaviti od spremljanja strani ali
 imenskega prostora.
-
---
-Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sl/uploadmail.txt b/inc/lang/sl/uploadmail.txt
index 0479be75f..126ff2a47 100644
--- a/inc/lang/sl/uploadmail.txt
+++ b/inc/lang/sl/uploadmail.txt
@@ -9,6 +9,3 @@ Ponudnik  : @HOSTNAME@
 Velikost  : @SIZE@
 Vrsta MIME: @MIME@
 Uporabnik : @USER@
-
---
-Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php
index 4c61b6a70..d1dc867d7 100644
--- a/inc/lang/sq/lang.php
+++ b/inc/lang/sq/lang.php
@@ -236,3 +236,4 @@ $lang['days']                  = '%d ditë më parë';
 $lang['hours']                 = '%d orë më parë';
 $lang['minutes']               = '%d minuta më parë';
 $lang['seconds']               = '%d sekonda më parë';
+$lang['email_signature'] = 'Ky email u gjenerua nga DokuWiki në';
diff --git a/inc/lang/sq/mailtext.txt b/inc/lang/sq/mailtext.txt
index 0746ca42c..0566aaf2b 100644
--- a/inc/lang/sq/mailtext.txt
+++ b/inc/lang/sq/mailtext.txt
@@ -12,5 +12,5 @@ Përdoruesi: @USER@
 @DIFF@
 
 ---
-Ky email u gjenerua nga DokuWiki në 
-@DOKUWIKIURL@
\ No newline at end of file
+Ky email u gjenerua nga DokuWiki në
+@DOKUWIKIURL@
diff --git a/inc/lang/sq/password.txt b/inc/lang/sq/password.txt
index 1c8a8694a..44acfe6f3 100644
--- a/inc/lang/sq/password.txt
+++ b/inc/lang/sq/password.txt
@@ -6,5 +6,5 @@ Hyrje: @LOGIN@
 Fjalëkalimi: @PASSWORD@
 
 ---
-Ky email u gjenerua nga DokuWiki në 
-@DOKUWIKIURL@
\ No newline at end of file
+Ky email u gjenerua nga DokuWiki në
+@DOKUWIKIURL@
diff --git a/inc/lang/sq/pwconfirm.txt b/inc/lang/sq/pwconfirm.txt
index 44d6c2dfe..ec776d449 100644
--- a/inc/lang/sq/pwconfirm.txt
+++ b/inc/lang/sq/pwconfirm.txt
@@ -7,7 +7,3 @@ Nëse nuk kërkuat një fjalëkalim të ri atëherë thjesht injorojeni këtë e
 Për të konfirmuar që kërkesa u dërgua me të vërtetë nga ju, ju lutemi përdorni link-un e mëposhtëm.
 
 @CONFIRM@
-
---
-Ky email u gjenerua nga DokuWiki në 
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sq/registermail.txt b/inc/lang/sq/registermail.txt
index ef90e455e..d0f7d5180 100644
--- a/inc/lang/sq/registermail.txt
+++ b/inc/lang/sq/registermail.txt
@@ -8,7 +8,3 @@ Data: @DATE@
 Shfletuesi: @BROWSER@
 Adresa IP: @IPADDRESS@
 Emri Hostit: @HOSTNAME@
-
---
-Ky email u gjenerua nga DokuWiki në
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sq/subscr_digest.txt b/inc/lang/sq/subscr_digest.txt
index 41404cff9..62ca057b5 100644
--- a/inc/lang/sq/subscr_digest.txt
+++ b/inc/lang/sq/subscr_digest.txt
@@ -14,7 +14,3 @@ Për të fshirë lajmërimet e faqes, mund të hyni tek wiki në
 @DOKUWIKIURL@ pastaj vizitoni
 @SUBSCRIBE@
 dhe ç'regjistro faqen dhe/ose ndryshimet e hapësirës së emrit.
-
---
-Ky eMail është gjeneruar nga DokuWiki në
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sq/subscr_list.txt b/inc/lang/sq/subscr_list.txt
index cb10d4223..0677f4053 100644
--- a/inc/lang/sq/subscr_list.txt
+++ b/inc/lang/sq/subscr_list.txt
@@ -7,7 +7,3 @@ Faqet në hapësirën e emrit @PAGE@ të wiki-t @TITLE@ ndryshuan. Këto janë f
 --------------------------------------------------------
 
 Për të fshirë lajmërimet e faqes, hyni në wiki-n tek @DOKUWIKIURL@ dhe pastaj vizitoni @SUBSCRIBE@ dhe fshini ndryshimet e faqes dhe/ose të hapësirës së emrit.
-
---
-Ky email u gjenerua nga DokuWiki në 
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sq/subscr_single.txt b/inc/lang/sq/subscr_single.txt
index df28ee176..0e4a71c1e 100644
--- a/inc/lang/sq/subscr_single.txt
+++ b/inc/lang/sq/subscr_single.txt
@@ -17,7 +17,3 @@ Për të fshirë lajmërimet e faqes, hyni në wiki tek
 @DOKUWIKIURL@ dhe pastaj vizitoni
 @SUBSCRIBE@
 dhe fshini ndryshimet e faqes dhe/ose hapësirës së emrit.
-
---
-Ky email u gjenerua nga DokuWiki në
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php
index 37a36c82b..9f692ab71 100644
--- a/inc/lang/sr/lang.php
+++ b/inc/lang/sr/lang.php
@@ -261,3 +261,4 @@ $lang['hours']                 = 'Пре %d сати';
 $lang['minutes']               = 'Пре %d минута';
 $lang['seconds']               = 'Пре %d секунди';
 $lang['wordblock']             = 'Ваше измене нису сачуване јер садрже забрањен текст (спам)';
+$lang['email_signature'] = 'Ову поруку је генерисао DokuWiki sa';
diff --git a/inc/lang/sr/mailtext.txt b/inc/lang/sr/mailtext.txt
index 2ed99bf34..ab9d717f0 100644
--- a/inc/lang/sr/mailtext.txt
+++ b/inc/lang/sr/mailtext.txt
@@ -10,8 +10,3 @@
 Корисник             : @USER@
 
 @DIFF@
-
-
--- 
-Ову поруку је генерисао DokuWiki са
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sr/password.txt b/inc/lang/sr/password.txt
index 114185574..453b9b687 100644
--- a/inc/lang/sr/password.txt
+++ b/inc/lang/sr/password.txt
@@ -4,7 +4,3 @@
 
 Корисничко име : @LOGIN@
 Шифра          : @PASSWORD@
-
--- 
-Ову поруку је генерисао DokuWiki на
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sr/pwconfirm.txt b/inc/lang/sr/pwconfirm.txt
index 35e23b75d..ce44cd5fd 100644
--- a/inc/lang/sr/pwconfirm.txt
+++ b/inc/lang/sr/pwconfirm.txt
@@ -7,7 +7,3 @@
 У супротном, да бисте потврдили захтев кликните на следећи линк:
 
 @CONFIRM@
-
--- 
-Ову поруку је генерисао DokuWiki sa
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sr/registermail.txt b/inc/lang/sr/registermail.txt
index efdcbb5c5..9dca20c85 100644
--- a/inc/lang/sr/registermail.txt
+++ b/inc/lang/sr/registermail.txt
@@ -8,8 +8,3 @@
 Веб читач: @BROWSER@
 ИП адреса: @IPADDRESS@
 Домаћин: @HOSTNAME@
-
-
--- 
-Ову поруку је генерисао DokuWiki sa
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sr/subscr_digest.txt b/inc/lang/sr/subscr_digest.txt
index db8416833..aaba525b7 100644
--- a/inc/lang/sr/subscr_digest.txt
+++ b/inc/lang/sr/subscr_digest.txt
@@ -14,7 +14,3 @@
 Да бисте поништили обавештења о променама страница, улогујте се на Вики овде
 @DOKUWIKIURL@ а затим посетите
 @SUBSCRIBE@ и поништите обавештавање о променама страница и/или именских простора..
-
---
-Овај имејл је направио DokuWiki на страници
-@DOKUWIKIURL@
diff --git a/inc/lang/sr/subscr_list.txt b/inc/lang/sr/subscr_list.txt
index b3887013b..09df43de2 100644
--- a/inc/lang/sr/subscr_list.txt
+++ b/inc/lang/sr/subscr_list.txt
@@ -11,7 +11,3 @@
 Да бисте поништили обавештења о променама страница, улогујте се на Вики овде
 @DOKUWIKIURL@ а затим посетите
 @SUBSCRIBE@ и поништите обавештавање о променама страница и/или именских простора..
-
---
-Овај имејл је направио DokuWiki на страници
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sr/subscr_single.txt b/inc/lang/sr/subscr_single.txt
index c0ed4d87a..67102dd7d 100644
--- a/inc/lang/sr/subscr_single.txt
+++ b/inc/lang/sr/subscr_single.txt
@@ -17,7 +17,3 @@
 Да бисте поништили обавештења о променама страница, улогујте се на Бики овде
 @DOKUWIKIURL@ а затим посетите
 @SUBSCRIBE@ и поништите обавештавање о променама страница и/или именских простора..
-
---
-Овај имејл је направио DokuWiki на страници
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sr/uploadmail.txt b/inc/lang/sr/uploadmail.txt
index 36b3bb31d..0db6f9e16 100644
--- a/inc/lang/sr/uploadmail.txt
+++ b/inc/lang/sr/uploadmail.txt
@@ -8,7 +8,3 @@
 Величина: @SIZE@
 MIME тип: @MIME@
 Корисник: @USER@
-
--- 
-Ову поруку је генерисао DokuWiki sa
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php
index f22491db1..275853cb8 100644
--- a/inc/lang/sv/lang.php
+++ b/inc/lang/sv/lang.php
@@ -345,3 +345,4 @@ $lang['media_update']          = 'Ladda upp ny version';
 $lang['media_restore']         = 'Återställ denna version';
 $lang['searchresult']          = 'Sökresultat';
 $lang['plainhtml']             = 'Ren HTML';
+$lang['email_signature'] = 'Detta meddelande har skapats av DokuWiki på';
diff --git a/inc/lang/sv/mailtext.txt b/inc/lang/sv/mailtext.txt
index 616bb4eee..a45bc2a32 100644
--- a/inc/lang/sv/mailtext.txt
+++ b/inc/lang/sv/mailtext.txt
@@ -10,8 +10,3 @@ Redigeringskommentar : @SUMMARY@
 Användare            : @USER@
 
 @DIFF@
-
-
--- 
-Detta meddelande har skapats av DokuWiki på
-@DOKUWIKIURL@
diff --git a/inc/lang/sv/password.txt b/inc/lang/sv/password.txt
index 934d913d6..f8465a4d6 100644
--- a/inc/lang/sv/password.txt
+++ b/inc/lang/sv/password.txt
@@ -4,7 +4,3 @@ Här är dina användaruppgifter för @TITLE@ på @DOKUWIKIURL@
 
 Användarnamn : @LOGIN@
 Lösenord     : @PASSWORD@
-
--- 
-Detta meddelande har skapats av DokuWiki på
-@DOKUWIKIURL@
diff --git a/inc/lang/sv/pwconfirm.txt b/inc/lang/sv/pwconfirm.txt
index 541437716..428cfa3dc 100644
--- a/inc/lang/sv/pwconfirm.txt
+++ b/inc/lang/sv/pwconfirm.txt
@@ -10,7 +10,3 @@ För att bekräfta att förfrågan verkligen kom från dig, var vänlig
 och använd följande länk.
 
 @CONFIRM@
-
--- 
-Detta meddelande har skapats av DokuWiki på
-@DOKUWIKIURL@
diff --git a/inc/lang/sv/registermail.txt b/inc/lang/sv/registermail.txt
index c0edc3728..cbcf3f43b 100644
--- a/inc/lang/sv/registermail.txt
+++ b/inc/lang/sv/registermail.txt
@@ -8,7 +8,3 @@ Datum        : @DATE@
 Webbläsare   : @BROWSER@
 IP-adress    : @IPADDRESS@
 Datornamn    : @HOSTNAME@
-
--- 
-Detta meddelande har skapats av DokuWiki på
-@DOKUWIKIURL@
diff --git a/inc/lang/sv/subscr_digest.txt b/inc/lang/sv/subscr_digest.txt
index 6724726ac..adf6680a4 100644
--- a/inc/lang/sv/subscr_digest.txt
+++ b/inc/lang/sv/subscr_digest.txt
@@ -10,10 +10,6 @@ Här är ändringarna:
 Äldre versionen: @OLDPAGE@
 Ny version: @NEWPAGE@
 
-För att avbryta meddelanden om sidändringar logga in till wikin @DOKUWIKIURL@, besök sedan 
-@SUBSCRIBE@ 
+För att avbryta meddelanden om sidändringar logga in till wikin @DOKUWIKIURL@, besök sedan
+@SUBSCRIBE@
 och avbeställ ändringar av sidor och/eller namespace.
-
---
-Detta meddelande har skapats av DokuWiki vid 
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sv/subscr_single.txt b/inc/lang/sv/subscr_single.txt
index dff88343e..50ef05621 100644
--- a/inc/lang/sv/subscr_single.txt
+++ b/inc/lang/sv/subscr_single.txt
@@ -17,7 +17,3 @@ För att avsluta noteringar om sidor, logga in på wikin vid
 @DOKUWIKIURL@ gå sedan till
 @SUBSCRIBE@
 och avsluta prenumerationen av sida och/eller namnrymd ändringar.
-
---
-Denna e-post har genererats av DokuWiki vid
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/sv/uploadmail.txt b/inc/lang/sv/uploadmail.txt
index 5963adcbd..8db5f5520 100644
--- a/inc/lang/sv/uploadmail.txt
+++ b/inc/lang/sv/uploadmail.txt
@@ -8,7 +8,3 @@ Datornamn   : @HOSTNAME@
 Storlek     : @SIZE@
 MIME-typ    : @MIME@
 Användare   : @USER@
-
--- 
-Detta meddelande har skapats av DokuWiki på
-@DOKUWIKIURL@
diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php
index 113431276..4f534462f 100644
--- a/inc/lang/th/lang.php
+++ b/inc/lang/th/lang.php
@@ -225,3 +225,4 @@ $lang['days']                  = '%d วันก่อน';
 $lang['hours']                 = '%d ชั่วโมงก่อน';
 $lang['minutes']               = '%d นาทีก่อน';
 $lang['seconds']               = '%d วินาทีก่อน';
+$lang['email_signature'] = 'จดหมายนี้ถูกสร้างขึ้นโดยโดกุวิกิที่';
diff --git a/inc/lang/th/mailtext.txt b/inc/lang/th/mailtext.txt
index a4af8a0f3..5dec2226f 100644
--- a/inc/lang/th/mailtext.txt
+++ b/inc/lang/th/mailtext.txt
@@ -10,8 +10,3 @@
 ผู้ใช้: @USER@
 
 @DIFF@
-
-
--- 
-จดหมายนี้สร้างขึ้นโดยโดกุวิกิที่
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/th/password.txt b/inc/lang/th/password.txt
index 5f0dcfffc..e463e7614 100644
--- a/inc/lang/th/password.txt
+++ b/inc/lang/th/password.txt
@@ -4,7 +4,3 @@
 
 ล็อกอิน: @LOGIN@
 รหัสผ่าน : @PASSWORD@
-
--- 
-จดหมายนี้ถูกสร้างขึ้นโดยโดกุวิกิที่
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/th/pwconfirm.txt b/inc/lang/th/pwconfirm.txt
index e6ab876cf..1cf42c8ef 100644
--- a/inc/lang/th/pwconfirm.txt
+++ b/inc/lang/th/pwconfirm.txt
@@ -8,7 +8,3 @@
 หากต้องการยืนยันว่านี่การร้องขอนี้ถูกส่งโดยคุณจริงๆ กรุณาใช้ลิงค์ดังต่อไปนี้
 
 @CONFIRM@
-
--- 
-จดหมายนี้ถูกสร้างขึ้นโดยโดกุวิกิที่
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/th/registermail.txt b/inc/lang/th/registermail.txt
index a96026d31..4cfaddd90 100644
--- a/inc/lang/th/registermail.txt
+++ b/inc/lang/th/registermail.txt
@@ -8,7 +8,3 @@
 บราวเซอร์ : @BROWSER@
 ที่อยู่ไอพี : @IPADDRESS@
 ชื่อโฮสต์ : @HOSTNAME@
-
--- 
-จดหมายนี้ถูกสร้างขึ้นโดยโดกุวิกิที่
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/th/uploadmail.txt b/inc/lang/th/uploadmail.txt
index 026965753..9d042b99e 100644
--- a/inc/lang/th/uploadmail.txt
+++ b/inc/lang/th/uploadmail.txt
@@ -8,7 +8,3 @@
 ขนาด: @SIZE@
 MIME Type : @MIME@
 ผู้ใช้: @USER@
-
--- 
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php
index 1676256a5..bc210ad64 100644
--- a/inc/lang/tr/lang.php
+++ b/inc/lang/tr/lang.php
@@ -329,3 +329,4 @@ $lang['currentns']             = 'Geçerli isimalanı';
 $lang['searchresult']          = 'Arama Sonucu';
 $lang['plainhtml']             = 'Yalın HTML';
 $lang['wikimarkup']            = 'Wiki Biçimlendirmesi';
+$lang['email_signature'] = 'Bu e-posta aşağıdaki DokuWiki tarafından otomatik olarak oluşturulmuştur';
diff --git a/inc/lang/tr/mailtext.txt b/inc/lang/tr/mailtext.txt
index 7e8fc8d81..dfcc39e7a 100644
--- a/inc/lang/tr/mailtext.txt
+++ b/inc/lang/tr/mailtext.txt
@@ -10,7 +10,3 @@ Değiştirme Özeti : @SUMMARY@
 Kullanıcı        : @USER@
 
 @DIFF@
-
-
--- 
-Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı.
diff --git a/inc/lang/tr/password.txt b/inc/lang/tr/password.txt
index 956a786d5..852811d19 100644
--- a/inc/lang/tr/password.txt
+++ b/inc/lang/tr/password.txt
@@ -5,6 +5,3 @@ Merhaba @FULLNAME@!
 
 GiriÅŸ ismi : @LOGIN@
 Parola : @PASSWORD@
-
--- 
-Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı.
\ No newline at end of file
diff --git a/inc/lang/tr/pwconfirm.txt b/inc/lang/tr/pwconfirm.txt
index 22348bb75..7e440e837 100644
--- a/inc/lang/tr/pwconfirm.txt
+++ b/inc/lang/tr/pwconfirm.txt
@@ -7,7 +7,3 @@ Eğer böyle bir talebiniz olmadıysa, bu e-postayı görmezden gelebilirsiniz.
 Onaylamak istiyorsanız aşağıdaki linke tıklayınız.
 
 @CONFIRM@
-
--- 
-Bu e-posta aşağıdaki DokuWiki tarafından otomatik olarak oluşturulmuştur.
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/tr/registermail.txt b/inc/lang/tr/registermail.txt
index 7754a5671..26ff73905 100644
--- a/inc/lang/tr/registermail.txt
+++ b/inc/lang/tr/registermail.txt
@@ -8,6 +8,3 @@ Tarih : @DATE@
 Tarayıcı : @BROWSER@
 IP Numarası : @IPADDRESS@
 Host : @HOSTNAME@
-
--- 
-Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı.
\ No newline at end of file
diff --git a/inc/lang/tr/uploadmail.txt b/inc/lang/tr/uploadmail.txt
index 2d75345ba..92feef2a1 100644
--- a/inc/lang/tr/uploadmail.txt
+++ b/inc/lang/tr/uploadmail.txt
@@ -8,6 +8,3 @@ Host : @HOSTNAME@
 Boyut : @SIZE@
 MIME Type : @MIME@
 Kullanıcı : @USER@
-
--- 
-Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı.
\ No newline at end of file
diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php
index a6b08c905..87c0b4ca8 100644
--- a/inc/lang/uk/lang.php
+++ b/inc/lang/uk/lang.php
@@ -286,3 +286,4 @@ $lang['hours']                 = '%d годин тому';
 $lang['minutes']               = '%d хвилин тому';
 $lang['seconds']               = '%d секунд тому';
 $lang['wordblock']             = 'Ваші зміни не збережено, тому що вони розпізнані як такі, що містять заблокований текст(спам).';
+$lang['email_signature'] = 'Це повідомлення було створене ДокуВікі з';
diff --git a/inc/lang/uk/mailtext.txt b/inc/lang/uk/mailtext.txt
index 5bd25c3c3..4f3072c2b 100644
--- a/inc/lang/uk/mailtext.txt
+++ b/inc/lang/uk/mailtext.txt
@@ -10,8 +10,3 @@
 Користувач   : @USER@
 
 @DIFF@
-
-
--- 
-Це повідомлення було створене ДокуВікі з
-@DOKUWIKIURL@
diff --git a/inc/lang/uk/password.txt b/inc/lang/uk/password.txt
index 8597d494a..7db9be38e 100644
--- a/inc/lang/uk/password.txt
+++ b/inc/lang/uk/password.txt
@@ -4,7 +4,3 @@
 
 Login    : @LOGIN@
 Password : @PASSWORD@
-
--- 
-Це повідомлення було створене ДокуВікі з
-@DOKUWIKIURL@
diff --git a/inc/lang/uk/pwconfirm.txt b/inc/lang/uk/pwconfirm.txt
index 54d7a200c..cd981f116 100644
--- a/inc/lang/uk/pwconfirm.txt
+++ b/inc/lang/uk/pwconfirm.txt
@@ -8,6 +8,3 @@
 перейдіть за наступним посиланням.
 
 @CONFIRM@
-
---
-Цей лист було надіслано за допомогою служби повідомлень DokuWiki, сайту @DOKUWIKIURL@
diff --git a/inc/lang/uk/registermail.txt b/inc/lang/uk/registermail.txt
index 28735ed79..14f0e4b83 100644
--- a/inc/lang/uk/registermail.txt
+++ b/inc/lang/uk/registermail.txt
@@ -8,6 +8,3 @@ E-Mail      : @NEWEMAIL@
 Браузер     : @BROWSER@
 Адреса IP   : @IPADDRESS@
 Назва хосту : @HOSTNAME@
-
---
-Цей лист було надіслано за допомогою служби повідомлень DokuWiki, сайту @DOKUWIKIURL@
diff --git a/inc/lang/uk/subscr_digest.txt b/inc/lang/uk/subscr_digest.txt
index 32379182b..c226e2962 100644
--- a/inc/lang/uk/subscr_digest.txt
+++ b/inc/lang/uk/subscr_digest.txt
@@ -12,6 +12,3 @@
 
 Щоб відмовитися від повідомлень про редагування сторінок, зайдіть під своїм ім'ям на сайт @DOKUWIKIURL@, потім відвідайте сторінку @SUBSCRIBE@
 та відпишіться від повідомлень про зміну сторінки та/або простору імен.
-
---
-Цей лист було надіслано за допомогою служби повідомлень DokuWiki, сайту @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/uk/subscr_list.txt b/inc/lang/uk/subscr_list.txt
index 7a538bc1f..6c4001f5c 100644
--- a/inc/lang/uk/subscr_list.txt
+++ b/inc/lang/uk/subscr_list.txt
@@ -9,6 +9,3 @@
 
 Щоб відмовитися від повідомлень про редагування сторінок, зайдіть під своїм ім'ям на сайт @DOKUWIKIURL@, потім відвідайте сторінку @SUBSCRIBE@
 та відпишіться від повідомлень про зміну сторінки та/або простору імен.
-
---
-Цей лист було надіслано за допомогою служби повідомлень DokuWiki, сайту @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/uk/subscr_single.txt b/inc/lang/uk/subscr_single.txt
index 22a06917e..658bae5d1 100644
--- a/inc/lang/uk/subscr_single.txt
+++ b/inc/lang/uk/subscr_single.txt
@@ -15,6 +15,3 @@
 
 Щоб відмовитися від повідомлень про редагування сторінок, зайдіть під своїм ім'ям на сайт @DOKUWIKIURL@, потім відвідайте сторінку @NEWPAGE@
 та відпишіться від повідомлень про зміну сторінки та/або простору імен.
-
---
-Цей лист було надіслано за допомогою служби повідомлень DokuWiki, сайту @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/uk/uploadmail.txt b/inc/lang/uk/uploadmail.txt
index 6eb8c93c9..ee982c850 100644
--- a/inc/lang/uk/uploadmail.txt
+++ b/inc/lang/uk/uploadmail.txt
@@ -8,7 +8,3 @@ IP-Адреса : @IPADDRESS@
 Розмір : @SIZE@
 Тип MIME : @MIME@
 Користувач : @USER@
-
--- 
-Цей лист автоматично створено ДокуВікі на сайті:
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php
index 41a7d590f..e755de8ba 100644
--- a/inc/lang/vi/lang.php
+++ b/inc/lang/vi/lang.php
@@ -240,3 +240,4 @@ $lang['media_perm_read']       = 'Sorry, bạn không đủ quyền truy cập.'
 $lang['media_perm_upload']     = 'Xin lỗi, bạn không đủ quyền để upload file lên.';
 $lang['media_update']          = 'Tải lên phiên bản mới';
 $lang['media_restore']         = 'Phục hồi phiên bản này';
+$lang['email_signature'] = 'Điện thư này tạo bởi DokuWiki ở';
diff --git a/inc/lang/vi/mailtext.txt b/inc/lang/vi/mailtext.txt
index 836e02d24..bcbb65659 100644
--- a/inc/lang/vi/mailtext.txt
+++ b/inc/lang/vi/mailtext.txt
@@ -10,7 +10,3 @@ Edit Summary: @SUMMARY@
 User        : @USER@
 
 @DIFF@
-
--- 
-Điện thư này tạo bởi DokuWiki ở
-@DOKUWIKIURL@
diff --git a/inc/lang/vi/password.txt b/inc/lang/vi/password.txt
index 798a20d33..9f80429f8 100644
--- a/inc/lang/vi/password.txt
+++ b/inc/lang/vi/password.txt
@@ -4,6 +4,3 @@ Thân chào bạn @FULLNAME@!
 
 Username: @LOGIN@
 Password: @PASSWORD@
-
--- 
-Điện thư này xuất phát từ @DOKUWIKIURL@.
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index c5e7da000..4ad5d04be 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -348,3 +348,4 @@ $lang['currentns']             = '目前的命名空間';
 $lang['searchresult']          = '搜尋結果';
 $lang['plainhtml']             = 'ç´” HTML';
 $lang['wikimarkup']            = 'Wiki 語法標記';
+$lang['email_signature'] = '本信件由以下 DokuWiki 網站產生';
diff --git a/inc/lang/zh-tw/mailtext.txt b/inc/lang/zh-tw/mailtext.txt
index e99858c75..7ffb83e80 100644
--- a/inc/lang/zh-tw/mailtext.txt
+++ b/inc/lang/zh-tw/mailtext.txt
@@ -10,8 +10,3 @@ IP 位址   : @IPADDRESS@
 使用者   : @USER@
 
 @DIFF@
-
-
---
-本信件由以下 DokuWiki 網站產生:
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/zh-tw/password.txt b/inc/lang/zh-tw/password.txt
index 9c5ad2f9d..9898f24ad 100644
--- a/inc/lang/zh-tw/password.txt
+++ b/inc/lang/zh-tw/password.txt
@@ -4,7 +4,3 @@
 
 帳號 : @LOGIN@
 密碼 : @PASSWORD@
-
---
-本信件由以下 DokuWiki 網站產生:
-@DOKUWIKIURL@
diff --git a/inc/lang/zh-tw/pwconfirm.txt b/inc/lang/zh-tw/pwconfirm.txt
index 6f6dcd3c4..93ed56973 100644
--- a/inc/lang/zh-tw/pwconfirm.txt
+++ b/inc/lang/zh-tw/pwconfirm.txt
@@ -7,7 +7,3 @@
 若您真的要使用新密碼,請拜訪以下的連結。
 
 @CONFIRM@
-
---
-本信件由以下 DokuWiki 網站產生:
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/zh-tw/registermail.txt b/inc/lang/zh-tw/registermail.txt
index a67835d77..22b7ff855 100644
--- a/inc/lang/zh-tw/registermail.txt
+++ b/inc/lang/zh-tw/registermail.txt
@@ -8,7 +8,3 @@
 瀏覽器   : @BROWSER@
 IP 位址   : @IPADDRESS@
 主機名稱 : @HOSTNAME@
-
---
-本信件由以下 DokuWiki 網站產生:
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/zh-tw/subscr_digest.txt b/inc/lang/zh-tw/subscr_digest.txt
index 1a34087c3..2ab0bc0df 100644
--- a/inc/lang/zh-tw/subscr_digest.txt
+++ b/inc/lang/zh-tw/subscr_digest.txt
@@ -13,7 +13,3 @@
 要取消頁面提醒,請登入本 wiki @DOKUWIKIURL@
 然後拜訪 @SUBSCRIBE@
 並取消訂閱頁面或分類名稱的更改。
-
---
-本信件由以下 DokuWiki 網站產生:
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/zh-tw/subscr_list.txt b/inc/lang/zh-tw/subscr_list.txt
index da2fb33e5..8cbb24ca5 100644
--- a/inc/lang/zh-tw/subscr_list.txt
+++ b/inc/lang/zh-tw/subscr_list.txt
@@ -10,7 +10,3 @@
 要取消頁面提醒,請登入本 wiki @DOKUWIKIURL@
 然後拜訪 @SUBSCRIBE@
 並取消訂閱頁面或分類名稱的更改。
-
---
-本信件由以下 DokuWiki 網站產生:
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/zh-tw/subscr_single.txt b/inc/lang/zh-tw/subscr_single.txt
index b11841b39..db9ed2dee 100644
--- a/inc/lang/zh-tw/subscr_single.txt
+++ b/inc/lang/zh-tw/subscr_single.txt
@@ -16,7 +16,3 @@
 要取消頁面提醒,請登入本 wiki @DOKUWIKIURL@
 然後拜訪 @NEWPAGE@
 並取消訂閱頁面或分類名稱的更改。
-
---
-本信件由以下 DokuWiki 網站產生:
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/zh-tw/uploadmail.txt b/inc/lang/zh-tw/uploadmail.txt
index 0084d7a7a..9572681b9 100644
--- a/inc/lang/zh-tw/uploadmail.txt
+++ b/inc/lang/zh-tw/uploadmail.txt
@@ -8,7 +8,3 @@ IP 位址   : @IPADDRESS@
 大小     : @SIZE@
 MIMEé¡žåž‹ : @MIME@
 使用者   : @USER@
-
---
-本信件由以下 DokuWiki 網站產生:
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 6f55834d0..6360b9f70 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -362,3 +362,4 @@ $lang['plainhtml']             = '纯HTML';
 $lang['wikimarkup']            = 'Wiki Markup 语言';
 $lang['page_nonexist_rev']     = '页面在 %s 不存在。它曾创建于 <a href="%s">%s</a>。';
 $lang['unable_to_parse_date']  = '无法解析参数 "%s"。';
+$lang['email_signature'] = '本邮件由 DokuWiki 自动创建';
diff --git a/inc/lang/zh/mailtext.txt b/inc/lang/zh/mailtext.txt
index 311acf1b9..f5e608113 100644
--- a/inc/lang/zh/mailtext.txt
+++ b/inc/lang/zh/mailtext.txt
@@ -10,8 +10,3 @@ IP 地址     : @IPADDRESS@
 用户        : @USER@
 
 @DIFF@
-
-
--- 
-本邮件由 DokuWiki 自动创建
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/zh/password.txt b/inc/lang/zh/password.txt
index 969297093..39095a17b 100644
--- a/inc/lang/zh/password.txt
+++ b/inc/lang/zh/password.txt
@@ -3,8 +3,3 @@
 这是您在 @TITLE@(@DOKUWIKIURL@)的用户资料
 用户名:@LOGIN@
 密码:@PASSWORD@
-
--- 
-本邮件由 DokuWiki 自动创建
-@DOKUWIKIURL@
-
diff --git a/inc/lang/zh/pwconfirm.txt b/inc/lang/zh/pwconfirm.txt
index 7e48751a6..1b31636a4 100644
--- a/inc/lang/zh/pwconfirm.txt
+++ b/inc/lang/zh/pwconfirm.txt
@@ -7,9 +7,3 @@
 为了确认发送新密码请求的确来自您,请使用下面的链接。
 
 @CONFIRM@
-
--- 
-本邮件由 DokuWiki 自动创建
-@DOKUWIKIURL@
-
-
diff --git a/inc/lang/zh/registermail.txt b/inc/lang/zh/registermail.txt
index 9647b5fad..56568dcf0 100644
--- a/inc/lang/zh/registermail.txt
+++ b/inc/lang/zh/registermail.txt
@@ -8,9 +8,3 @@ E-mail      : @NEWEMAIL@
 浏览器      : @BROWSER@
 IP 地址     : @IPADDRESS@
 机器名称    : @HOSTNAME@
-
--- 
-本邮件由 DokuWiki 自动创建
-@DOKUWIKIURL@
-
-
diff --git a/inc/lang/zh/subscr_digest.txt b/inc/lang/zh/subscr_digest.txt
index 3c73ff4c5..0428bc9e2 100644
--- a/inc/lang/zh/subscr_digest.txt
+++ b/inc/lang/zh/subscr_digest.txt
@@ -13,7 +13,3 @@
 要取消页面提醒,从 @DOKUWIKIURL@ 登录维基,然后浏览
 @SUBSCRIBE@
 并退订页面以及/或者命名空间的更改。
-
---
-本邮件由以下 DokuWiki 产生
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/zh/subscr_list.txt b/inc/lang/zh/subscr_list.txt
index 1fc1e213c..eb2db6b96 100644
--- a/inc/lang/zh/subscr_list.txt
+++ b/inc/lang/zh/subscr_list.txt
@@ -10,7 +10,3 @@
 要取消页面提醒,从 @DOKUWIKIURL@ 登录维基,然后浏览
 @SUBSCRIBE@
 并退订页面以及/或者命名空间的更改。
-
---
-本邮件由以下 DokuWiki 产生
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/zh/subscr_single.txt b/inc/lang/zh/subscr_single.txt
index 7da57d570..4ea4198cd 100644
--- a/inc/lang/zh/subscr_single.txt
+++ b/inc/lang/zh/subscr_single.txt
@@ -16,7 +16,3 @@
 要取消页面提醒,从 @DOKUWIKIURL@ 登录维基,然后浏览
 @SUBSCRIBE@
 并退订页面以及/或者命名空间的更改。
-
---
-本邮件由以下 DokuWiki 产生
-@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/zh/uploadmail.txt b/inc/lang/zh/uploadmail.txt
index b820cee2b..a5ce53930 100644
--- a/inc/lang/zh/uploadmail.txt
+++ b/inc/lang/zh/uploadmail.txt
@@ -10,11 +10,3 @@ IP 地址 : @IPADDRESS@
 大小 : @SIZE@
 MIME 类型 : @MIME@
 用户 : @USER@
-
--- 
-本邮件由 DokuWiki 自动创建
-@DOKUWIKIURL@
-
-
-
-
-- 
GitLab