From 0645aba7c4fe227f462646cb64116140c3c33cf5 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 7 Sep 2018 10:12:01 +0200
Subject: [PATCH] revert mailtexts back to master

This undoes the change in alignments. Those are useful when displaying
text only emails in a monospace font.

As discussed in https://github.com/splitbrain/dokuwiki/pull/2462#issuecomment-413786942
---
 inc/lang/ar/mailtext.txt              | 10 +++++-----
 inc/lang/ar/password.txt              |  4 ++--
 inc/lang/ar/registermail.txt          |  8 ++++----
 inc/lang/ar/uploadmail.txt            | 11 +++++------
 inc/lang/az/mailtext.txt              | 16 ++++++++--------
 inc/lang/az/password.txt              |  6 +++---
 inc/lang/az/registermail.txt          | 14 +++++++-------
 inc/lang/az/uploadmail.txt            | 17 ++++++++---------
 inc/lang/bg/mailtext.txt              | 10 +++++-----
 inc/lang/bg/password.txt              |  6 +++---
 inc/lang/bg/registermail.txt          | 14 +++++++-------
 inc/lang/bg/uploadmail.txt            | 17 ++++++++---------
 inc/lang/ca-valencia/password.txt     |  6 +++---
 inc/lang/ca-valencia/registermail.txt | 14 +++++++-------
 inc/lang/ca-valencia/uploadmail.txt   |  1 -
 inc/lang/ca/mailtext.txt              | 15 +++++++--------
 inc/lang/ca/password.txt              |  6 +++---
 inc/lang/ca/uploadmail.txt            |  1 -
 inc/lang/cs/mailtext.txt              | 16 ++++++++--------
 inc/lang/cs/password.txt              |  7 ++++---
 inc/lang/cs/registermail.txt          | 14 +++++++-------
 inc/lang/cs/uploadmail.txt            | 17 ++++++++---------
 inc/lang/cy/mailtext.txt              | 19 ++++++++++++-------
 inc/lang/cy/password.txt              | 10 +++++++---
 inc/lang/cy/registermail.txt          | 18 +++++++++++-------
 inc/lang/cy/uploadmail.txt            | 22 +++++++++++++---------
 inc/lang/da/mailtext.txt              | 16 ++++++++--------
 inc/lang/da/password.txt              |  6 +++---
 inc/lang/da/registermail.txt          | 14 +++++++-------
 inc/lang/da/uploadmail.txt            | 17 ++++++++---------
 inc/lang/de-informal/mailtext.txt     | 14 +++++++-------
 inc/lang/de-informal/password.txt     |  4 ++--
 inc/lang/de-informal/registermail.txt | 14 +++++++-------
 inc/lang/de-informal/uploadmail.txt   | 16 ++++++++--------
 inc/lang/de/mailtext.txt              | 14 +++++++-------
 inc/lang/de/password.txt              |  4 ++--
 inc/lang/de/registermail.txt          | 14 +++++++-------
 inc/lang/de/uploadmail.txt            | 16 ++++++++--------
 inc/lang/el/mailtext.txt              | 17 +++++++++--------
 inc/lang/el/password.txt              |  6 +++---
 inc/lang/el/registermail.txt          | 12 ++++++------
 inc/lang/el/uploadmail.txt            | 14 +++++++-------
 inc/lang/en/mailtext.txt              | 10 +++++-----
 inc/lang/en/password.txt              |  6 +++---
 inc/lang/en/registermail.txt          | 14 +++++++-------
 inc/lang/en/uploadmail.txt            | 16 ++++++++--------
 inc/lang/eo/uploadmail.txt            |  1 -
 inc/lang/es/mailtext.txt              | 12 ++++++------
 inc/lang/es/password.txt              |  6 +++---
 inc/lang/es/registermail.txt          | 14 +++++++-------
 inc/lang/es/uploadmail.txt            | 16 ++++++++--------
 inc/lang/et/mailtext.txt              | 14 +++++++-------
 inc/lang/et/password.txt              |  6 +++---
 inc/lang/et/registermail.txt          | 14 +++++++-------
 inc/lang/et/uploadmail.txt            | 21 +++++++++++----------
 inc/lang/eu/mailtext.txt              | 16 ++++++++--------
 inc/lang/eu/password.txt              |  6 +++---
 inc/lang/eu/registermail.txt          | 14 +++++++-------
 inc/lang/eu/uploadmail.txt            | 17 ++++++++---------
 inc/lang/fa/password.txt              |  2 +-
 inc/lang/fa/uploadmail.txt            |  1 -
 inc/lang/fi/mailtext.txt              |  4 ++--
 inc/lang/fi/password.txt              |  6 +++---
 inc/lang/fi/registermail.txt          | 14 +++++++-------
 inc/lang/fi/uploadmail.txt            | 17 ++++++++---------
 inc/lang/fo/mailtext.txt              | 16 ++++++++--------
 inc/lang/fo/password.txt              |  6 +++---
 inc/lang/fr/mailtext.txt              | 19 ++++++++++---------
 inc/lang/fr/password.txt              |  6 +++---
 inc/lang/fr/registermail.txt          | 16 ++++++++--------
 inc/lang/fr/uploadmail.txt            | 17 ++++++++---------
 inc/lang/gl/mailtext.txt              | 16 ++++++++--------
 inc/lang/gl/password.txt              |  6 +++---
 inc/lang/gl/registermail.txt          | 14 +++++++-------
 inc/lang/gl/uploadmail.txt            | 17 ++++++++---------
 inc/lang/he/mailtext.txt              | 10 +++++-----
 inc/lang/he/password.txt              |  6 +++---
 inc/lang/he/registermail.txt          | 14 +++++++-------
 inc/lang/he/uploadmail.txt            | 17 ++++++++---------
 inc/lang/hr/mailtext.txt              | 16 ++++++++--------
 inc/lang/hr/password.txt              |  6 +++---
 inc/lang/hr/registermail.txt          | 14 +++++++-------
 inc/lang/hr/uploadmail.txt            | 16 ++++++++--------
 inc/lang/hu/password.txt              |  2 +-
 inc/lang/hu/registermail.txt          |  2 +-
 inc/lang/hu/uploadmail.txt            |  1 -
 inc/lang/ia/mailtext.txt              | 10 +++++-----
 inc/lang/ia/password.txt              |  6 +++---
 inc/lang/ia/registermail.txt          | 14 +++++++-------
 inc/lang/ia/uploadmail.txt            | 15 +++++++--------
 inc/lang/id/mailtext.txt              | 10 +++++-----
 inc/lang/id/password.txt              |  6 +++---
 inc/lang/id/registermail.txt          | 14 +++++++-------
 inc/lang/id/uploadmail.txt            | 17 ++++++++---------
 inc/lang/it/mailtext.txt              | 16 ++++++++--------
 inc/lang/it/password.txt              |  6 +++---
 inc/lang/it/registermail.txt          | 14 +++++++-------
 inc/lang/it/uploadmail.txt            | 17 ++++++++---------
 inc/lang/ja/mailtext.txt              | 10 +++++-----
 inc/lang/ja/password.txt              |  6 +++---
 inc/lang/ja/registermail.txt          | 14 +++++++-------
 inc/lang/ja/uploadmail.txt            | 17 ++++++++---------
 inc/lang/km/password.txt              |  6 +++---
 inc/lang/la/mailtext.txt              |  9 ++++-----
 inc/lang/la/password.txt              |  6 +++---
 inc/lang/la/registermail.txt          | 14 +++++++-------
 inc/lang/la/uploadmail.txt            | 17 ++++++++---------
 inc/lang/lb/mailtext.txt              | 14 +++++++-------
 inc/lang/lb/password.txt              |  6 +++---
 inc/lang/lb/registermail.txt          | 12 ++++++------
 inc/lang/lb/uploadmail.txt            | 17 ++++++++---------
 inc/lang/lt/mailtext.txt              | 12 +++++++-----
 inc/lang/lt/password.txt              |  4 ++--
 inc/lang/lv/mailtext.txt              | 14 +++++++-------
 inc/lang/lv/password.txt              |  2 +-
 inc/lang/lv/registermail.txt          | 12 ++++++------
 inc/lang/lv/uploadmail.txt            | 17 ++++++++---------
 inc/lang/mg/mailtext.txt              | 16 ++++++++--------
 inc/lang/mg/password.txt              |  6 +++---
 inc/lang/mr/mailtext.txt              | 18 +++++++++---------
 inc/lang/mr/password.txt              |  6 +++---
 inc/lang/mr/registermail.txt          | 16 ++++++++--------
 inc/lang/mr/uploadmail.txt            | 17 ++++++++---------
 inc/lang/ne/uploadmail.txt            | 18 ++++++++----------
 inc/lang/nl/mailtext.txt              | 14 +++++++-------
 inc/lang/nl/password.txt              |  4 ++--
 inc/lang/nl/registermail.txt          | 10 +++++-----
 inc/lang/nl/uploadmail.txt            | 12 ++++++------
 inc/lang/no/mailtext.txt              | 16 ++++++++--------
 inc/lang/no/password.txt              |  6 +++---
 inc/lang/no/registermail.txt          | 14 +++++++-------
 inc/lang/no/uploadmail.txt            | 16 ++++++++--------
 inc/lang/pl/mailtext.txt              | 19 ++++++++++---------
 inc/lang/pl/password.txt              |  6 +++---
 inc/lang/pl/registermail.txt          | 17 +++++++++--------
 inc/lang/pl/uploadmail.txt            | 21 +++++++++++----------
 inc/lang/pt-br/password.txt           |  6 +++---
 inc/lang/pt-br/uploadmail.txt         |  1 -
 inc/lang/pt/mailtext.txt              | 16 +++++++++-------
 inc/lang/pt/password.txt              |  4 ++--
 inc/lang/pt/registermail.txt          | 14 +++++++-------
 inc/lang/pt/uploadmail.txt            | 18 +++++++++---------
 inc/lang/ro/mailtext.txt              | 17 +++++++++--------
 inc/lang/ro/password.txt              |  4 ++--
 inc/lang/ro/registermail.txt          | 17 +++++++++--------
 inc/lang/ro/uploadmail.txt            | 19 ++++++++++---------
 inc/lang/sk/mailtext.txt              | 16 ++++++++--------
 inc/lang/sk/password.txt              |  7 ++++---
 inc/lang/sk/registermail.txt          | 14 +++++++-------
 inc/lang/sk/uploadmail.txt            | 17 ++++++++---------
 inc/lang/sl/mailtext.txt              | 14 +++++++-------
 inc/lang/sl/password.txt              |  2 +-
 inc/lang/sl/registermail.txt          | 15 ++++++++-------
 inc/lang/sl/uploadmail.txt            | 18 +++++++++---------
 inc/lang/sq/mailtext.txt              |  4 ++++
 inc/lang/sq/password.txt              |  6 +++++-
 inc/lang/sq/uploadmail.txt            |  1 -
 inc/lang/sr/mailtext.txt              | 16 ++++++++--------
 inc/lang/sr/password.txt              |  6 +++---
 inc/lang/sr/uploadmail.txt            |  1 -
 inc/lang/sv/mailtext.txt              | 16 ++++++++--------
 inc/lang/sv/password.txt              |  6 +++---
 inc/lang/sv/registermail.txt          | 14 +++++++-------
 inc/lang/sv/uploadmail.txt            | 17 ++++++++---------
 inc/lang/th/password.txt              |  4 ++--
 inc/lang/th/registermail.txt          | 14 +++++++-------
 inc/lang/th/uploadmail.txt            |  3 +--
 inc/lang/tr/mailtext.txt              | 16 ++++++++--------
 inc/lang/tr/password.txt              |  7 ++++---
 inc/lang/tr/registermail.txt          | 14 +++++++-------
 inc/lang/tr/uploadmail.txt            | 17 ++++++++---------
 inc/lang/uk/mailtext.txt              | 14 +++++++-------
 inc/lang/uk/password.txt              |  4 ++--
 inc/lang/uk/registermail.txt          | 14 +++++++-------
 inc/lang/uk/uploadmail.txt            | 17 ++++++++---------
 inc/lang/vi/mailtext.txt              | 10 +++++-----
 inc/lang/vi/password.txt              |  2 +-
 inc/lang/zh-tw/mailtext.txt           | 16 ++++++++--------
 inc/lang/zh-tw/password.txt           |  6 +++---
 inc/lang/zh-tw/registermail.txt       | 14 +++++++-------
 inc/lang/zh-tw/uploadmail.txt         | 17 ++++++++---------
 inc/lang/zh/mailtext.txt              | 16 ++++++++--------
 inc/lang/zh/password.txt              |  5 ++---
 inc/lang/zh/registermail.txt          | 14 +++++++-------
 inc/lang/zh/uploadmail.txt            | 21 +++++++++++----------
 185 files changed, 1072 insertions(+), 1066 deletions(-)

diff --git a/inc/lang/ar/mailtext.txt b/inc/lang/ar/mailtext.txt
index 3e4f7f374..132e36ef3 100644
--- a/inc/lang/ar/mailtext.txt
+++ b/inc/lang/ar/mailtext.txt
@@ -1,12 +1,12 @@
 تم تغيير أو أضافة صفحة فى دوكو ويكي. اليك التفاصيل:
 
-التاريخ: @DATE@
-المتصفح: @BROWSER@
-عنوان الـIP: @IPADDRESS@
-أسم الجهاز: @HOSTNAME@
+التاريخ        : @DATE@
+المتصفح     : @BROWSER@
+عنوان الـIP  : @IPADDRESS@
+أسم الجهاز    : @HOSTNAME@
 النسخة القديمة: @OLDPAGE@
 النسخة الجديدة: @NEWPAGE@
 ملخص التحرير: @SUMMARY@
-مستخدم: @USER@
+مستخدم        : @USER@
 
 @DIFF@
diff --git a/inc/lang/ar/password.txt b/inc/lang/ar/password.txt
index edfed7841..2489800ad 100644
--- a/inc/lang/ar/password.txt
+++ b/inc/lang/ar/password.txt
@@ -2,5 +2,5 @@
 
 ها هى معلومات المستخدم لـ @TITLE@ الموجودة على العنوان @DOKUWIKIURL@
 
-أسم المستخدم: @LOGIN@
-كلمة السر: @PASSWORD@
+أسم المستخدم    : @LOGIN@
+كلمة السر : @PASSWORD@
diff --git a/inc/lang/ar/registermail.txt b/inc/lang/ar/registermail.txt
index 9d1b1c3d0..7c1cae08a 100644
--- a/inc/lang/ar/registermail.txt
+++ b/inc/lang/ar/registermail.txt
@@ -1,10 +1,10 @@
 سجل مستخدم جديد. هذه هي التفاصيل:
 
-اسم المستخدم: @NEWUSER@
-الاسم الكامل: @NEWNAME@
+اسم المستخدم : @NEWUSER@
+الاسم الكامل : @NEWNAME@
 البريد: @NEWEMAIL@
 
-التاريخ: @DATE@
-المتصفح: @BROWSER@
+التاريخ : @DATE@
+المتصفح : @BROWSER@
 عنوان-IP: @IPADDRESS@
 اسم المضيف: @HOSTNAME@
diff --git a/inc/lang/ar/uploadmail.txt b/inc/lang/ar/uploadmail.txt
index 882187b2b..bc61e6efc 100644
--- a/inc/lang/ar/uploadmail.txt
+++ b/inc/lang/ar/uploadmail.txt
@@ -1,11 +1,10 @@
 رُفع ملف إلى دوكو ويكي خاصتك. هذه هي التفاصيل:
 
-الملف: @MEDIA@
-القديمة تنقيح: @OLD@
-التاريخ: @DATE@
-المستعرض: @BROWSER@
+الملف : @MEDIA@
+التاريخ : @DATE@
+المستعرض : @BROWSER@
 عنوان-IP: @IPADDRESS@
 اسم المضيف: @HOSTNAME@
-الحجم: @SIZE@
-نوع MIME: @MIME@
+الحجم : @SIZE@
+نوع MIME : @MIME@
 المستخدم: @USER@
diff --git a/inc/lang/az/mailtext.txt b/inc/lang/az/mailtext.txt
index d83c0f656..97cb68d03 100644
--- a/inc/lang/az/mailtext.txt
+++ b/inc/lang/az/mailtext.txt
@@ -1,12 +1,12 @@
 Sizin DokuWiki-də səhifə yaradılıb ya dəyişdirilib. Ətraflı məlumat:
 
-Tarix: @DATE@
-Brauzer: @BROWSER@
-IP-adres: @IPADDRESS@
-Host: @HOSTNAME@
-Köhnə versiya: @OLDPAGE@
-Yeni versiya: @NEWPAGE@
-Dəyişiklərin xülasəsi: @SUMMARY@
-İstifadəçi: @USER@
+Tarix                 : @DATE@
+Brauzer               : @BROWSER@
+IP-adres              : @IPADDRESS@
+Host                  : @HOSTNAME@
+Köhnə versiya         : @OLDPAGE@
+Yeni versiya          : @NEWPAGE@
+Dəyişiklərin xülasəsi : @SUMMARY@
+İstifadəçi            : @USER@
 
 @DIFF@
diff --git a/inc/lang/az/password.txt b/inc/lang/az/password.txt
index e73ef83f1..6424161fa 100644
--- a/inc/lang/az/password.txt
+++ b/inc/lang/az/password.txt
@@ -1,6 +1,6 @@
-Salam, @FULLNAME@!
+Salam @FULLNAME@!
 
 Sizin @TITLE@ (@DOKUWIKIURL@) üçün olan məlumatlarınız
 
-İstifadəçi adı: @LOGIN@
-ÅžifrÉ™: @PASSWORD@
+İstifadəçi adı  : @LOGIN@
+ÅžifrÉ™ : @PASSWORD@
diff --git a/inc/lang/az/registermail.txt b/inc/lang/az/registermail.txt
index 4c3adbb23..b080e9b57 100644
--- a/inc/lang/az/registermail.txt
+++ b/inc/lang/az/registermail.txt
@@ -1,10 +1,10 @@
 Yeni istifadəçi qeydiyyatdan keçdi. Ətraflı məlumat:
 
-İstifadəçi adı: @NEWUSER@
-Tam adı: @NEWNAME@
-E-mail: @NEWEMAIL@
+İstifadəçi adı       : @NEWUSER@
+Tam adı  : @NEWNAME@
+E-mail      : @NEWEMAIL@
 
-Tarix: @DATE@
-Brauzer: @BROWSER@
-IP adres: @IPADDRESS@
-Host: @HOSTNAME@
+Tarix        : @DATE@
+Brauzer     : @BROWSER@
+IP adres    : @IPADDRESS@
+Host        : @HOSTNAME@
diff --git a/inc/lang/az/uploadmail.txt b/inc/lang/az/uploadmail.txt
index 446d8b281..88103fd8f 100644
--- a/inc/lang/az/uploadmail.txt
+++ b/inc/lang/az/uploadmail.txt
@@ -1,11 +1,10 @@
 Sizin DokuWiki-yə fayl yuklənildi. Ətraflı məlumat:
 
-Fayl: @MEDIA@
-Köhnə redaksiya: @OLD@
-Tarix: @DATE@
-Brauzer: @BROWSER@
-IP Adres: @IPADDRESS@
-Host: @HOSTNAME@
-Həcm: @SIZE@
-MIME Növ: @MIME@
-İstifadəçi: @USER@
+Fayl        : @MEDIA@
+Tarix       : @DATE@
+Brauzer     : @BROWSER@
+IP Adres    : @IPADDRESS@
+Host        : @HOSTNAME@
+Həcm        : @SIZE@
+MIME Növ    : @MIME@
+İstifadəçi  : @USER@
diff --git a/inc/lang/bg/mailtext.txt b/inc/lang/bg/mailtext.txt
index e73f6804f..60cffed22 100644
--- a/inc/lang/bg/mailtext.txt
+++ b/inc/lang/bg/mailtext.txt
@@ -1,12 +1,12 @@
 Страница в DokuWiki е добавена или променена. Ето детайлите:
 
-Дата: @DATE@
-Браузър: @BROWSER@
-IP адрес: @IPADDRESS@
-Име на хоста: @HOSTNAME@
+Дата : @DATE@
+Браузър : @BROWSER@
+IP адрес : @IPADDRESS@
+Име на хоста : @HOSTNAME@
 Стара версия: @OLDPAGE@
 Нова версия: @NEWPAGE@
 Обобщение: @SUMMARY@
-Потребител: @USER@
+Потребител : @USER@
 
 @DIFF@
diff --git a/inc/lang/bg/password.txt b/inc/lang/bg/password.txt
index 2a1347067..77fa48b95 100644
--- a/inc/lang/bg/password.txt
+++ b/inc/lang/bg/password.txt
@@ -1,6 +1,6 @@
-Здравейте, @FULLNAME@!
+Здравейте @FULLNAME@!
 
 Вашите потребителски данни за @TITLE@ на @DOKUWIKIURL@
 
