newline at end of header

2013-01-11 10:00:10 -07:00 · 2013-01-11 10:00:10 -07:00 · c43ff35fe7
parent 1656c63a55
commit c43ff35fe7
630 changed files with 1025 additions and 414 deletions
--- a/mods/friendica-to-smarty-tpl.py
+++ b/mods/friendica-to-smarty-tpl.py
@ -94,7 +94,7 @@ def fix_element(element):


 def convert(filename, tofilename, php_tpl):
-	header = ldelim + "*\n *\tAUTOMATICALLY GENERATED TEMPLATE\n *\tDO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN\n *\n *" + rdelim
+	header = ldelim + "*\n *\tAUTOMATICALLY GENERATED TEMPLATE\n *\tDO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN\n *\n *" + rdelim + "\n"
 	tofilename.write(header)

 	for line in filename:
--- a/view/ca/smarty3/cmnt_received_eml.tpl
+++ b/view/ca/smarty3/cmnt_received_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Apreciat/da {{$username}},

 	'{{$from}}' ha comentat un element/conversació que estàs seguint.
--- a/view/ca/smarty3/follow_notify_eml.tpl
+++ b/view/ca/smarty3/follow_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Apreciat/da {{$myname}},

 Tens un nou seguidor en {{$sitename}} -  '{{$requestor}}'.
--- a/view/ca/smarty3/friend_complete_eml.tpl
+++ b/view/ca/smarty3/friend_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Apreciat/da {{$username}},

 	Grans noticies... '{{$fn}}' a '{{$dfrn_url}}' ha acceptat la teva sol·licitud de connexió en '{{$sitename}}'.
--- a/view/ca/smarty3/htconfig.tpl
+++ b/view/ca/smarty3/htconfig.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<?php
+ *}}
+<?php

 // Set the following for your MySQL installation
 // Copy or rename this file to .htconfig.php
--- a/view/ca/smarty3/intro_complete_eml.tpl
+++ b/view/ca/smarty3/intro_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Apreciat/da {{$username}},

 	'{{$fn}}' en '{{$dfrn_url}}' ha acceptat la teva petició
--- a/view/ca/smarty3/lostpass_eml.tpl
+++ b/view/ca/smarty3/lostpass_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Apreciat/da {{$username}},
 	
 	S'ha rebut una sol·licitud en {{$sitename}} recentment per restablir
--- a/view/ca/smarty3/mail_received_html_body_eml.tpl
+++ b/view/ca/smarty3/mail_received_html_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+ *}}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
 	<title>Mensaje de Friendica</title>
--- a/view/ca/smarty3/mail_received_text_body_eml.tpl
+++ b/view/ca/smarty3/mail_received_text_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Has rebut un nou missatge privat de '{{$from}}' en {{$siteName}}.
+ *}}
+Has rebut un nou missatge privat de '{{$from}}' en {{$siteName}}.
 	
 {{$title}}

--- a/view/ca/smarty3/passchanged_eml.tpl
+++ b/view/ca/smarty3/passchanged_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Apreciat/da {{$username}},

    La teva contrasenya ha estat modificada com has sol·licitat. Pren nota d'aquesta informació
--- a/view/ca/smarty3/register_open_eml.tpl
+++ b/view/ca/smarty3/register_open_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Apreciat/da {{$username}},

 	Gràcies per registrar-te en {{$sitename}}. El teu compte ha estat creat.
--- a/view/ca/smarty3/register_verify_eml.tpl
+++ b/view/ca/smarty3/register_verify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 S'ha rebut la sol·licitud de registre d'un nou usuari en
 {{$sitename}} que requereix la teva aprovació.

--- a/view/ca/smarty3/request_notify_eml.tpl
+++ b/view/ca/smarty3/request_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Apreciat/da {{$myname}},

 Acabes de rebre una sol·licitud de connexió de '{{$requestor}}' en {{$sitename}}.
--- a/view/ca/smarty3/wall_received_eml.tpl
+++ b/view/ca/smarty3/wall_received_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Apreciat/da {{$username}},

 	'{{$from}}' ha escrit quelcom en el mur del teu perfil.
--- a/view/cs/smarty3/cmnt_received_eml.tpl
+++ b/view/cs/smarty3/cmnt_received_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Milý/Milá {{$username}},
+ *}}
+Milý/Milá {{$username}},

        '{{$from}}' okommentoval položku/konverzaci, kterou následujete.

