newline at end of header

2013-01-11 10:00:10 -07:00 · 2013-01-11 10:00:10 -07:00 · c43ff35fe7
commit c43ff35fe7
parent 1656c63a55
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/view/is/smarty3/passchanged_eml.tpl
+++ b/view/is/smarty3/passchanged_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Góðan daginn {{$username}},
 	Lykilorð þínu hefur verið breytt einsog umbeðið var.  Endilega geyma þessar 
 upplýsingar (eða skiptu strax um aðgangsorð 
--- a/view/is/smarty3/register_open_eml.tpl
+++ b/view/is/smarty3/register_open_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Góðan daginn {{$username}},
 	Takk fyrir að skrá þig á {{$sitename}}. Notandinn þinn hefur verið stofnaður. 
 Innskráningar upplýsingarnar þínar eru eftirfarandi:
--- a/view/is/smarty3/register_verify_eml.tpl
+++ b/view/is/smarty3/register_verify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Beiðni um nýjan notanda barst {{$sitename}} sem krefst 
 þíns samþykkis. 

--- a/view/is/smarty3/request_notify_eml.tpl
+++ b/view/is/smarty3/request_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Góðan dag {{$myname}},

 Þér hefur borist beiðni um tengingu á {{$sitename}} 
--- a/view/is/smarty3/update_fail_eml.tpl
+++ b/view/is/smarty3/update_fail_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Hæ, 
+ *}}
+Hæ, 
 Ég er {{$sitename}}.   
 Þróunarteymi friendica gáfu nýlega út uppfærslu {{$update}}, 
 En þegar ég reyndi að uppfæra, gerist eitthvað hræðilegt.  
--- a/view/it/smarty3/cmnt_received_eml.tpl
+++ b/view/it/smarty3/cmnt_received_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Caro/a {{$username}},

 	'{{$from}}' ha commentato un elemeto/conversazione che stai seguendo.
--- a/view/it/smarty3/cmnt_received_html_body_eml.tpl
+++ b/view/it/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 Messaggio</title>
--- a/view/it/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/it/smarty3/cmnt_received_text_body_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Caro/a {{$username}},

 	'{{$from}}' ha commentato un elemeto/conversazione che stai seguendo.
--- a/view/it/smarty3/follow_notify_eml.tpl
+++ b/view/it/smarty3/follow_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Ciao {{$myname}},

 Un nuovo utente ha iniziato a seguirti su {{$sitename}} - '{{$requestor}}'.
--- a/view/it/smarty3/friend_complete_eml.tpl
+++ b/view/it/smarty3/friend_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Ciao {{$username}},

 	Ottime notizie... '{{$fn}}' di '{{$dfrn_url}}' ha accettato 
--- a/view/it/smarty3/htconfig.tpl
+++ b/view/it/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/it/smarty3/intro_complete_eml.tpl
+++ b/view/it/smarty3/intro_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Ciao {{$username}},

 	'{{$fn}}' di '{{$dfrn_url}}' ha accettato 
--- a/view/it/smarty3/lostpass_eml.tpl
+++ b/view/it/smarty3/lostpass_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Ciao {{$username}},
 	Su {{$sitename}} è stata ricevuta una richiesta di azzeramento di password per un account. 
 Per confermare la richiesta, clicca sul link di verifica
--- a/view/it/smarty3/mail_received_html_body_eml.tpl
+++ b/view/it/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 Messsaggio</title>
--- a/view/it/smarty3/mail_received_text_body_eml.tpl
+++ b/view/it/smarty3/mail_received_text_body_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Hai ricevuto un nuovo messsaggio privato su {{$siteName}} da '{{$from}}'.
+ *}}
+Hai ricevuto un nuovo messsaggio privato su {{$siteName}} da '{{$from}}'.
 	
 {{$title}}

