Merge pull request #1100 from tugelbend/master

bug fix #1097
2024-11-10 05:42:54 +00:00 · 2014-09-06 10:35:40 +02:00 · 2014-09-06 10:35:40 +02:00 · 6679d18826
commit 6679d18826
parent 7eef05e4f5 191595766d
650 changed files with 655 additions and 3251 deletions
--- a/util/vagrant_provision.sh
+++ b/util/vagrant_provision.sh
@ -15,6 +15,9 @@ if [ -f /vagrant/.htconfig.php ]
    rm /vagrant/.htconfig.php
 fi

+#change ownership of dir where sessions are stored
+chown -R www-data:www-data /var/lib/php5
+
 #create the friendica database
 echo "create database friendica" | mysql -u root -proot

--- a/view/ca/smarty3/cmnt_received_eml.tpl
+++ b/view/ca/smarty3/cmnt_received_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Apreciat/da {{$username}},

--- a/view/ca/smarty3/follow_notify_eml.tpl
+++ b/view/ca/smarty3/follow_notify_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Apreciat/da {{$myname}},

--- a/view/ca/smarty3/friend_complete_eml.tpl
+++ b/view/ca/smarty3/friend_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Apreciat/da {{$username}},

--- a/view/ca/smarty3/htconfig.tpl
+++ b/view/ca/smarty3/htconfig.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <?php

 // Set the following for your MySQL installation
--- a/view/ca/smarty3/intro_complete_eml.tpl
+++ b/view/ca/smarty3/intro_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Apreciat/da {{$username}},

--- a/view/ca/smarty3/lostpass_eml.tpl
+++ b/view/ca/smarty3/lostpass_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Apreciat/da {{$username}},
 	
--- a/view/ca/smarty3/mail_received_html_body_eml.tpl
+++ b/view/ca/smarty3/mail_received_html_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
--- a/view/ca/smarty3/mail_received_text_body_eml.tpl
+++ b/view/ca/smarty3/mail_received_text_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Apreciat/da {{$username}},

--- a/view/ca/smarty3/register_open_eml.tpl
+++ b/view/ca/smarty3/register_open_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Apreciat/da {{$username}},

--- a/view/ca/smarty3/register_verify_eml.tpl
+++ b/view/ca/smarty3/register_verify_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Apreciat/da {{$myname}},

--- a/view/ca/smarty3/wall_received_eml.tpl
+++ b/view/ca/smarty3/wall_received_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Apreciat/da {{$username}},

--- a/view/cs/smarty3/cmnt_received_eml.tpl
+++ b/view/cs/smarty3/cmnt_received_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
--- a/view/cs/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/cs/smarty3/cmnt_received_text_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Milý/Milá {{$username}},

--- a/view/cs/smarty3/friend_complete_eml.tpl
+++ b/view/cs/smarty3/friend_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Milý/Milá {{$username}},

--- a/view/cs/smarty3/htconfig.tpl
+++ b/view/cs/smarty3/htconfig.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <?php

 // Nastavte následující pro Vaši instalaci MySQL