--- a/view/cs/smarty3/cmnt_received_html_body_eml.tpl
+++ b/view/cs/smarty3/cmnt_received_html_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+ *}}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
 	<title>Friendica zpráva</title>
--- a/view/cs/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/cs/smarty3/cmnt_received_text_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Milý/Milá {{$username}},
+ *}}
+Milý/Milá {{$username}},

        '{{$from}}' okommentoval položku/konverzaci, kterou následujete.

--- a/view/cs/smarty3/follow_notify_eml.tpl
+++ b/view/cs/smarty3/follow_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Milý/Milá {{$username}},

 Máte nového následovatele na {{$sitename}} -  '{{$requestor}}'.
--- a/view/cs/smarty3/friend_complete_eml.tpl
+++ b/view/cs/smarty3/friend_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Milý/Milá {{$username}},

        Skvělé zprávy... '{{$fn}}' na '{{$dfrn_url}}' odsouhlasil Váš požadavek na spojení na '{{$sitename}}'.
--- a/view/cs/smarty3/htconfig.tpl
+++ b/view/cs/smarty3/htconfig.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<?php
+ *}}
+<?php

 // Nastavte následující pro Vaši instalaci MySQL
 // Zkopírujte nebo přejmenujte tento soubor na .htconfig.php
--- a/view/cs/smarty3/intro_complete_eml.tpl
+++ b/view/cs/smarty3/intro_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Milý/Milá {{$username}},


--- a/view/cs/smarty3/lostpass_eml.tpl
+++ b/view/cs/smarty3/lostpass_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Milý/Milá {{$username}},
 	Na webu {{$sitename}} byl zaregistrován požadavek na znovunastavení hesla k Vašemu účtu. Pro potvrzení této žádosti prosím klikněte na potvrzovací odkaz níže, nebo si tento odkaz zkopírujte do adresního řádku prohlížeče.  
 Pokud jste o znovunastavení hesla NEŽÁDALI, prosím NEKLIKEJTE na tento odkaz a ignorujte tento e-mail nebo ho rovnou smažte.
--- a/view/cs/smarty3/mail_received_html_body_eml.tpl
+++ b/view/cs/smarty3/mail_received_html_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+ *}}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
 	<title>Friendica Zpráva</title>
--- a/view/cs/smarty3/mail_received_text_body_eml.tpl
+++ b/view/cs/smarty3/mail_received_text_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}{{$from}} Vám poslal(a) novou soukromou zprávu na {{$siteName}}.
+ *}}
+{{$from}} Vám poslal(a) novou soukromou zprávu na {{$siteName}}.

 {{$title}}

--- a/view/cs/smarty3/passchanged_eml.tpl
+++ b/view/cs/smarty3/passchanged_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Milý/Milá {{$username}},
        Vaše heslo bylo na Vaši žádost změněno. Prosím zaznamenejte si tuto informaci (nebo si Vaše heslo změňte na nějaké, které si budete pamatovat).
 
--- a/view/cs/smarty3/register_open_eml.tpl
+++ b/view/cs/smarty3/register_open_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Milý/milá {{$username}},
+ *}}
+Milý/milá {{$username}},
 	Díky za registraci na {{$sitename}}. Váš účet byl vytvořen.
 Vaše přihlašovací údaje jsou tato:

--- a/view/cs/smarty3/register_verify_eml.tpl
+++ b/view/cs/smarty3/register_verify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Na webu {{$sitename}} byla vytvořena nová uživatelská registrace, která vyžaduje Vaše schválení.

 Přihlašovací údaje jsou tato:
--- a/view/cs/smarty3/request_notify_eml.tpl
+++ b/view/cs/smarty3/request_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Milý/Milá {{$username}},

 Právě jste obdržel/obdržela požadavek na spojení na webu {{$sitename}} 
--- a/view/cs/smarty3/wall_received_eml.tpl
+++ b/view/cs/smarty3/wall_received_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Milý/Milá {{$username}},
+ *}}
+Milý/Milá {{$username}},

        '{{$from}}' obohatil Vaši profilovou zeď.

--- a/view/cs/smarty3/wall_received_html_body_eml.tpl
+++ b/view/cs/smarty3/wall_received_html_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+ *}}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
 	<title>Friendica zpráva</title>