-Потребител: @LOGIN@
-Парола: @PASSWORD@
+Потребител : @LOGIN@
+Парола : @PASSWORD@
diff --git a/inc/lang/bg/registermail.txt b/inc/lang/bg/registermail.txt
index 80cf72145..3c555f54a 100644
--- a/inc/lang/bg/registermail.txt
+++ b/inc/lang/bg/registermail.txt
@@ -1,10 +1,10 @@
 Регистриран е нов потребител. Ето детайлите:
 
-Потребител: @NEWUSER@
-Пълно име: @NEWNAME@
-E. поща: @NEWEMAIL@
+Потребител  : @NEWUSER@
+Пълно име : @NEWNAME@
+E. поща : @NEWEMAIL@
 
-Дата: @DATE@
-Браузър: @BROWSER@
-IP адрес: @IPADDRESS@
-Име на хоста: @HOSTNAME@
+Дата : @DATE@
+Браузър : @BROWSER@
+IP адрес : @IPADDRESS@
+Име на хоста : @HOSTNAME@
diff --git a/inc/lang/bg/uploadmail.txt b/inc/lang/bg/uploadmail.txt
index dc403397f..0c14437b0 100644
--- a/inc/lang/bg/uploadmail.txt
+++ b/inc/lang/bg/uploadmail.txt
@@ -1,11 +1,10 @@
 Качен е файл на вашето DokuWiki. Ето детайлите
 
-Файл: @MEDIA@
-Старата версия: @OLD@
-Дата: @DATE@
-Браузър: @BROWSER@
-IP адрес: @IPADDRESS@
-Име на хоста: @HOSTNAME@
-Размер: @SIZE@
-MIME тип: @MIME@
-Потребител: @USER@
+Файл : @MEDIA@
+Дата  : @DATE@
+Браузър : @BROWSER@
+IP адрес : @IPADDRESS@
+Име на хоста : @HOSTNAME@
+Размер : @SIZE@
+MIME тип : @MIME@
+Потребител : @USER@
diff --git a/inc/lang/ca-valencia/password.txt b/inc/lang/ca-valencia/password.txt
index 2ee4b1e83..d9a781e0f 100644
--- a/inc/lang/ca-valencia/password.txt
+++ b/inc/lang/ca-valencia/password.txt
@@ -1,6 +1,6 @@
-¡Hola, @FULLNAME@!
+¡Hola @FULLNAME@!
 
 Estes són les seues senyes d'usuari per a @TITLE@ en @DOKUWIKIURL@
 
-Usuari: @LOGIN@
-Contrasenya: @PASSWORD@
+Usuari      : @LOGIN@
+Contrasenya : @PASSWORD@
diff --git a/inc/lang/ca-valencia/registermail.txt b/inc/lang/ca-valencia/registermail.txt
index 387f945bc..02f2c1a3b 100644
--- a/inc/lang/ca-valencia/registermail.txt
+++ b/inc/lang/ca-valencia/registermail.txt
@@ -1,10 +1,10 @@
 S'ha registrat un usuari nou. Estes són les senyes:
 
-Nom d'usuari: @NEWUSER@
-Nom complet: @NEWNAME@
-Correu electrònic: @NEWEMAIL@
+Nom d'usuari : @NEWUSER@
+Nom complet : @NEWNAME@
+Correu electrònic : @NEWEMAIL@
 
-Data: @DATE@
-Navegador: @BROWSER@
-Direcció IP: @IPADDRESS@
-Nom de la màquina: @HOSTNAME@
+Data : @DATE@
+Navegador : @BROWSER@
+Direcció IP : @IPADDRESS@
+Nom de la màquina : @HOSTNAME@
diff --git a/inc/lang/ca-valencia/uploadmail.txt b/inc/lang/ca-valencia/uploadmail.txt
index 74692c2af..a67397db1 100644
--- a/inc/lang/ca-valencia/uploadmail.txt
+++ b/inc/lang/ca-valencia/uploadmail.txt
@@ -1,7 +1,6 @@
 S'ha enviat un archiu al seu DokuWiki. Les senyes:
 
 Arxiu: @MEDIA@
-Revisió anterior: @OLD@
 Data: @DATE@
 Navegador: @BROWSER@
 Direcció IP: @IPADDRESS@
diff --git a/inc/lang/ca/mailtext.txt b/inc/lang/ca/mailtext.txt
index 631f07d33..dd7f0c567 100644
--- a/inc/lang/ca/mailtext.txt
+++ b/inc/lang/ca/mailtext.txt
@@ -1,12 +1,11 @@
 S'ha afegit o modificat una pàgina en el vostre wiki. Ací teniu més detalls:
 
-Data: @DATE@
-Navegador: @BROWSER@
-IP: @IPADDRESS@
-Nom de la màquina: @HOSTNAME@
-Rev. anterior: @OLDPAGE@
-Rev. actual: @NEWPAGE@
-Resum d'edició: @SUMMARY@
-Usuari: @USER@
+Data           : @DATE@
+Navegador      : @BROWSER@
+IP             : @IPADDRESS@
+Rev. anterior  : @OLDPAGE@
+Rev. actual    : @NEWPAGE@
+Resum d'edició : @SUMMARY@
+Usuari         : @USER@
 
 @DIFF@
diff --git a/inc/lang/ca/password.txt b/inc/lang/ca/password.txt
index 026d7cefb..d4bd9f964 100644
--- a/inc/lang/ca/password.txt
+++ b/inc/lang/ca/password.txt
@@ -1,6 +1,6 @@
-Benvolgut/da, @FULLNAME@!
+Benvolgut/da @FULLNAME@,
 
 Aquestes són les teves dades per a entrar en @TITLE@ en l'adreça @DOKUWIKIURL@
 
-Usuari: @LOGIN@
-Contrasenya: @PASSWORD@
+Usuari      : @LOGIN@
+Contrasenya : @PASSWORD@
diff --git a/inc/lang/ca/uploadmail.txt b/inc/lang/ca/uploadmail.txt
index 5a8409648..01b764822 100644
--- a/inc/lang/ca/uploadmail.txt
+++ b/inc/lang/ca/uploadmail.txt
@@ -1,7 +1,6 @@
 S'ha penjat un fitxer al vostre DokuWiki. Heus ací els detalls:
 
 Fitxer: @MEDIA@
-Revisió antiga: @OLD@
 Data: @DATE@
 Navegador: @BROWSER@
 Adreça IP: @IPADDRESS@
diff --git a/inc/lang/cs/mailtext.txt b/inc/lang/cs/mailtext.txt
index 0438cff75..8036ebec3 100644
--- a/inc/lang/cs/mailtext.txt
+++ b/inc/lang/cs/mailtext.txt
@@ -1,12 +1,12 @@
 Stránka ve vaší DokuWiki byla změněna. Zde jsou podrobnosti:
 
-Datum: @DATE@
-Prohlížeč: @BROWSER@
-IP adresa: @IPADDRESS@
-Hostitel: @HOSTNAME@
-Stará verze: @OLDPAGE@
-Nová verze: @NEWPAGE@
-Komentář: @SUMMARY@
-Uživatel: @USER@
+Datum       : @DATE@
+Prohlížeč   : @BROWSER@
+IP adresa   : @IPADDRESS@
+Hostitel    : @HOSTNAME@
+Stará verze : @OLDPAGE@
+Nová verze  : @NEWPAGE@
+Komentář    : @SUMMARY@
+Uživatel    : @USER@
 
 @DIFF@
diff --git a/inc/lang/cs/password.txt b/inc/lang/cs/password.txt
index 9f99cc4a7..6b7c68273 100644
--- a/inc/lang/cs/password.txt
+++ b/inc/lang/cs/password.txt
@@ -1,6 +1,7 @@
-Dobrý den, @FULLNAME@!
+Dobrý den!
 
 Zde jsou přihlašovací informace pro wiki @TITLE@ (@DOKUWIKIURL@)
 
-Uživatelské jméno: @LOGIN@
-Heslo: @PASSWORD@
+Jméno             : @FULLNAME@
+Uživatelské jméno : @LOGIN@
+Heslo             : @PASSWORD@
diff --git a/inc/lang/cs/registermail.txt b/inc/lang/cs/registermail.txt
index 3d58e295d..3c449bca1 100644
--- a/inc/lang/cs/registermail.txt
+++ b/inc/lang/cs/registermail.txt
@@ -1,10 +1,10 @@
 Zaregistroval se nový uživatel. Zde jsou detaily:
 
-Uživatelské jméno: @NEWUSER@
-Celé jméno: @NEWNAME@
-E-mail: @NEWEMAIL@
+Uživatelské jméno : @NEWUSER@
+Celé jméno : @NEWNAME@
+E-mail : @NEWEMAIL@
 
-Datum: @DATE@
-Prohlížeč: @BROWSER@
-IP adresa: @IPADDRESS@
-Hostitel: @HOSTNAME@
+Datum : @DATE@
+Prohlížeč : @BROWSER@
+IP adresa : @IPADDRESS@
+Hostitel : @HOSTNAME@
diff --git a/inc/lang/cs/uploadmail.txt b/inc/lang/cs/uploadmail.txt
index 8585b2576..090167da6 100644
--- a/inc/lang/cs/uploadmail.txt
+++ b/inc/lang/cs/uploadmail.txt
@@ -1,11 +1,10 @@
 Do DokuWiki byl nahrán nový dokument. Zde jsou podrobnosti:
 
-Soubor: @MEDIA@
-Stará revize: @OLD@
-Datum: @DATE@
-Prohlížeč: @BROWSER@
-IP adresa: @IPADDRESS@
-Hostitel: @HOSTNAME@
-Velikost: @SIZE@
-MIME typ: @MIME@
-Uživatel: @USER@
+Soubor : @MEDIA@
+Datum : @DATE@
+Prohlížeč : @BROWSER@
+IP adresa : @IPADDRESS@
+Hostitel : @HOSTNAME@
+Velikost : @SIZE@
+MIME typ : @MIME@
+Uživatel : @USER@
diff --git a/inc/lang/cy/mailtext.txt b/inc/lang/cy/mailtext.txt
index b00c67d12..27462332e 100644
--- a/inc/lang/cy/mailtext.txt
+++ b/inc/lang/cy/mailtext.txt
@@ -1,12 +1,17 @@
 Cafodd tudalen yn eich DokuWiki ei hychwanegu neu newid. Dyma'r manylion:
 
-Dyddiad: @DATE@
-Porwr: @BROWSER@
-Cyfeiriad-IP: @IPADDRESS@
-Gwesteiwr: @HOSTNAME@
-Hen Adolygiad: @OLDPAGE@
+Dyddiad         : @DATE@
+Porwr           : @BROWSER@
+Cyfeiriad-IP    : @IPADDRESS@
+Gwesteiwr       : @HOSTNAME@
+Hen Adolygiad   : @OLDPAGE@
 Adolygiad Newydd: @NEWPAGE@
-Crynodeb Golygu: @SUMMARY@
-Defnyddiwr: @USER@
+Crynodeb Golygu : @SUMMARY@
+Defnyddiwr      : @USER@
 
 @DIFF@
+
+
+-- 
+Cafodd y neges hon ei generadyu gan DokuWiki ar
+@DOKUWIKIURL@
diff --git a/inc/lang/cy/password.txt b/inc/lang/cy/password.txt
index d37fee99c..da0678ef3 100644
--- a/inc/lang/cy/password.txt
+++ b/inc/lang/cy/password.txt
@@ -1,6 +1,10 @@
-Shw mae, @FULLNAME@!
+Shw mae @FULLNAME@!
 
 Dyma'ch manylion ar gyfer @TITLE@ ar @DOKUWIKIURL@
 
-Defnyddair: @LOGIN@
-Cyfrinair: @PASSWORD@
+Defnyddair  : @LOGIN@
+Cyfrinair   : @PASSWORD@
+
+-- 
+Cafodd y neges hon ei generadu gan DokuWiki ar
+@DOKUWIKIURL@
diff --git a/inc/lang/cy/registermail.txt b/inc/lang/cy/registermail.txt
index 9b58bc07d..0cb2b4fd2 100644
--- a/inc/lang/cy/registermail.txt
+++ b/inc/lang/cy/registermail.txt
@@ -1,10 +1,14 @@
 Cofrestrodd defnyddiwr newydd. Dyma'r manylion:
 
-Defnyddair: @NEWUSER@
-Enw llawn: @NEWNAME@
-E-bost: @NEWEMAIL@
+Defnyddair   : @NEWUSER@
+Enw llawn    : @NEWNAME@
+E-bost       : @NEWEMAIL@
 
-Dyddiad: @DATE@
-Porwr: @BROWSER@
-Cyfeiriad-IP: @IPADDRESS@
-Gwesteiwr: @HOSTNAME@
+Dyddiad      : @DATE@
+Porwr        : @BROWSER@
+Cyfeiriad-IP : @IPADDRESS@
+Gwesteiwr    : @HOSTNAME@
+
+-- 
+Cafodd y neges hon ei generadu gan DokuWiki ar
+@DOKUWIKIURL@
diff --git a/inc/lang/cy/uploadmail.txt b/inc/lang/cy/uploadmail.txt
index 6f8627e22..8102232a3 100644
--- a/inc/lang/cy/uploadmail.txt
+++ b/inc/lang/cy/uploadmail.txt
@@ -1,11 +1,15 @@
 Cafodd ffeil ei lanlwytho i'ch DokuWiki. Dyma'r manylion:
 
-Ffeil: @MEDIA@
-Hen adolygiad: @OLD@
-Dyddiad: @DATE@
-Porwr: @BROWSER@
-Cyfeiriad-IP: @IPADDRESS@
-Gwesteiwr: @HOSTNAME@
-Maint: @SIZE@
-Teip MIME: @MIME@
-Defnyddiwr: @USER@
+Ffeil         : @MEDIA@
+Hen adolygiad : @OLD@
+Dyddiad       : @DATE@
+Porwr         : @BROWSER@
+Cyfeiriad-IP  : @IPADDRESS@
+Gwesteiwr     : @HOSTNAME@
+Maint         : @SIZE@
+Teip MIME     : @MIME@
+Defnyddiwr    : @USER@
+
+-- 
+Cafodd y neges hon ei generadu gan DokuWiki ar
+@DOKUWIKIURL@
diff --git a/inc/lang/da/mailtext.txt b/inc/lang/da/mailtext.txt
index e8c71b942..bea9cd3e4 100644
--- a/inc/lang/da/mailtext.txt
+++ b/inc/lang/da/mailtext.txt
@@ -1,12 +1,12 @@
 Et dokument i din DokuWiki blev ændret eller tilføjet. Her er detajlerne:
 
-Dato: @DATE@
-Browser: @BROWSER@
-IP-adresse: @IPADDRESS@
-Hostnavn: @HOSTNAME@
-Gammel udgave: @OLDPAGE@
-Ny udgave: @NEWPAGE@
-Redigerings resumé: @SUMMARY@
-Bruger: @USER@
+Dato               : @DATE@
+Browser            : @BROWSER@
+IP-adresse         : @IPADDRESS@
+Hostnavn           : @HOSTNAME@
+Gammel udgave      : @OLDPAGE@
+Ny udgave          : @NEWPAGE@
+Redigerings resumé : @SUMMARY@
+Bruger             : @USER@
 
 @DIFF@
diff --git a/inc/lang/da/password.txt b/inc/lang/da/password.txt
index 51330b9bc..b129bb9b1 100644
--- a/inc/lang/da/password.txt
+++ b/inc/lang/da/password.txt
@@ -1,6 +1,6 @@
-Hej, @FULLNAME@!
+Hej @FULLNAME@!
 
 Her er dine brugeroplysninger @TITLE@ at @DOKUWIKIURL@
 
-Brugernavn: @LOGIN@
-Adgangskode: @PASSWORD@
+Brugernavn  : @LOGIN@
+Adgangskode : @PASSWORD@
diff --git a/inc/lang/da/registermail.txt b/inc/lang/da/registermail.txt
index 793a16464..8ce3b54dc 100644
--- a/inc/lang/da/registermail.txt
+++ b/inc/lang/da/registermail.txt
@@ -1,10 +1,10 @@
 En ny bruger har registreret. Her er detaljerne:
 
-Brugernavn: @NEWUSER@
-Navn: @NEWNAME@
-E-mail: @NEWEMAIL@
+Brugernavn : @NEWUSER@
+Navn       : @NEWNAME@
+E-mail     : @NEWEMAIL@
 
-Dato: @DATE@
-Browser: @BROWSER@
-IP-adresse: @IPADDRESS@
-Værtsnavn: @HOSTNAME@
+Dato       : @DATE@
+Browser    : @BROWSER@
+IP-adresse : @IPADDRESS@
+Værtsnavn  : @HOSTNAME@
diff --git a/inc/lang/da/uploadmail.txt b/inc/lang/da/uploadmail.txt
index b9a4d76b4..87a087589 100644
--- a/inc/lang/da/uploadmail.txt
+++ b/inc/lang/da/uploadmail.txt
@@ -1,11 +1,10 @@
 En fil blev overføret til din DokuWiki. Her er detaljerne:
 
-Fil: @MEDIA@
-Gamle version: @OLD@
-Dato: @DATE@
-Browser: @BROWSER@
-IP-adresse: @IPADDRESS@
-Værtsnavn: @HOSTNAME@
-Størrelse: @SIZE@
-MIME Type: @MIME@
-Bruger: @USER@
+Fil         : @MEDIA@
+Dato        : @DATE@
+Browser     : @BROWSER@
+IP-adresse  : @IPADDRESS@
+Værtsnavn   : @HOSTNAME@
+Størrelse   : @SIZE@
+MIME Type   : @MIME@
+Bruger      : @USER@
diff --git a/inc/lang/de-informal/mailtext.txt b/inc/lang/de-informal/mailtext.txt
index c151b97a0..127b4816b 100644
--- a/inc/lang/de-informal/mailtext.txt
+++ b/inc/lang/de-informal/mailtext.txt
@@ -1,12 +1,12 @@
 Eine Seite in deinem Wiki wurde geändert oder neu angelegt. Hier sind die Details:
 
-Datum: @DATE@
-Browser: @BROWSER@
-IP-Adresse: @IPADDRESS@
-Hostname: @HOSTNAME@
-Alte Version: @OLDPAGE@
-Neue Version: @NEWPAGE@
+Datum          : @DATE@
+Browser        : @BROWSER@
+IP-Adresse     : @IPADDRESS@
+Hostname       : @HOSTNAME@
+Alte Version   : @OLDPAGE@
+Neue Version   : @NEWPAGE@
 Zusammenfassung: @SUMMARY@
-Benutzer: @USER@
+Benutzer       : @USER@
 
 @DIFF@
diff --git a/inc/lang/de-informal/password.txt b/inc/lang/de-informal/password.txt
index d87df2283..e99fc53b2 100644
--- a/inc/lang/de-informal/password.txt
+++ b/inc/lang/de-informal/password.txt
@@ -1,6 +1,6 @@
-Hallo, @FULLNAME@!
+Hallo @FULLNAME@!
 
 Hier sind deine Benutzerdaten für @TITLE@ auf @DOKUWIKIURL@
 
 Benutzername: @LOGIN@
-Passwort: @PASSWORD@
+Passwort    : @PASSWORD@
diff --git a/inc/lang/de-informal/registermail.txt b/inc/lang/de-informal/registermail.txt
index 674d99a7a..e19fb8f65 100644
--- a/inc/lang/de-informal/registermail.txt
+++ b/inc/lang/de-informal/registermail.txt
@@ -1,10 +1,10 @@
 Ein neuer Benutzer hat sich registriert. Hier sind die Details:
 
-Benutzername: @NEWUSER@
-Voller Name: @NEWNAME@
-E-Mail: @NEWEMAIL@
+Benutzername : @NEWUSER@
+Voller Name  : @NEWNAME@
+E-Mail       : @NEWEMAIL@
 
-Date: @DATE@
-Browser: @BROWSER@
-IP-Address: @IPADDRESS@
-Hostname: @HOSTNAME@
+Date         : @DATE@
+Browser      : @BROWSER@
+IP-Address   : @IPADDRESS@
+Hostname     : @HOSTNAME@
diff --git a/inc/lang/de-informal/uploadmail.txt b/inc/lang/de-informal/uploadmail.txt
index bfe4e6be2..d608cd562 100644
--- a/inc/lang/de-informal/uploadmail.txt
+++ b/inc/lang/de-informal/uploadmail.txt
@@ -1,11 +1,11 @@
 Eine Datei wurde in deinem Wiki hochgeladen. Hier sind die Details:
 
-Datei: @MEDIA@
+Datei       : @MEDIA@
 Alte Version: @OLD@
-Datum: @DATE@
-Browser: @BROWSER@
-IP-Adresse: @IPADDRESS@
-Hostname: @HOSTNAME@
-Größe: @SIZE@
-MIME-Typ: @MIME@
-Benutzer: @USER@
+Datum       : @DATE@
+Browser     : @BROWSER@
+IP-Adresse  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Größe       : @SIZE@
+MIME-Typ    : @MIME@
+Benutzer    : @USER@
diff --git a/inc/lang/de/mailtext.txt b/inc/lang/de/mailtext.txt
index 8158c3b1b..5968a704e 100644
--- a/inc/lang/de/mailtext.txt
+++ b/inc/lang/de/mailtext.txt
@@ -1,12 +1,12 @@
 Eine Seite in Ihrem Wiki wurde geändert oder neu angelegt. Hier sind die Details:
 
