merged stable to master

htdocs/lang/de/ocstyle/email/removed_log.email

@@ -1,8 +1,11 @@
 Hallo %log_owner%,
 
-%cache_owner% hat deinen Logeintrag für seinen Cache "%cache_name%" gelöscht.
+%cache_owner% hat deinen Logeintrag für seinen Cache "%cache_name%" gelöscht
+(http://opencaching.de/%cache_wp%).
+
+%log_text%
 
 %comment%
 
-Weiterhin viel Spass beim Geocaching wünscht dir das Opencaching.de-Team
-http://www.opencaching.de
+Weiterhin viel Spass beim Geocaching wünscht dir das Opencaching.de-Team.
+http://www.opencaching.de

htdocs/lang/de/ocstyle/removelog.inc.php

@@ -18,6 +18,8 @@
  $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
 
  $removed_log_title = t('Info: Your log entry has been removed from the cache owner');
- $removed_message_titel = t('The owner of the has written you the following comment:') . "\n---";
+ $removed_message_title = t('The owner of the has written you the following comment:') . "\n---";
  $removed_message_end = "---";
+ $removed_text_title = t('Deleted text:') . "\n---";
+ $removed_text_end = "---";
 ?>

htdocs/lang/de/ocstyle/removelog_cacheowner.tpl.php

@@ -20,7 +20,6 @@
 <input type="hidden" name="logid" value="{logid}"/>
 <table class="table">
 	<tr><td class="header" colspan="2"><img src="lang/de/ocstyle/images/description/22x22-logs.png" border="0" width="32" height="32" alt="" title="" align="middle"> <b>{t}remove log entry for <a href="viewcache.php?cacheid={cacheid}">{cachename}</a>{/t}</b></td></tr>
-	<tr><td class="spacer"></td></tr>
 
 	<tr><td colspan="2">{t}are you sure that this log entry shall be removed?{/t}</td></tr>
 	<tr><td class="spacer"></td></tr>
@@ -28,22 +27,19 @@
 	<tr>
 		<td>&nbsp;&nbsp;&nbsp;</td>
 		<td>
-			{logimage} {date}{time} &nbsp; {typetext}
+			<div class="textblock">
+				<p>{logimage} {date}{time} &nbsp; {typetext}</p>
+				<p>{logtext}</p>
+			</div>
 		</td>
 	</tr>
-	<tr><td class="spacer"></td></tr>
-	<tr>
-		<td></td>
-		<td>
-			{logtext}
-		</td>
-	</tr>
-	<tr><td class="spacer"></td></tr>
+	<tr><td class="spacer">&nbsp;</td></tr>
 
 	<tr><td class="header-small" colspan="2">{t}do you want to send {log_user_name} a note?{/t}</td></tr>
 	<tr>
-		<td colspan="2">
-		<textarea class="logs" name="logowner_message"></textarea>
+		<td>&nbsp;&nbsp;&nbsp;</td>
+		<td>
+		<textarea class="removelogs" name="logowner_message"></textarea>
 		</td>
 	</tr>
 	<tr><td class="spacer"></td></tr>

htdocs/lang/de/ocstyle/removelog_logowner.tpl.php

@@ -32,17 +32,13 @@
 	<tr>
 		<td>&nbsp;&nbsp;&nbsp;</td>
 		<td>
-			{logimage} {date}{time} &nbsp; {typetext}
+			<div class="textblock">
+				<p>{logimage} {date}{time} &nbsp; {typetext}</p>
+				<p>{logtext}</p>
+			</div>
 		</td>
 	</tr>
-	<tr><td class="spacer"></td></tr>
-	<tr>
-		<td></td>
-		<td>
-			{logtext}
-		</td>
-	</tr>
-	<tr><td class="spacer"></td></tr>
+	<tr><td class="spacer">&nbsp;</td></tr>
 
 	<tr>
 		<td class="header-small" colspan="2">