--- a/view/cs/smarty3/wall_received_text_body_eml.tpl
+++ b/view/cs/smarty3/wall_received_text_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Milý/Milá {{$username}},
+ *}}
+Milý/Milá {{$username}},

        '{{$from}}' obohatil Vaši profilovou zeď.

--- a/view/de/smarty3/cmnt_received_eml.tpl
+++ b/view/de/smarty3/cmnt_received_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Hallo {{$username}},

 '{{$from}}' hat einen Pinnwandeintrag kommentiert dem du auch folgst.
--- a/view/de/smarty3/cmnt_received_html_body_eml.tpl
+++ b/view/de/smarty3/cmnt_received_html_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+ *}}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
 	<title>Friendica Nachricht</title>
--- a/view/de/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/de/smarty3/cmnt_received_text_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Hallo {{$username}},
+ *}}
+Hallo {{$username}},

 '{{$from}}' hat einen Pinnwandeintrag kommentiert dem du auch folgst.

--- a/view/de/smarty3/follow_notify_eml.tpl
+++ b/view/de/smarty3/follow_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Hallo {{$myname}},

 Du hast einen neuen Anhänger auf {{$sitename}} -  '{{$requestor}}'.
--- a/view/de/smarty3/friend_complete_eml.tpl
+++ b/view/de/smarty3/friend_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Hallo {{$username}},

 	Großartige Neuigkeiten... '{{$fn}}' auf '{{$dfrn_url}}' hat 
--- a/view/de/smarty3/htconfig.tpl
+++ b/view/de/smarty3/htconfig.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<?php
+ *}}
+<?php

 // Set the following for your MySQL installation
 // Copy or rename this file to .htconfig.php
--- a/view/de/smarty3/intro_complete_eml.tpl
+++ b/view/de/smarty3/intro_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Hallo {{$username}},

 	'{{$fn}}' auf '{{$dfrn_url}}' hat deine Verbindungsanfrage 
--- a/view/de/smarty3/lostpass_eml.tpl
+++ b/view/de/smarty3/lostpass_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Hallo {{$username}},
 	Auf {{$sitename}} wurde eine Anfrage zum Zurücksetzen deines 
 Passworts empfangen. Um diese zu bestätigen folge bitte dem Link
--- a/view/de/smarty3/mail_received_html_body_eml.tpl
+++ b/view/de/smarty3/mail_received_html_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+ *}}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
 	<title>Friendica Nachricht</title>
--- a/view/de/smarty3/mail_received_text_body_eml.tpl
+++ b/view/de/smarty3/mail_received_text_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Du hast eine neue private Nachricht von '{{$from}}' auf '{{$siteName}}' erhhalten.
+ *}}
+Du hast eine neue private Nachricht von '{{$from}}' auf '{{$siteName}}' erhhalten.
 	
 {{$title}}

--- a/view/de/smarty3/passchanged_eml.tpl
+++ b/view/de/smarty3/passchanged_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Hallo {{$username}},
 	Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese 
 Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort 
--- a/view/de/smarty3/register_open_eml.tpl
+++ b/view/de/smarty3/register_open_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Hallo {{$username}},
 	Danke für deine Anmeldung auf {{$sitename}}. Dein Account wurde angelegt. 
 Hier die Login Details:
--- a/view/de/smarty3/register_verify_eml.tpl
+++ b/view/de/smarty3/register_verify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Eine Neuanmeldung auf {{$sitename}} benötigt 
 deine Aufmerksamkeit. 

--- a/view/de/smarty3/request_notify_eml.tpl
+++ b/view/de/smarty3/request_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Hallo {{$myname}},

 du hast eine Kontaktanfrage von '{{$requestor}}' auf {{$sitename}} 
--- a/view/de/smarty3/update_fail_eml.tpl
+++ b/view/de/smarty3/update_fail_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Hi, 
+ *}}
+Hi, 
 ich bin {{$sitename}}.   
 Die friendica Entwickler haben jüngst Update {{$update}} veröffentlicht, 
 aber als ich versucht habe es zu installieren ist etwas schrecklich schief gegangen.  