-Datum: @DATE@
-Browser: @BROWSER@
-IP-Adresse: @IPADDRESS@
-Hostname: @HOSTNAME@
-Alte Version: @OLDPAGE@
-Neue Version: @NEWPAGE@
+Datum          : @DATE@
+Browser        : @BROWSER@
+IP-Adresse     : @IPADDRESS@
+Hostname       : @HOSTNAME@
+Alte Version   : @OLDPAGE@
+Neue Version   : @NEWPAGE@
 Zusammenfassung: @SUMMARY@
-Benutzer: @USER@
+Benutzer       : @USER@
 
 @DIFF@
diff --git a/inc/lang/de/password.txt b/inc/lang/de/password.txt
index 24bea49e5..e6ab83c3e 100644
--- a/inc/lang/de/password.txt
+++ b/inc/lang/de/password.txt
@@ -1,6 +1,6 @@
-Hallo, @FULLNAME@!
+Hallo @FULLNAME@!
 
 Hier sind Ihre Benutzerdaten für @TITLE@ auf @DOKUWIKIURL@
 
 Benutzername: @LOGIN@
-Passwort: @PASSWORD@
+Passwort    : @PASSWORD@
diff --git a/inc/lang/de/registermail.txt b/inc/lang/de/registermail.txt
index 674d99a7a..e19fb8f65 100644
--- a/inc/lang/de/registermail.txt
+++ b/inc/lang/de/registermail.txt
@@ -1,10 +1,10 @@
 Ein neuer Benutzer hat sich registriert. Hier sind die Details:
 
-Benutzername: @NEWUSER@
-Voller Name: @NEWNAME@
-E-Mail: @NEWEMAIL@
+Benutzername : @NEWUSER@
+Voller Name  : @NEWNAME@
+E-Mail       : @NEWEMAIL@
 
-Date: @DATE@
-Browser: @BROWSER@
-IP-Address: @IPADDRESS@
-Hostname: @HOSTNAME@
+Date         : @DATE@
+Browser      : @BROWSER@
+IP-Address   : @IPADDRESS@
+Hostname     : @HOSTNAME@
diff --git a/inc/lang/de/uploadmail.txt b/inc/lang/de/uploadmail.txt
index 54a0866e7..3646bcc2c 100644
--- a/inc/lang/de/uploadmail.txt
+++ b/inc/lang/de/uploadmail.txt
@@ -1,11 +1,11 @@
 Eine Datei wurde in Ihrem Wiki hochgeladen. Hier sind die Details:
 
-Datei: @MEDIA@
+Datei       : @MEDIA@
 Alte Version: @OLD@
-Datum: @DATE@
-Browser: @BROWSER@
-IP-Adresse: @IPADDRESS@
-Hostname: @HOSTNAME@
-Größe: @SIZE@
-MIME-Typ: @MIME@
-Benutzer: @USER@
+Datum       : @DATE@
+Browser     : @BROWSER@
+IP-Adresse  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Größe       : @SIZE@
+MIME-Typ    : @MIME@
+Benutzer    : @USER@
diff --git a/inc/lang/el/mailtext.txt b/inc/lang/el/mailtext.txt
index 5a07879e8..cc2a22f05 100644
--- a/inc/lang/el/mailtext.txt
+++ b/inc/lang/el/mailtext.txt
@@ -1,12 +1,13 @@
-Μία σελίδα προστέθηκε ή τροποποιήθηκε στο DokuWiki σας. Αυτά είναι τα αντίστοιχα στοιχεία:
+Μία σελίδα προστέθηκε ή τροποποιήθηκε στο DokuWiki σας.
+Αυτά είναι τα αντίστοιχα στοιχεία:
 
-Ημερομηνία: @DATE@
-Φυλλομετρητής: @BROWSER@
-IP-Διεύθυνση: @IPADDRESS@
+Ημερομηνία      : @DATE@
+Φυλλομετρητής   : @BROWSER@
+IP-Διεύθυνση    : @IPADDRESS@
 Όνομα υπολογιστή: @HOSTNAME@
-Παλιά έκδοση: @OLDPAGE@
-Νέα έκδοση: @NEWPAGE@
-Σύνοψη: @SUMMARY@
-Χρήστης: @USER@
+Παλιά έκδοση    : @OLDPAGE@
+Νέα έκδοση      : @NEWPAGE@
+Σύνοψη          : @SUMMARY@
+Χρήστης         : @USER@
 
 @DIFF@
diff --git a/inc/lang/el/password.txt b/inc/lang/el/password.txt
index 029b12905..c664cb006 100644
--- a/inc/lang/el/password.txt
+++ b/inc/lang/el/password.txt
@@ -1,6 +1,6 @@
-@FULLNAME@, γειά σας!
+@FULLNAME@!, γειά σας.
 
 Αυτά είναι τα στοιχεία εισόδου για το @TITLE@ στο @DOKUWIKIURL@
 
-Όνομα: @LOGIN@
-Συνθηματικό: @PASSWORD@
+Όνομα       : @LOGIN@
+Συνθηματικό : @PASSWORD@
diff --git a/inc/lang/el/registermail.txt b/inc/lang/el/registermail.txt
index 82e25036d..5266fc195 100644
--- a/inc/lang/el/registermail.txt
+++ b/inc/lang/el/registermail.txt
@@ -1,10 +1,10 @@
 Ένας νέος χρήστης εγγράφηκε. Ορίστε οι λεπτομέρειες:
 
-Χρήστης: @NEWUSER@
-Όνομα: @NEWNAME@
-e-mail: @NEWEMAIL@
+Χρήστης         : @NEWUSER@
+Όνομα           : @NEWNAME@
+e-mail          : @NEWEMAIL@
 
-Ημερομηνία: @DATE@
-Φυλλομετρητής: @BROWSER@
-IP-Διεύθυνση: @IPADDRESS@
+Ημερομηνία      : @DATE@
+Φυλλομετρητής   : @BROWSER@
+IP-Διεύθυνση    : @IPADDRESS@
 Όνομα υπολογιστή: @HOSTNAME@
diff --git a/inc/lang/el/uploadmail.txt b/inc/lang/el/uploadmail.txt
index 3bc302cd1..c9cfca926 100644
--- a/inc/lang/el/uploadmail.txt
+++ b/inc/lang/el/uploadmail.txt
@@ -1,11 +1,11 @@
 Ένα αρχείο φορτώθηκε στο DokuWiki σας.
 Αυτά είναι τα αντίστοιχα στοιχεία:
 
-Αρχείο: @MEDIA@
-Ημερομηνία: @DATE@
-Φυλλομετρητής: @BROWSER@
-IP-Διεύθυνση: @IPADDRESS@
+Αρχείο          : @MEDIA@
+Ημερομηνία      : @DATE@
+Φυλλομετρητής   : @BROWSER@
+IP-Διεύθυνση    : @IPADDRESS@
 Όνομα υπολογιστή: @HOSTNAME@
-Μέγεθος: @SIZE@
-MIME Type: @MIME@
-Χρήστης: @USER@
+Μέγεθος         : @SIZE@
+MIME Type       : @MIME@
+Χρήστης         : @USER@
diff --git a/inc/lang/en/mailtext.txt b/inc/lang/en/mailtext.txt
index 4a35bbf49..aea14d459 100644
--- a/inc/lang/en/mailtext.txt
+++ b/inc/lang/en/mailtext.txt
@@ -1,12 +1,12 @@
 A page in your DokuWiki was added or changed. Here are the details:
 
-Date: @DATE@
-Browser: @BROWSER@
-IP-Address: @IPADDRESS@
-Hostname: @HOSTNAME@
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
 Old Revision: @OLDPAGE@
 New Revision: @NEWPAGE@
 Edit Summary: @SUMMARY@
-User: @USER@
+User        : @USER@
 
 @DIFF@
diff --git a/inc/lang/en/password.txt b/inc/lang/en/password.txt
index 14fb34ab1..0a0dfb52b 100644
--- a/inc/lang/en/password.txt
+++ b/inc/lang/en/password.txt
@@ -1,6 +1,6 @@
-Hi, @FULLNAME@!
+Hi @FULLNAME@!
 
 Here is your userdata for @TITLE@ at @DOKUWIKIURL@
 
-Login: @LOGIN@
-Password: @PASSWORD@
+Login    : @LOGIN@
+Password : @PASSWORD@
diff --git a/inc/lang/en/registermail.txt b/inc/lang/en/registermail.txt
index 45095ddd2..5517ca11b 100644
--- a/inc/lang/en/registermail.txt
+++ b/inc/lang/en/registermail.txt
@@ -1,10 +1,10 @@
 A new user has registered. Here are the details:
 
-User name: @NEWUSER@
-Full name: @NEWNAME@
-E-mail: @NEWEMAIL@
+User name   : @NEWUSER@
+Full name   : @NEWNAME@
+E-mail      : @NEWEMAIL@
 
-Date: @DATE@
-Browser: @BROWSER@
-IP-Address: @IPADDRESS@
-Hostname: @HOSTNAME@
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
diff --git a/inc/lang/en/uploadmail.txt b/inc/lang/en/uploadmail.txt
index df423bce0..dca8e3344 100644
--- a/inc/lang/en/uploadmail.txt
+++ b/inc/lang/en/uploadmail.txt
@@ -1,11 +1,11 @@
 A file was uploaded to your DokuWiki. Here are the details:
 
-File: @MEDIA@
+File        : @MEDIA@
 Old revision: @OLD@
-Date: @DATE@
-Browser: @BROWSER@
-IP-Address: @IPADDRESS@
-Hostname: @HOSTNAME@
-Size: @SIZE@
-MIME Type: @MIME@
-User: @USER@
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Size        : @SIZE@
+MIME Type   : @MIME@
+User        : @USER@
diff --git a/inc/lang/eo/uploadmail.txt b/inc/lang/eo/uploadmail.txt
index 623af0d28..6268824c5 100644
--- a/inc/lang/eo/uploadmail.txt
+++ b/inc/lang/eo/uploadmail.txt
@@ -1,7 +1,6 @@
 Dosiero alŝutiĝis al via DokuVikio. Jen detaloj:
 
 Dosiero: @MEDIA@
-Malnova revizio: @OLD@
 Dato: @DATE@
 Foliumilo: @BROWSER@
 IP-Adreso: @IPADDRESS@
diff --git a/inc/lang/es/mailtext.txt b/inc/lang/es/mailtext.txt
index cdd845658..e74d3eb83 100644
--- a/inc/lang/es/mailtext.txt
+++ b/inc/lang/es/mailtext.txt
@@ -1,12 +1,12 @@
 Se ha cambiado o añadido una página en tu DokuWiki. Aquí están los detalles:
 
-Fecha: @DATE@
-Navegador: @BROWSER@
-Dirección-IP: @IPADDRESS@
-Nombre de Host: @HOSTNAME@
+Fecha : @DATE@
+Navegador : @BROWSER@
+Dirección-IP : @IPADDRESS@
+Nombre de Host : @HOSTNAME@
 Revisión Vieja: @OLDPAGE@
-Revisión Nueva: @NEWPAGE@
+Revisión Nueva : @NEWPAGE@
 Resumen de la edición: @SUMMARY@
-Usuario: @USER@
+Usuario : @USER@
 
 @DIFF@
diff --git a/inc/lang/es/password.txt b/inc/lang/es/password.txt
index 1ae1ba082..64bded46a 100644
--- a/inc/lang/es/password.txt
+++ b/inc/lang/es/password.txt
@@ -1,6 +1,6 @@
-Hola, @FULLNAME@!
+Hola @FULLNAME@!
 
 Estos son los datos de usuario para @TITLE@ en @DOKUWIKIURL@
 
-Usuario: @LOGIN@
-Contraseña: @PASSWORD@
+Usuario : @LOGIN@
+Contraseña : @PASSWORD@
diff --git a/inc/lang/es/registermail.txt b/inc/lang/es/registermail.txt
index d72214e71..b9208a1af 100644
--- a/inc/lang/es/registermail.txt
+++ b/inc/lang/es/registermail.txt
@@ -1,10 +1,10 @@
 Un nuevo usuario ha sido registrado. Aquí están los detalles:
 
-Usuario: @NEWUSER@
-Nombre completo: @NEWNAME@
-E-Mail: @NEWEMAIL@
+Usuario         : @NEWUSER@
+Nombre completo : @NEWNAME@
+E-Mail          : @NEWEMAIL@
 
-Fecha: @DATE@
-Navegador: @BROWSER@
-Dirección-IP: @IPADDRESS@
-Nombre del host: @HOSTNAME@
+Fecha : @DATE@
+Navegador : @BROWSER@
+Dirección-IP : @IPADDRESS@
+Nombre del host : @HOSTNAME@
diff --git a/inc/lang/es/uploadmail.txt b/inc/lang/es/uploadmail.txt
index 2e8d1459c..eb1c5df2a 100644
--- a/inc/lang/es/uploadmail.txt
+++ b/inc/lang/es/uploadmail.txt
@@ -1,11 +1,11 @@
 Se ha subido un fichero a tu DokuWiki. Estos son los detalles:
 
-Archivo: @MEDIA@
+Archivo : @MEDIA@
 Ultima revisión: @OLD@
-Fecha: @DATE@
-Navegador: @BROWSER@
-Dirección IP: @IPADDRESS@
-Hostname: @HOSTNAME@
-Tamaño: @SIZE@
-MIME Type: @MIME@
-Usuario: @USER@
+Fecha : @DATE@
+Navegador : @BROWSER@
+Dirección IP : @IPADDRESS@
+Hostname : @HOSTNAME@
+Tamaño : @SIZE@
+MIME Type : @MIME@
+Usuario : @USER@
diff --git a/inc/lang/et/mailtext.txt b/inc/lang/et/mailtext.txt
index 8ed8dede4..f1a62029d 100644
--- a/inc/lang/et/mailtext.txt
+++ b/inc/lang/et/mailtext.txt
@@ -1,12 +1,12 @@
 Sinu lehte DokuWiki-s on muudetud. Alljärgnevalt detailid:
 
-Kuupäev: @DATE@
-Brauser: @BROWSER@
-IP-Aadress: @IPADDRESS@
-Arvuti nimi: @HOSTNAME@
-Eelnev versioon: @OLDPAGE@
-Uus versioon: @NEWPAGE@
+Kuupäev           : @DATE@
+Brauser           : @BROWSER@
+IP-Aadress        : @IPADDRESS@
+Arvuti nimi       : @HOSTNAME@
+Eelnev versioon   : @OLDPAGE@
+Uus versioon      : @NEWPAGE@
 Toimeta kokkuvõtet: @SUMMARY@
-Kasutaja: @USER@
+Kasutaja          : @USER@
 
 @DIFF@
diff --git a/inc/lang/et/password.txt b/inc/lang/et/password.txt
index c463087f6..9d75bb8db 100644
--- a/inc/lang/et/password.txt
+++ b/inc/lang/et/password.txt
@@ -1,6 +1,6 @@
-Hi, @FULLNAME@!
+Hi @FULLNAME@!
 
 Siin on sinu kasutajaandmed @TITLE@ks @DOKUWIKIURL@s
 
-Sisse logimisnimi: @LOGIN@
-Parool: @PASSWORD@
+Sisse logimisnimi : @LOGIN@
+Parool : @PASSWORD@
diff --git a/inc/lang/et/registermail.txt b/inc/lang/et/registermail.txt
index 2e8ecff31..3b7896377 100644
--- a/inc/lang/et/registermail.txt
+++ b/inc/lang/et/registermail.txt
@@ -1,10 +1,10 @@
 Uus kasutaja on registreeritud. Tema info:
 
-Kasutaja: @NEWUSER@
-Täielik nimi: @NEWNAME@
-E-post: @NEWEMAIL@
+Kasutaja     : @NEWUSER@
+Täielik nimi : @NEWNAME@
+E-post       : @NEWEMAIL@
 
-Kuupäev: @DATE@
-Lehitseja: @BROWSER@
-IP-Aaddress: @IPADDRESS@
-Hosti nimi: @HOSTNAME@
+Kuupäev      : @DATE@
+Lehitseja    : @BROWSER@
+IP-Aaddress  : @IPADDRESS@
+Hosti nimi   : @HOSTNAME@
diff --git a/inc/lang/et/uploadmail.txt b/inc/lang/et/uploadmail.txt
index 56dee12c6..2c21926e2 100644
--- a/inc/lang/et/uploadmail.txt
+++ b/inc/lang/et/uploadmail.txt
@@ -1,11 +1,12 @@
-Sinu DokuWiki-sse lisati fail. Lähemalt:
+Sinu DokuWiki-sse lisati fail.
+Lähemalt:
 
-Fail: @MEDIA@
-Endine: @OLD@
-Kuupäev: @DATE@
-Veebilehitseja: @BROWSER@
-IP-aadress: @IPADDRESS@
-Hostinimi: @HOSTNAME@
-Suurus: @SIZE@
-MIME liik: @MIME@
-Kasutaja: @ USER@
+  Fail                 : @MEDIA@
+  Endine            : @OLD@
+  Kuupäev         : @DATE@
+  Veebilehitseja : @BROWSER@
+  IP-aadress      : @IPADDRESS@
+  Hostinimi         : @HOSTNAME@
+  Suurus            : @SIZE@
+  MIME liik         : @MIME@
+  Kasutaja          : @ USER@
diff --git a/inc/lang/eu/mailtext.txt b/inc/lang/eu/mailtext.txt
index 9607d0973..ad0ff2f20 100644
--- a/inc/lang/eu/mailtext.txt
+++ b/inc/lang/eu/mailtext.txt
@@ -1,12 +1,12 @@
 DokuWiki-Eskuliburuetan orriren bat aldatu edo gehitu da. Hemen dituzu xehetasunak
 
-Data: @DATE@
-Nabigatzailea: @BROWSER@
-IP-Helbidea: @IPADDRESS@
-Host izena: @HOSTNAME@
-Bertsio zaharra: @OLDPAGE@
-Bertsio berria: @NEWPAGE@
-Aldatu laburpena: @SUMMARY@
-Erabiltzailea: @USER@
+Data                : @DATE@
+Nabigatzailea       : @BROWSER@
+IP-Helbidea         : @IPADDRESS@
+Host izena          : @HOSTNAME@
+Bertsio zaharra : @OLDPAGE@
+Bertsio berria  : @NEWPAGE@
+Aldatu laburpena    : @SUMMARY@
+Erabiltzailea       : @USER@
 
 @DIFF@
diff --git a/inc/lang/eu/password.txt b/inc/lang/eu/password.txt
index 085c89cdf..a9c079f23 100644
--- a/inc/lang/eu/password.txt
+++ b/inc/lang/eu/password.txt
@@ -1,6 +1,6 @@
-Kaixo, @FULLNAME@!
+Kaixo @FULLNAME@!
 
 Hau da zure erabiltzailea @TITLE@ -rentzako @DOKUWIKIURL@
 
-Erabiltzailea: @LOGIN@
-Pasahitza: @PASSWORD@
+Erabiltzailea    : @LOGIN@
+Pasahitza : @PASSWORD@
diff --git a/inc/lang/eu/registermail.txt b/inc/lang/eu/registermail.txt
index 8cb9143e9..a2897e6dd 100644
--- a/inc/lang/eu/registermail.txt
+++ b/inc/lang/eu/registermail.txt
@@ -1,10 +1,10 @@
 Erabiltzaile berri bat erregistratu da. Hona hemen xehetasunak:
 
-Erabiltzaile izena: @NEWUSER@
-Izen osoa: @NEWNAME@
-Posta-e: @NEWEMAIL@
+Erabiltzaile izena : @NEWUSER@
+Izen osoa : @NEWNAME@
+Posta-e : @NEWEMAIL@
 
-Data: @DATE@
-Nabigatzailea: @BROWSER@
-IP-Helbidea: @IPADDRESS@
-Hostalari izena: @HOSTNAME@
+Data : @DATE@
+Nabigatzailea : @BROWSER@
+IP-Helbidea : @IPADDRESS@
+Hostalari izena : @HOSTNAME@
diff --git a/inc/lang/eu/uploadmail.txt b/inc/lang/eu/uploadmail.txt
index 16cacc39c..7b685e046 100644
--- a/inc/lang/eu/uploadmail.txt
+++ b/inc/lang/eu/uploadmail.txt
@@ -1,11 +1,10 @@
 Fitxategi bat igo da zure DokuWikira. Hona hemen xehetasunak:
 
-Fitxategia: @MEDIA@
-Zaharrak berrikustea: @OLD@
-Data: @DATE@
-Nabigatzailea: @BROWSER@
-IP-Helbide: @IPADDRESS@
-Hostalari izena: @HOSTNAME@
-Tamaina: @SIZE@
-MIME Mota: @MIME@
-Erabiltzailea: @USER@
+Fitxategia : @MEDIA@
+Data : @DATE@
+Nabigatzailea : @BROWSER@
+IP-Helbide : @IPADDRESS@
+Hostalari izena : @HOSTNAME@
+Tamaina : @SIZE@
+MIME Mota : @MIME@
+Erabiltzailea : @USER@
diff --git a/inc/lang/fa/password.txt b/inc/lang/fa/password.txt
index e8f7f2c60..86e7289c9 100644
--- a/inc/lang/fa/password.txt
+++ b/inc/lang/fa/password.txt
@@ -1,4 +1,4 @@
-سلام, @FULLNAME@!
+سلام @FULLNAME@!
 
 اطلاعات شخصی شما با عنوان @TITLE@ در @DOKUWIKIURL@ در ادامه آمده است:
 
