diff --git a/util/vagrant_provision.sh b/util/vagrant_provision.sh index 476a1cd1..448e80fe 100644 --- 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 diff --git a/view/ca/smarty3/cmnt_received_eml.tpl b/view/ca/smarty3/cmnt_received_eml.tpl index c398c523..406eaaeb 100644 --- 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}}, diff --git a/view/ca/smarty3/follow_notify_eml.tpl b/view/ca/smarty3/follow_notify_eml.tpl index b9080474..153f1956 100644 --- 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}}, diff --git a/view/ca/smarty3/friend_complete_eml.tpl b/view/ca/smarty3/friend_complete_eml.tpl index b26152d8..660ac8c1 100644 --- 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}}, diff --git a/view/ca/smarty3/htconfig.tpl b/view/ca/smarty3/htconfig.tpl index cb92f253..17bd56f7 100644 --- 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 - * - *}} + diff --git a/view/ca/smarty3/mail_received_text_body_eml.tpl b/view/ca/smarty3/mail_received_text_body_eml.tpl index 3bd4a186..4addb7d6 100644 --- 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}} diff --git a/view/ca/smarty3/passchanged_eml.tpl b/view/ca/smarty3/passchanged_eml.tpl index eddf2ed8..43063fc8 100644 --- 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}}, diff --git a/view/ca/smarty3/register_open_eml.tpl b/view/ca/smarty3/register_open_eml.tpl index b4e90991..ba56d6ae 100644 --- 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}}, diff --git a/view/ca/smarty3/register_verify_eml.tpl b/view/ca/smarty3/register_verify_eml.tpl index d9cc94c1..070288a4 100644 --- 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ó. diff --git a/view/ca/smarty3/request_notify_eml.tpl b/view/ca/smarty3/request_notify_eml.tpl index 3e94e1a5..5bef9f67 100644 --- 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}}, diff --git a/view/ca/smarty3/wall_received_eml.tpl b/view/ca/smarty3/wall_received_eml.tpl index faaaf1b1..25409577 100644 --- 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}}, diff --git a/view/cs/smarty3/cmnt_received_eml.tpl b/view/cs/smarty3/cmnt_received_eml.tpl index 2bf7cc18..87d379d2 100644 --- 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. diff --git a/view/cs/smarty3/cmnt_received_html_body_eml.tpl b/view/cs/smarty3/cmnt_received_html_body_eml.tpl index 0fa62da8..c512a317 100644 --- 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 - * - *}} + diff --git a/view/cs/smarty3/cmnt_received_text_body_eml.tpl b/view/cs/smarty3/cmnt_received_text_body_eml.tpl index 2bf7cc18..87d379d2 100644 --- 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. diff --git a/view/cs/smarty3/follow_notify_eml.tpl b/view/cs/smarty3/follow_notify_eml.tpl index f2bd3175..1b4d6a94 100644 --- 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}}, diff --git a/view/cs/smarty3/friend_complete_eml.tpl b/view/cs/smarty3/friend_complete_eml.tpl index 138036d6..462022a0 100644 --- 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}}, diff --git a/view/cs/smarty3/htconfig.tpl b/view/cs/smarty3/htconfig.tpl index da9b798c..4aeff753 100644 --- 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 - * - *}} +  diff --git a/view/cs/smarty3/mail_received_text_body_eml.tpl b/view/cs/smarty3/mail_received_text_body_eml.tpl index de9a84a7..a15fd6c4 100644 --- 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}} diff --git a/view/cs/smarty3/passchanged_eml.tpl b/view/cs/smarty3/passchanged_eml.tpl index 41eb2b40..cfc71356 100644 --- 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). diff --git a/view/cs/smarty3/register_open_eml.tpl b/view/cs/smarty3/register_open_eml.tpl index 7278baf7..df9bcf53 100644 --- 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: diff --git a/view/cs/smarty3/register_verify_eml.tpl b/view/cs/smarty3/register_verify_eml.tpl index 785a1826..7d08ffa0 100644 --- 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í. diff --git a/view/cs/smarty3/request_notify_eml.tpl b/view/cs/smarty3/request_notify_eml.tpl index 537cea01..6fd4d02b 100644 --- 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}}, diff --git a/view/cs/smarty3/wall_received_eml.tpl b/view/cs/smarty3/wall_received_eml.tpl index a7c8bd13..b2255130 100644 --- 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ď. diff --git a/view/cs/smarty3/wall_received_html_body_eml.tpl b/view/cs/smarty3/wall_received_html_body_eml.tpl index 245843e9..6d6b06b0 100644 --- 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 - * - *}} + diff --git a/view/cs/smarty3/wall_received_text_body_eml.tpl b/view/cs/smarty3/wall_received_text_body_eml.tpl index eddf6d33..9646db63 100644 --- 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ď. diff --git a/view/de/smarty3/cmnt_received_eml.tpl b/view/de/smarty3/cmnt_received_eml.tpl index 9b5c3d84..6e5eab7a 100644 --- 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}}, diff --git a/view/de/smarty3/cmnt_received_html_body_eml.tpl b/view/de/smarty3/cmnt_received_html_body_eml.tpl index c219fcb1..39f08073 100644 --- 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 - * - *}} + diff --git a/view/de/smarty3/cmnt_received_text_body_eml.tpl b/view/de/smarty3/cmnt_received_text_body_eml.tpl index d100040c..b99432a7 100644 --- 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 fr die Aufmerksamkeit +Danke f�r die Aufmerksamkeit {{$sitename}} Administrator diff --git a/view/de/smarty3/follow_notify_eml.tpl b/view/de/smarty3/follow_notify_eml.tpl index 7bec4d32..4da71eb1 100644 --- 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}}, diff --git a/view/de/smarty3/friend_complete_eml.tpl b/view/de/smarty3/friend_complete_eml.tpl index 592bf7dd..27dd1bc9 100644 --- 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}}, diff --git a/view/de/smarty3/htconfig.tpl b/view/de/smarty3/htconfig.tpl index 033e4819..a5f8dab1 100644 --- 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 - * - *}} + diff --git a/view/de/smarty3/mail_received_text_body_eml.tpl b/view/de/smarty3/mail_received_text_body_eml.tpl index 2004cc3b..a09dafc6 100644 --- 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 Gre, +Viele Gr��e, {{$siteName}} Administrator diff --git a/view/de/smarty3/passchanged_eml.tpl b/view/de/smarty3/passchanged_eml.tpl index 4fd97881..2c4576f0 100644 --- 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 diff --git a/view/de/smarty3/register_open_eml.tpl b/view/de/smarty3/register_open_eml.tpl index 9e474ce9..acd28693 100644 --- 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. diff --git a/view/de/smarty3/register_verify_eml.tpl b/view/de/smarty3/register_verify_eml.tpl index c7acbd9b..9c0bb77f 100644 --- 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. diff --git a/view/de/smarty3/request_notify_eml.tpl b/view/de/smarty3/request_notify_eml.tpl index d7c49b02..a68032c2 100644 --- 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}}, diff --git a/view/de/smarty3/update_fail_eml.tpl b/view/de/smarty3/update_fail_eml.tpl index 4329d0e4..8a480d50 100644 --- 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, diff --git a/view/de/smarty3/wall_received_eml.tpl b/view/de/smarty3/wall_received_eml.tpl index 2ace0d5f..19e31413 100644 --- 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}}, diff --git a/view/de/smarty3/wall_received_html_body_eml.tpl b/view/de/smarty3/wall_received_html_body_eml.tpl index c58ee750..e8d8dd2c 100644 --- 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 - * - *}} + diff --git a/view/de/smarty3/wall_received_text_body_eml.tpl b/view/de/smarty3/wall_received_text_body_eml.tpl index eb310177..1ecba1dd 100644 --- 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}}, diff --git a/view/en/smarty3/follow_notify_eml.tpl b/view/en/smarty3/follow_notify_eml.tpl index e944aad1..00a2406e 100644 --- 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}}, diff --git a/view/en/smarty3/friend_complete_eml.tpl b/view/en/smarty3/friend_complete_eml.tpl index 8f72027e..32311e83 100644 --- 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}}, diff --git a/view/en/smarty3/htconfig.tpl b/view/en/smarty3/htconfig.tpl index 0cceabb6..f11922a9 100644 --- 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 - * - *}} + diff --git a/view/es/smarty3/mail_received_text_body_eml.tpl b/view/es/smarty3/mail_received_text_body_eml.tpl index 7ff093b9..43ea2fa3 100644 --- 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}} diff --git a/view/es/smarty3/passchanged_eml.tpl b/view/es/smarty3/passchanged_eml.tpl index e17776ea..c3003b2c 100644 --- 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}}, diff --git a/view/es/smarty3/register_open_eml.tpl b/view/es/smarty3/register_open_eml.tpl index 5d563046..0d0cc5ae 100644 --- 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}}, diff --git a/view/es/smarty3/register_verify_eml.tpl b/view/es/smarty3/register_verify_eml.tpl index a67aedd1..b49a616d 100644 --- 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. diff --git a/view/es/smarty3/request_notify_eml.tpl b/view/es/smarty3/request_notify_eml.tpl index f7bdf329..e4eae838 100644 --- 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}}, diff --git a/view/es/smarty3/wall_received_eml.tpl b/view/es/smarty3/wall_received_eml.tpl index a69c421c..daa5b411 100644 --- 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}}, diff --git a/view/fr/smarty3/cmnt_received_eml.tpl b/view/fr/smarty3/cmnt_received_eml.tpl index a2c1407f..05a71d5a 100644 --- 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}}, diff --git a/view/fr/smarty3/cmnt_received_html_body_eml.tpl b/view/fr/smarty3/cmnt_received_html_body_eml.tpl index d4f7ee7e..d879e4cd 100644 --- 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 - * - *}} + diff --git a/view/fr/smarty3/cmnt_received_text_body_eml.tpl b/view/fr/smarty3/cmnt_received_text_body_eml.tpl index b0360655..e5bae0ac 100644 --- 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 lment ou une conversation que vous suivez. + � {{$from}} � a comment� un �l�ment ou une conversation que vous suivez. ----- {{$body}} ----- -Connectez-vous {{$siteurl}} si vous souhaitez voir la conversation complte : +Connectez-vous � {{$siteurl}} si vous souhaitez voir la conversation compl�te : {{$display}} diff --git a/view/fr/smarty3/follow_notify_eml.tpl b/view/fr/smarty3/follow_notify_eml.tpl index 7f7da5ec..b96ef04f 100644 --- 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}}, diff --git a/view/fr/smarty3/friend_complete_eml.tpl b/view/fr/smarty3/friend_complete_eml.tpl index 2f68255a..9f329c95 100644 --- 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}}, diff --git a/view/fr/smarty3/htconfig.tpl b/view/fr/smarty3/htconfig.tpl index 033e4819..a5f8dab1 100644 --- 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 - * - *}} + diff --git a/view/fr/smarty3/mail_received_text_body_eml.tpl b/view/fr/smarty3/mail_received_text_body_eml.tpl index d1f03fb6..a2321129 100644 --- 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� un message � {{$siteName}}. {{$title}} {{$textversion}} -Veuillez ouvrir une session sur {{$siteurl}} pour lire et rpondre vos messages privs. +Veuillez ouvrir une session sur {{$siteurl}} pour lire et r�pondre � vos messages priv�s. Merci, {{$siteName}} Administrateur diff --git a/view/fr/smarty3/passchanged_eml.tpl b/view/fr/smarty3/passchanged_eml.tpl index 47b10d3f..a7a4bd30 100644 --- 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}}, diff --git a/view/fr/smarty3/register_open_eml.tpl b/view/fr/smarty3/register_open_eml.tpl index 320a5801..3e812135 100644 --- 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}}, diff --git a/view/fr/smarty3/register_verify_eml.tpl b/view/fr/smarty3/register_verify_eml.tpl index 8127010d..f046797d 100644 --- 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. diff --git a/view/fr/smarty3/request_notify_eml.tpl b/view/fr/smarty3/request_notify_eml.tpl index cf2fe0cf..6fa998a7 100644 --- 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}}, diff --git a/view/fr/smarty3/wall_received_eml.tpl b/view/fr/smarty3/wall_received_eml.tpl index 2f91457f..0c537c5b 100644 --- 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}}, diff --git a/view/is/smarty3/follow_notify_eml.tpl b/view/is/smarty3/follow_notify_eml.tpl index e9638011..fcc0cf87 100644 --- 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}}, diff --git a/view/is/smarty3/friend_complete_eml.tpl b/view/is/smarty3/friend_complete_eml.tpl index 5bdbeff5..f25787ef 100644 --- 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}}, diff --git a/view/is/smarty3/intro_complete_eml.tpl b/view/is/smarty3/intro_complete_eml.tpl index 11b6bbd4..feab4d6f 100644 --- 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}}, diff --git a/view/is/smarty3/lostpass_eml.tpl b/view/is/smarty3/lostpass_eml.tpl index a6f83ed5..2ff6812a 100644 --- 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 diff --git a/view/is/smarty3/passchanged_eml.tpl b/view/is/smarty3/passchanged_eml.tpl index 6d08a076..8574b827 100644 --- a/view/is/smarty3/passchanged_eml.tpl +++ b/view/is/smarty3/passchanged_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * 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 diff --git a/view/is/smarty3/register_open_eml.tpl b/view/is/smarty3/register_open_eml.tpl index 8ab04b3a..3391c08c 100644 --- a/view/is/smarty3/register_open_eml.tpl +++ b/view/is/smarty3/register_open_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * 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. diff --git a/view/is/smarty3/register_verify_eml.tpl b/view/is/smarty3/register_verify_eml.tpl index 1e6060df..0b16695a 100644 --- a/view/is/smarty3/register_verify_eml.tpl +++ b/view/is/smarty3/register_verify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Beiðni um nýjan notanda barst {{$sitename}} sem krefst þíns samþykkis. diff --git a/view/is/smarty3/request_notify_eml.tpl b/view/is/smarty3/request_notify_eml.tpl index 6ecec12f..09a80902 100644 --- a/view/is/smarty3/request_notify_eml.tpl +++ b/view/is/smarty3/request_notify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Góðan dag {{$myname}}, diff --git a/view/is/smarty3/update_fail_eml.tpl b/view/is/smarty3/update_fail_eml.tpl index 227ee288..c14afe55 100644 --- a/view/is/smarty3/update_fail_eml.tpl +++ b/view/is/smarty3/update_fail_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Hæ, Ég er {{$sitename}}. Þróunarteymi friendica gáfu nýlega út uppfærslu {{$update}}, diff --git a/view/it/smarty3/htconfig.tpl b/view/it/smarty3/htconfig.tpl index f5796445..30998b86 100644 --- a/view/it/smarty3/htconfig.tpl +++ b/view/it/smarty3/htconfig.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/sv/smarty3/mail_received_text_body_eml.tpl b/view/sv/smarty3/mail_received_text_body_eml.tpl index ce334078..fea4a74f 100644 --- a/view/sv/smarty3/mail_received_text_body_eml.tpl +++ b/view/sv/smarty3/mail_received_text_body_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$from}} har skickat ett personligt meddelande till dig på {{$siteName}}. {{$title}} diff --git a/view/sv/smarty3/passchanged_eml.tpl b/view/sv/smarty3/passchanged_eml.tpl index 49afb735..8b724f7f 100644 --- a/view/sv/smarty3/passchanged_eml.tpl +++ b/view/sv/smarty3/passchanged_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$username}}, diff --git a/view/sv/smarty3/register_open_eml.tpl b/view/sv/smarty3/register_open_eml.tpl index 55bd64e3..a399bd02 100644 --- a/view/sv/smarty3/register_open_eml.tpl +++ b/view/sv/smarty3/register_open_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$username}}, Tack för att du registrerat dig på {{$sitename}}. Kontot har skapats. Här är dina inloggningsuppgifter: diff --git a/view/sv/smarty3/register_verify_eml.tpl b/view/sv/smarty3/register_verify_eml.tpl index 50c94f94..369c9a53 100644 --- a/view/sv/smarty3/register_verify_eml.tpl +++ b/view/sv/smarty3/register_verify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + En registreringsförfrågan som kräver svar har mottagits på {{$sitename}} diff --git a/view/sv/smarty3/request_notify_eml.tpl b/view/sv/smarty3/request_notify_eml.tpl index 22cfb46d..97a0b961 100644 --- a/view/sv/smarty3/request_notify_eml.tpl +++ b/view/sv/smarty3/request_notify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$myname}}, Du har just fått en kontaktförfrågan på {{$sitename}} från '{{$requestor}}' diff --git a/view/sv/smarty3/wall_received_eml.tpl b/view/sv/smarty3/wall_received_eml.tpl index cd286ecf..7a3d673d 100644 --- a/view/sv/smarty3/wall_received_eml.tpl +++ b/view/sv/smarty3/wall_received_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$username}}, '{{$from}}' har skrivit på din profilsida. diff --git a/view/templates/404.tpl b/view/templates/404.tpl index 2d581ab8..518ad1d2 100644 --- a/view/templates/404.tpl +++ b/view/templates/404.tpl @@ -1,6 +1 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}