--- a/view/it/smarty3/passchanged_eml.tpl
+++ b/view/it/smarty3/passchanged_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Ciao {{$username}},
 	La tua password è cambiata come hai richiesto. Conserva queste 
 informazioni (oppure cambia immediatamente la password con 
--- a/view/it/smarty3/register_open_eml.tpl
+++ b/view/it/smarty3/register_open_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Ciao {{$username}},
 	Grazie per aver effettuato la registrazione a {{$sitename}}. Il tuo account è stato creato. 
 I dettagli di accesso sono i seguenti
--- a/view/it/smarty3/register_verify_eml.tpl
+++ b/view/it/smarty3/register_verify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Su {{$sitename}} è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede 
 la tua approvazione. 

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

 Hai appena ricevuto una richiesta di connessione da {{$sitename}} 
--- a/view/it/smarty3/wall_received_eml.tpl
+++ b/view/it/smarty3/wall_received_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Caro/a {{$username}},

 	'{{$from}}' ha scritto qualcosa sulla bachecha del tuo profilo.
--- a/view/it/smarty3/wall_received_html_body_eml.tpl
+++ b/view/it/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>Messaggio da Friendica</title>
--- a/view/it/smarty3/wall_received_text_body_eml.tpl
+++ b/view/it/smarty3/wall_received_text_body_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Caro {{$username}},

 	'{{$from}}' ha scritto sulla tua bacheca.
--- a/view/nb-no/smarty3/follow_notify_eml.tpl
+++ b/view/nb-no/smarty3/follow_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Kjære {{$myname}},

 Du har en ny følgesvenn på {{$sitename}} - '{{$requestor}}'.
--- a/view/nb-no/smarty3/friend_complete_eml.tpl
+++ b/view/nb-no/smarty3/friend_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Kjære {{$username}},

 	Gode nyheter... '{{$fn}}' ved '{{$dfrn_url}}' har godtatt 
--- a/view/nb-no/smarty3/intro_complete_eml.tpl
+++ b/view/nb-no/smarty3/intro_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Kjære {{$username}},

 	'{{$fn}}' ved '{{$dfrn_url}}' har godtatt 
--- a/view/nb-no/smarty3/lostpass_eml.tpl
+++ b/view/nb-no/smarty3/lostpass_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Kjære {{$username}},
 	En forespørsel ble nylig mottatt hos {{$sitename}} om å tilbakestille din kontos 
 passord. For å godkjenne denne forespørselen, vennligst velg bekreftelseslenken
--- a/view/nb-no/smarty3/passchanged_eml.tpl
+++ b/view/nb-no/smarty3/passchanged_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Kjære {{$username}},
 	Ditt passord har blitt endret som forespurt. Vennligst ta vare på denne 
 meldingen for sikkerhets skyld (eller bytt passordet ditt umiddelbart til 
--- a/view/nb-no/smarty3/register_open_eml.tpl
+++ b/view/nb-no/smarty3/register_open_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Kjære {{$username}},
 	Takk for at du registrerte deg hos {{$sitename}}. Kontoen din er opprettet. 
 Innloggingsdetaljene er som følger:
--- a/view/nb-no/smarty3/register_verify_eml.tpl
+++ b/view/nb-no/smarty3/register_verify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 En ny forespørsel om brukerregistering ble mottatt hos {{$sitename}} og krever  
 din godkjenning. 

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

 Du har akkurat mottatt en kontaktforespørsel hos {{$sitename}} 
--- a/view/nb-no/smarty3/update_fail_eml.tpl
+++ b/view/nb-no/smarty3/update_fail_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Hei,  
+ *}}
+Hei,  
 jeg er {{$sitename}}.   
 Friendica-utviklerne slapp nylig oppdateringen {{$update}}, 
 men da jeg prøvde å installere den, gikk noe forferdelig galt.  
--- a/view/pl/smarty3/follow_notify_eml.tpl
+++ b/view/pl/smarty3/follow_notify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Drogi {{$myname}},

 Masz nowego obserwującego na {{$sitename}} -  '{{$requestor}}'.
--- a/view/pl/smarty3/friend_complete_eml.tpl
+++ b/view/pl/smarty3/friend_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Drogi {{$username}},

 	Świetne wieści! '{{$fn}}' na '{{$dfrn_url}}' przyjął / przyjęła 
--- a/view/pl/smarty3/intro_complete_eml.tpl
+++ b/view/pl/smarty3/intro_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Drogi {{$username}},

 	'{{$fn}}' w '{{$dfrn_url}}' zaakceptował 