diff --git a/inc/lang/fa/uploadmail.txt b/inc/lang/fa/uploadmail.txt
index 2b6126747..e9218b6b1 100644
--- a/inc/lang/fa/uploadmail.txt
+++ b/inc/lang/fa/uploadmail.txt
@@ -1,7 +1,6 @@
 یک فایل به ویکی ارسال شد:
 
 فایل: @MEDIA@
-پیر تجدید نظر: @OLD@
 تاریخ: @DATE@
 مرورگر: @BROWSER@
 آدرس IP: @IPADDRESS@
diff --git a/inc/lang/fi/mailtext.txt b/inc/lang/fi/mailtext.txt
index fd63fffa2..015b3c325 100644
--- a/inc/lang/fi/mailtext.txt
+++ b/inc/lang/fi/mailtext.txt
@@ -1,12 +1,12 @@
 DokuWikiisi lisättiin tai siellä muutettiin sivua. Tässä yksityiskohdat
 
-Päivämäärä: @DATE@
+Päivämäärä : @DATE@
 Selain: @BROWSER@
 IP-Osoite: @IPADDRESS@
 Isäntänimi: @HOSTNAME@
 Vanha versio: @OLDPAGE@
 Uusi versio: @NEWPAGE@
 Yhteenveto: @SUMMARY@
-Käyttäjä: @USER@
+Käyttäjä : @USER@
 
 @DIFF@
diff --git a/inc/lang/fi/password.txt b/inc/lang/fi/password.txt
index 6e629017c..e088166f6 100644
--- a/inc/lang/fi/password.txt
+++ b/inc/lang/fi/password.txt
@@ -1,6 +1,6 @@
-Terve, @FULLNAME@!
+Terve @FULLNAME@!
 
 Tässä käyttäjätietosi sivulla @TITLE@ osoitteessa @DOKUWIKIURL@
 
-Käyttäjätunnus: @LOGIN@
-Salasana: @PASSWORD@
+Käyttäjätunnus : @LOGIN@
+Salasana : @PASSWORD@
diff --git a/inc/lang/fi/registermail.txt b/inc/lang/fi/registermail.txt
index b3ca22a7f..07c35be0a 100644
--- a/inc/lang/fi/registermail.txt
+++ b/inc/lang/fi/registermail.txt
@@ -1,10 +1,10 @@
 Uusi käyttäjä on rekisteröitynyt. Tässä tiedot:
 
-Käyttäjänimi: @NEWUSER@
-Kokonimi: @NEWNAME@
-Sähköposti: @NEWEMAIL@
+Käyttäjänimi : @NEWUSER@
+Kokonimi : @NEWNAME@
+Sähköposti : @NEWEMAIL@
 
-Päivämäärä: @DATE@
-Selain: @BROWSER@
-IP-osoite: @IPADDRESS@
-Hostname: @HOSTNAME@
+Päivämäärä : @DATE@
+Selain : @BROWSER@
+IP-osoite : @IPADDRESS@
+Hostname : @HOSTNAME@
diff --git a/inc/lang/fi/uploadmail.txt b/inc/lang/fi/uploadmail.txt
index 012e0f3ee..e7b9abfe8 100644
--- a/inc/lang/fi/uploadmail.txt
+++ b/inc/lang/fi/uploadmail.txt
@@ -1,11 +1,10 @@
 Tiedosto ladattiin DokuWikillesi. Tässä yksityiskohtaiset tiedot:
 
-Tiedosto: @MEDIA@
-Vanha tarkistus: @OLD@
-PVM: @DATE@
-Selain: @BROWSER@
-IP-Osoite: @IPADDRESS@
-Hostname: @HOSTNAME@
-Koko: @SIZE@
-MIME Type: @MIME@
-Käyttäjä: @USER@
+Tiedosto : @MEDIA@
+PVM : @DATE@
+Selain : @BROWSER@
+IP-Osoite : @IPADDRESS@
+Hostname : @HOSTNAME@
+Koko : @SIZE@
+MIME Type : @MIME@
+Käyttäjä : @USER@
diff --git a/inc/lang/fo/mailtext.txt b/inc/lang/fo/mailtext.txt
index c2086327e..331edfefc 100644
--- a/inc/lang/fo/mailtext.txt
+++ b/inc/lang/fo/mailtext.txt
@@ -1,12 +1,12 @@
 Eitt skjal í tíni DokuWiki bleiv broytt ella skoytt uppí. Her er ein lýsing:
 
-Dato: @DATE@
-Browser: @BROWSER@
-IP-adressa: @IPADDRESS@
-Hostnavn: @HOSTNAME@
-Gomul útgáva: @OLDPAGE@
-Nýggj útgáva: @NEWPAGE@
-Rætti samandráttur: @SUMMARY@
-Brúkari: @USER@
+Dato               : @DATE@
+Browser            : @BROWSER@
+IP-adressa         : @IPADDRESS@
+Hostnavn           : @HOSTNAME@
+Gomul útgáva       : @OLDPAGE@
+Nýggj útgáva       : @NEWPAGE@
+Rætti samandráttur : @SUMMARY@
+Brúkari            : @USER@
 
 @DIFF@
diff --git a/inc/lang/fo/password.txt b/inc/lang/fo/password.txt
index 640204d35..df8b6e71e 100644
--- a/inc/lang/fo/password.txt
+++ b/inc/lang/fo/password.txt
@@ -1,6 +1,6 @@
-Hey, @FULLNAME@!
+Hey @FULLNAME@!
 
 Her eru tínar brúkaraupplýsingar @TITLE@ at @DOKUWIKIURL@
 
-Brúkaranavn: @LOGIN@
-Loyniorð: @PASSWORD@
+Brúkaranavn : @LOGIN@
+Loyniorð    : @PASSWORD@
diff --git a/inc/lang/fr/mailtext.txt b/inc/lang/fr/mailtext.txt
index 89aef5a62..d93eb1e8a 100644
--- a/inc/lang/fr/mailtext.txt
+++ b/inc/lang/fr/mailtext.txt
@@ -1,12 +1,13 @@
-Une page dans votre wiki a été ajoutée ou modifiée. Voici les détails:
+Une page dans votre wiki a été ajoutée ou modifiée. Voici les
+détails :
 
-Date: @DATE@
-Navigateur: @BROWSER@
-Adresse IP: @IPADDRESS@
-Nom d'hôte: @HOSTNAME@
-Ancienne révision: @OLDPAGE@
-Nouvelle révision: @NEWPAGE@
-Résumé: @SUMMARY@
-Utilisateur: @USER@
+Date              : @DATE@
+Navigateur        : @BROWSER@
+Adresse IP        : @IPADDRESS@
+Nom d'hôte        : @HOSTNAME@
+Ancienne révision : @OLDPAGE@
+Nouvelle révision : @NEWPAGE@
+Résumé            : @SUMMARY@
+Utilisateur       : @USER@
 
 @DIFF@
diff --git a/inc/lang/fr/password.txt b/inc/lang/fr/password.txt
index b3589ce8b..2ffe71586 100644
--- a/inc/lang/fr/password.txt
+++ b/inc/lang/fr/password.txt
@@ -1,6 +1,6 @@
-Bonjour, @FULLNAME@!
+Bonjour @FULLNAME@ !
 
 Voici vos identifiants pour @TITLE@ sur @DOKUWIKIURL@
 
-Utilisateur: @LOGIN@
-Mot de passe: @PASSWORD@
+Utilisateur  : @LOGIN@
+Mot de passe : @PASSWORD@
diff --git a/inc/lang/fr/registermail.txt b/inc/lang/fr/registermail.txt
index fcc1a7ec7..fe39c2db5 100644
--- a/inc/lang/fr/registermail.txt
+++ b/inc/lang/fr/registermail.txt
@@ -1,10 +1,10 @@
-Un nouvel utilisateur s'est enregistré. Voici les détails:
+Un nouvel utilisateur s'est enregistré. Voici les détails :
 
-Utilisateur: @NEWUSER@
-Nom: @NEWNAME@
-Courriel: @NEWEMAIL@
+Utilisateur         : @NEWUSER@
+Nom         : @NEWNAME@
+Courriel : @NEWEMAIL@
 
-Date: @DATE@
-Navigateur internet: @BROWSER@
-Adresse IP: @IPADDRESS@
-Nom d'hôte: @HOSTNAME@
+Date                : @DATE@
+Navigateur internet         : @BROWSER@
+Adresse IP          : @IPADDRESS@
+Nom d'hôte          : @HOSTNAME@
diff --git a/inc/lang/fr/uploadmail.txt b/inc/lang/fr/uploadmail.txt
index af8205ae1..37273d954 100644
--- a/inc/lang/fr/uploadmail.txt
+++ b/inc/lang/fr/uploadmail.txt
@@ -1,11 +1,10 @@
 Un fichier a été envoyé dans votre wiki. Voici les détails :
 
-Fichier: @MEDIA@
-Ancienne révision: @OLD@
-Date: @DATE@
-Navigateur: @BROWSER@
-Adresse IP: @IPADDRESS@
-Nom d'hôte: @HOSTNAME@
-Taille: @SIZE@
-Type MIME: @MIME@
-Utilisateur: @USER@
+Fichier     : @MEDIA@
+Date        : @DATE@
+Navigateur  : @BROWSER@
+Adresse IP  : @IPADDRESS@
+Nom d'hôte  : @HOSTNAME@
+Taille      : @SIZE@
+Type MIME   : @MIME@
+Utilisateur : @USER@
diff --git a/inc/lang/gl/mailtext.txt b/inc/lang/gl/mailtext.txt
index be6c79fbe..bf102e18b 100644
--- a/inc/lang/gl/mailtext.txt
+++ b/inc/lang/gl/mailtext.txt
@@ -1,12 +1,12 @@
 Engadiuse ou mudouse unha páxina no teu DokuWiki. Aquí van os pormenores:
 
-Data: @DATE@
-Navegador: @BROWSER@
-Enderezo IP: @IPADDRESS@
-Nome do Host: @HOSTNAME@
-Revisión Antiga: @OLDPAGE@
-Revision Nova: @NEWPAGE@
-Resumo da Edición: @SUMMARY@
-Usuario: @USER@
+Data              : @DATE@
+Navegador         : @BROWSER@
+Enderezo IP       : @IPADDRESS@
+Nome do Host      : @HOSTNAME@
+Revisión Antiga   : @OLDPAGE@
+Revision Nova     : @NEWPAGE@
+Resumo da Edición : @SUMMARY@
+Usuario         : @USER@
 
 @DIFF@
diff --git a/inc/lang/gl/password.txt b/inc/lang/gl/password.txt
index 8271fb20d..36f8562b3 100644
--- a/inc/lang/gl/password.txt
+++ b/inc/lang/gl/password.txt
@@ -1,6 +1,6 @@
-Ola, @FULLNAME@!
+Ola @FULLNAME@!
 
 Aquí tes os teus datos de usuario para @TITLE@ en @DOKUWIKIURL@
 
-Usuario: @LOGIN@
-Contrasinal: @PASSWORD@
+Usuario    : @LOGIN@
+Contrasinal : @PASSWORD@
diff --git a/inc/lang/gl/registermail.txt b/inc/lang/gl/registermail.txt
index 1d61c527a..aad8481ba 100644
--- a/inc/lang/gl/registermail.txt
+++ b/inc/lang/gl/registermail.txt
@@ -1,10 +1,10 @@
 Rexistrouse un novo usuario. Aquí van os pormenores:
 
-Nome de usuario: @NEWUSER@
-Nome completo: @NEWNAME@
-Correo-e: @NEWEMAIL@
+Nome de usuario   : @NEWUSER@
+Nome completo	  : @NEWNAME@
+Correo-e	      : @NEWEMAIL@
 
-Data: @DATE@
-Navegador     : @BROWSER@
-Enderezo IP: @IPADDRESS@
-Nome do Host: @HOSTNAME@
+Data	        : @DATE@
+Navegador     	: @BROWSER@
+Enderezo IP		: @IPADDRESS@
+Nome do Host	: @HOSTNAME@
diff --git a/inc/lang/gl/uploadmail.txt b/inc/lang/gl/uploadmail.txt
index 01a259987..c01bc7df4 100644
--- a/inc/lang/gl/uploadmail.txt
+++ b/inc/lang/gl/uploadmail.txt
@@ -1,11 +1,10 @@
 Subiuse un arquivo ao teu DokuWiki. Aquí van os pormenores:
 
-Arquivo: @MEDIA@
-Revisión antiga: @OLD@
-Data: @DATE@
-Navegador: @BROWSER@
-Enderezo IP: @IPADDRESS@
-Nome do Host: @HOSTNAME@
-Tamaño: @SIZE@
-Tipo MIME: @MIME@
-Usuario: @USER@
+Arquivo : @MEDIA@
+Data : @DATE@
+Navegador : @BROWSER@
+Enderezo IP : @IPADDRESS@
+Nome do Host : @HOSTNAME@
+Tamaño : @SIZE@
+Tipo MIME : @MIME@
+Usuario : @USER@
diff --git a/inc/lang/he/mailtext.txt b/inc/lang/he/mailtext.txt
index f0907e452..f33760e76 100644
--- a/inc/lang/he/mailtext.txt
+++ b/inc/lang/he/mailtext.txt
@@ -1,12 +1,12 @@
 דף בDokuWiki נוסף או שונה. להלן הפרטים:
 
-תאריך: @DATE@
-דפדפן: @BROWSER@
-כתובת ה־IP&#8207;: @IPADDRESS@
-שם המארח: @HOSTNAME@
+תאריך        : @DATE@
+דפדפן     : @BROWSER@
+כתובת ה־IP&#8207;  : @IPADDRESS@
+שם המארח    : @HOSTNAME@
 המהדורה הישנה: @OLDPAGE@
 המהדורה החדשה: @NEWPAGE@
 תקציר העריכה: @SUMMARY@
-משתמש: @USER@
+משתמש        : @USER@
 
 @DIFF@
diff --git a/inc/lang/he/password.txt b/inc/lang/he/password.txt
index eda24349c..bfa29b680 100644
--- a/inc/lang/he/password.txt
+++ b/inc/lang/he/password.txt
@@ -1,6 +1,6 @@
-שלום, @FULLNAME@!
+שלום @FULLNAME@!
 
 הנה נתוני המשתמש שלך עבור @TITLE@ ב־@DOKUWIKIURL@
 
-שם כניסה: @LOGIN@
-ססמה: @PASSWORD@
+שם כניסה     : @LOGIN@
+ססמה     : @PASSWORD@
diff --git a/inc/lang/he/registermail.txt b/inc/lang/he/registermail.txt
index 2088d5d0c..2216cb36a 100644
--- a/inc/lang/he/registermail.txt
+++ b/inc/lang/he/registermail.txt
@@ -1,10 +1,10 @@
 משתמש חדש נרשם. להלן הפרטים:
 
-שם משתמש: @NEWUSER@
-שם מלא: @NEWNAME@
-דוא״ל: @NEWEMAIL@
+שם משתמש   : @NEWUSER@
+שם מלא     : @NEWNAME@
+דוא״ל      : @NEWEMAIL@
 
-תאריך: @DATE@
-דפדפן: @BROWSER@
-כתובת IP&#8207;: @IPADDRESS@
-שם המארח: @HOSTNAME@
+תאריך      : @DATE@
+דפדפן      : @BROWSER@
+כתובת IP&#8207;  : @IPADDRESS@
+שם המארח   : @HOSTNAME@
diff --git a/inc/lang/he/uploadmail.txt b/inc/lang/he/uploadmail.txt
index ad61384e1..9c06f133b 100644
--- a/inc/lang/he/uploadmail.txt
+++ b/inc/lang/he/uploadmail.txt
@@ -1,11 +1,10 @@
 קובץ הועלה אל הדוקוויקי שלך. הנה פרטיו:
 
-קובץ: @MEDIA@
-בת revision: @OLD@
-תאריך: @DATE@
-דפדפן: @BROWSER@
-כתובת IP: @IPADDRESS@
-מארח: @HOSTNAME@
-גודל: @SIZE@
-סיווג: @MIME@
-משתמש: @USER@
+קובץ : @MEDIA@
+תאריך : @DATE@
+דפדפן : @BROWSER@
+כתובת IP : @IPADDRESS@
+מארח : @HOSTNAME@
+גודל : @SIZE@
+סיווג : @MIME@
+משתמש : @USER@
diff --git a/inc/lang/hr/mailtext.txt b/inc/lang/hr/mailtext.txt
index e81cb8ea8..1719fd5a0 100644
--- a/inc/lang/hr/mailtext.txt
+++ b/inc/lang/hr/mailtext.txt
@@ -1,12 +1,12 @@
 Dokument na Vašem wiki-ju je promijenjen ili dodan:
 
-Datum: @DATE@
-Preglednik: @BROWSER@
-IP-Adresa: @IPADDRESS@
-Host: @HOSTNAME@
-Prijašnja izmjena: @OLDPAGE@
-Nova izmjena: @NEWPAGE@
-Opis izmjene: @SUMMARY@
-Korisnik: @USER@
+Datum             : @DATE@
+Preglednik        : @BROWSER@
+IP-Adresa         : @IPADDRESS@
+Host              : @HOSTNAME@
+Prijašnja izmjena : @OLDPAGE@
+Nova izmjena      : @NEWPAGE@
+Opis izmjene      : @SUMMARY@
+Korisnik          : @USER@
 
 @DIFF@
diff --git a/inc/lang/hr/password.txt b/inc/lang/hr/password.txt
index 883c799b3..76cccbd2e 100644
--- a/inc/lang/hr/password.txt
+++ b/inc/lang/hr/password.txt
@@ -1,6 +1,6 @@
-Pozdrav, @FULLNAME@!
+Pozdrav @FULLNAME@!
 
 Slijede podaci za @TITLE@ sa @DOKUWIKIURL@
 
-Korisničko ime: @LOGIN@
-Lozinka: @PASSWORD@
+Korisničko ime : @LOGIN@
+Lozinka        : @PASSWORD@
diff --git a/inc/lang/hr/registermail.txt b/inc/lang/hr/registermail.txt
index c3e45867e..9c556d9e3 100644
--- a/inc/lang/hr/registermail.txt
+++ b/inc/lang/hr/registermail.txt
@@ -1,10 +1,10 @@
 Novi korisnik je registriran. Ovdje su detalji:
 
-Korisničko ime: @NEWUSER@
-Puno ime: @NEWNAME@
-e-pošta: @NEWEMAIL@
+Korisničko ime : @NEWUSER@
+Puno ime       : @NEWNAME@
+e-pošta        : @NEWEMAIL@
 
-Datum: @DATE@
-Preglednik: @BROWSER@
-IP-Adresa: @IPADDRESS@
-Računalo: @HOSTNAME@
+Datum      : @DATE@
+Preglednik : @BROWSER@
+IP-Adresa  : @IPADDRESS@
+Računalo   : @HOSTNAME@
diff --git a/inc/lang/hr/uploadmail.txt b/inc/lang/hr/uploadmail.txt
index ccc513ed5..f4ab91ea5 100644
--- a/inc/lang/hr/uploadmail.txt
+++ b/inc/lang/hr/uploadmail.txt
@@ -1,11 +1,11 @@
 Datoteka je učitana na Vaš DokuWiki. Ovdje su detalji:
 
-Datoteka: @MEDIA@
+Datoteka     : @MEDIA@
 Stara izmjena: @OLD@
-Datum: @DATE@
-Preglednik: @BROWSER@
-IP-Adresa: @IPADDRESS@
-Računalo: @HOSTNAME@
-Veličina: @SIZE@
-MIME Tip: @MIME@
-Korisnik: @USER@
+Datum        : @DATE@
+Preglednik   : @BROWSER@
+IP-Adresa    : @IPADDRESS@
+Računalo     : @HOSTNAME@
+Veličina     : @SIZE@
+MIME Tip     : @MIME@
+Korisnik     : @USER@
diff --git a/inc/lang/hu/password.txt b/inc/lang/hu/password.txt
index 9c4e50a83..49cf69fed 100644
--- a/inc/lang/hu/password.txt
+++ b/inc/lang/hu/password.txt
@@ -1,4 +1,4 @@
-Kedves, @FULLNAME@!
+Kedves @FULLNAME@!
 
 A felhasználói adataid a @TITLE@ wikihez, a következő helyen:  @DOKUWIKIURL@
 
diff --git a/inc/lang/hu/registermail.txt b/inc/lang/hu/registermail.txt
index 4e96355e0..d37d59b81 100644
--- a/inc/lang/hu/registermail.txt
+++ b/inc/lang/hu/registermail.txt
@@ -6,5 +6,5 @@ E-mail: @NEWEMAIL@
 
 Dátum: @DATE@
 Böngésző: @BROWSER@