--- a/view/cs/smarty3/intro_complete_eml.tpl
+++ b/view/cs/smarty3/intro_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	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.  
--- a/view/cs/smarty3/mail_received_html_body_eml.tpl
+++ b/view/cs/smarty3/mail_received_html_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
--- a/view/cs/smarty3/mail_received_text_body_eml.tpl
+++ b/view/cs/smarty3/mail_received_text_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 {{$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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	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í.

--- a/view/cs/smarty3/request_notify_eml.tpl
+++ b/view/cs/smarty3/request_notify_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Milý/Milá {{$username}},

--- a/view/cs/smarty3/wall_received_eml.tpl
+++ b/view/cs/smarty3/wall_received_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
--- a/view/cs/smarty3/wall_received_text_body_eml.tpl
+++ b/view/cs/smarty3/wall_received_text_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Hallo {{$username}},

--- a/view/de/smarty3/cmnt_received_html_body_eml.tpl
+++ b/view/de/smarty3/cmnt_received_html_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
--- a/view/de/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/de/smarty3/cmnt_received_text_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 Hallo {{$username}},

 '{{$from}}' hat einen Pinnwandeintrag kommentiert dem du auch folgst.
@ -15,7 +11,7 @@ Um die gesamte Konversation zu sehen melde dich bitte bei {{$siteurl}} an:

 {{$display}}

-Danke fŸr die Aufmerksamkeit
+Danke f<EFBFBD>r die Aufmerksamkeit
        {{$sitename}} Administrator
 

--- a/view/de/smarty3/follow_notify_eml.tpl
+++ b/view/de/smarty3/follow_notify_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Hallo {{$myname}},

--- a/view/de/smarty3/friend_complete_eml.tpl
+++ b/view/de/smarty3/friend_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Hallo {{$username}},

--- a/view/de/smarty3/htconfig.tpl
+++ b/view/de/smarty3/htconfig.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <?php

 // Set the following for your MySQL installation
--- a/view/de/smarty3/intro_complete_eml.tpl
+++ b/view/de/smarty3/intro_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Hallo {{$username}},

--- a/view/de/smarty3/lostpass_eml.tpl
+++ b/view/de/smarty3/lostpass_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Hallo {{$username}},
 	Auf {{$sitename}} wurde eine Anfrage zum Zurücksetzen deines 
--- a/view/de/smarty3/mail_received_html_body_eml.tpl
+++ b/view/de/smarty3/mail_received_html_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
--- a/view/de/smarty3/mail_received_text_body_eml.tpl
+++ b/view/de/smarty3/mail_received_text_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 Du hast eine neue private Nachricht von '{{$from}}' auf '{{$siteName}}' erhhalten.
 	
 {{$title}}
@ -12,5 +8,5 @@ Du hast eine neue private Nachricht von '{{$from}}' auf '{{$siteName}}' erhhalte
 Bitte melde dich unter {{$siteurl}} an um deine privaten Nachrichte zu lesen und zu
 beantworten.

-Viele GrŸ§e,
+Viele Gr<EFBFBD><EFBFBD>e,
 {{$siteName}} Administrator
--- a/view/de/smarty3/passchanged_eml.tpl
+++ b/view/de/smarty3/passchanged_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Hallo {{$username}},
 	Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese 
--- a/view/de/smarty3/register_open_eml.tpl
+++ b/view/de/smarty3/register_open_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Hallo {{$username}},
 	Danke für deine Anmeldung auf {{$sitename}}. Dein Account wurde angelegt. 
--- a/view/de/smarty3/register_verify_eml.tpl
+++ b/view/de/smarty3/register_verify_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Hallo {{$myname}},

--- a/view/de/smarty3/update_fail_eml.tpl
+++ b/view/de/smarty3/update_fail_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 Hi, 
 ich bin {{$sitename}}.   
 Die friendica Entwickler haben jüngst Update {{$update}} veröffentlicht, 
--- a/view/de/smarty3/wall_received_eml.tpl
+++ b/view/de/smarty3/wall_received_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Hallo {{$username}},

--- a/view/de/smarty3/wall_received_html_body_eml.tpl
+++ b/view/de/smarty3/wall_received_html_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
--- a/view/de/smarty3/wall_received_text_body_eml.tpl
+++ b/view/de/smarty3/wall_received_text_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Hallo {{$username}},

--- a/view/en/smarty3/follow_notify_eml.tpl
+++ b/view/en/smarty3/follow_notify_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Dear {{$myname}},

--- a/view/en/smarty3/friend_complete_eml.tpl
+++ b/view/en/smarty3/friend_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Dear {{$username}},

--- a/view/en/smarty3/htconfig.tpl
+++ b/view/en/smarty3/htconfig.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <?php

 // Set the following for your MySQL installation
--- a/view/en/smarty3/intro_complete_eml.tpl
+++ b/view/en/smarty3/intro_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Dear {{$username}},

--- a/view/en/smarty3/lostpass_eml.tpl
+++ b/view/en/smarty3/lostpass_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Dear {{$username}},
 	A request was recently received at {{$sitename}} to reset your account 
--- a/view/en/smarty3/passchanged_eml.tpl
+++ b/view/en/smarty3/passchanged_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Dear {{$username}},
 	Your password has been changed as requested. Please retain this 
--- a/view/en/smarty3/register_open_eml.tpl
+++ b/view/en/smarty3/register_open_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Dear {{$username}},
 	Thank you for registering at {{$sitename}}. Your account has been created. 
--- a/view/en/smarty3/register_verify_eml.tpl
+++ b/view/en/smarty3/register_verify_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Dear {{$myname}},

--- a/view/en/smarty3/update_fail_eml.tpl
+++ b/view/en/smarty3/update_fail_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 Hey, 
 I'm {{$sitename}};   
 The friendica developers released update {{$update}} recently, 
--- a/view/eo/smarty3/follow_notify_eml.tpl
+++ b/view/eo/smarty3/follow_notify_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Kara {{$myname}},

--- a/view/eo/smarty3/friend_complete_eml.tpl
+++ b/view/eo/smarty3/friend_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Kara {{$username}},

--- a/view/eo/smarty3/intro_complete_eml.tpl
+++ b/view/eo/smarty3/intro_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Kara {{$username}},

--- a/view/eo/smarty3/lostpass_eml.tpl
+++ b/view/eo/smarty3/lostpass_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Kara {{$username}},
 	{{$sitename}} ricevis peton por rekomencigi vian pasvorton. 
--- a/view/eo/smarty3/passchanged_eml.tpl
+++ b/view/eo/smarty3/passchanged_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Kara {{$username}},
 	Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun 
--- a/view/eo/smarty3/register_open_eml.tpl
+++ b/view/eo/smarty3/register_open_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Kara {{$username}},
 	Dankon pro via registrado ĉe {{$sitename}}. Vian konton estas kreita. 
--- a/view/eo/smarty3/register_verify_eml.tpl
+++ b/view/eo/smarty3/register_verify_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Kara {{$myname}},

--- a/view/eo/smarty3/update_fail_eml.tpl
+++ b/view/eo/smarty3/update_fail_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 Saluton! 
 Mi estas {{$sitename}}.   
 La programistoj de Frienda eldonis ĝisdatigon {{$update}} antaŭ ne longe, 
--- a/view/es/smarty3/cmnt_received_eml.tpl
+++ b/view/es/smarty3/cmnt_received_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Estimado/a {{$username}},

--- a/view/es/smarty3/follow_notify_eml.tpl
+++ b/view/es/smarty3/follow_notify_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Estimado/a {{$myname}},

--- a/view/es/smarty3/friend_complete_eml.tpl
+++ b/view/es/smarty3/friend_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Estimado/a {{$username}},

--- a/view/es/smarty3/htconfig.tpl
+++ b/view/es/smarty3/htconfig.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <?php

 // Set the following for your MySQL installation
--- a/view/es/smarty3/intro_complete_eml.tpl
+++ b/view/es/smarty3/intro_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Estimado/a {{$username}},

--- a/view/es/smarty3/lostpass_eml.tpl
+++ b/view/es/smarty3/lostpass_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Estimado/a {{$username}},
 	
--- a/view/es/smarty3/mail_received_html_body_eml.tpl
+++ b/view/es/smarty3/mail_received_html_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
--- a/view/es/smarty3/mail_received_text_body_eml.tpl
+++ b/view/es/smarty3/mail_received_text_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Estimado/a {{$username}},

--- a/view/es/smarty3/register_open_eml.tpl
+++ b/view/es/smarty3/register_open_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Estimado/a {{$username}},

--- a/view/es/smarty3/register_verify_eml.tpl
+++ b/view/es/smarty3/register_verify_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Estimado/a {{$myname}},

--- a/view/es/smarty3/wall_received_eml.tpl
+++ b/view/es/smarty3/wall_received_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Estimado/a {{$username}},

--- a/view/fr/smarty3/cmnt_received_eml.tpl
+++ b/view/fr/smarty3/cmnt_received_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Cher(e) {{$username}},

--- a/view/fr/smarty3/cmnt_received_html_body_eml.tpl
+++ b/view/fr/smarty3/cmnt_received_html_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
--- a/view/fr/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/fr/smarty3/cmnt_received_text_body_eml.tpl
@ -1,18 +1,14 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Cher(e) {{$username}},

-	« {{$from}} » a commenté un éléŽment ou une conversation que vous suivez.
+	<09> {{$from}} <20> a comment<6E> un <20>l<EFBFBD>ment ou une conversation que vous suivez.

 -----
 {{$body}}
 -----

-Connectez-vous à {{$siteurl}} si vous souhaitez voir la conversation complète :
+Connectez-vous <EFBFBD> {{$siteurl}} si vous souhaitez voir la conversation compl<EFBFBD>te :

 {{$display}}

--- a/view/fr/smarty3/follow_notify_eml.tpl
+++ b/view/fr/smarty3/follow_notify_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Cher(e) {{$myname}},

--- a/view/fr/smarty3/friend_complete_eml.tpl
+++ b/view/fr/smarty3/friend_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Cher(e) {{$username}},

--- a/view/fr/smarty3/htconfig.tpl
+++ b/view/fr/smarty3/htconfig.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <?php

 // Set the following for your MySQL installation
--- a/view/fr/smarty3/intro_complete_eml.tpl
+++ b/view/fr/smarty3/intro_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Cher(e) {{$username}},

--- a/view/fr/smarty3/lostpass_eml.tpl
+++ b/view/fr/smarty3/lostpass_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Cher(e) {{$username}},

--- a/view/fr/smarty3/mail_received_html_body_eml.tpl
+++ b/view/fr/smarty3/mail_received_html_body_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
--- a/view/fr/smarty3/mail_received_text_body_eml.tpl
+++ b/view/fr/smarty3/mail_received_text_body_eml.tpl
@ -1,15 +1,11 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$from}} vous a envoyé un message à {{$siteName}}.
+
+{{$from}} vous a envoy<6F> un message <20> {{$siteName}}.
 	
 {{$title}}

 {{$textversion}}