--- a/view/pl/smarty3/lostpass_eml.tpl
+++ b/view/pl/smarty3/lostpass_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 {{$username}},
 	Ze strony {{$sitename}} wpłynęła prośba z zresetowanie 
 hasła. W celu potwierdzenia kliknij w weryfikacyjny link
--- a/view/pl/smarty3/passchanged_eml.tpl
+++ b/view/pl/smarty3/passchanged_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Drogi {{$username}},
 	Twoje hasło zostało zmienione. Zachowaj tę 
 Informację dla dokumentacji (lub zmień swoje hasło 
--- a/view/pl/smarty3/register_open_eml.tpl
+++ b/view/pl/smarty3/register_open_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Drogi {{$username}},
 	Dziękujemy za rejestrację na {{$sitename}}. Twoje konto zostało utworzone pomyślnie.  
 Dane do logowania:
--- a/view/pl/smarty3/register_verify_eml.tpl
+++ b/view/pl/smarty3/register_verify_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Nowy wniosek o rejestrację użytkownika wpłynął na {{$sitename}} i wymaga 
 potwierdzenia. 

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

 Otrzymałeś właśnie zaproszenie do znajomych na stronie {{$sitename}} 
--- a/view/pl/smarty3/update_fail_eml.tpl
+++ b/view/pl/smarty3/update_fail_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Hey,  
+ *}}
+Hey,  
 Jestem {{$sitename}}.   
 Deweloperzy friendica wydali ostatnio aktualizację {{$update}}, 
 ale kiedy próbowałem ją zainstalować, coś poszło nie tak.  
--- a/view/pt-br/smarty3/intro_complete_eml.tpl
+++ b/view/pt-br/smarty3/intro_complete_eml.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 Prezado/a {{$username}},

 	'{{$fn}}' em '{{$dfrn_url}}' aceitou 
--- a/view/pt-br/smarty3/update_fail_eml.tpl
+++ b/view/pt-br/smarty3/update_fail_eml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}Oi, 
+ *}}
+Oi, 
 Eu sou {{$sitename}}   
 Os desenvolvedores do friendica lançaram uma atualização {{$update}} recentemente, 
 mas quando tentei instalá-la algo de errado aconeteceu.  
--- a/view/smarty3/404.tpl
+++ b/view/smarty3/404.tpl
@ -2,4 +2,5 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<h1>{{$message}}</h1>
+ *}}
+<h1>{{$message}}</h1>
--- a/view/smarty3/acl_selector.tpl
+++ b/view/smarty3/acl_selector.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<div id="acl-wrapper">
+ *}}
+<div id="acl-wrapper">
 	<input id="acl-search">
 	<a href="#" id="acl-showall">{{$showall}}</a>
 	<div id="acl-list">
--- a/view/smarty3/admin_aside.tpl
+++ b/view/smarty3/admin_aside.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<script>
+ *}}
+<script>
 	// update pending count //
 	$(function(){

--- a/view/smarty3/admin_logs.tpl
+++ b/view/smarty3/admin_logs.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<div id='adminpage'>
+ *}}
+<div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
 	<form action="{{$baseurl}}/admin/logs" method="post">
--- a/view/smarty3/admin_plugins.tpl
+++ b/view/smarty3/admin_plugins.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<div id='adminpage'>
+ *}}
+<div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
 		<ul id='pluginslist'>
--- a/view/smarty3/admin_plugins_details.tpl
+++ b/view/smarty3/admin_plugins_details.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<div id='adminpage'>
+ *}}
+<div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
 	<p><span class='toggleplugin icon {{$status}}'></span> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a></p>
--- a/view/smarty3/admin_remoteupdate.tpl
+++ b/view/smarty3/admin_remoteupdate.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<script src="js/jquery.htmlstream.js"></script>
+ *}}
+<script src="js/jquery.htmlstream.js"></script>
 <script>
 	/* ajax updater */
 	function updateEnd(data){
--- a/view/smarty3/admin_site.tpl
+++ b/view/smarty3/admin_site.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<script>
+ *}}
+<script>
 	$(function(){
 		
 		$("#cnftheme").fancybox({
--- a/view/smarty3/admin_summary.tpl
+++ b/view/smarty3/admin_summary.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<div id='adminpage'>
+ *}}
+<div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>

 	<dl>
--- a/view/smarty3/admin_users.tpl
+++ b/view/smarty3/admin_users.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<script>
+ *}}
+<script>
 	function confirm_delete(uname){
 		return confirm( "{{$confirm_delete}}".format(uname));
 	}