-IP-cím: @IPADDRESS@
+IP-cím : @IPADDRESS@
 Gép neve: @HOSTNAME@
diff --git a/inc/lang/hu/uploadmail.txt b/inc/lang/hu/uploadmail.txt
index a5a6227af..62e0c2e56 100644
--- a/inc/lang/hu/uploadmail.txt
+++ b/inc/lang/hu/uploadmail.txt
@@ -1,7 +1,6 @@
 Fájlfeltöltés történt a DokuWikidben. Részletek:
 
 Állomány: @MEDIA@
-Régi felülvizsgálat: @OLD@
 Dátum: @DATE@
 Böngésző: @BROWSER@
 IP-cím: @IPADDRESS@
diff --git a/inc/lang/ia/mailtext.txt b/inc/lang/ia/mailtext.txt
index 8994c9f81..ed3eb2512 100644
--- a/inc/lang/ia/mailtext.txt
+++ b/inc/lang/ia/mailtext.txt
@@ -1,12 +1,12 @@
 Un pagina in tu DokuWiki ha essite addite o modificate. Ecce le detalios:
 
-Data: @DATE@
-Navigator: @BROWSER@
-Adresse IP: @IPADDRESS@
-Nomine host: @HOSTNAME@
+Data : @DATE@
+Navigator : @BROWSER@
+Adresse IP : @IPADDRESS@
+Nomine host : @HOSTNAME@
 Version ancian: @OLDPAGE@
 Version nove: @NEWPAGE@
 Summario: @SUMMARY@
-Usator: @USER@
+Usator : @USER@
 
 @DIFF@
diff --git a/inc/lang/ia/password.txt b/inc/lang/ia/password.txt
index 661e4237b..bf0e40080 100644
--- a/inc/lang/ia/password.txt
+++ b/inc/lang/ia/password.txt
@@ -1,6 +1,6 @@
-Salute, @FULLNAME@!
+Salute @FULLNAME@!
 
 Ecce tu datos de usator pro @TITLE@ a @DOKUWIKIURL@
 
-Nomine de usator: @LOGIN@
-Contrasigno: @PASSWORD@
+Nomine de usator : @LOGIN@
+Contrasigno : @PASSWORD@
diff --git a/inc/lang/ia/registermail.txt b/inc/lang/ia/registermail.txt
index 24c8124fb..b6fa332aa 100644
--- a/inc/lang/ia/registermail.txt
+++ b/inc/lang/ia/registermail.txt
@@ -1,10 +1,10 @@
 Un nove conto de usator ha essite create. Ecce le detalios:
 
-Nomine de usator: @NEWUSER@
-Nomine complete: @NEWNAME@
-E-mail: @NEWEMAIL@
+Nomine de usator : @NEWUSER@
+Nomine complete : @NEWNAME@
+E-mail : @NEWEMAIL@
 
-Data: @DATE@
-Navigator: @BROWSER@
-Adresse IP: @IPADDRESS@
-Nomine host: @HOSTNAME@
+Data : @DATE@
+Navigator : @BROWSER@
+Adresse IP : @IPADDRESS@
+Nomine host : @HOSTNAME@
diff --git a/inc/lang/ia/uploadmail.txt b/inc/lang/ia/uploadmail.txt
index d70de59ff..c406d4b31 100644
--- a/inc/lang/ia/uploadmail.txt
+++ b/inc/lang/ia/uploadmail.txt
@@ -1,11 +1,10 @@
 Un file ha essite incargate in tu DokuWiki. Ecce le detalios:
 
-File: @MEDIA@
-Revista vetule: @OLD@
-Data: @DATE@
-Navigator: @BROWSER@
-Adresse IP: @IPADDRESS@
+File : @MEDIA@
+Data : @DATE@
+Navigator : @BROWSER@
+Adresse IP : @IPADDRESS@
 Nomine host: @HOSTNAME@
-Dimension: @SIZE@
-Typo MIME: @MIME@
-Usator: @USER@
+Dimension : @SIZE@
+Typo MIME : @MIME@
+Usator : @USER@
diff --git a/inc/lang/id/mailtext.txt b/inc/lang/id/mailtext.txt
index 0c252f4de..df9699ee4 100644
--- a/inc/lang/id/mailtext.txt
+++ b/inc/lang/id/mailtext.txt
@@ -1,12 +1,12 @@
 Halaman di DokuWiki Anda telah bertamah atau berubah, dengan detil sebagai berikut:
 
-Date: @DATE@
-Browser: @BROWSER@
-IP-Address: @IPADDRESS@
-Hostname: @HOSTNAME@
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
 Old Revision: @OLDPAGE@
 New Revision: @NEWPAGE@
 Edit Summary: @SUMMARY@
-User: @USER@
+User        : @USER@
 
 @DIFF@
diff --git a/inc/lang/id/password.txt b/inc/lang/id/password.txt
index 885531d1e..285915ccf 100644
--- a/inc/lang/id/password.txt
+++ b/inc/lang/id/password.txt
@@ -1,6 +1,6 @@
-Hi, @FULLNAME@!
+Hi @FULLNAME@!
 
 Berikut data Anda untuk @TITLE@ di @DOKUWIKIURL@
 
-Login: @LOGIN@
-Password: @PASSWORD@
+Login    : @LOGIN@
+Password : @PASSWORD@
diff --git a/inc/lang/id/registermail.txt b/inc/lang/id/registermail.txt
index 9ba269caa..5943e35a5 100644
--- a/inc/lang/id/registermail.txt
+++ b/inc/lang/id/registermail.txt
@@ -1,10 +1,10 @@
 User baru telah mendaftar. Berikut detailnya:
 
-User name: @NEWUSER@
-Full name: @NEWNAME@
-E-mail: @NEWEMAIL@
+User name : @NEWUSER@
+Full name : @NEWNAME@
+E-mail : @NEWEMAIL@
 
-Date: @DATE@
-Browser: @BROWSER@
-IP-Address: @IPADDRESS@
-Hostname: @HOSTNAME@
+Date : @DATE@
+Browser : @BROWSER@
+IP-Address : @IPADDRESS@
+Hostname : @HOSTNAME@
diff --git a/inc/lang/id/uploadmail.txt b/inc/lang/id/uploadmail.txt
index f68594462..bb5f5e81f 100644
--- a/inc/lang/id/uploadmail.txt
+++ b/inc/lang/id/uploadmail.txt
@@ -1,11 +1,10 @@
 Sebuah file telah diupload di DokuWiki Anda. Berikut detailnya:
 
-File: @MEDIA@
-Revisi lama: @OLD@
-Tanggal: @DATE@
-Browser: @BROWSER@
-IP-Address: @IPADDRESS@
-Nama Host: @HOSTNAME@
-Ukuran: @SIZE@
-MIME Lihat: @MIME@
-Pengguna: @USER@
+File : @MEDIA@
+Date : @DATE@
+Browser : @BROWSER@
+IP-Address : @IPADDRESS@
+Hostname : @HOSTNAME@
+Size : @SIZE@
+MIME Type : @MIME@
+User : @USER@
diff --git a/inc/lang/it/mailtext.txt b/inc/lang/it/mailtext.txt
index 96007aced..3374d37dd 100644
--- a/inc/lang/it/mailtext.txt
+++ b/inc/lang/it/mailtext.txt
@@ -1,12 +1,12 @@
 Una pagina su DokuWiki è stata aggiunta o modificata. Questi sono i dettagli:
 
-Data: @DATE@
-Browser: @BROWSER@
-Indirizzo IP: @IPADDRESS@
-Nome host: @HOSTNAME@
-Vecchia revisione: @OLDPAGE@
-Nuova revisione: @NEWPAGE@
-Oggetto della modifica: @SUMMARY@
-Utente: @USER@
+Data : @DATE@
+Browser : @BROWSER@
+Indirizzo IP : @IPADDRESS@
+Nome host : @HOSTNAME@
+Vecchia revisione : @OLDPAGE@
+Nuova revisione : @NEWPAGE@
+Oggetto della modifica : @SUMMARY@
+Utente : @USER@
 
 @DIFF@
diff --git a/inc/lang/it/password.txt b/inc/lang/it/password.txt
index 54e26a4b5..f7ca9e98d 100644
--- a/inc/lang/it/password.txt
+++ b/inc/lang/it/password.txt
@@ -1,6 +1,6 @@
-Ciao, @FULLNAME@!
+Ciao @FULLNAME@!
 
 Questi sono i tuoi dati di accesso per @TITLE@ su @DOKUWIKIURL@
 
-Nome utente: @LOGIN@
-Password: @PASSWORD@
+Nome utente : @LOGIN@
+Password    : @PASSWORD@
diff --git a/inc/lang/it/registermail.txt b/inc/lang/it/registermail.txt
index 001a84153..77454cd3f 100644
--- a/inc/lang/it/registermail.txt
+++ b/inc/lang/it/registermail.txt
@@ -1,10 +1,10 @@
 Un nuovo utente è stato registrato. Ecco i dettagli:
 
-Nome utente: @NEWUSER@
-Nome completo: @NEWNAME@
-EMail: @NEWEMAIL@
+Nome utente   : @NEWUSER@
+Nome completo : @NEWNAME@
+EMail        : @NEWEMAIL@
 
-Data: @DATE@
-Browser: @BROWSER@
-Indirizzo IP: @IPADDRESS@
-Nome host: @HOSTNAME@
+Data : @DATE@
+Browser : @BROWSER@
+Indirizzo IP : @IPADDRESS@
+Nome host : @HOSTNAME@
diff --git a/inc/lang/it/uploadmail.txt b/inc/lang/it/uploadmail.txt
index 9441d4c17..4dd7cd463 100644
--- a/inc/lang/it/uploadmail.txt
+++ b/inc/lang/it/uploadmail.txt
@@ -1,11 +1,10 @@
 Un file è stato caricato sul tuo DokuWiki. Seguono i dettagli:
 
-File: @MEDIA@
-Vecchio revisione: @VECCHIO@
-Data: @DATE@
-Browser: @BROWSER@
-Indirizzo IP: @IPADDRESS@
-Hostname: @HOSTNAME@
-Dimensione: @SIZE@
-Tipo MIME: @MIME@
-Utente: @USER@
+File : @MEDIA@
+Data : @DATE@
+Browser : @BROWSER@
+Indirizzo IP : @IPADDRESS@
+Hostname : @HOSTNAME@
+Dimensione : @SIZE@
+Tipo MIME : @MIME@
+Utente : @USER@
diff --git a/inc/lang/ja/mailtext.txt b/inc/lang/ja/mailtext.txt
index be85bedee..4bad3d945 100644
--- a/inc/lang/ja/mailtext.txt
+++ b/inc/lang/ja/mailtext.txt
@@ -1,12 +1,12 @@
 DokuWiki 内の文書が追加もしくは変更されました。詳細は以下の通りです。
 
-日付: @DATE@
-ブラウザ: @BROWSER@
-IPアドレス: @IPADDRESS@
-ホスト名: @HOSTNAME@
+日付        : @DATE@
+ブラウザ    : @BROWSER@
+IPアドレス  : @IPADDRESS@
+ホスト名    : @HOSTNAME@
 前リビジョン: @OLDPAGE@
 新リビジョン: @NEWPAGE@
 編集のサマリ: @SUMMARY@
-ユーザー名: @USER@
+ユーザー名  : @USER@
 
 @DIFF@
diff --git a/inc/lang/ja/password.txt b/inc/lang/ja/password.txt
index b334ac4d0..fa11b1044 100644
--- a/inc/lang/ja/password.txt
+++ b/inc/lang/ja/password.txt
@@ -1,6 +1,6 @@
-こんにちは @FULLNAME@ さん!
+こんにちは @FULLNAME@! さん
 
 @TITLE@(@DOKUWIKIURL@)に登録されたユーザー情報は以下の通りです。
 
-ユーザー名: @LOGIN@
-パスワード: @PASSWORD@
+ユーザー名 : @LOGIN@
+パスワード : @PASSWORD@
diff --git a/inc/lang/ja/registermail.txt b/inc/lang/ja/registermail.txt
index b0e8faef9..ad5241a0b 100644
--- a/inc/lang/ja/registermail.txt
+++ b/inc/lang/ja/registermail.txt
@@ -1,10 +1,10 @@
 新しいユーザーが登録されました。ユーザー情報は以下の通りです。
 
-ユーザー名: @NEWUSER@
-フルネーム: @NEWNAME@
-メールアドレス: @NEWEMAIL@
+ユーザー名     : @NEWUSER@
+フルネーム     : @NEWNAME@
+メールアドレス : @NEWEMAIL@
 
-登録日: @DATE@
-ブラウザ: @BROWSER@
-IPアドレス: @IPADDRESS@
-ホスト名: @HOSTNAME@
+登録日         : @DATE@
+ブラウザ       : @BROWSER@
+IPアドレス     : @IPADDRESS@
+ホスト名       : @HOSTNAME@
diff --git a/inc/lang/ja/uploadmail.txt b/inc/lang/ja/uploadmail.txt
index 2b164440e..8734c91df 100644
--- a/inc/lang/ja/uploadmail.txt
+++ b/inc/lang/ja/uploadmail.txt
@@ -1,11 +1,10 @@
 お使いのDokuWikiにファイルがアップロードされました。詳細は以下の通りです。
 
-ファイル: @MEDIA@
-古改: @OLD@
-日付: @DATE@
-ブラウザ: @BROWSER@
-IPアドレス: @IPADDRESS@
-ホスト名: @HOSTNAME@
-サイズ: @SIZE@
-MIMEタイプ: @MIME@
-ユーザー名: @USER@
+ファイル    : @MEDIA@
+日付        : @DATE@
+ブラウザ    : @BROWSER@
+IPアドレス  : @IPADDRESS@
+ホスト名    : @HOSTNAME@
+サイズ      : @SIZE@
+MIMEタイプ  : @MIME@
+ユーザー名  : @USER@
diff --git a/inc/lang/km/password.txt b/inc/lang/km/password.txt
index 98a8f2964..8cdfcd81b 100644
--- a/inc/lang/km/password.txt
+++ b/inc/lang/km/password.txt
@@ -1,6 +1,6 @@
-សួរស្ដី, @FULLNAME@!
+សួរស្ដី @FULLNAME@!
 
 នេះជាបញ្ជីប្រើប្រះរុបស @TITLE@ នៅ @DOKUWIKIURL@
 
-នាមបង្រើ៖: @LOGIN@
-ពាក្សសម្ងាត៖: @PASSWORD@
+នាមបង្រើ៖  @LOGIN@
+ពាក្សសម្ងាត៖ @PASSWORD@
diff --git a/inc/lang/la/mailtext.txt b/inc/lang/la/mailtext.txt
index 000b1a1ce..8348378dc 100644
--- a/inc/lang/la/mailtext.txt
+++ b/inc/lang/la/mailtext.txt
@@ -1,12 +1,11 @@
 Pagina in uice addita uel mutata. Hae singulae res sunt:
 
-Dies: @DATE@
-IP-Numerus: @IPADDRESS@
-Hospes situs: @HOSTNAME@
-Host nomen: @HOSTNAME@
+Dies : @DATE@
+IP-Numerus : @IPADDRESS@
+Hospes situs : @HOSTNAME@
 Vetus recensio: @OLDPAGE@
 Noua recensio: @NEWPAGE@
 Summa recensere: @SUMMARY@
-Sodalis: @USER@
+Sodalis : @USER@
 
 @DIFF@
diff --git a/inc/lang/la/password.txt b/inc/lang/la/password.txt
index 4d75f4af8..05573576a 100644
--- a/inc/lang/la/password.txt
+++ b/inc/lang/la/password.txt
@@ -1,6 +1,6 @@
-Aue, @FULLNAME@!
+Aue @FULLNAME@!
 
 Hae res @TITLE@, i ad paginam: @DOKUWIKIURL@
 
-Sodalis nomen: @LOGIN@
-Tessera: @PASSWORD@
+Sodalis nomen : @LOGIN@
+Tessera : @PASSWORD@
diff --git a/inc/lang/la/registermail.txt b/inc/lang/la/registermail.txt
index 981302f88..1f2865973 100644
--- a/inc/lang/la/registermail.txt
+++ b/inc/lang/la/registermail.txt
@@ -1,10 +1,10 @@
 Nouos\a Sodalis est. Hae suae res:
 
-Sodalis nomen: @NEWUSER@
-Nomen uerum: @NEWNAME@
-Cursus interretialis: @NEWEMAIL@
+Sodalis nomen : @NEWUSER@
+Nomen uerum : @NEWNAME@
+Cursus interretialis : @NEWEMAIL@
 
-Dies: @DATE@
-Machina interretis: @BROWSER@
-IP-numerus: @IPADDRESS@
-Hostname: @HOSTNAME@
+Dies : @DATE@
+Machina interretis : @BROWSER@
+IP-numerus : @IPADDRESS@
+Hostname : @HOSTNAME@
diff --git a/inc/lang/la/uploadmail.txt b/inc/lang/la/uploadmail.txt
index dd76cba22..329bf31a1 100644
--- a/inc/lang/la/uploadmail.txt
+++ b/inc/lang/la/uploadmail.txt
@@ -1,11 +1,10 @@
 Documentum nouatum est. Hae mutatione sunt:
 
-Documentum: @MEDIA@
-Vetus revision: @OLD@
-Dies: @DATE@
-Machina interretis: @BROWSER@
-IP-Numerus: @IPADDRESS@
-Hospes situs: @HOSTNAME@
-Pondus: @SIZE@
-MIME Genus: @MIME@
-Sodalis: @USER@
+Documentum : @MEDIA@
+Dies : @DATE@
+Machina interretis : @BROWSER@
+IP-Numerus : @IPADDRESS@
+Hospes situs : @HOSTNAME@
+Pondus : @SIZE@
+MIME Genus : @MIME@
+Sodalis : @USER@
diff --git a/inc/lang/lb/mailtext.txt b/inc/lang/lb/mailtext.txt
index 57beca741..59c46e088 100644
--- a/inc/lang/lb/mailtext.txt
+++ b/inc/lang/lb/mailtext.txt
@@ -1,12 +1,12 @@
 Et gouf eng Säit an dengem DokuWiki g'ännert oder nei erstallt. Hei sinn d'Detailer:
 
-Datum: @DATE@
-Browser: @BROWSER@
-IP-Address: @IPADDRESS@
-Hostname: @HOSTNAME@
-Al Versioun: @OLDPAGE@
-Nei Versioun: @NEWPAGE@
+Datum          : @DATE@
+Browser        : @BROWSER@
+IP-Address     : @IPADDRESS@
+Hostname       : @HOSTNAME@
+Al Versioun    : @OLDPAGE@
+Nei Versioun   : @NEWPAGE@
 Zesummefaassung: @SUMMARY@
-Benotzer: @USER@
+Benotzer       : @USER@
 
 @DIFF@
diff --git a/inc/lang/lb/password.txt b/inc/lang/lb/password.txt
index 13a41f098..1d058323b 100644
--- a/inc/lang/lb/password.txt
+++ b/inc/lang/lb/password.txt
@@ -1,6 +1,6 @@
-Moien, @FULLNAME@!
+Moien @FULLNAME@!
 
 Hei sinn deng Benotzerdaten fir @TITLE@ op @DOKUWIKIURL@
 
-Benotzernumm: @LOGIN@
-Passwuert: @PASSWORD@
+Benotzernumm : @LOGIN@
+Passwuert    : @PASSWORD@
diff --git a/inc/lang/lb/registermail.txt b/inc/lang/lb/registermail.txt
index 270dc1efb..5240dee84 100644
--- a/inc/lang/lb/registermail.txt
+++ b/inc/lang/lb/registermail.txt
@@ -1,10 +1,10 @@
 Et huet sech e neie Benotzer registréiert. Hei sinn d'Deteiler:
 
 Benotzernumm: @NEWUSER@
-Ganze Numm: @NEWNAME@
-Email: @NEWEMAIL@
+Ganze Numm  : @NEWNAME@
+Email       : @NEWEMAIL@
 
-Datum: @DATE@
-Browser: @BROWSER@
-IP-Adress: @IPADDRESS@
-Hostnumm: @HOSTNAME@
+Datum       : @DATE@
+Browser     : @BROWSER@
+IP-Adress   : @IPADDRESS@
+Hostnumm    : @HOSTNAME@
diff --git a/inc/lang/lb/uploadmail.txt b/inc/lang/lb/uploadmail.txt
index 433e2a384..c4b9e8dff 100644
--- a/inc/lang/lb/uploadmail.txt
+++ b/inc/lang/lb/uploadmail.txt
@@ -1,11 +1,10 @@
 Eng Datei gouf op däin DokuWiki eropgelueden. Hei sinn d'Deteiler:
 
