Merge commit 'mike/master'

5 files changed, 5 insertions, 53 deletions

diff --git a/view/de/logout.tpl b/view/de/logout.tpl
deleted file mode 100644
index 9a6c1d763..000000000
--- a/view/de/logout.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<form action="" method="post" >
-<div class="logout-wrapper">
-<input type="hidden" name="auth-params" value="logout" />
-<input type="submit" name="submit" id="logout-button" value="Logout" />
-</div>
-</form>
diff --git a/view/de/register-link.tpl b/view/de/register-link.tpl
deleted file mode 100644
index cf9d7976d..000000000
--- a/view/de/register-link.tpl
+++ /dev/null
@@ -1 +0,0 @@
-	<a href="register" name="Neuen Account anlegen" id="register-link" >Registrieren</a>
diff --git a/view/de/strings.php b/view/de/strings.php
index cc0319606..d17037f6d 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -175,7 +175,11 @@ $a->strings['Cancel'] = 'Abbrechen';
 $a->strings['Global Directory'] = 'Weltweites Verzeichnis';
 $a->strings['Private Message'] = 'Private Nachricht';
 $a->strings['This is you'] = 'Das bist du';
-$a->strings['View $name\'s profile'] = 'Profile von $name';
+$a->strings['View $name\'s profile'] = 'Betrachte das Profil von $name';
+$a->strings['View $owner_name\'s profile'] = 'Betrachte das Profil von $owner_name';
+$a->strings['to'] = 'to';
+$a->strings['Wall-to-Wall'] = 'Wall-to-Wall';
+$a->strings['via Wall-To-Wall:'] = 'via Wall-To-Wall:';
 $a->strings['Item has been removed.'] = 'Eintrag wurde entfernt.';
 $a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.';
 $a->strings['The profile address specified does not provide adequate information.'] = 'Die angegebene Profiladresse liefert unzureichende Informationen.';
diff --git a/view/de/wall_item_drop.tpl b/view/de/wall_item_drop.tpl
deleted file mode 100644
index 7b267f314..000000000
--- a/view/de/wall_item_drop.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" ><a
-href="item/drop/$id" onclick="return confirmDelete();" ><img
-src="images/b_drophide.gif" alt="Löschen" title="Löschen" id="wall-item-delete-icon-$id" class="wall-item-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>
-		<div class="wall-item-delete-end"></div>
diff --git a/view/de/wallwall_item.tpl b/view/de/wallwall_item.tpl
deleted file mode 100644
index b9a655582..000000000
--- a/view/de/wallwall_item.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<span class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper" id="wall-item-ownerphoto-wrapper-$id" >
-				<a href="$owner_url" title="Gehe zum Profil von $owner_name" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
-				<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" height="80" width="80" alt="$owner_name" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="Wall-To-Wall" /></div>
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
-				<a href="$profile_url" title="Betrachte das Profil von $name" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a>
-			</div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-				$lock
-				<a href="$profile_url" title="Betrachte das Profil von $name" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> to <a href="$owner_url" title="View $owner_name's profile" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> via Wall-To-Wall:<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
-				<div class="wall-item-location" id="wall-item-location-$id">$location</div>
-				$vote
-			</div>
-		</span>
-		<div class="wall-item-content" id="wall-item-content-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$id">
-		$plink
-		$drop
-		</div>
-	</div>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
-	<div class="wall-item-comment-separator"></div>
-	<div class="wall-item-comment-wrapper" >
-	$comment
-	</div>
-</div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-