-Veuillez ouvrir une session sur {{$siteurl}} pour lire et répondre à vos messages privés.
+Veuillez ouvrir une session sur {{$siteurl}} pour lire et r<EFBFBD>pondre <20> vos messages priv<69>s.

 Merci,
 {{$siteName}} Administrateur
--- a/view/fr/smarty3/passchanged_eml.tpl
+++ b/view/fr/smarty3/passchanged_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Cher(e) {{$username}},

--- a/view/fr/smarty3/register_open_eml.tpl
+++ b/view/fr/smarty3/register_open_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Cher(e) {{$username}},

--- a/view/fr/smarty3/register_verify_eml.tpl
+++ b/view/fr/smarty3/register_verify_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	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
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Cher(e) {{$myname}},

--- a/view/fr/smarty3/wall_received_eml.tpl
+++ b/view/fr/smarty3/wall_received_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Cher(e) {{$username}},

--- a/view/is/smarty3/follow_notify_eml.tpl
+++ b/view/is/smarty3/follow_notify_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Góðan daginn {{$myname}},

--- a/view/is/smarty3/friend_complete_eml.tpl
+++ b/view/is/smarty3/friend_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Góðan daginn {{$username}}, 

--- a/view/is/smarty3/intro_complete_eml.tpl
+++ b/view/is/smarty3/intro_complete_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Góðan daginn {{$username}},

--- a/view/is/smarty3/lostpass_eml.tpl
+++ b/view/is/smarty3/lostpass_eml.tpl
@ -1,8 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+

 Góðan dag {{$username}},
 	Beiðni barst á {{$sitename}} um að endursetja 
--- a/Show more
+++ b/Show more