{{$message}}

diff --git a/view/templates/admin_aside.tpl b/view/templates/admin_aside.tpl index 24f07e28..a9d26a89 100644 --- a/view/templates/admin_aside.tpl +++ b/view/templates/admin_aside.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/templates/contacts-widget-sidebar.tpl b/view/templates/contacts-widget-sidebar.tpl index c4697a91..5c52f432 100644 --- a/view/templates/contacts-widget-sidebar.tpl +++ b/view/templates/contacts-widget-sidebar.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$vcard_widget}} {{$follow_widget}} {{$groups_widget}} diff --git a/view/templates/content.tpl b/view/templates/content.tpl index 811f92dd..2cd732b2 100644 --- a/view/templates/content.tpl +++ b/view/templates/content.tpl @@ -1,7 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +
diff --git a/view/templates/conversation.tpl b/view/templates/conversation.tpl index 24f0d120..e46cd139 100644 --- a/view/templates/conversation.tpl +++ b/view/templates/conversation.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$live_update}} {{foreach $threads as $thread}} diff --git a/view/templates/cropend.tpl b/view/templates/cropend.tpl index a7fb9610..8b137891 100644 --- a/view/templates/cropend.tpl +++ b/view/templates/cropend.tpl @@ -1,5 +1 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/delegate.tpl b/view/templates/delegate.tpl index 7aa85cf3..0897b8a5 100644 --- a/view/templates/delegate.tpl +++ b/view/templates/delegate.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +

{{$header}}

{{$desc}}
diff --git a/view/templates/dfrn_req_confirm.tpl b/view/templates/dfrn_req_confirm.tpl index c941a201..accfd4f8 100644 --- a/view/templates/dfrn_req_confirm.tpl +++ b/view/templates/dfrn_req_confirm.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +

{{$welcome}} diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl index 82d5f67e..d7247858 100644 --- a/view/templates/dfrn_request.tpl +++ b/view/templates/dfrn_request.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +

{{$header}}

diff --git a/view/templates/diasp_dec_hdr.tpl b/view/templates/diasp_dec_hdr.tpl index c3305ecd..136d1ca3 100644 --- a/view/templates/diasp_dec_hdr.tpl +++ b/view/templates/diasp_dec_hdr.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$inner_iv}} {{$inner_key}} diff --git a/view/templates/diaspora_comment.tpl b/view/templates/diaspora_comment.tpl index 8df3842d..107cc730 100644 --- a/view/templates/diaspora_comment.tpl +++ b/view/templates/diaspora_comment.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_comment_relay.tpl b/view/templates/diaspora_comment_relay.tpl index c01441e3..b4f84dc8 100644 --- a/view/templates/diaspora_comment_relay.tpl +++ b/view/templates/diaspora_comment_relay.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_conversation.tpl b/view/templates/diaspora_conversation.tpl index fd11b826..28e4cdb9 100644 --- a/view/templates/diaspora_conversation.tpl +++ b/view/templates/diaspora_conversation.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_like.tpl b/view/templates/diaspora_like.tpl index b35ec46a..165b0f5f 100644 --- a/view/templates/diaspora_like.tpl +++ b/view/templates/diaspora_like.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_like_relay.tpl b/view/templates/diaspora_like_relay.tpl index 379bf0f4..e1696e72 100644 --- a/view/templates/diaspora_like_relay.tpl +++ b/view/templates/diaspora_like_relay.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_message.tpl b/view/templates/diaspora_message.tpl index e1690734..fe0ab4b5 100644 --- a/view/templates/diaspora_message.tpl +++ b/view/templates/diaspora_message.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_photo.tpl b/view/templates/diaspora_photo.tpl index 258a9c2f..03304995 100644 --- a/view/templates/diaspora_photo.tpl +++ b/view/templates/diaspora_photo.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_post.tpl b/view/templates/diaspora_post.tpl index b5a79c19..d6ba9732 100644 --- a/view/templates/diaspora_post.tpl +++ b/view/templates/diaspora_post.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_profile.tpl b/view/templates/diaspora_profile.tpl index e57b8282..afbbb1e1 100644 --- a/view/templates/diaspora_profile.tpl +++ b/view/templates/diaspora_profile.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$handle}} diff --git a/view/templates/diaspora_relay_retraction.tpl b/view/templates/diaspora_relay_retraction.tpl index 97a1344c..b3f97a2e 100644 --- a/view/templates/diaspora_relay_retraction.tpl +++ b/view/templates/diaspora_relay_retraction.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_relayable_retraction.tpl b/view/templates/diaspora_relayable_retraction.tpl index c25e13db..2ae776d1 100644 --- a/view/templates/diaspora_relayable_retraction.tpl +++ b/view/templates/diaspora_relayable_retraction.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_reshare.tpl b/view/templates/diaspora_reshare.tpl index c2b4bf77..6a4776b1 100644 --- a/view/templates/diaspora_reshare.tpl +++ b/view/templates/diaspora_reshare.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_retract.tpl b/view/templates/diaspora_retract.tpl index 345f4bcb..3ddfcabf 100644 --- a/view/templates/diaspora_retract.tpl +++ b/view/templates/diaspora_retract.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_share.tpl b/view/templates/diaspora_share.tpl index 5ff04440..0142ab36 100644 --- a/view/templates/diaspora_share.tpl +++ b/view/templates/diaspora_share.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_signed_retract.tpl b/view/templates/diaspora_signed_retract.tpl index 58c5cc23..83d0def4 100644 --- a/view/templates/diaspora_signed_retract.tpl +++ b/view/templates/diaspora_signed_retract.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_vcard.tpl b/view/templates/diaspora_vcard.tpl index 5ea6335a..25a0fe0f 100644 --- a/view/templates/diaspora_vcard.tpl +++ b/view/templates/diaspora_vcard.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +
Nickname
diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl index ed1115de..29393aed 100644 --- a/view/templates/directory_header.tpl +++ b/view/templates/directory_header.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +

{{$sitedir}}

{{$globaldir}} diff --git a/view/templates/directory_item.tpl b/view/templates/directory_item.tpl index ae52646b..b43fcd28 100644 --- a/view/templates/directory_item.tpl +++ b/view/templates/directory_item.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +
diff --git a/view/templates/display-head.tpl b/view/templates/display-head.tpl index 7750b655..2050cdec 100644 --- a/view/templates/display-head.tpl +++ b/view/templates/display-head.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/events-js.tpl b/view/templates/events-js.tpl index 5fa046f5..ed9354bd 100644 --- a/view/templates/events-js.tpl +++ b/view/templates/events-js.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$tabs}}

{{$title}}

diff --git a/view/templates/events.tpl b/view/templates/events.tpl index f798a8e3..525a5e06 100644 --- a/view/templates/events.tpl +++ b/view/templates/events.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$tabs}}

{{$title}}

diff --git a/view/templates/events_reminder.tpl b/view/templates/events_reminder.tpl index 3448ea45..df163b81 100644 --- a/view/templates/events_reminder.tpl +++ b/view/templates/events_reminder.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{if $count}}