-Datei: @MEDIA@
-Al revision: @OLD@
-Datum: @DATE@
-Browser: @BROWSER@
-IP-Adress: @IPADDRESS@
-Hostnumm: @HOSTNAME@
-Gréisst: @SIZE@
-MIME Typ: @MIME@
-Benotzer: @USER@
+Datei       : @MEDIA@
+Datum       : @DATE@
+Browser     : @BROWSER@
+IP-Adress   : @IPADDRESS@
+Hostnumm    : @HOSTNAME@
+Gréisst     : @SIZE@
+MIME Typ    : @MIME@
+Benotzer    : @USER@
diff --git a/inc/lang/lt/mailtext.txt b/inc/lang/lt/mailtext.txt
index 937d75486..2abd3ab81 100644
--- a/inc/lang/lt/mailtext.txt
+++ b/inc/lang/lt/mailtext.txt
@@ -1,12 +1,14 @@
 Jūsų DokuWiki buvo sukurtas arba pakeistas puslapis. Detalės:
 
-Data: @DATE@
-Naršyklė: @BROWSER@
-IP adresas: @IPADDRESS@
-Host'as: @HOSTNAME@
+Data        : @DATE@
+Naršyklė     : @BROWSER@
+IP adresas  : @IPADDRESS@
+Host'as    : @HOSTNAME@
 Sena versija: @OLDPAGE@
 Nauja versija: @NEWPAGE@
 Redagavimo aprašas: @SUMMARY@
-Vartotojas: @USER@
+Vartotojas        : @USER@
+
+Pakeitimo diff'as:
 
 @DIFF@
diff --git a/inc/lang/lt/password.txt b/inc/lang/lt/password.txt
index fbb87c023..0bcc8e7b5 100644
--- a/inc/lang/lt/password.txt
+++ b/inc/lang/lt/password.txt
@@ -2,5 +2,5 @@ Labas, @FULLNAME@!
 
 Čia yra jūsų prisijungimo duomenys prie tinklalapio @TITLE@ (@DOKUWIKIURL@):
 
-Prisijungimo vardas: @LOGIN@
-Slaptažodis: @PASSWORD@
+Prisijungimo vardas:  @LOGIN@
+Slaptažodis:          @PASSWORD@
diff --git a/inc/lang/lv/mailtext.txt b/inc/lang/lv/mailtext.txt
index 49c9148e3..831600313 100644
--- a/inc/lang/lv/mailtext.txt
+++ b/inc/lang/lv/mailtext.txt
@@ -1,12 +1,12 @@
 Tavā DokuWiki pievienota vai labota lapa. Šeit ir sīkākas ziņas:
 
-Datums: @DATE@
-Pārlūks: @BROWSER@
-IP adrese: @IPADDRESS@
-Dators: @HOSTNAME@
-Vecā versija: @OLDPAGE@
+Datums       : @DATE@
+Pārlūks      : @BROWSER@
+IP adrese    : @IPADDRESS@
+Dators       : @HOSTNAME@
+Vecā versija : @OLDPAGE@
 Jaunā versija: @NEWPAGE@
-Anotācija: @SUMMARY@
-Lietotājs: @USER@
+Anotācija    : @SUMMARY@
+Lietotājs    : @USER@
 
 @DIFF@
diff --git a/inc/lang/lv/password.txt b/inc/lang/lv/password.txt
index ae6458bf0..7cd7d8b25 100644
--- a/inc/lang/lv/password.txt
+++ b/inc/lang/lv/password.txt
@@ -3,4 +3,4 @@ Sveiki, @FULLNAME@!
 Tavi  dati @TITLE@ lapām uz servera @DOKUWIKIURL@ ir
 
 Lietotājvārds:  @LOGIN@
-Parole: @PASSWORD@
+Parole:  @PASSWORD@
diff --git a/inc/lang/lv/registermail.txt b/inc/lang/lv/registermail.txt
index c109f2f07..2a2084c91 100644
--- a/inc/lang/lv/registermail.txt
+++ b/inc/lang/lv/registermail.txt
@@ -1,10 +1,10 @@
 Reģistrēts jauns lietotājs. Tā dati:
 
-Lietotājvārds: @NEWUSER@
-Pilns vārds: @NEWNAME@
-E-pasts: @NEWEMAIL@
+Lietotājvārds : @NEWUSER@
+Pilns vārds   : @NEWNAME@
+E-pasts       : @NEWEMAIL@
 
-Datums: @DATE@
-Pārlūks: @BROWSER@
-IP aderese: @IPADDRESS@
+Datums      : @DATE@
+Pārlūks     : @BROWSER@
+IP aderese  : @IPADDRESS@
 Datora vārds: @HOSTNAME@
diff --git a/inc/lang/lv/uploadmail.txt b/inc/lang/lv/uploadmail.txt
index 304a38108..8d664d6b4 100644
--- a/inc/lang/lv/uploadmail.txt
+++ b/inc/lang/lv/uploadmail.txt
@@ -1,11 +1,10 @@
 Fails augšupielādēts DokuWiki. Sīkākas ziņas:
 
-Fails: @MEDIA@
-Veco pārskatīšana: @OLD@
-Datums: @DATE@
-Pārlūks: @BROWSER@
-IP adrese: @IPADDRESS@
-Datora vārds: @HOSTNAME@
-Izmērs: @SIZE@
-MIME tips: @MIME@
-Lietotājs: @USER@
+Fails         : @MEDIA@
+Datums        : @DATE@
+Pārlūks       : @BROWSER@
+IP adrese     : @IPADDRESS@
+Datora vārds  : @HOSTNAME@
+Izmērs        : @SIZE@
+MIME tips     : @MIME@
+Lietotājs     : @USER@
diff --git a/inc/lang/mg/mailtext.txt b/inc/lang/mg/mailtext.txt
index 50a533327..c772686fd 100644
--- a/inc/lang/mg/mailtext.txt
+++ b/inc/lang/mg/mailtext.txt
@@ -1,12 +1,12 @@
 Nisy pejy niova tao amin'ny wiky. Ireto ny antsipiriany:
 
-Date: @DATE@
-Browser: @BROWSER@
-Adiresy IP: @IPADDRESS@
-Hostname: @HOSTNAME@
-Taloha: @OLDPAGE@
-Vaovao: @NEWPAGE@
-Fiovana: @SUMMARY@
-Novain'i: @USER@
+Date        : @DATE@
+Browser     : @BROWSER@
+Adiresy IP  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Taloha      : @OLDPAGE@
+Vaovao      : @NEWPAGE@
+Fiovana     : @SUMMARY@
+Novain'i    : @USER@
 
 @DIFF@
diff --git a/inc/lang/mg/password.txt b/inc/lang/mg/password.txt
index d41e672f0..4ed28582f 100644
--- a/inc/lang/mg/password.txt
+++ b/inc/lang/mg/password.txt
@@ -1,6 +1,6 @@
-Miarahaba an'i, @FULLNAME@!
+Miarahaba an'i @FULLNAME@!
 
 Ireto ny momba anao ho an'ny @TITLE@ ao amin'ny @DOKUWIKIURL@
 
-Anarana: @LOGIN@
-Alahidy: @PASSWORD@
+Anarana    : @LOGIN@
+Alahidy    : @PASSWORD@
diff --git a/inc/lang/mr/mailtext.txt b/inc/lang/mr/mailtext.txt
index 6f3bd0d83..826ab0c45 100644
--- a/inc/lang/mr/mailtext.txt
+++ b/inc/lang/mr/mailtext.txt
@@ -1,12 +1,12 @@
-तुमच्या डॉक्युविकिमधील एक पान बदलले किंवा नवीन टाकले गेले आहे. त्याची माहिती पुढील प्रमाणे:
+तुमच्या डॉक्युविकिमधील एक पान बदलले किंवा नवीन टाकले गेले आहे. त्याची माहिती पुढील प्रमाणे :
 
-दिनांक: @DATE@
-ब्राउजर: @BROWSER@
-IP-पत्ता: @IPADDRESS@
-मशिनचे नाव (Host name): @HOSTNAME@
-जुनी आवृत्ती: @OLDPAGE@
-नवी आवृत्ती: @NEWPAGE@
-संपादन सारांश: @SUMMARY@
-सदस्य: @USER@
+दिनांक : @DATE@
+ब्राउजर : @BROWSER@
+IP-पत्ता : @IPADDRESS@
+मशिनचे नाव ( Host name ) : @HOSTNAME@
+जुनी आवृत्ती : @OLDPAGE@
+नवी आवृत्ती : @NEWPAGE@
+संपादन सारांश : @SUMMARY@
+सदस्य : @USER@
 
 @DIFF@
diff --git a/inc/lang/mr/password.txt b/inc/lang/mr/password.txt
index 6df835e6c..a83f97e7c 100644
--- a/inc/lang/mr/password.txt
+++ b/inc/lang/mr/password.txt
@@ -1,6 +1,6 @@
-नमस्कार, @FULLNAME@!
+नमस्कार @FULLNAME@!
 
 खाली तुमच्या @DOKUWIKIURL@ येथील @TITLE@ साठी सदस्य माहिती दिली आहे.
 
-लॉगिन: @LOGIN@
-पासवर्ड: @PASSWORD@
+लॉगिन :  @LOGIN@
+पासवर्ड : @PASSWORD@
diff --git a/inc/lang/mr/registermail.txt b/inc/lang/mr/registermail.txt
index 48e78b368..ed3b92b42 100644
--- a/inc/lang/mr/registermail.txt
+++ b/inc/lang/mr/registermail.txt
@@ -1,10 +1,10 @@
-एक नवीन सदस्याची नोंदणी झाली आहे. त्याची माहीत पुढीलप्रमाणे:
+एक नवीन सदस्याची नोंदणी झाली आहे. त्याची माहीत पुढीलप्रमाणे :
 
-सदस्य नाम:  @NEWUSER@
-पूर्ण नाव: @NEWNAME@
-ईमेल: @NEWEMAIL@
+सदस्य नाम :  @NEWUSER@
+पूर्ण नाव : @NEWNAME@
+ईमेल : @NEWEMAIL@
 
-दिनांक: @DATE@
-ब्राउजर: @BROWSER@
-IP-पत्ता: @IPADDRESS@
-होस्ट नाम: @HOSTNAME@
+दिनांक : @DATE@
+ब्राउजर : @BROWSER@
+IP-पत्ता : @IPADDRESS@
+होस्ट नाम : @HOSTNAME@
diff --git a/inc/lang/mr/uploadmail.txt b/inc/lang/mr/uploadmail.txt
index d118893f0..1aea97c33 100644
--- a/inc/lang/mr/uploadmail.txt
+++ b/inc/lang/mr/uploadmail.txt
@@ -1,11 +1,10 @@
 एक फाइल तुमच्या डॉक्युविकिवर अपलोड केली गेली आहे. त्याची माहिती याप्रमाणे :
 
-फाइल: @MEDIA@
-जुन्या पुनरावृत्ती: @OLD@
-दिनांक: @DATE@
-ब्राउजर: @BROWSER@
-IP-पत्ता: @IPADDRESS@
-होस्टनाम: @HOSTNAME@
-साइज़: @SIZE@
-MIME टाइप: @MIME@
-सदस्य: @USER@
+फाइल : @MEDIA@
+दिनांक : @DATE@
+ब्राउजर : @BROWSER@
+IP-पत्ता : @IPADDRESS@
+होस्टनाम : @HOSTNAME@
+साइज़ : @SIZE@
+MIME टाइप : @MIME@
+सदस्य : @USER@
diff --git a/inc/lang/ne/uploadmail.txt b/inc/lang/ne/uploadmail.txt
index 689f86804..a02379784 100644
--- a/inc/lang/ne/uploadmail.txt
+++ b/inc/lang/ne/uploadmail.txt
@@ -1,11 +1,9 @@
 एउटा फाइल तपाईको DokuWiki मा भरण गरिएको छ। थप जानकारी निम्न रहेका छन् :
-
-फाइल: @MEDIA@
-पुरानो संशोधन: @OLD@
-मिति: @DATE@
-ब्राउजर: @BROWSER@
-आइपि ठगाना: @IPADDRESS@
-होस्टनाम: @HOSTNAME@
-आकार: @SIZE@
-MIME प्रकार: @MIME@
-प्रयोगकर्ता: @USER@
+फाइल : @MEDIA@
+मिति : @DATE@
+ब्राउजर : @BROWSER@
+आइपि ठगाना  : @IPADDRESS@
+होस्टनाम : @HOSTNAME@
+आकार : @SIZE@
+MIME प्रकार : @MIME@
+प्रयोगकर्ता : @USER@
diff --git a/inc/lang/nl/mailtext.txt b/inc/lang/nl/mailtext.txt
index f2eb3062f..32f6f635d 100644
--- a/inc/lang/nl/mailtext.txt
+++ b/inc/lang/nl/mailtext.txt
@@ -1,12 +1,12 @@
 Er is een pagina in je DokuWiki toegevoegd of gewijzigd. Hier zijn de details:
 
-Datum: @DATE@
-Browser: @BROWSER@
-IP-Adres: @IPADDRESS@
-Hostnaam: @HOSTNAME@
-Oude revisie: @OLDPAGE@
+Datum         : @DATE@
+Browser       : @BROWSER@
+IP-Adres      : @IPADDRESS@
+Hostnaam      : @HOSTNAME@
+Oude revisie  : @OLDPAGE@
 Nieuwe revisie: @NEWPAGE@
-Samenvatting: @SUMMARY@
-User: @USER@
+Samenvatting  : @SUMMARY@
+User          : @USER@
 
 @DIFF@
diff --git a/inc/lang/nl/password.txt b/inc/lang/nl/password.txt
index 7d1c2cfe3..94a180a94 100644
--- a/inc/lang/nl/password.txt
+++ b/inc/lang/nl/password.txt
@@ -1,6 +1,6 @@
-Beste, @FULLNAME@!
+Beste @FULLNAME@!
 
 Hier is je gebruikersinformatie voor @TITLE@ op @DOKUWIKIURL@
 
 Gebruikersnaam: @LOGIN@
-Wachtwoord: @PASSWORD@
+Wachtwoord    : @PASSWORD@
diff --git a/inc/lang/nl/registermail.txt b/inc/lang/nl/registermail.txt
index e5f474920..8d23efdb8 100644
--- a/inc/lang/nl/registermail.txt
+++ b/inc/lang/nl/registermail.txt
@@ -2,9 +2,9 @@ Een nieuwe gebruiker heeft zich geregistreerd. Dit zijn de details:
 
 Gebruikersnaam: @NEWUSER@
 Volledige naam: @NEWNAME@
-E-mail: @NEWEMAIL@
+E-mail        : @NEWEMAIL@
 
-Datum: @DATE@
-Browser: @BROWSER@
-IP-adres: @IPADDRESS@
-Hostname: @HOSTNAME@
+Datum         : @DATE@
+Browser       : @BROWSER@
+IP-adres      : @IPADDRESS@
+Hostname      : @HOSTNAME@
diff --git a/inc/lang/nl/uploadmail.txt b/inc/lang/nl/uploadmail.txt
index 194776c78..85a4b950a 100644
--- a/inc/lang/nl/uploadmail.txt
+++ b/inc/lang/nl/uploadmail.txt
@@ -1,11 +1,11 @@
 Er is een bestand geüpload naar uw DokuWiki. Hier zijn de details;
 
-Bestand: @MEDIA@
+Bestand  : @MEDIA@
 Oude revisie: @OLD@
-Datum: @DATE@
-Browser: @BROWSER@
-IP-adres: @IPADDRESS@
-Hostname: @HOSTNAME@
-Grootte: @SIZE@
+Datum    : @DATE@
+Browser  : @BROWSER@
+IP-adres : @IPADDRESS@
+Hostname : @HOSTNAME@
+Grootte  : @SIZE@
 MIME type: @MIME@
 Gebruiker: @USER@
diff --git a/inc/lang/no/mailtext.txt b/inc/lang/no/mailtext.txt
index 19ed8b1e3..7260733a6 100644
--- a/inc/lang/no/mailtext.txt
+++ b/inc/lang/no/mailtext.txt
@@ -1,12 +1,12 @@
 En side i din DokuWiki har blitt lagt til eller blitt endret. Informasjon om endringen:
 
-Dato: @DATE@
-Nettleser: @BROWSER@
-IP-adresse: @IPADDRESS@
-Vertsnavn: @HOSTNAME@
-Tidligere versjon: @OLDPAGE@
-Aktuell versjon: @NEWPAGE@
-Redigeringskommentar: @SUMMARY@
-Bruker: @USER@
+Dato                 : @DATE@
+Nettleser            : @BROWSER@
+IP-adresse           : @IPADDRESS@
+Vertsnavn            : @HOSTNAME@
+Tidligere versjon    : @OLDPAGE@
+Aktuell versjon      : @NEWPAGE@
+Redigeringskommentar : @SUMMARY@
+Bruker               : @USER@
 
 @DIFF@
diff --git a/inc/lang/no/password.txt b/inc/lang/no/password.txt
index e602040d0..46023e330 100644
--- a/inc/lang/no/password.txt
+++ b/inc/lang/no/password.txt
@@ -1,6 +1,6 @@
-Hei, @FULLNAME@!
+Hei @FULLNAME@!
 
 Her er dine brukeropplysninger for @TITLE@ på @DOKUWIKIURL@
 
-Brukernavn: @LOGIN@
-Passord: @PASSWORD@
+Brukernavn : @LOGIN@
+Passord : @PASSWORD@
diff --git a/inc/lang/no/registermail.txt b/inc/lang/no/registermail.txt
index 314fad273..89022738f 100644
--- a/inc/lang/no/registermail.txt
+++ b/inc/lang/no/registermail.txt
@@ -1,10 +1,10 @@
 En ny bruker har registrert seg, her er detaljene:
 
-Brukernavn: @NEWUSER@
-Fult navn: @NEWNAME@
-E-post: @NEWEMAIL@
+Brukernavn  : @NEWUSER@
+Fult navn   : @NEWNAME@
+E-post      : @NEWEMAIL@
 
-Dato: @DATE@
-Nettleser: @BROWSER@
-IP-adresse: @IPADDRESS@
-Tjener: @HOSTNAME@
+Dato        : @DATE@
+Nettleser   : @BROWSER@
+IP-adresse  : @IPADDRESS@
+Tjener      : @HOSTNAME@
diff --git a/inc/lang/no/uploadmail.txt b/inc/lang/no/uploadmail.txt
index 76673efef..237ec65bc 100644
--- a/inc/lang/no/uploadmail.txt
+++ b/inc/lang/no/uploadmail.txt
@@ -1,11 +1,11 @@
 En fil ble lastet opp på din DokuWiki. Her er detaljene:
 
-Fil: @MEDIA@
+Fil : @MEDIA@
 Gammel versjon: @OLD@
-Dato: @DATE@
-Nettleser: @BROWSER@
-IP-adresse: @IPADDRESS@
-Vertnavn: @HOSTNAME@
-Størrelse: @SIZE@
-MIME-type: @MIME@
-Bruker: @USER@
+Dato : @DATE@
+Nettleser : @BROWSER@
+IP-adresse : @IPADDRESS@
+Vertnavn : @HOSTNAME@
+Størrelse : @SIZE@
+MIME-type : @MIME@
+Bruker : @USER@
diff --git a/inc/lang/pl/mailtext.txt b/inc/lang/pl/mailtext.txt
index cea4e03d7..cae98db3e 100644
--- a/inc/lang/pl/mailtext.txt
+++ b/inc/lang/pl/mailtext.txt
@@ -1,12 +1,13 @@
-Strona w Twoim DokuWiki została dodana lub zmieniona. Szczegółowe informacje:
+Strona w Twoim DokuWiki została dodana lub zmieniona.
+Szczegółowe informacje:
 
-Data: @DATE@
-PrzeglÄ…darka: @BROWSER@
-Adres IP: @IPADDRESS@
-Nazwa DNS: @HOSTNAME@
-Stara wersja: @OLDPAGE@
-Nowa wersja: @NEWPAGE@
-Opis zmian: @SUMMARY@
-Użytkownik: @USER@
+Data         : @DATE@
+PrzeglÄ…darka : @BROWSER@
+Adres IP     : @IPADDRESS@
+Nazwa DNS    : @HOSTNAME@
+Stara wersja : @OLDPAGE@
+Nowa wersja  : @NEWPAGE@
+Opis zmian   : @SUMMARY@
+Użytkownik   : @USER@
 
 @DIFF@
diff --git a/inc/lang/pl/password.txt b/inc/lang/pl/password.txt
index b57ea1732..745556fa5 100644
--- a/inc/lang/pl/password.txt
+++ b/inc/lang/pl/password.txt
@@ -1,6 +1,6 @@
-Witaj, @FULLNAME@!
+Witaj @FULLNAME@!
 
 Dane użytkownika @TITLE@ pod adresem @DOKUWIKIURL@
 
-Użytkownik: @LOGIN@
-Hasło: @PASSWORD@
+Użytkownik : @LOGIN@
+Hasło      : @PASSWORD@
diff --git a/inc/lang/pl/registermail.txt b/inc/lang/pl/registermail.txt
index 400d392a3..00229673e 100644
--- a/inc/lang/pl/registermail.txt
+++ b/inc/lang/pl/registermail.txt
@@ -1,10 +1,11 @@
-Zarejestrował się nowy użytkownik. Szczegółowe informacje:
+Zarejestrował się nowy użytkownik.
+Szczegółowe informacje:
 
