Merge branch 'pull'

author: friendica <info@friendica.com> 2011-12-27 14:27:39 -0800
committer: friendica <info@friendica.com> 2011-12-27 14:27:39 -0800
commit: aca8c8a13a8c3a850cad26efbc1e262b99c7b8a3 (patch)
tree: 20c846e5a0e525cd4373411e1d647468cef24fcf /view
parent: 0f87f84cfbe026e6f049026d8f8c4d4db22dcc56 (diff)
parent: f29507cdbab2f81a05e20ed792e9e73af771e4be (diff)
download: volse-hubzilla-aca8c8a13a8c3a850cad26efbc1e262b99c7b8a3.tar.gz
volse-hubzilla-aca8c8a13a8c3a850cad26efbc1e262b99c7b8a3.tar.bz2
volse-hubzilla-aca8c8a13a8c3a850cad26efbc1e262b99c7b8a3.zip
4 files changed, 54 insertions, 11 deletions
diff --git a/view/de/cmnt_received_html_body_eml.tpl b/view/de/cmnt_received_html_body_eml.tpl
index 3904b5f57..db7f829bc 100644
--- a/view/de/cmnt_received_html_body_eml.tpl
+++ b/view/de/cmnt_received_html_body_eml.tpl
@@ -1,25 +1,25 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
-	<title>Friendika Mitteilung</title>
+	<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:#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>
 		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
 	<tr><td style="padding-bottom:5px;"></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></td><td>Danke für die Aufmerksamkeit</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>Beste Gr&uuml;&szlig;e,</td></tr>
 	<tr><td></td><td>$sitename Administrator</td></tr>
 	</tbody>
 </table>
 </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/view/de/mail_received_html_body_eml.tpl b/view/de/mail_received_html_body_eml.tpl
index 9d0ecf7ae..34eea59da 100644
--- a/view/de/mail_received_html_body_eml.tpl
+++ b/view/de/mail_received_html_body_eml.tpl
@@ -1,23 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
-	<title>Friendika Nachricht</title>
+	<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:#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>
 		<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="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></td><td>Viele Grüße,</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>Beste Gr&uuml;&szlig;e,</td></tr>
 	<tr><td></td><td>$siteName Administrator</td></tr>
 	</tbody>
 </table>
diff --git a/view/de/wall_received_html_body_eml.tpl b/view/de/wall_received_html_body_eml.tpl
new file mode 100644
index 000000000..407e4fdce
--- /dev/null
+++ b/view/de/wall_received_html_body_eml.tpl
@@ -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>
diff --git a/view/de/wall_received_text_body_eml.tpl b/view/de/wall_received_text_body_eml.tpl
new file mode 100644
index 000000000..c627b0c7e
--- /dev/null
+++ b/view/de/wall_received_text_body_eml.tpl
@@ -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
+
+ 
+
author	friendica <info@friendica.com>	2011-12-27 14:27:39 -0800
committer	friendica <info@friendica.com>	2011-12-27 14:27:39 -0800
commit	aca8c8a13a8c3a850cad26efbc1e262b99c7b8a3 (patch)
tree	20c846e5a0e525cd4373411e1d647468cef24fcf /view
parent	0f87f84cfbe026e6f049026d8f8c4d4db22dcc56 (diff)
parent	f29507cdbab2f81a05e20ed792e9e73af771e4be (diff)
download	volse-hubzilla-aca8c8a13a8c3a850cad26efbc1e262b99c7b8a3.tar.gz volse-hubzilla-aca8c8a13a8c3a850cad26efbc1e262b99c7b8a3.tar.bz2 volse-hubzilla-aca8c8a13a8c3a850cad26efbc1e262b99c7b8a3.zip