--- a/view/smarty3/album_edit.tpl
+++ b/view/smarty3/album_edit.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<div id="photo-album-edit-wrapper">
+ *}}
+<div id="photo-album-edit-wrapper">
 <form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >


--- a/view/smarty3/api_config_xml.tpl
+++ b/view/smarty3/api_config_xml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<config>
+ *}}
+<config>
 <site>
  <name>{{$config.site.name}}</name>
  <server>{{$config.site.server}}</server>
--- a/view/smarty3/api_friends_xml.tpl
+++ b/view/smarty3/api_friends_xml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<!-- TEMPLATE APPEARS UNUSED -->
+ *}}
+<!-- TEMPLATE APPEARS UNUSED -->

 <users type="array">
 	{{foreach $users as $u}}
--- a/view/smarty3/api_ratelimit_xml.tpl
+++ b/view/smarty3/api_ratelimit_xml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<hash>
+ *}}
+<hash>
 <remaining-hits type="integer">{{$hash.remaining_hits}}</remaining-hits>
 <hourly-limit type="integer">{{$hash.hourly_limit}}</hourly-limit>
 <reset-time type="datetime">{{$hash.reset_time}}</reset-time>
--- a/view/smarty3/api_status_xml.tpl
+++ b/view/smarty3/api_status_xml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<status>{{if $status}}
+ *}}
+<status>{{if $status}}
    <created_at>{{$status.created_at}}</created_at>
    <id>{{$status.id}}</id>
    <text>{{$status.text}}</text>
--- a/view/smarty3/api_test_xml.tpl
+++ b/view/smarty3/api_test_xml.tpl
@ -2,4 +2,5 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<ok>{{$ok}}</ok>
+ *}}
+<ok>{{$ok}}</ok>
--- a/view/smarty3/api_timeline_atom.tpl
+++ b/view/smarty3/api_timeline_atom.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
+ *}}
+<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
 <generator uri="http://status.net" version="0.9.7">StatusNet</generator>
 <id>{{$rss.self}}</id>
 <title>Friendica</title>
--- a/view/smarty3/api_timeline_rss.tpl
+++ b/view/smarty3/api_timeline_rss.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com">
+ *}}
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com">
  <channel>
    <title>Friendica</title>
    <link>{{$rss.alternate}}</link>
--- a/view/smarty3/api_timeline_xml.tpl
+++ b/view/smarty3/api_timeline_xml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
+ *}}
+<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
 {{foreach $statuses as $status}} <status>
  <text>{{$status.text}}</text>
  <truncated>{{$status.truncated}}</truncated>
--- a/view/smarty3/api_user_xml.tpl
+++ b/view/smarty3/api_user_xml.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}  <user>
+ *}}
+  <user>
   <id>{{$user.id}}</id>
   <name>{{$user.name}}</name>
   <screen_name>{{$user.screen_name}}</screen_name>
--- a/view/smarty3/apps.tpl
+++ b/view/smarty3/apps.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<h3>{{$title}}</h3>
+ *}}
+<h3>{{$title}}</h3>

 <ul>
 	{{foreach $apps as $ap}}
--- a/view/smarty3/atom_feed.tpl
+++ b/view/smarty3/atom_feed.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<?xml version="1.0" encoding="utf-8" ?>
+ *}}
+<?xml version="1.0" encoding="utf-8" ?>
 <feed xmlns="http://www.w3.org/2005/Atom"
      xmlns:thr="http://purl.org/syndication/thread/1.0"
      xmlns:at="http://purl.org/atompub/tombstones/1.0"
--- a/view/smarty3/atom_feed_dfrn.tpl
+++ b/view/smarty3/atom_feed_dfrn.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<?xml version="1.0" encoding="utf-8" ?>
+ *}}
+<?xml version="1.0" encoding="utf-8" ?>
 <feed xmlns="http://www.w3.org/2005/Atom"
      xmlns:thr="http://purl.org/syndication/thread/1.0"
      xmlns:at="http://purl.org/atompub/tombstones/1.0"