-Użytkownik: @NEWUSER@
-ImiÄ™ i nazwisko: @NEWNAME@
-E-mail: @NEWEMAIL@
+Użytkownik      : @NEWUSER@
+ImiÄ™ i nazwisko : @NEWNAME@
+E-mail          : @NEWEMAIL@
 
-Data: @DATE@
-PrzeglÄ…darka: @BROWSER@
-Adres IP: @IPADDRESS@
-Nazwa DNS: @HOSTNAME@
+Data            : @DATE@
+PrzeglÄ…darka    : @BROWSER@
+Adres IP        : @IPADDRESS@
+Nazwa DNS       : @HOSTNAME@
diff --git a/inc/lang/pl/uploadmail.txt b/inc/lang/pl/uploadmail.txt
index cbe140c27..a8daa05e1 100644
--- a/inc/lang/pl/uploadmail.txt
+++ b/inc/lang/pl/uploadmail.txt
@@ -1,11 +1,12 @@
-Umieszczono nowy plik. Szczegóły:
+Umieszczono nowy plik.
 
-Plik: @MEDIA@
-Stara wersja: @OLD@
-Dane: @DATE@
-PrzeglÄ…darka: @BROWSER@
-Adres IP: @IPADDRESS@
-Nazwa DNS: @HOSTNAME@
-Rozmiar: @SIZE@
-Typ MIME: @MIME@
-Użytkownik: @USER@
+Szczegóły:
+
+Plik         : @MEDIA@
+Data         : @DATE@
+PrzeglÄ…darka : @BROWSER@
+Adres IP     : @IPADDRESS@
+Nazwa DNS    : @HOSTNAME@
+Rozmiar      : @SIZE@
+Typ MIME     : @MIME@
+Użytkownik   : @USER@
diff --git a/inc/lang/pt-br/password.txt b/inc/lang/pt-br/password.txt
index d1029dc4a..0a7587a99 100644
--- a/inc/lang/pt-br/password.txt
+++ b/inc/lang/pt-br/password.txt
@@ -1,6 +1,6 @@
-Olá, @FULLNAME@!
+Olá @FULLNAME@!
 
 Aqui estão os seus dados de usuário para @TITLE@ em @DOKUWIKIURL@
 
-Usuário: @LOGIN@
-Senha: @PASSWORD@
+Usuário  : @LOGIN@
+Senha    : @PASSWORD@
diff --git a/inc/lang/pt-br/uploadmail.txt b/inc/lang/pt-br/uploadmail.txt
index a8b95fc2b..8527f8e17 100644
--- a/inc/lang/pt-br/uploadmail.txt
+++ b/inc/lang/pt-br/uploadmail.txt
@@ -1,7 +1,6 @@
 Um arquivo foi enviado para o seu DokuWiki. Os detalhes são:
 
 Arquivo: @MEDIA@
-Revisão antiga: @OLD@
 Data: @DATE@
 Navegador: @BROWSER@
 Endereço IP: @IPADDRESS@
diff --git a/inc/lang/pt/mailtext.txt b/inc/lang/pt/mailtext.txt
index e353a7ead..844f24617 100644
--- a/inc/lang/pt/mailtext.txt
+++ b/inc/lang/pt/mailtext.txt
@@ -1,12 +1,14 @@
-Um documento no site Wiki @DOKUWIKIURL@ foi criado ou modificado. Aqui estão os detalhes:
+Um documento no site Wiki @DOKUWIKIURL@ foi criado ou modificado.
 
-Data: @DATE@
-Browser: @BROWSER@
-Endereço IP: @IPADDRESS@
-Hostname: @HOSTNAME@
+Aqui estão os detalhes:
+
+Data          : @DATE@
+Browser       : @BROWSER@
+Endereço IP   : @IPADDRESS@
+Hostname      : @HOSTNAME@
 Documento Ant.: @OLDPAGE@
 Documento Novo: @NEWPAGE@
-Edit Summary: @SUMMARY@
-User: @USER@
+Edit Summary  : @SUMMARY@
+User          : @USER@
 
 @DIFF@
diff --git a/inc/lang/pt/password.txt b/inc/lang/pt/password.txt
index a1c2dc275..cfd81f3b8 100644
--- a/inc/lang/pt/password.txt
+++ b/inc/lang/pt/password.txt
@@ -2,5 +2,5 @@ Olá, @FULLNAME@!
 
 Aqui estão as suas credenciais de autenticação para @TITLE@, em @DOKUWIKIURL@
 
-Utilizador: @LOGIN@
-Senha: @PASSWORD@
+Utilizador : @LOGIN@
+Senha      : @PASSWORD@
diff --git a/inc/lang/pt/registermail.txt b/inc/lang/pt/registermail.txt
index 8cb3bb839..7f5333dad 100644
--- a/inc/lang/pt/registermail.txt
+++ b/inc/lang/pt/registermail.txt
@@ -1,10 +1,10 @@
 Inscrição de um novo utilizador. Aqui estão os detalhes:
 
-Username: @NEWUSER@
-Nome Completo: @NEWNAME@
-E-mail: @NEWEMAIL@
+Username : @NEWUSER@
+Nome Completo : @NEWNAME@
+E-mail : @NEWEMAIL@
 
-Data: @DATE@
-Browser: @BROWSER@
-Endereço IP: @IPADDRESS@
-Hostname: @HOSTNAME@
+Data : @DATE@
+Browser : @BROWSER@
+Endereço IP : @IPADDRESS@
+Hostname : @HOSTNAME@
diff --git a/inc/lang/pt/uploadmail.txt b/inc/lang/pt/uploadmail.txt
index 6a6f0d88c..09787e1db 100644
--- a/inc/lang/pt/uploadmail.txt
+++ b/inc/lang/pt/uploadmail.txt
@@ -1,11 +1,11 @@
 Um ficheiro foi carregado. Aqui estão os detalhes:
 
-Ficheiro: @MEDIA@
-Revisão antiga: @OLD@
-Data: @DATE@
-Navegador: @BROWSER@
-Endereço IP: @IPADDRESS@
-Hostname: @HOSTNAME@
-Tamanho: @SIZE@
-MIME Type: @MIME@
-Utilizador: @USER@
+Ficheiro       : @MEDIA@
+Revisão antiga : @OLD@
+Data           : @DATE@
+Navegador      : @BROWSER@
+Endereço IP    : @IPADDRESS@
+Hostname       : @HOSTNAME@
+Tamanho        : @SIZE@
+MIME Type      : @MIME@
+Utilizador     : @USER@
diff --git a/inc/lang/ro/mailtext.txt b/inc/lang/ro/mailtext.txt
index 06d980047..14a15384c 100644
--- a/inc/lang/ro/mailtext.txt
+++ b/inc/lang/ro/mailtext.txt
@@ -1,12 +1,13 @@
-Salutare, @FULLNAME@! A fost adăugată sau modificată o pagină. Aici sunt detaliile:
+Salutare, @FULLNAME@!
 
-Dată: @DATE@
-Browser: @BROWSER@
-Adresă IP: @IPADDRESS@
-Hostname: @HOSTNAME@
-Versiune anterioară: @OLDPAGE@
-Versiune curentă: @NEWPAGE@
+A fost adăugată sau modificată o pagină. Aici sunt detaliile:
+
+Dată        : @DATE@
+Browser   : @BROWSER@
+Adresă IP   : @IPADDRESS@
+Hostname  : @HOSTNAME@
+Versiune anterioară : @OLDPAGE@
+Versiune curentă  : @NEWPAGE@
 Sumar editare: @SUMMARY@
-Utilizator: @USER@
 
 @DIFF@
diff --git a/inc/lang/ro/password.txt b/inc/lang/ro/password.txt
index a0ed49860..3f8ae24bc 100644
--- a/inc/lang/ro/password.txt
+++ b/inc/lang/ro/password.txt
@@ -2,5 +2,5 @@ Salutare, @FULLNAME@!
 
 Aici se găsesc credențialele de utilizator pentru @TITLE@ la @DOKUWIKIURL@
 
-Login: @LOGIN@
-Parola: @PASSWORD@
+Login    : @LOGIN@
+Parola   : @PASSWORD@
diff --git a/inc/lang/ro/registermail.txt b/inc/lang/ro/registermail.txt
index ac42c3787..599deabd5 100644
--- a/inc/lang/ro/registermail.txt
+++ b/inc/lang/ro/registermail.txt
@@ -1,10 +1,11 @@
-Un nou utilizator s-a înregistrat. Iată detaliile:
+Salutare, @FULLNAME@!
 
-Nume de utilizator: @NEWUSER@
-Nume complet: @NEWNAME@
-E-mail: @NEWEMAIL@
+Un nou utilizator s-a înregistrat. Iată detaliile:
 
-Dată: @DATE@
-Browser: @BROWSER@
-Adresă IP: @IPADDRESS@
-Hostname: @HOSTNAME@
+Nume de utilizator : @NEWUSER@
+Nume complet : @NEWNAME@
+E-mail : @NEWEMAIL@
+Dată : @DATE@
+Browser : @BROWSER@
+Adresă IP : @IPADDRESS@
+Hostname : @HOSTNAME@
diff --git a/inc/lang/ro/uploadmail.txt b/inc/lang/ro/uploadmail.txt
index 7225f4597..cf8e8e02a 100644
--- a/inc/lang/ro/uploadmail.txt
+++ b/inc/lang/ro/uploadmail.txt
@@ -1,11 +1,12 @@
+Salutare, @FULLNAME@!
+
 Un fișier a fost încărcat în DokuWiki. Iată detaliile:
 
-Fișier: @MEDIA@
-Vechi de revizuire: @OLD@
-Dată: @DATE@
-Browser: @BROWSER@
-Adresă IP: @IPADDRESS@
-Hostname: @HOSTNAME@
-Dimensiune: @SIZE@
-MIME Type: @MIME@
-Utilizator: @USER@
+Fișier : @MEDIA@
+Dată : @DATE@
+Browser : @BROWSER@
+Adresă IP : @IPADDRESS@
+Hostname : @HOSTNAME@
+Dimensiune : @SIZE@
+MIME Type : @MIME@
+Utilizator : @USER@
diff --git a/inc/lang/sk/mailtext.txt b/inc/lang/sk/mailtext.txt
index 04b83ffbd..da2f441b1 100644
--- a/inc/lang/sk/mailtext.txt
+++ b/inc/lang/sk/mailtext.txt
@@ -1,12 +1,12 @@
 Stránka vo vašej DokuWiki bola zmenená. Tu sú podrobnosti:
 
-Dátum: @DATE@
-Prehliadač: @BROWSER@
-IP adresa: @IPADDRESS@
-Adresa: @HOSTNAME@
-Stará verzia: @OLDPAGE@
-Nová verzia: @NEWPAGE@
-Komentár: @SUMMARY@
-User: @USER@
+Dátum : @DATE@
+Prehliadač : @BROWSER@
+IP adresa : @IPADDRESS@
+Adresa : @HOSTNAME@
+Stará verzia : @OLDPAGE@
+Nová verzia : @NEWPAGE@
+Komentár : @SUMMARY@
+User : @USER@
 
 @DIFF@
diff --git a/inc/lang/sk/password.txt b/inc/lang/sk/password.txt
index d9a666e91..8d0907e40 100644
--- a/inc/lang/sk/password.txt
+++ b/inc/lang/sk/password.txt
@@ -1,6 +1,7 @@
-Dobrý deň, @FULLNAME@!
+Dobrý deň,
 
 Tu sú prihlasovacie informácie pre @TITLE@ (@DOKUWIKIURL@)
 
-Používateľské meno: @LOGIN@
-Heslo: @PASSWORD@
+Meno : @FULLNAME@
+Používateľské meno : @LOGIN@
+Heslo : @PASSWORD@
diff --git a/inc/lang/sk/registermail.txt b/inc/lang/sk/registermail.txt
index b8dabf9b7..2be1ac3b3 100644
--- a/inc/lang/sk/registermail.txt
+++ b/inc/lang/sk/registermail.txt
@@ -1,10 +1,10 @@
 Nový používateľ bol registrovaný. Tu sú detaily:
 
-Používateľské meno: @NEWUSER@
-Celé meno: @NEWNAME@
-E-Mail: @NEWEMAIL@
+Používateľské meno : @NEWUSER@
+Celé meno        : @NEWNAME@
+E-Mail           : @NEWEMAIL@
 
-Dátum: @DATE@
-Prehliadač: @BROWSER@
-IP adresa: @IPADDRESS@
-Meno servera: @HOSTNAME@
+Dátum            : @DATE@
+Prehliadač       : @BROWSER@
+IP adresa        : @IPADDRESS@
+Meno servera     : @HOSTNAME@
diff --git a/inc/lang/sk/uploadmail.txt b/inc/lang/sk/uploadmail.txt
index d653382f2..df409678f 100644
--- a/inc/lang/sk/uploadmail.txt
+++ b/inc/lang/sk/uploadmail.txt
@@ -1,11 +1,10 @@
 Súbor bol nahraný do DokuWiki. Tu sú podrobnosti:
 
-Súbor: @MEDIA@
-Staré revízie: @OLD@
-Dátum: @DATE@
-Prehliadač: @BROWSER@
-IP adresa: @IPADDRESS@
-Názov hostiteľa: @HOSTNAME@
-Veľkosť: @SIZE@
-MIME Typ: @MIME@
-Užívateľ: @USER@
+Súbor : @MEDIA@
+Dátum : @DATE@
+Prehliadač : @BROWSER@
+IP adresa : @IPADDRESS@
+Názov hostiteľa : @HOSTNAME@
+Veľkosť : @SIZE@
+MIME Typ : @MIME@
+Užívateľ : @USER@
diff --git a/inc/lang/sl/mailtext.txt b/inc/lang/sl/mailtext.txt
index 3f545fe24..9b333731d 100644
--- a/inc/lang/sl/mailtext.txt
+++ b/inc/lang/sl/mailtext.txt
@@ -1,12 +1,12 @@
 Stran na vašem DokuWiki je bila dodana ali spremenjena. Podrobnosti:
 
-Datum: @DATE@
-Brskalnik: @BROWSER@
-Naslov IP: @IPADDRESS@
-Ime gostitelja: @HOSTNAME@
-Stara različica: @OLDPAGE@
-Nova različica: @NEWPAGE@
+Datum            : @DATE@
+Brskalnik        : @BROWSER@
+Naslov IP        : @IPADDRESS@
+Ime gostitelja   : @HOSTNAME@
+Stara različica  : @OLDPAGE@
+Nova različica   : @NEWPAGE@
 Povzetek urejanja: @SUMMARY@
-Uporabnik: @USER@
+Uporabnik        : @USER@
 
 @DIFF@
diff --git a/inc/lang/sl/password.txt b/inc/lang/sl/password.txt
index 14c31ec77..d0e1f69b5 100644
--- a/inc/lang/sl/password.txt
+++ b/inc/lang/sl/password.txt
@@ -3,4 +3,4 @@ Pozdravljeni, @FULLNAME@!
 Spodaj so navedeni podatki za @TITLE@ na wiki spletišču @DOKUWIKIURL@
 
 Uporabniško ime: @LOGIN@
-Geslo: @PASSWORD@
+Geslo          : @PASSWORD@
diff --git a/inc/lang/sl/registermail.txt b/inc/lang/sl/registermail.txt
index 36f50873e..255eb628c 100644
--- a/inc/lang/sl/registermail.txt
+++ b/inc/lang/sl/registermail.txt
@@ -1,10 +1,11 @@
-Nov uporabniški račun je uspešno vpisan. Podatki računa:
+Nov uporabniški račun je uspešno vpisan.
+Podatki računa:
 
-Uporabniško ime: @NEWUSER@
-Polno ime: @NEWNAME@
+Uporabniško ime   : @NEWUSER@
+Polno ime         : @NEWNAME@
 Elektronski naslov: @NEWEMAIL@
 
-Datum: @DATE@
-Brskalnik: @BROWSER@
-Naslov IP: @IPADDRESS@
-Ime gostitelja: @HOSTNAME@
+Datum             : @DATE@
+Brskalnik         : @BROWSER@
+Naslov IP         : @IPADDRESS@
+Ime gostitelja    : @HOSTNAME@
diff --git a/inc/lang/sl/uploadmail.txt b/inc/lang/sl/uploadmail.txt
index 5bde39230..126ff2a47 100644
--- a/inc/lang/sl/uploadmail.txt
+++ b/inc/lang/sl/uploadmail.txt
@@ -1,11 +1,11 @@
-Datoteka je bila uspešno naložena na DokuWiki spletišče. Podrobnosti o datoteki:
+Datoteka je bila uspešno naložena na DokuWiki spletišče.
+Podrobnosti o datoteki:
 
-Datoteka: @MEDIA@
-Stari revizija: @OLD@
-Datum: @DATE@
-Brskalnik: @BROWSER@
-Naslov IP: @IPADDRESS@
-Ponudnik: @HOSTNAME@
-Velikost: @SIZE@
+Datoteka  : @MEDIA@
+Datum     : @DATE@
+Brskalnik : @BROWSER@
+Naslov IP : @IPADDRESS@
+Ponudnik  : @HOSTNAME@
+Velikost  : @SIZE@
 Vrsta MIME: @MIME@
-Uporabnik: @USER@
+Uporabnik : @USER@
diff --git a/inc/lang/sq/mailtext.txt b/inc/lang/sq/mailtext.txt
index f79dfaf92..0566aaf2b 100644
--- a/inc/lang/sq/mailtext.txt
+++ b/inc/lang/sq/mailtext.txt
@@ -10,3 +10,7 @@ Përmbledhja redaktimit: @SUMMARY@
 Përdoruesi: @USER@
 
 @DIFF@
+
+---
+Ky email u gjenerua nga DokuWiki në
+@DOKUWIKIURL@
diff --git a/inc/lang/sq/password.txt b/inc/lang/sq/password.txt
index 86fbfe1d1..44acfe6f3 100644
--- a/inc/lang/sq/password.txt
+++ b/inc/lang/sq/password.txt
@@ -1,6 +1,10 @@
-Përshëndetje, @FULLNAME@!
+Përshëndetje @FULLNAME@!
 
 Këtu janë të dhënat e përdoruesit për @TITLE@ në @DOKUWIKIURL@
 
 Hyrje: @LOGIN@
 Fjalëkalimi: @PASSWORD@
+
+---
+Ky email u gjenerua nga DokuWiki në
+@DOKUWIKIURL@
diff --git a/inc/lang/sq/uploadmail.txt b/inc/lang/sq/uploadmail.txt
index 997e1ebab..126aefc0d 100644
--- a/inc/lang/sq/uploadmail.txt
+++ b/inc/lang/sq/uploadmail.txt
@@ -1,7 +1,6 @@
 Një skedar u ngarkua në DokuWiki-n tënd. Detajet janë:
 
 Skedar: @MEDIA@
-Vjetër rishikimi: @OLD@
 Data: @DATE@
 Shfletuesi: @BROWSER@
 Adresa IP: @IPADDRESS@
diff --git a/inc/lang/sr/mailtext.txt b/inc/lang/sr/mailtext.txt
index 0eeadfc27..ab9d717f0 100644
--- a/inc/lang/sr/mailtext.txt
+++ b/inc/lang/sr/mailtext.txt
@@ -1,12 +1,12 @@
 Страница на Вашем DokuWiki-ју је додата или измењена. Ево детаља
 
-Датум: @DATE@
-Веб читач: @BROWSER@
-ИП адреса: @IPADDRESS@
-Име домаћина: @HOSTNAME@
-Стара ревизија: @OLDPAGE@
-Нова ревизија: @NEWPAGE@
-Сажетак измена: @SUMMARY@
-Корисник: @USER@
+Датум                 : @DATE@
+Веб читач           : @BROWSER@
+ИП адреса          : @IPADDRESS@
+Име домаћина     : @HOSTNAME@
+Стара ревизија    : @OLDPAGE@
+Нова ревизија      : @NEWPAGE@
+Сажетак измена   : @SUMMARY@
+Корисник             : @USER@
 
 @DIFF@
diff --git a/inc/lang/sr/password.txt b/inc/lang/sr/password.txt
index b2eade324..bd2cf3202 100644
--- a/inc/lang/sr/password.txt
+++ b/inc/lang/sr/password.txt
@@ -1,6 +1,6 @@
-Здраво, @FULLNAME@!
+Здраво @FULLNAME@!
 
 Ево Ваших података за @TITLE@ на @DOKUWIKIURL@
 
-Корисничко име: @LOGIN@
-Лозинка: @PASSWORD@
+Корисничко име : @LOGIN@
+Лозинка          : @PASSWORD@
diff --git a/inc/lang/sr/uploadmail.txt b/inc/lang/sr/uploadmail.txt
index 3f85cebcf..0db6f9e16 100644
--- a/inc/lang/sr/uploadmail.txt
+++ b/inc/lang/sr/uploadmail.txt
@@ -1,7 +1,6 @@
 Нова датотека је послата на Ваш DokuWiki. Ово су њени детањи:
 
 Датотека: @MEDIA@
-Стара верзија: @OLD@
 Датум: @DATE@
 Веб читач: @BROWSER@
 ИП адреса: @IPADDRESS@
