aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-02-06 02:21:45 -0800
committerFriendika <info@friendika.com>2011-02-06 02:21:45 -0800
commit073f3720ac3132b950fc0aec6470feb99c5e8b92 (patch)
treea7291d0baafd99ee4436e05297374a3be861e08b
parent4e63b0acb94b5db67dd1b054d9484bff70107bb2 (diff)
parent09af200bcc15e37a7c788a840abaee5c1860e24a (diff)
downloadvolse-hubzilla-073f3720ac3132b950fc0aec6470feb99c5e8b92.tar.gz
volse-hubzilla-073f3720ac3132b950fc0aec6470feb99c5e8b92.tar.bz2
volse-hubzilla-073f3720ac3132b950fc0aec6470feb99c5e8b92.zip
Merge branch 'tobiasd-master'
-rw-r--r--view/de/profile_photo.tpl4
-rw-r--r--view/de/strings.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/view/de/profile_photo.tpl b/view/de/profile_photo.tpl
index fe74b4746..10d7d7b97 100644
--- a/view/de/profile_photo.tpl
+++ b/view/de/profile_photo.tpl
@@ -14,5 +14,5 @@
</form>
<div id="profile-photo-link-select-wrapper">
-or <a href='photos/$user'>select a photo from albums</a>
-</div> \ No newline at end of file
+oder <a href='photos/$user'>wähle ein Bild aus einem Album</a>
+</div>
diff --git a/view/de/strings.php b/view/de/strings.php
index f59dcf63b..bc31fab78 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -227,8 +227,8 @@ $a->strings['Please contact the sender by replying to this post if you do not wi
$a->strings['posted an update.'] = 'posted an update.';
$a->strings['photo'] = 'Foto';
$a->strings['status'] = 'Status';
-$a->strings['likes'] = 'mag es';
-$a->strings['doesn\'t like'] = 'mag es nicht';
+$a->strings['likes'] = 'mag das';
+$a->strings['doesn\'t like'] = 'mag das nicht';
$a->strings['\'s'] = '\'s';
$a->strings['Remote privacy information not available.'] = 'Entfernte Privatsphäreneinstellungen nicht verfügbar.';
$a->strings['Visible to:'] = 'Sichtbar für:';