--- a/view/smarty3/atom_mail.tpl
+++ b/view/smarty3/atom_mail.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 <dfrn:mail>

 	<dfrn:sender>
--- a/view/smarty3/atom_relocate.tpl
+++ b/view/smarty3/atom_relocate.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 <dfrn:relocate>

 	<dfrn:url>{{$url}}</dfrn:url>
--- a/view/smarty3/atom_suggest.tpl
+++ b/view/smarty3/atom_suggest.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 <dfrn:suggest>

 	<dfrn:url>{{$url}}</dfrn:url>
--- a/view/smarty3/auto_request.tpl
+++ b/view/smarty3/auto_request.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 <h1>{{$header}}</h1>

 <p id="dfrn-request-intro">
--- a/view/smarty3/birthdays_reminder.tpl
+++ b/view/smarty3/birthdays_reminder.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}{{if $count}}
+ *}}
+{{if $count}}
 <div id="birthday-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('birthday-wrapper');">{{$event_reminders}} ({{$count}})</div>
 <div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">{{$event_title}}</div>
 <div id="birthday-title-end"></div>
--- a/view/smarty3/categories_widget.tpl
+++ b/view/smarty3/categories_widget.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<div id="categories-sidebar" class="widget">
+ *}}
+<div id="categories-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 	<div id="nets-desc">{{$desc}}</div>
 	
--- a/view/smarty3/comment_item.tpl
+++ b/view/smarty3/comment_item.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}		{{if $threaded}}
+ *}}
+		{{if $threaded}}
 		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 		{{else}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
--- a/view/smarty3/common_friends.tpl
+++ b/view/smarty3/common_friends.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<div class="profile-match-wrapper">
+ *}}
+<div class="profile-match-wrapper">
 	<div class="profile-match-photo">
 		<a href="{{$url}}">
 			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" />
--- a/view/smarty3/common_tabs.tpl
+++ b/view/smarty3/common_tabs.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<ul class="tabs">
+ *}}
+<ul class="tabs">
 	{{foreach $tabs as $tab}}
 		<li id="{{$tab.id}}"><a href="{{$tab.url}}" class="tab button {{$tab.sel}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
 	{{/foreach}}
--- a/view/smarty3/contact_block.tpl
+++ b/view/smarty3/contact_block.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<div id="contact-block">
+ *}}
+<div id="contact-block">
 <h4 class="contact-block-h4">{{$contacts}}</h4>
 {{if $micropro}}
 		<a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
--- a/view/smarty3/contact_edit.tpl
+++ b/view/smarty3/contact_edit.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 <h2>{{$header}}</h2>

 <div id="contact-edit-wrapper" >
--- a/view/smarty3/contact_head.tpl
+++ b/view/smarty3/contact_head.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<script language="javascript" type="text/javascript"
+ *}}
+<script language="javascript" type="text/javascript"
          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
          <script language="javascript" type="text/javascript">

--- a/view/smarty3/contact_template.tpl
+++ b/view/smarty3/contact_template.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
 	<div class="contact-entry-photo-wrapper" >
 		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
--- a/view/smarty3/contacts-head.tpl
+++ b/view/smarty3/contacts-head.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 <script src="{{$baseurl}}/library/jquery_ac/friendica.complete.js" ></script>

 <script>
--- a/view/smarty3/contacts-template.tpl
+++ b/view/smarty3/contacts-template.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>
+ *}}
+<h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>

 {{if $finding}}<h4>{{$finding}}</h4>{{/if}}

--- a/view/smarty3/contacts-widget-sidebar.tpl
+++ b/view/smarty3/contacts-widget-sidebar.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}{{$vcard_widget}}
+ *}}
+{{$vcard_widget}}
 {{$follow_widget}}
 {{$groups_widget}}
 {{$findpeople_widget}}
--- a/view/smarty3/content.tpl
+++ b/view/smarty3/content.tpl
@ -2,5 +2,6 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<div id="content-begin"></div>
+ *}}
+<div id="content-begin"></div>
 <div id="content-end"></div>
--- a/view/smarty3/conversation.tpl
+++ b/view/smarty3/conversation.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}{{$live_update}}
+ *}}
+{{$live_update}}

 {{foreach $threads as $thread}}
 <div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
