diff --git a/inc/lang/ar/mailtext.txt b/inc/lang/ar/mailtext.txt
index 3e4f7f3748b94dcbc04cc7b6fb4f324e0d91ce7c..132e36ef33460ba54e37a3dbfea68067ae40aa2f 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 edfed7841e8ea0875b70cb6b48f24d4cc461cd21..2489800ad44f561cc0adfa5637bed63be76e7d9f 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 9d1b1c3d0996c2890d2521c0a438da8ef7b181ee..7c1cae08ab4b63409c860c30256b9f94b2b1d955 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 882187b2bd33c957fd930b525f9e43eacb548847..bc61e6efc305b522287f2121a77e6e015c28ced8 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 d83c0f656fa3655264820626533e91261ff3d75b..97cb68d0335af0cd855e6a09f18c5651ee077697 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 e73ef83f1e52e3cebd6e109d0a9978cc8f1256dc..6424161fa6ba2b570a4435aa3756c68ae68c750c 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 4c3adbb23a37787ae8da1d307774395a76fc0e80..b080e9b57530e34930d2665968add3d3ca5e77f6 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 446d8b281faf33546ca3b3249a1cd227bbfa917c..88103fd8f8bc54924f8ef75bb13e014fddb166b9 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 e73f6804ffdd38ad2be864565ffd7d1f5888a19e..60cffed22058426a0d853dd196d78def0214f8c7 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 2a1347067d61859759485d259d33a97368138b9c..77fa48b9579f9c378327246eb2f09ec2cc001f7f 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 80cf7214581608c4d71ae5efc34ccdfebdad6d37..3c555f54a30e50eb7c26f80a9c3bd853035b19e2 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 dc403397f19011647c8d98422005b564837fd468..0c14437b056e86bf7cefba569f090bac65d3050d 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 2ee4b1e8368046a95d1780db14093ed28ef2a79c..d9a781e0f471fe0d7f635a549fefbdb414b239c4 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 387f945bc97683d78ef4fd85d75718afe4b4edf0..02f2c1a3b1252a9706ad7cc6bd693472b6ac7ff1 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 74692c2af5d8a6f87dd0c62914d852cc71f8e9b9..a67397db10fc8f6c52e2df5b80ee44cf35ada46e 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 631f07d330423a1c285daf967d330c1e717e45d9..dd7f0c56776247385bd7795df2b59a4bdf645970 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 026d7cefbb166d60affd2a2d21596fb4fd926f52..d4bd9f964b967d0e6bccb3cb65d0f4167d253f5f 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 5a8409648a509e10e0cee13eaa83deb3cb203a84..01b7648224ad856ebf60aa8d086bfc525dd49485 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 0438cff753c67787d9d21e51047d8d2418a612a9..8036ebec36f39950d9f013d06e81afff00d84f5a 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 9f99cc4a70bc2b7e21bc2e1f36b60d2f916e074e..6b7c68273257e283492e7ee77029ef5119d0d3f1 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 3d58e295d1f5b07077f8d0d0b40d7c2b0c908f5e..3c449bca18bbd713fe96e691eeae67f6c8066e7d 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 8585b2576b81ebf64f69e4e8b38ac28d5a68ec0e..090167da605be7eae8f83e26cdde148023b4d81e 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 b00c67d123f4c5d1a4b7af1c92b7fb4a3d696dbd..27462332e9a0beff45ff587b370a18a3a37daafe 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 d37fee99c71407ff40e868f438428cf1f4d8f8e6..da0678ef32006529d6b20ee1a833a45607d375b1 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 9b58bc07d7a4f6572ecbddca7f393173eb621898..0cb2b4fd230d280425a4771ec98676cf80527b88 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 6f8627e2237edb7295010e07222486f2ee2582c5..8102232a3512578ed0b08f67845a702876b53560 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 e8c71b942ed019bb266c7d5a8758dd4e4ae64802..bea9cd3e43f91d3b344b3d4eb7aee873fd1dfe56 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 51330b9bccbd33d593335e0b04380f200cb82a35..b129bb9b1a991b53b38724696b1d176a388e0d5b 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 793a16464ae3e6c39fb18d0464dfb718c928aa64..8ce3b54dc65d73737ee30675fbc6539158bd5780 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 b9a4d76b4d800900bf51a145777863f8d65a7d24..87a0875891ff6ff9cc570c3a851526bd07b01a80 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 c151b97a07b30b2babb985b5a89b41755a7ce15b..127b4816b7b5744354a610f152437fce77ec7862 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 d87df2283871bb5c19f89a66129986767716e3a4..e99fc53b24c844e55a9c2e6fd52355e14fd5be23 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 674d99a7a2777a1acd61630e313095f91fde5c10..e19fb8f655ce15315b3f9152036f60ec336d7314 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 bfe4e6be2b4cab9af205256383e6d7400e846929..d608cd562d23bcb55650a298ab8035ce2d32e878 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 8158c3b1b2235ca8006df679801bb4a1b6bd090a..5968a704e95126d2819052cd4f19c64381d9cddf 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 24bea49e54098ebac17b6fa71db8c0f9155b9f40..e6ab83c3e99865c81a9324c58d40097098219497 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 674d99a7a2777a1acd61630e313095f91fde5c10..e19fb8f655ce15315b3f9152036f60ec336d7314 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 54a0866e790b383390e661df23198a504f143a26..3646bcc2cdab7b241695adbea6dd3d2ed94e06b0 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 5a07879e89039a195db31bae14446100fb95c5e3..cc2a22f05743dd0bc4e340d4028e56660b2f155c 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 029b1290519af44ac6e3b566e2e9eeda71e1cac7..c664cb00609c478781b7adb89cdf9fc3a6187d62 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 82e25036d658681957d8906faa9b1ab306664850..5266fc195c030d9605a353a7b5aec38057fa8c50 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 3bc302cd168e783a5bd3175e1f8b40770b20f197..c9cfca926efa7ea5109010dcc186a506e8157421 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 4a35bbf49a62056d19b746c934c402f8b81c52f7..aea14d459b125ad020ecca6c717ba090d5a0b189 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 14fb34ab1c99ffc806330601b10d1460700904ae..0a0dfb52b043d1ca312702cba3275b848e295e22 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 45095ddd2008c9d4b27c1d59f23aa884228e66d6..5517ca11b448e0eb0d35a25b7e3c6cd142342006 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 df423bce066d4c3ba0ca0bb0fdc9155582a13f8a..dca8e3344e1e86ec243432f7fdd7f5bd66a29bfa 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 623af0d28554a776901e6ac53ecb0bc13513b629..6268824c5b67bfe40b12626962a94b79d8d0d6ab 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 cdd845658094b7a5fa339eb62f213754b26f8d43..e74d3eb83e8b746e4bd08628ab6cbd82281e0bb4 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 1ae1ba082efdf9d15768460924c7dab12bf933e3..64bded46a580e138db527cdb96a8612300c5ff32 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 d72214e71b918c87f9917a61d1f11f58838d57e2..b9208a1af9de82a2b9187e5b824e3192494d9492 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 2e8d1459cd6d46705da723b4c30b1a9c5cc6724c..eb1c5df2a57c357232b119288a7f92ca8a25a3dc 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 8ed8dede4315dfcb5362b8afa1e75b18cb8d4444..f1a62029da6976ad73d98c7b146e522e8d66d4cd 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 c463087f6a9eb36c1058144a37c24e9d43355d7a..9d75bb8db8d0e7a6c51e150733adb825fd7409a0 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 2e8ecff3146a50300f2ad0c50d0e5cd8c01781df..3b78963771bd573f3e0ea56c13d108f508c2f0ea 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 56dee12c659fa75b1bb11ca43c1e3864b3f07817..2c21926e23d459df7942a3b21173e6f44a26c94d 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 9607d0973182ab11f12c636863ae6de107ddb43b..ad0ff2f2023e7607fbcd0828445adc60718ecdcc 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 085c89cdf121f6a4021f72c523267fecf2bbe7b2..a9c079f23023ffdaa5410a7300a3214e048f0d84 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 8cb9143e968a33c8e4d5cb6566cba2efe26a0d3f..a2897e6dd499fccf0fcbe6fb64a9c74d45d0fa6d 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 16cacc39ce3af75dd515bb3ac07fa44e556c7241..7b685e046966391ba7fb31948ee5dc6cd663f704 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 e8f7f2c6005a030c608446d27157babf22e1de08..86e7289c900b53f9164459a41a6280031c01dacf 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 2b612674753389e8cdd11029ef95bed5fcb5cc95..e9218b6b187fd5bb9dc981675427a73bbad2b2fe 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 fd63fffa28ca7a458c569fe46877851387fecaec..015b3c32591d7580a0b76b319044de2cc2d03ed4 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 6e629017c3479a821269fd1a40e84eae068b08bb..e088166f6c36eb8d35f0cef7a47028ab1c28b0d8 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 b3ca22a7fdf46428062b76f8f064d4ed40e3fb36..07c35be0a5d105b6ea73613a428a0fa6979cbaed 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 012e0f3ee14402f07ce3cda27147883a71e3da52..e7b9abfe8f3f4f99532f431a0fe8ae73f69416d4 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 c2086327eb892886153efce8ab2fcc00ae6161d3..331edfefc94b60a1a986f91a01d19d14e305bb60 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 640204d3524475a9537a58ab3fb3a95f729728df..df8b6e71ead0dcfea168d67c20ab1a687b06ba59 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 89aef5a6220f05b325a7c35248c3d2e609819294..d93eb1e8a2216796ac34f4dd253c5438af5412ab 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 b3589ce8bacfa9698e16d34014e074737157baa7..2ffe715865e33b8610f8cdbbe9e9cd79c58d6b97 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 fcc1a7ec76aeecc06a317fab4880877cea97d927..fe39c2db573593ff602f65a393aef6e12169c949 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 af8205ae1bbac7ac7a05bb17584199dd22ce9614..37273d9542fac333cce5731382659add9c1f5b3e 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 be6c79fbe74d1a8e9f32447b700cdb7133116aa1..bf102e18bdc62ae4585597a0b8ee03ce64d1983a 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 8271fb20d88571a075348251b5bc8af79314c36b..36f8562b3034508aa0982db11ea6109c31d24375 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 1d61c527aa314e9fdcaf35d854dddc8ec4fc7694..aad8481ba8f9262c48592d597eec429700b6874e 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 01a259987def0e9d0e500bceb30177a4ffc1984c..c01bc7df491b76cb28b05961373d192600747e35 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 f0907e452035ae4cd4f99806ac0080213bd81def..f33760e76b6f7509402ba2c714b708816b551138 100644
--- a/inc/lang/he/mailtext.txt
+++ b/inc/lang/he/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/he/password.txt b/inc/lang/he/password.txt
index eda24349cb70156c4760f2f3ab3c5257a599e7d0..bfa29b680b6582c34a04004b7db4a9940ce44918 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 2088d5d0cfdd9b3f6e4e0364b641c446367ee209..2216cb36a2e298179da54b6caf25115ff082b6e7 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‏: @IPADDRESS@
-שם המארח: @HOSTNAME@
+תאריך      : @DATE@
+דפדפן      : @BROWSER@
+כתובת IP‏  : @IPADDRESS@
+שם המארח   : @HOSTNAME@
diff --git a/inc/lang/he/uploadmail.txt b/inc/lang/he/uploadmail.txt
index ad61384e19a6c5ba97c7801e7436ac5894ae5818..9c06f133bbdf0e9b0f6785c5a9fc9f079767cc4d 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 e81cb8ea8796332119b151894af44fc263ed7cfd..1719fd5a09736cefa883b38f6209f3cf17a36e6d 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 883c799b31121deb65ba0f99d471d961e706cbfc..76cccbd2e042783ce5c68a92e6badae4e5580d67 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 c3e45867e97bb44aac872e51831b10cc1dc7bbce..9c556d9e342d3199caf7b9f02dbc54cb3bdd0d39 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 ccc513ed57c75cd84f9d682be1aa21f2c0bfdacd..f4ab91ea579601494ed2638112183fbc5d1603b0 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 9c4e50a83f117bf20b3ffd73d8b4bb698fe714a7..49cf69fed5115f80d3ecc841b64dedf3aea8e4a3 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 4e96355e02bbcfcefe333faadfd7928ad2b88520..d37d59b817788f4d7fb34ea109fbe3d9d35bfa2a 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 a5a6227af473b2d0b05d06cb47c3929b34fa9dd1..62e0c2e569e47ccc28647f24e33e430d5d6d6840 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 8994c9f813b37ff995dd5c1e7d82216223c6acde..ed3eb2512642839181d96eaed442804b7ef25492 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 661e4237b43e71efe6c1a69e76b6f0e92035d233..bf0e40080fb97d987a2e6f0a19be165eb8415938 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 24c8124fbe348c0232bfc3e25b12414174853c75..b6fa332aad0272114e7faae410aaf4a72a8a7169 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 d70de59ffd4e31515afff4f3d8a3efb3fd519228..c406d4b315e1d28c74ce6a1dca3f2677e9f1d897 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 0c252f4de30173135de34cd23273bd11a31e6ce2..df9699ee439d46c300c536be856d3fde71cae12a 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 885531d1ebc0f8a4cdd11a29c672379fe09ff479..285915ccf64480caf2b84f90ca2a9f7c4493434f 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 9ba269caa256a9ad74647d7cbf84bcbbe3370489..5943e35a5c58bcab9a7e5aaca12c4c7d832d0aa5 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 f68594462464e497304cf05d3eaf588d506f109b..bb5f5e81fa84952a0827674facfdf25705f86308 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 96007aced66d251eb022a649acc2e699d0600789..3374d37dd9d81db8010fdfa4bc54fcd4276b9fa0 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 54e26a4b5aa6db0e5cfeee90a50578682511eeea..f7ca9e98d0d9847fd4f2f839733f049a5b46446a 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 001a84153d1191bcd7440b79e0c0b7f80f7432dc..77454cd3f07933bc58da495ca18d9101d9d827b1 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 9441d4c1752f7234f88a4b9378578fe827bebc20..4dd7cd463b0837bdd990692307a9138236b6021e 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 be85bedeea92d6abedc512e2bebb427d3d48bae4..4bad3d945df69c73b03ba670784f9f01e2a566bb 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 b334ac4d0e15290642adbd23c61f665ea90eab29..fa11b104440db193b2c159ae3fcdc7c7e797e008 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 b0e8faef90d97143739a3fa249fbf2b00376dea7..ad5241a0b4cc347e9383ce4fbcc699bb6f9693e7 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 2b164440e70066226f3c6dda33508202c9075671..8734c91df54855040e205d206fb37e990f09e65c 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 98a8f2964d8a17ba0b3ee964f4bba2165278cace..8cdfcd81b0fc602f85f1d081e692d4bcc0d38f66 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 000b1a1ce504d3f8d045242630fe70028b8636e7..8348378dc6c3d635effac03f688652b3a6637bf7 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 4d75f4af8f4e03b56e2b99de3c5388301d5def21..05573576ac8df68a85745e1e741abf249927428c 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 981302f88c4b387512e5f95fb162ae2cae955d22..1f28659739deac0ca55ee9253d0ac53175064f74 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 dd76cba22fd1d0f3cf6588d202b5f14eca0bbc90..329bf31a1b4b368ab8011a67cbb9e0ef9c3a47ff 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 57beca741924c08f47bc37dc14a10f2ce7a6d417..59c46e088bef1d7e16dae4103b36409231949a9d 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 13a41f098b146cddc5979f05b7feef577d805209..1d058323bbc196f0d9ee7137079a41f545349fc6 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 270dc1efbfc3612594ee46642c5666648dc2bd4e..5240dee842db63c35d69bc18c1ec9212d041277d 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 433e2a38495466b82f8d829ca9ecdc79f8802727..c4b9e8dff63cb524a2bcdb24d24d25c0389ad9e8 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 937d75486416fc556f58dc6b827ab9b595683cc4..2abd3ab8162740cd7a32ad17e9e8920676669365 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 fbb87c023deb798bea792b05d2717aebab22aa78..0bcc8e7b55733b79b56f906aec9bbdcbd2174d23 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 49c9148e3d6e5bab423d47e2302eb1635f9f2ee2..83160031339c277cea3a349997e406bad1bc5448 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 ae6458bf07336196ac0bf635b40c23de9aa06008..7cd7d8b2502867eac616cc4ab2cf7853b93769d2 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 c109f2f0736113d40a9e00a613cb70b40bb2e996..2a2084c9166e284114b0ab53c3ca0ee65eab0ebd 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 304a381084c0d71cac2ac172f1e313b5142fedd2..8d664d6b4e74eb97d628f6a9cb60e2efc431e58e 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 50a533327da3e5ff7b440c66fa67c9ef567fe80b..c772686fdd3b5c1c73eb797115db72933d093e80 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 d41e672f0d7f4c101c6c258c9f29bea1d38e5da9..4ed28582f77c56cdd8aed1664dcfebe05b503a29 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 6f3bd0d8393d2bc44b812ec16e25f94902b6a142..826ab0c45c235ff09e27ef434af7b845535c51f3 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 6df835e6cd9108fceae595a1455069a57ed59b00..a83f97e7c93353a8065aa9c269c1f63bfc94d98a 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 48e78b368035ed6684eab29ed8a3086f6b6bac10..ed3b92b42beb3a85b302a3a97164185e0578ff00 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 d118893f064743dea6edfd9965f8b786c290cc47..1aea97c3393f3a919804a35b8683eb611809c296 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 689f86804e014727e16cd0236f958c1c857abfcb..a02379784ec9b5ca3731abbab6d44a40af1cdad8 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 f2eb3062ff129f73d33e9d76b44ba2b5084a55f2..32f6f635de0c6e3925cf0d70df0aae6bd56b9472 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 7d1c2cfe3bc3574b862ceaef421fb2f859bbf633..94a180a94f719a75bb089d9f0b2f7c79f578a4c7 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 e5f474920be4f7b2b48b53af64f7135ea635d776..8d23efdb8926fd8a4ea2895839b5c940bed417ea 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 194776c78b5749cf48db541c190226a072a00bed..85a4b950a0f3a68587312190d8f517345b2c9e56 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 19ed8b1e3387f2357fffd9b3a335d1a58f25dc1e..7260733a6fdce7c287f2a012d1bb6e518b126932 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 e602040d011cbe84423258f61a3482a5e6e6c7ce..46023e3305145de273ef1c05fc95a4623406611e 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 314fad273b9e82fde6dad0eb68ee8abc1a853b11..89022738fdfa016bb26d112360147d693ba90e7b 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 76673efefe0d87b026d86663e581dbd345e86499..237ec65bc73ee6633d375e201548ab4f29b2dc61 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 cea4e03d7411808cc6c06cf4d218166d3448f5e5..cae98db3e17e556b2be81a9716e636e3bf434b2a 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 b57ea17323c2c0ef3ee4d37f00a7ea4987eb733d..745556fa5856c5d52efe0dfe0df03427f10f49de 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 400d392a3d0ad1bc7b4a46f499a8ebe248c34588..00229673eeb902c5e55be9699b18affb5271650f 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 cbe140c2731d5b3cd441929c63c29b1475430999..a8daa05e1f0ffffedf241b71bbe8337535a02294 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 d1029dc4a47204397c7c1304a0c102bd37dcc398..0a7587a99749b45808d2abb0ef48f842ec8c24b8 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 a8b95fc2b8f95d350c96eafcc22d96d2213a93b4..8527f8e1751e99e123afd413cb585c707edab1eb 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 e353a7ead9a833cfbef0ceb17f8b5019aacbbeff..844f246175a802a4eadfc0a038504b87b74cf5a0 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 a1c2dc275eea3b17d5e3b5831c701ce4a3e4ee44..cfd81f3b8f4205d90c2f7d7774b746b71cb9ab03 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 8cb3bb83977b8029a562f973a9ecd1552ebcfeb2..7f5333dadb890e5d7c310e44deeb26041b8b9247 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 6a6f0d88c392d433a7f10855fb9df6de8ea98e0f..09787e1dba272f6f9648ab1a77f1a25d997bc491 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 06d98004760ee28d2ca18846cafcf984368db0ee..14a15384c6496dc2bd4633e4bc29b4894fb43d33 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 a0ed49860896fec593b0c7c9a51f731569642bd4..3f8ae24bca03e5bf84aa6b83b6b65190e6f5f465 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 ac42c3787a75b32eaa5385eb9c6042dfb0affe5e..599deabd50bbeee66c16f23e1a0e966efb516d4c 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 7225f45976f397ba7c07e926494b0a50dd7c85f0..cf8e8e02a0d297bb3233f68dd6c39377e805f3b3 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 04b83ffbd5da16212b597212f3d8a73b0aeac4f6..da2f441b186f70d24190d8c0267ec31b9a2c3d6f 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 d9a666e9191505728ce9350562dd38388924b99d..8d0907e40892b17c5c0cac6773e6758d9af73a48 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 b8dabf9b743d8189b0ec73f16b59b6314a40a1f3..2be1ac3b34e7289dcba1a723a132162a18b96a1d 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 d653382f26f3f4528f09b4869841eccf9c564fdd..df409678f31862d68ca79f9b33a66e23a5ca93ea 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 3f545fe24014bbc3482d501731cd237dd027d6b1..9b333731dd8f460710a2c60411932dbfe43bc855 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 14c31ec77528cb65e60cb0a3c6a741c59b3dc68a..d0e1f69b5e3e9594cf751a7be7a80c35f412df69 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 36f50873e268eab2d20690d256b8379c20a943b1..255eb628c61d184737a3bb0c00b0767da436841d 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 5bde3923058373154f28252f1efb8ab50f68b16e..126ff2a47cd7a517b59fb8d3714307c4c6d5ec1b 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 f79dfaf92701c5add6f154855be12adf3274ddca..0566aaf2b17ce4fdc62b38e226caa6c2438abef5 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 86fbfe1d12f59eab8108b7ae2eae26a6296018b8..44acfe6f3ec9a1f49a6ef09340793f9d1039d139 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 997e1ebab11e5c4ad15745a7926cb283382e4f78..126aefc0dc1d47df7d7170e39acf255ce9575673 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 0eeadfc27d82c1d35a6af5f838e5bd9bc7911b3e..ab9d717f0d47df76b8d0258826217a3777f68ccf 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 b2eade3243dd57ef6b0b7b0ccade6c4f7f2f02c0..bd2cf3202d876372ef6fdb42eb12505caf93e901 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 3f85cebcf54a9f8d106b991b6a98eff75c375a98..0db6f9e165989349558a90c90f6fa848a75950d9 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 202dfc6f525b17bef75d8e4959253dba82310945..a45bc2a320ce4181ae2d5d91416e76c669aa069b 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 d87714c398e86689f0b3150a2b81f0d1998fdc03..f8465a4d669190b11df47dcb879121bd739e5430 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 c0ffb47c0d323bac2c792af176152395adcc9590..cbcf3f43bce2d6d767ee05351282d477f9519a1d 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 626525b5b5683ca0266743f65113cabedfdba1ac..8db5f5520a15f319aeb959c47679b2aeeb9de51f 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 f5fdb1d3b618f5278ed235a13fadc85b30330948..e463e7614ce946220fa48b59cb4a483c202dfde8 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 e673c832ecc1914c6e5f9f5879573233372218e2..4cfaddd90faa3d124aa2a7e4c9231118bfc31086 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 7b4cfd031cc2e1f8ba16e3a014f381304319a546..9d042b99e4efa693ae383da4090db38c2f38e152 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 03748ec5cc1ff8e0681c9a4935fba9f978845890..dfcc39e7a1577904f5e8a9463d77b776bee9744e 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 e06f5b2184f9865801a7770f2f85607ed9b8df53..852811d19978d5a16bfbc586d998d3b2c252c827 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 0f779567e336449ec38bbb6e5f548ce995f14154..26ff73905e13e9da6c815ee8e4e01b74f16d1001 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 61ff2dfaba539378cc7a36850ade4120178d61c7..92feef2a107c4d020c009f91dc27e40881246288 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 64a37a760729c21ce87606aa382ad54ecd882ce5..4f3072c2b9f9fe2df3c612c4875cd7d3852c774d 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 3fa9e5bdf318e6c5a742c60922fc07dff25ff463..7db9be38e9fbe9b44df214c1e77fc64575b1cd26 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 689a33fc58408ae3f5b89864a5943bf1eccaefe7..14f0e4b83ac00074f6f0244c557d383d6133feff 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 965de1ba4f387a8ebac8766317b6e863502fdde4..ee982c850eb421701f1e18ae04b1d333eb650805 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 3469a272fb86b0f9c3d0abd7e51b2df5293ea1b1..bcbb65659daba40a4696e748808e260d45e6a5ce 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 3b4f03ee6071378cc937a120c2884656378472fd..9f80429f8e931058b42e2cacb534bd6f376a7a97 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 ac8d81083193411ca94dcca5322e4744d27fdb10..7ffb83e80776d834481d396d0553f837ef676fce 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 e99f5b99196e2217641575c265e4ab3e877054f2..9898f24ad76681174b779f95eb84493fd7829d13 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 a7137b031ddc4340c34a9a0a0d68d4f6aff971e8..22b7ff855b0f42e3579eae42de91471dd9f1b6b6 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 1ee28c1f48c84c7daaeae3a74f4b66fc3b34e8e0..9572681b97c1f121f7277aa0648b20a1c3ff38ee 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 fa20ebe55ee392849bc3958d4a9f2ff4b28c4665..f5e608113249fd720cc62af09e6554b532731981 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 f8c4115b8cafc9197e600651fef93bc1310fb061..39095a17bc71f7511ecead8c139afeec7285c586 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 d58d660ef822ae16d2d774899f7b68a1152da3ab..56568dcf08453e4cac18bffbb42ead2c6c1db945 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 00baf2f35824fbf3bd231bff42d32c6c670a5376..a5ce53930d0946dde4d804b564f08ff91eb225cd 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@