MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
friendica 2011-12-27 14:27:39 -08:00
parent 0f87f84cfb f29507cdba
commit aca8c8a13a
4 changed files with 54 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
view/de/cmnt_received_html_body_eml.tpl
View file

@ -1,25 +1,25 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html> <html>
<head> <head>
<title>Friendika Mitteilung</title> <title>Friendica Nachricht</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head> </head>
<body> <body>
<table style="border:1px solid #ccc"> <table style="border:1px solid #ccc">
<tbody> <tbody>
<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendika</span></td></tr> <tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$from hat einen Pinnwandeintrag kommentiert dem du auch folgst.</td></tr> <tr><td style="padding-top:22px;" colspan="2">$from hat einen Beitrag kommentiert dem du auch folgst.</td></tr>
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td> <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr> <td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
<tr><td style="padding-bottom:5px;"></td></tr> <tr><td style="padding-bottom:5px;"></td></tr>
<tr><td style="padding-right:22px;">$body</td></tr> <tr><td style="padding-right:22px;">$body</td></tr>
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2"><a href="$display">Um die gesamte Konversation zu sehen melde dich bitte bei $siteurl an</a>.</td></tr> <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Bitte melde dich an um <a href="$display">die komplette Unterhaltung anzuzeigen</a>.</td></tr>
<tr><td></td><td>Danke für die Aufmerksamkeit</td></tr> <tr><td></td><td>Beste Gr&uuml;&szlig;e,</td></tr>
<tr><td></td><td>$sitename Administrator</td></tr> <tr><td></td><td>$sitename Administrator</td></tr>
</tbody> </tbody>
</table> </table>
</body> </body>
</html> </html>

11
view/de/mail_received_html_body_eml.tpl
View file

@ -1,23 +1,24 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html> <html>
<head> <head>
<title>Friendika Nachricht</title> <title>Friendica Nachricht</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head> </head>
<body> <body>
<table style="border:1px solid #ccc"> <table style="border:1px solid #ccc">
<tbody> <tbody>
<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/freindika-32.png'><span style="padding:7px;">Friendika</span></td></tr> <tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
<tr><td style="padding-top:22px;" colspan="2">Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.</td></tr>
<tr><td style="padding-top:22px;" colspan="2">$fromi hat dir eine private Nachricht auf $siteName gesendet.</td></tr>
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td> <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr> <td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr> <tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
<tr><td style="padding-right:22px;">$htmlversion</td></tr> <tr><td style="padding-right:22px;">$htmlversion</td></tr>
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Bitte melde dich unter <a href="$siteurl"$siteurl</a> an um deine privaten Nachrichte zu lesen und zu beantworten.</td></tr> <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Bitte melde dich auf <a href="$siteurl/message">$siteurl/message</a> an um die Nachricht zu bearbeiten.</td></tr>
<tr><td></td><td>Viele Grüße,</td></tr> <tr><td></td><td>Beste Gr&uuml;&szlig;e,</td></tr>
<tr><td></td><td>$siteName Administrator</td></tr> <tr><td></td><td>$siteName Administrator</td></tr>
</tbody> </tbody>
</table> </table>

24
view/de/wall_received_html_body_eml.tpl Normal file
View file

@ -0,0 +1,24 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
<title>Friendica Nachricht</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
<tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$from hat etwas auf deine Pinnwand gepostet.</td></tr>
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
<tr><td style="padding-right:22px;">$body</td></tr>
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Bitte melde dich auf <a href="$siteurl">$siteurl</a> an um <a href="$display">den Eintrag anzusehen oder ihn zu l&ouml;schen</a>.</td></tr>
<tr><td></td><td>Beste Gr&uuml;&szlig;e,</td></tr>
<tr><td></td><td>$sitename Administrator</td></tr>
</tbody>
</table>
</body>
</html>

18
view/de/wall_received_text_body_eml.tpl Normal file
View file

@ -0,0 +1,18 @@
Hallo $username,
'$from' hat etwas auf deiner Pinnwand gepostet.
-----
$body
-----
Bitte melde dich auf $siteurl an um den Beitrag anzusehen oder ihn zu löschen:
$display
Besten Dank!
$sitename Administrator