--- a/view/smarty3/crepair.tpl
+++ b/view/smarty3/crepair.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 <form id="crepair-form" action="crepair/{{$contact_id}}" method="post" >

 <h4>{{$contact_name}}</h4>
--- a/view/smarty3/cropbody.tpl
+++ b/view/smarty3/cropbody.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<h1>{{$title}}</h1>
+ *}}
+<h1>{{$title}}</h1>
 <p id="cropimage-desc">
 {{$desc}}
 </p>
--- a/view/smarty3/crophead.tpl
+++ b/view/smarty3/crophead.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
+ *}}
+      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
--- a/view/smarty3/delegate.tpl
+++ b/view/smarty3/delegate.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<h3>{{$header}}</h3>
+ *}}
+<h3>{{$header}}</h3>

 <div id="delegate-desc" class="delegate-desc">{{$desc}}</div>

--- a/view/smarty3/dfrn_req_confirm.tpl
+++ b/view/smarty3/dfrn_req_confirm.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 <p id="dfrn-request-homecoming" >
 {{$welcome}}
 <br />
--- a/view/smarty3/dfrn_request.tpl
+++ b/view/smarty3/dfrn_request.tpl
@ -3,6 +3,7 @@
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
 *}}
+
 <h1>{{$header}}</h1>

 <p id="dfrn-request-intro">
--- a/view/smarty3/diasp_dec_hdr.tpl
+++ b/view/smarty3/diasp_dec_hdr.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<decrypted_hdeader>
+ *}}
+<decrypted_hdeader>
  <iv>{{$inner_iv}}</iv>
  <aes_key>{{$inner_key}}</aes_key>
  <author>
--- a/view/smarty3/diaspora_comment.tpl
+++ b/view/smarty3/diaspora_comment.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<XML>
+ *}}
+<XML>
  <post>
    <comment>
      <guid>{{$guid}}</guid>
--- a/view/smarty3/diaspora_comment_relay.tpl
+++ b/view/smarty3/diaspora_comment_relay.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<XML>
+ *}}
+<XML>
  <post>
    <comment>
      <guid>{{$guid}}</guid>
--- a/view/smarty3/diaspora_conversation.tpl
+++ b/view/smarty3/diaspora_conversation.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<XML>
+ *}}
+<XML>
  <post>
    <conversation>
      <guid>{{$conv.guid}}</guid>
--- a/view/smarty3/diaspora_like.tpl
+++ b/view/smarty3/diaspora_like.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<XML>
+ *}}
+<XML>
  <post>
    <like>
      <target_type>{{$target_type}}</target_type>
--- a/view/smarty3/diaspora_like_relay.tpl
+++ b/view/smarty3/diaspora_like_relay.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<XML>
+ *}}
+<XML>
  <post>
    <like>
      <guid>{{$guid}}</guid>
--- a/view/smarty3/diaspora_message.tpl
+++ b/view/smarty3/diaspora_message.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<XML>
+ *}}
+<XML>
  <post>
      <message>
        <guid>{{$msg.guid}}</guid>
--- a/view/smarty3/diaspora_photo.tpl
+++ b/view/smarty3/diaspora_photo.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<XML>
+ *}}
+<XML>
  <post>
    <photo>
      <remote_photo_path>{{$path}}</remote_photo_path>
--- a/view/smarty3/diaspora_post.tpl
+++ b/view/smarty3/diaspora_post.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<XML>
+ *}}
+<XML>
  <post>
    <status_message>
      <raw_message>{{$body}}</raw_message>
--- a/view/smarty3/diaspora_profile.tpl
+++ b/view/smarty3/diaspora_profile.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<XML>
+ *}}
+<XML>
 <post><profile>
  <diaspora_handle>{{$handle}}</diaspora_handle>
  <first_name>{{$first}}</first_name>
--- a/view/smarty3/diaspora_relay_retraction.tpl
+++ b/view/smarty3/diaspora_relay_retraction.tpl
@ -2,7 +2,8 @@
 *	AUTOMATICALLY GENERATED TEMPLATE
 *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
 *
- *}}<XML>
+ *}}
+<XML>
  <post>
    <relayable_retraction>
      <target_type>{{$type}}</target_type>
--- a/Show more
+++ b/Show more