--- a/view/de/smarty3/wall_received_eml.tpl
+++ b/view/de/smarty3/wall_received_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Hallo {{$username}},

 '{{$from}}' hat etwas auf deiner Profilwand gepostet.
--- a/view/de/smarty3/wall_received_html_body_eml.tpl
+++ b/view/de/smarty3/wall_received_html_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+ *}}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
 	<title>Friendica Nachricht</title>
--- a/view/de/smarty3/wall_received_text_body_eml.tpl
+++ b/view/de/smarty3/wall_received_text_body_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Hallo {{$username}},

        '{{$from}}' hat etwas auf deiner Pinnwand gepostet.
--- a/view/en/smarty3/follow_notify_eml.tpl
+++ b/view/en/smarty3/follow_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Dear {{$myname}},

 You have a new follower at {{$sitename}} -  '{{$requestor}}'.
--- a/view/en/smarty3/friend_complete_eml.tpl
+++ b/view/en/smarty3/friend_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Dear {{$username}},

 	Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted 
--- a/view/en/smarty3/htconfig.tpl
+++ b/view/en/smarty3/htconfig.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<?php
+ *}}
+<?php

 // Set the following for your MySQL installation
 // Copy or rename this file to .htconfig.php
--- a/view/en/smarty3/intro_complete_eml.tpl
+++ b/view/en/smarty3/intro_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Dear {{$username}},

 	'{{$fn}}' at '{{$dfrn_url}}' has accepted 
--- a/view/en/smarty3/lostpass_eml.tpl
+++ b/view/en/smarty3/lostpass_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Dear {{$username}},
 	A request was recently received at {{$sitename}} to reset your account 
 password. In order to confirm this request, please select the verification link
--- a/view/en/smarty3/passchanged_eml.tpl
+++ b/view/en/smarty3/passchanged_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Dear {{$username}},
 	Your password has been changed as requested. Please retain this 
 information for your records (or change your password immediately to 
--- a/view/en/smarty3/register_open_eml.tpl
+++ b/view/en/smarty3/register_open_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Dear {{$username}},
 	Thank you for registering at {{$sitename}}. Your account has been created. 
 The login details are as follows:
--- a/view/en/smarty3/register_verify_eml.tpl
+++ b/view/en/smarty3/register_verify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 A new user registration request was received at {{$sitename}} which requires 
 your approval. 

--- a/view/en/smarty3/request_notify_eml.tpl
+++ b/view/en/smarty3/request_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Dear {{$myname}},

 You have just received a connection request at {{$sitename}} 
--- a/view/en/smarty3/update_fail_eml.tpl
+++ b/view/en/smarty3/update_fail_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Hey, 
+ *}}
+Hey, 
 I'm {{$sitename}};   
 The friendica developers released update {{$update}} recently, 
 but when I tried to install it, something went terribly wrong.  
--- a/view/eo/smarty3/follow_notify_eml.tpl
+++ b/view/eo/smarty3/follow_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Kara {{$myname}},

 Vi havas novan abonanton ĉe {{$sitename}} -  '{{$requestor}}'.
--- a/view/eo/smarty3/friend_complete_eml.tpl
+++ b/view/eo/smarty3/friend_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Kara {{$username}},

 	Boegaj novaĵoj.... '{{$fn}}' ĉe '{{$dfrn_url}}' aprobis 
--- a/view/eo/smarty3/intro_complete_eml.tpl
+++ b/view/eo/smarty3/intro_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Kara {{$username}},

 	'{{$fn}}' ĉe '{{$dfrn_url}}' akceptis 
--- a/view/eo/smarty3/lostpass_eml.tpl
+++ b/view/eo/smarty3/lostpass_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Kara {{$username}},
 	{{$sitename}} ricevis peton por rekomencigi vian pasvorton. 
 Por konfirmi la peton, bonvolu klaki la sekvantan konfirmligilon 