diff --git a/inc/lang/sv/mailtext.txt b/inc/lang/sv/mailtext.txt
index 202dfc6f5..a45bc2a32 100644
--- a/inc/lang/sv/mailtext.txt
+++ b/inc/lang/sv/mailtext.txt
@@ -1,12 +1,12 @@
 En sida i din DokuWiki har lagts till eller ändrats. Här är detaljerna:
 
-Datum: @DATE@
-Webbläsare: @BROWSER@
-IP-adress: @IPADDRESS@
-Datornamn: @HOSTNAME@
-Tidigare version: @OLDPAGE@
-Aktuell version: @NEWPAGE@
-Redigeringskommentar: @SUMMARY@
-Användare: @USER@
+Datum                : @DATE@
+Webbläsare           : @BROWSER@
+IP-adress            : @IPADDRESS@
+Datornamn            : @HOSTNAME@
+Tidigare version     : @OLDPAGE@
+Aktuell version      : @NEWPAGE@
+Redigeringskommentar : @SUMMARY@
+Användare            : @USER@
 
 @DIFF@
diff --git a/inc/lang/sv/password.txt b/inc/lang/sv/password.txt
index d87714c39..f8465a4d6 100644
--- a/inc/lang/sv/password.txt
+++ b/inc/lang/sv/password.txt
@@ -1,6 +1,6 @@
-Hej, @FULLNAME@!
+Hej @FULLNAME@!
 
 Här är dina användaruppgifter för @TITLE@ på @DOKUWIKIURL@
 
-Användarnamn: @LOGIN@
-Lösenord: @PASSWORD@
+Användarnamn : @LOGIN@
+Lösenord     : @PASSWORD@
diff --git a/inc/lang/sv/registermail.txt b/inc/lang/sv/registermail.txt
index c0ffb47c0..cbcf3f43b 100644
--- a/inc/lang/sv/registermail.txt
+++ b/inc/lang/sv/registermail.txt
@@ -1,10 +1,10 @@
 En ny användare har registrerat sig. Här är detaljerna:
 
-Användarnamn: @NEWUSER@
-Namn: @NEWNAME@
-E-post: @NEWEMAIL@
+Användarnamn : @NEWUSER@
+Namn         : @NEWNAME@
+E-post       : @NEWEMAIL@
 
-Datum: @DATE@
-Webbläsare: @BROWSER@
-IP-adress: @IPADDRESS@
-Datornamn: @HOSTNAME@
+Datum        : @DATE@
+Webbläsare   : @BROWSER@
+IP-adress    : @IPADDRESS@
+Datornamn    : @HOSTNAME@
diff --git a/inc/lang/sv/uploadmail.txt b/inc/lang/sv/uploadmail.txt
index 626525b5b..8db5f5520 100644
--- a/inc/lang/sv/uploadmail.txt
+++ b/inc/lang/sv/uploadmail.txt
@@ -1,11 +1,10 @@
 En fil har laddats upp till din DokuWiki. Här är detaljerna:
 
-Fil: @MEDIA@
-Gammal revision: @OLD@
-Datum: @DATE@
-Webbläsare: @BROWSER@
-IP-adress: @IPADDRESS@
-Datornamn: @HOSTNAME@
-Storlek: @SIZE@
-MIME-typ: @MIME@
-Användare: @USER@
+Fil         : @MEDIA@
+Datum       : @DATE@
+Webbläsare  : @BROWSER@
+IP-adress   : @IPADDRESS@
+Datornamn   : @HOSTNAME@
+Storlek     : @SIZE@
+MIME-typ    : @MIME@
+Användare   : @USER@
diff --git a/inc/lang/th/password.txt b/inc/lang/th/password.txt
index f5fdb1d3b..e463e7614 100644
--- a/inc/lang/th/password.txt
+++ b/inc/lang/th/password.txt
@@ -1,6 +1,6 @@
-สวัสดี, @FULLNAME@!
+สวัสดี@FULLNAME@!
 
 นี่คือข้อมูลผู้ใช้ของคุณสำหรับ @TITLE@ ที่ @DOKUWIKIURL@
 
 ล็อกอิน: @LOGIN@
-รหัสผ่าน: @PASSWORD@
+รหัสผ่าน : @PASSWORD@
diff --git a/inc/lang/th/registermail.txt b/inc/lang/th/registermail.txt
index e673c832e..4cfaddd90 100644
--- a/inc/lang/th/registermail.txt
+++ b/inc/lang/th/registermail.txt
@@ -1,10 +1,10 @@
 มีผู้ใช้คนใหม่ได้ลงทะเบียน นี่คือรายละเอียด:
 
-ชื่อผู้ใช้: @NEWUSER@
-ชื่อเต็ม: @NEWNAME@
-อีเมล: @NEWEMAIL@
+ชื่อผู้ใช้ : @NEWUSER@
+ชื่อเต็ม : @NEWNAME@
+อีเมล : @NEWEMAIL@
 
-วันที่: @DATE@
-บราวเซอร์: @BROWSER@
-ที่อยู่ไอพี: @IPADDRESS@
-ชื่อโฮสต์: @HOSTNAME@
+วันที่ : @DATE@
+บราวเซอร์ : @BROWSER@
+ที่อยู่ไอพี : @IPADDRESS@
+ชื่อโฮสต์ : @HOSTNAME@
diff --git a/inc/lang/th/uploadmail.txt b/inc/lang/th/uploadmail.txt
index 7b4cfd031..9d042b99e 100644
--- a/inc/lang/th/uploadmail.txt
+++ b/inc/lang/th/uploadmail.txt
@@ -1,11 +1,10 @@
 มีไฟล์ได้ถูกอัพโหลดเข้าไปยังโดกุวิกิของคุณ นี่คือรายละเอียด:
 
 ไฟล์: @MEDIA@
-อายุรุ่น: @OLD@
 วันที่: @DATE@
 เบราเซอร์: @BROWSER@
 ที่อยู่ไอพี: @IPADDRESS@
 ชื่อโฮสต์: @HOSTNAME@
 ขนาด: @SIZE@
-MIME Type: @MIME@
+MIME Type : @MIME@
 ผู้ใช้: @USER@
diff --git a/inc/lang/tr/mailtext.txt b/inc/lang/tr/mailtext.txt
index 03748ec5c..dfcc39e7a 100644
--- a/inc/lang/tr/mailtext.txt
+++ b/inc/lang/tr/mailtext.txt
@@ -1,12 +1,12 @@
 DokuWikinizde bir sayfa eklendi veya deÄŸiÅŸti. Detaylar ÅŸunlar:
 
-Tarih: @DATE@
-Tarayıcı: @BROWSER@
-IP-Adresi: @IPADDRESS@
-Sunucu adı: @HOSTNAME@
-Eski Sürüm: @OLDPAGE@
-Yeni Sürüm: @NEWPAGE@
-Değiştirme Özeti: @SUMMARY@
-Kullanıcı: @USER@
+Tarih            : @DATE@
+Tarayıcı         : @BROWSER@
+IP-Adresi        : @IPADDRESS@
+Sunucu adı       : @HOSTNAME@
+Eski Sürüm       : @OLDPAGE@
+Yeni Sürüm       : @NEWPAGE@
+Değiştirme Özeti : @SUMMARY@
+Kullanıcı        : @USER@
 
 @DIFF@
diff --git a/inc/lang/tr/password.txt b/inc/lang/tr/password.txt
index e06f5b218..852811d19 100644
--- a/inc/lang/tr/password.txt
+++ b/inc/lang/tr/password.txt
@@ -1,6 +1,7 @@
-Merhaba, @FULLNAME@!
+Merhaba @FULLNAME@!
+
 
 @DOKUWIKIURL@ adresindeki @TITLE@ için kullanıcı bilgin şöyle:
 
-GiriÅŸ ismi: @LOGIN@
-Parola: @PASSWORD@
+GiriÅŸ ismi : @LOGIN@
+Parola : @PASSWORD@
diff --git a/inc/lang/tr/registermail.txt b/inc/lang/tr/registermail.txt
index 0f779567e..26ff73905 100644
--- a/inc/lang/tr/registermail.txt
+++ b/inc/lang/tr/registermail.txt
@@ -1,10 +1,10 @@
 Yeni bir kullanıcı kayıt oldu. Ayrıntıları aşağıda listelenmiştir:
 
-Kullanıcı adı: @NEWUSER@
-Ä°sim: @NEWNAME@
-E-posta: @NEWEMAIL@
+Kullanıcı adı : @NEWUSER@
+Ä°sim : @NEWNAME@
+E-posta : @NEWEMAIL@
 
-Tarih: @DATE@
-Tarayıcı: @BROWSER@
-IP Numarası: @IPADDRESS@
-Host: @HOSTNAME@
+Tarih : @DATE@
+Tarayıcı : @BROWSER@
+IP Numarası : @IPADDRESS@
+Host : @HOSTNAME@
diff --git a/inc/lang/tr/uploadmail.txt b/inc/lang/tr/uploadmail.txt
index 61ff2dfab..92feef2a1 100644
--- a/inc/lang/tr/uploadmail.txt
+++ b/inc/lang/tr/uploadmail.txt
@@ -1,11 +1,10 @@
 Yeni dosya yüklendi. Ayrıntıları aşağıda listelenmiştir:
 
-Dosya: @MEDIA@
-Eski revizyon: @OLD@
-Tarih: @DATE@
-Tarayıcı: @BROWSER@
-IP Adresi: @IPADDRESS@
-Host: @HOSTNAME@
-Boyut: @SIZE@
-MIME Type: @MIME@
-Kullanıcı: @USER@
+Dosya : @MEDIA@
+Tarih : @DATE@
+Tarayıcı : @BROWSER@
+IP Adresi : @IPADDRESS@
+Host : @HOSTNAME@
+Boyut : @SIZE@
+MIME Type : @MIME@
+Kullanıcı : @USER@
diff --git a/inc/lang/uk/mailtext.txt b/inc/lang/uk/mailtext.txt
index 64a37a760..4f3072c2b 100644
--- a/inc/lang/uk/mailtext.txt
+++ b/inc/lang/uk/mailtext.txt
@@ -1,12 +1,12 @@
 Сторінка в вашому ДокуВікі була змінена. Деталі нижче:
 
-Дата: @DATE@
-Оглядач: @BROWSER@
-Адреса IP: @IPADDRESS@
-Ім'я вузла: @HOSTNAME@
+Дата         : @DATE@
+Оглядач      : @BROWSER@
+Адреса IP    : @IPADDRESS@
+Ім'я вузла   : @HOSTNAME@
 Стара ревізія: @OLDPAGE@
-Нова ревізія: @NEWPAGE@
-Підсумок змін: @SUMMARY@
-Користувач: @USER@
+Нова ревізія : @NEWPAGE@
+Підсумок змін : @SUMMARY@
+Користувач   : @USER@
 
 @DIFF@
diff --git a/inc/lang/uk/password.txt b/inc/lang/uk/password.txt
index 3fa9e5bdf..7db9be38e 100644
--- a/inc/lang/uk/password.txt
+++ b/inc/lang/uk/password.txt
@@ -2,5 +2,5 @@
 
 Ваші дані користувача для @TITLE@ на @DOKUWIKIURL@
 
-Login: @LOGIN@
-Password: @PASSWORD@
+Login    : @LOGIN@
+Password : @PASSWORD@
diff --git a/inc/lang/uk/registermail.txt b/inc/lang/uk/registermail.txt
index 689a33fc5..14f0e4b83 100644
--- a/inc/lang/uk/registermail.txt
+++ b/inc/lang/uk/registermail.txt
@@ -1,10 +1,10 @@
 Зареєстровано нового користувача. Перегляньте деталі:
 
-Користувач: @NEWUSER@
-Повне ім'я: @NEWNAME@
-E-Mail: @NEWEMAIL@
+Користувач  : @NEWUSER@
+Повне ім'я  : @NEWNAME@
+E-Mail      : @NEWEMAIL@
 
-Дата: @DATE@
-Браузер: @BROWSER@
-Адреса IP: @IPADDRESS@
-Назва хосту: @HOSTNAME@
+Дата        : @DATE@
+Браузер     : @BROWSER@
+Адреса IP   : @IPADDRESS@
+Назва хосту : @HOSTNAME@
diff --git a/inc/lang/uk/uploadmail.txt b/inc/lang/uk/uploadmail.txt
index 965de1ba4..ee982c850 100644
--- a/inc/lang/uk/uploadmail.txt
+++ b/inc/lang/uk/uploadmail.txt
@@ -1,11 +1,10 @@
 На вашу ДокуВікі завантажено файл. Деталі:
 
-Файл: @MEDIA@
-Стара редакція: @OLD@
-Дата: @DATE@
-Браузер: @BROWSER@
-IP-адрес: @IPADDRESS@
-Назва вузла: @HOSTNAME@
-Розмір: @SIZE@
-Тип MIME: @MIME@
-Користувач: @USER@
+Файл : @MEDIA@
+Дата : @DATE@
+Браузер : @BROWSER@
+IP-Адреса : @IPADDRESS@
+Назва вузла : @HOSTNAME@
+Розмір : @SIZE@
+Тип MIME : @MIME@
+Користувач : @USER@
diff --git a/inc/lang/vi/mailtext.txt b/inc/lang/vi/mailtext.txt
index 3469a272f..bcbb65659 100644
--- a/inc/lang/vi/mailtext.txt
+++ b/inc/lang/vi/mailtext.txt
@@ -1,12 +1,12 @@
 Một trang trên DokuWiki của bạn vừa được bổ sung hoặc thay đổi. Sau đây là chi tiết:
 
-Date: @DATE@
-Browser: @BROWSER@
-IP-Address: @IPADDRESS@
-Hostname: @HOSTNAME@
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
 Old Revision: @OLDPAGE@
 New Revision: @NEWPAGE@
 Edit Summary: @SUMMARY@
-User: @USER@
+User        : @USER@
 
 @DIFF@
diff --git a/inc/lang/vi/password.txt b/inc/lang/vi/password.txt
index 3b4f03ee6..9f80429f8 100644
--- a/inc/lang/vi/password.txt
+++ b/inc/lang/vi/password.txt
@@ -1,4 +1,4 @@
-Thân chào bạn, @FULLNAME@!
+Thân chào bạn @FULLNAME@!
 
 Đây là chi tiết để bạn đăng nhập @TITLE@ tại @DOKUWIKIURL@:
 
diff --git a/inc/lang/zh-tw/mailtext.txt b/inc/lang/zh-tw/mailtext.txt
index ac8d81083..7ffb83e80 100644
--- a/inc/lang/zh-tw/mailtext.txt
+++ b/inc/lang/zh-tw/mailtext.txt
@@ -1,12 +1,12 @@
 您的 DokuWiki 有個新增或變動的頁面。詳細資料如下:
 
-日期: @DATE@
-瀏覽器: @BROWSER@
-IP 位址: @IPADDRESS@
-主機名稱: @HOSTNAME@
-舊版本: @OLDPAGE@
-新版本: @NEWPAGE@
-編輯摘要: @SUMMARY@
-使用者: @USER@
+日期     : @DATE@
+瀏覽器   : @BROWSER@
+IP 位址   : @IPADDRESS@
+主機名稱 : @HOSTNAME@
+舊版本   : @OLDPAGE@
+新版本   : @NEWPAGE@
+編輯摘要 : @SUMMARY@
+使用者   : @USER@
 
 @DIFF@
diff --git a/inc/lang/zh-tw/password.txt b/inc/lang/zh-tw/password.txt
index e99f5b991..9898f24ad 100644
--- a/inc/lang/zh-tw/password.txt
+++ b/inc/lang/zh-tw/password.txt
@@ -1,6 +1,6 @@
-@FULLNAME@, 您好!
+@FULLNAME@ 您好!
 
 這是您在位於 @DOKUWIKIURL@ 之 @TITLE@ 的使用者資料
 
-帳號: @LOGIN@
-密碼: @PASSWORD@
+帳號 : @LOGIN@
+密碼 : @PASSWORD@
diff --git a/inc/lang/zh-tw/registermail.txt b/inc/lang/zh-tw/registermail.txt
index a7137b031..22b7ff855 100644
--- a/inc/lang/zh-tw/registermail.txt
+++ b/inc/lang/zh-tw/registermail.txt
@@ -1,10 +1,10 @@
 有新的使用者註冊。詳細資料如下:
 
-帳號: @NEWUSER@
-姓名: @NEWNAME@
-電郵: @NEWEMAIL@
+帳號     : @NEWUSER@
+姓名     : @NEWNAME@
+電郵   : @NEWEMAIL@
 
-日期: @DATE@
-瀏覽器: @BROWSER@
-IP 位址: @IPADDRESS@
-主機名稱: @HOSTNAME@
+日期     : @DATE@
+瀏覽器   : @BROWSER@
+IP 位址   : @IPADDRESS@
+主機名稱 : @HOSTNAME@
diff --git a/inc/lang/zh-tw/uploadmail.txt b/inc/lang/zh-tw/uploadmail.txt
index 1ee28c1f4..9572681b9 100644
--- a/inc/lang/zh-tw/uploadmail.txt
+++ b/inc/lang/zh-tw/uploadmail.txt
@@ -1,11 +1,10 @@
 有人把檔案上傳到您的 DokuWiki。詳細資料如下:
 
-檔名: @MEDIA@
-旧版本: @OLD@
-日期: @DATE@
-瀏覽器: @BROWSER@
-IP 位址: @IPADDRESS@
-主機名稱: @HOSTNAME@
-大小: @SIZE@
-MIMEé¡žåž‹: @MIME@
-使用者: @USER@
+檔名     : @MEDIA@
+日期     : @DATE@
+瀏覽器   : @BROWSER@
+IP 位址   : @IPADDRESS@
+主機名稱 : @HOSTNAME@
+大小     : @SIZE@
+MIMEé¡žåž‹ : @MIME@
+使用者   : @USER@
diff --git a/inc/lang/zh/mailtext.txt b/inc/lang/zh/mailtext.txt
index fa20ebe55..f5e608113 100644
--- a/inc/lang/zh/mailtext.txt
+++ b/inc/lang/zh/mailtext.txt
@@ -1,12 +1,12 @@
 您的 DokuWiki 中有一个页面被添加或更改了。以下是详细资料:
 
-日期: @DATE@
-浏览器: @BROWSER@
-IP 地址: @IPADDRESS@
-机器名称: @HOSTNAME@
-修订记录: @OLDPAGE@
-最新修订: @NEWPAGE@
-编辑摘要: @SUMMARY@
-用户: @USER@
+日期        : @DATE@
+浏览器      : @BROWSER@
+IP 地址     : @IPADDRESS@
+机器名称    : @HOSTNAME@
+修订记录    : @OLDPAGE@
+最新修订    : @NEWPAGE@
+编辑摘要    : @SUMMARY@
+用户        : @USER@
 
 @DIFF@
diff --git a/inc/lang/zh/password.txt b/inc/lang/zh/password.txt
index f8c4115b8..39095a17b 100644
--- a/inc/lang/zh/password.txt
+++ b/inc/lang/zh/password.txt
@@ -1,6 +1,5 @@
 @FULLNAME@ 您好!
 
 这是您在 @TITLE@(@DOKUWIKIURL@)的用户资料
-
-用户名: @LOGIN@
-密码: @PASSWORD@
+用户名:@LOGIN@
+密码:@PASSWORD@
diff --git a/inc/lang/zh/registermail.txt b/inc/lang/zh/registermail.txt
index d58d660ef..56568dcf0 100644
--- a/inc/lang/zh/registermail.txt
+++ b/inc/lang/zh/registermail.txt
@@ -1,10 +1,10 @@
 新用户已创建。下面是详细信息:
 
-用户名: @NEWUSER@
-全名: @NEWNAME@
-E-mail: @NEWEMAIL@
+用户名      : @NEWUSER@
+全名        : @NEWNAME@
+E-mail      : @NEWEMAIL@
 
-日期: @DATE@
-浏览器: @BROWSER@
-IP 地址: @IPADDRESS@
-机器名称: @HOSTNAME@
+日期        : @DATE@
+浏览器      : @BROWSER@
+IP 地址     : @IPADDRESS@
+机器名称    : @HOSTNAME@
diff --git a/inc/lang/zh/uploadmail.txt b/inc/lang/zh/uploadmail.txt
index 00baf2f35..a5ce53930 100644
--- a/inc/lang/zh/uploadmail.txt
+++ b/inc/lang/zh/uploadmail.txt
@@ -1,11 +1,12 @@
-您好! 一个文件被上传到您的 DokuWiki 站点。下面是详细信息:
+您好!
 
-文件名: @MEDIA@
-旧版本: @OLD@
-日期: @DATE@
-浏览器: @BROWSER@
-IP 地址: @IPADDRESS@
-主机名: @HOSTNAME@
-大小: @SIZE@
-MIME 类型: @MIME@
-用户: @USER@
+一个文件被上传到您的 DokuWiki 站点。下面是详细信息:
+
+文件名 : @MEDIA@
+日期 : @DATE@
+浏览器 : @BROWSER@
+IP 地址 : @IPADDRESS@
+主机名 : @HOSTNAME@
+大小 : @SIZE@
+MIME 类型 : @MIME@
+用户 : @USER@
-- 
GitLab