--- a/view/eo/smarty3/passchanged_eml.tpl
+++ b/view/eo/smarty3/passchanged_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Kara {{$username}},
 	Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun 
 informon (aŭ tuj ŝanĝu vian pasvorton al 
--- a/view/eo/smarty3/register_open_eml.tpl
+++ b/view/eo/smarty3/register_open_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Kara {{$username}},
 	Dankon pro via registrado ĉe {{$sitename}}. Vian konton estas kreita. 
 Jen viaj legitimaĵoj:
--- a/view/eo/smarty3/register_verify_eml.tpl
+++ b/view/eo/smarty3/register_verify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Nova peto por registrado atendas ĉe {{$sitename}} 
 kaj bezonas vian aprobon. 

--- a/view/eo/smarty3/request_notify_eml.tpl
+++ b/view/eo/smarty3/request_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Kara {{$myname}},

 Vi ĵus ricevis kontaktpeton ĉe {{$sitename}} 
--- a/view/eo/smarty3/update_fail_eml.tpl
+++ b/view/eo/smarty3/update_fail_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Saluton! 
+ *}}
+Saluton! 
 Mi estas {{$sitename}}.   
 La programistoj de Frienda eldonis ĝisdatigon {{$update}} antaŭ ne longe, 
 sed kiam mi provis instali ĝin, io terure malsukcesis.  
--- a/view/es/smarty3/cmnt_received_eml.tpl
+++ b/view/es/smarty3/cmnt_received_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Estimado/a {{$username}},

 	'{{$from}}' ha comentado un elemento/conversación que estás siguiendo.
--- a/view/es/smarty3/follow_notify_eml.tpl
+++ b/view/es/smarty3/follow_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Estimado/a {{$myname}},

 Tienes un nuevo seguidor en {{$sitename}} -  '{{$requestor}}'.
--- a/view/es/smarty3/friend_complete_eml.tpl
+++ b/view/es/smarty3/friend_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Estimado/a {{$username}},

 	Grandes noticias... '{{$fn}}' a '{{$dfrn_url}}' ha aceptado tu solicitud de conexión en '{{$sitename}}'.
--- a/view/es/smarty3/htconfig.tpl
+++ b/view/es/smarty3/htconfig.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<?php
+ *}}
+<?php

 // Set the following for your MySQL installation
 // Copy or rename this file to .htconfig.php
--- a/view/es/smarty3/intro_complete_eml.tpl
+++ b/view/es/smarty3/intro_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Estimado/a {{$username}},

 	'{{$fn}}' en '{{$dfrn_url}}' ha aceptado tu petición
--- a/view/es/smarty3/lostpass_eml.tpl
+++ b/view/es/smarty3/lostpass_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Estimado/a {{$username}},
 	
 	Se ha recibido una solicitud en {{$sitename}} recientemente para restablecer
--- a/view/es/smarty3/mail_received_html_body_eml.tpl
+++ b/view/es/smarty3/mail_received_html_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+ *}}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
 	<title>Mensaje de Friendica</title>
--- a/view/es/smarty3/mail_received_text_body_eml.tpl
+++ b/view/es/smarty3/mail_received_text_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Has recibido un nuevo mensaje privado de '{{$from}}' en {{$siteName}}.
+ *}}
+Has recibido un nuevo mensaje privado de '{{$from}}' en {{$siteName}}.
 	
 {{$title}}

--- a/view/es/smarty3/passchanged_eml.tpl
+++ b/view/es/smarty3/passchanged_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Estimado/a {{$username}},

    Tu contraseña ha sido modificada como has solicitado. Anota esta información
--- a/view/es/smarty3/register_open_eml.tpl
+++ b/view/es/smarty3/register_open_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Estimado/a {{$username}},

    Gracias por registrarte en {{$sitename}}. Tu cuenta ha sido creada.
--- a/view/es/smarty3/register_verify_eml.tpl
+++ b/view/es/smarty3/register_verify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Se ha recibido la solicitud de registro de un nuevo usuario en
 {{$sitename}} que requiere tu aprobación.

--- a/view/es/smarty3/request_notify_eml.tpl
+++ b/view/es/smarty3/request_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Estimado/a {{$myname}},

 Acabas de recibir una solicitud de conexión de '{{$requestor}}' en {{$sitename}}.
--- a/view/es/smarty3/wall_received_eml.tpl
+++ b/view/es/smarty3/wall_received_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Estimado/a {{$username}},

 	'{{$from}}' ha escrito algo en el muro de tu perfil.
--- a/view/fr/smarty3/cmnt_received_eml.tpl
+++ b/view/fr/smarty3/cmnt_received_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Cher(e) {{$username}},

 	« {{$from}} » a commenté un élément ou une conversation que vous suivez.
--- a/view/fr/smarty3/cmnt_received_html_body_eml.tpl
+++ b/view/fr/smarty3/cmnt_received_html_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+ *}}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
 	<title>Message de Friendica</title>
--- a/view/fr/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/fr/smarty3/cmnt_received_text_body_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Cher(e) {{$username}},

 	« {{$from}} » a commenté un éléŽment ou une conversation que vous suivez.
--- a/view/fr/smarty3/follow_notify_eml.tpl
+++ b/view/fr/smarty3/follow_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Cher(e) {{$myname}},

 Une nouvelle personne - {{$requestor}} - vous suit désormais sur {{$sitename}}.
--- a/view/fr/smarty3/friend_complete_eml.tpl
+++ b/view/fr/smarty3/friend_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Cher(e) {{$username}},

 	Grande nouvelle… « {{$fn}} » (de « {{$dfrn_url}} ») a accepté votre 
--- a/view/fr/smarty3/htconfig.tpl
+++ b/view/fr/smarty3/htconfig.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<?php
+ *}}
+<?php

 // Set the following for your MySQL installation
 // Copy or rename this file to .htconfig.php
--- a/view/fr/smarty3/intro_complete_eml.tpl
+++ b/view/fr/smarty3/intro_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Cher(e) {{$username}},

 	« {{$fn}} » du site « {{$dfrn_url}} » a accepté votre
--- a/view/fr/smarty3/lostpass_eml.tpl
+++ b/view/fr/smarty3/lostpass_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Cher(e) {{$username}},

 	Nous avons récemment reçu, chez {{$sitename}}, une demande de remise
--- a/view/fr/smarty3/mail_received_html_body_eml.tpl
+++ b/view/fr/smarty3/mail_received_html_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+ *}}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
 	<title>Message de Friendica</title>
--- a/view/fr/smarty3/mail_received_text_body_eml.tpl
+++ b/view/fr/smarty3/mail_received_text_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}{{$from}} vous a envoyé un message à {{$siteName}}.
+ *}}
+{{$from}} vous a envoyé un message à {{$siteName}}.
 	
 {{$title}}

--- a/view/fr/smarty3/passchanged_eml.tpl
+++ b/view/fr/smarty3/passchanged_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Cher(e) {{$username}},

 	Votre mot de passe a été modifié comme demandé. Merci de conserver
--- a/view/fr/smarty3/register_open_eml.tpl
+++ b/view/fr/smarty3/register_open_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Cher(e) {{$username}},

 	Merci de votre inscription à {{$sitename}}. Votre compte a été créé.
--- a/view/fr/smarty3/register_verify_eml.tpl
+++ b/view/fr/smarty3/register_verify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Une nouvelle demande d'inscription a été reçue sur {{$sitename}}, et elle
 nécessite votre approbation.

--- a/view/fr/smarty3/request_notify_eml.tpl
+++ b/view/fr/smarty3/request_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Cher(e) {{$myname}},

 Vous venez de recevoir une demande de mise en relation sur {{$sitename}}
--- a/view/fr/smarty3/wall_received_eml.tpl
+++ b/view/fr/smarty3/wall_received_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Cher(e) {{$username}},

 	« {{$from}} » a posté quelque chose sur le mur de votre profil.
--- a/view/is/smarty3/follow_notify_eml.tpl
+++ b/view/is/smarty3/follow_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Góðan daginn {{$myname}},

 Þú hefur nýjan aðdáanda frá {{$sitename}} - '{{$requestor}}'.
--- a/view/is/smarty3/friend_complete_eml.tpl
+++ b/view/is/smarty3/friend_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Góðan daginn {{$username}}, 

 	Frábærar fréttir... '{{$fn}}' hjá '{{$dfrn_url}}' hefur samþykkt 
--- a/view/is/smarty3/intro_complete_eml.tpl
+++ b/view/is/smarty3/intro_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Góðan daginn {{$username}},

 	'{{$fn}}' hjá '{{$dfrn_url}}' hefur samþykkt 
--- a/view/is/smarty3/lostpass_eml.tpl
+++ b/view/is/smarty3/lostpass_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Góðan dag {{$username}},
 	Beiðni barst á {{$sitename}} um að endursetja 
 aðgangsorðið.  Til að staðfesta þessa beiði, veldu slóðina
--- a/Show more
+++ b/Show more