aboutsummaryrefslogtreecommitdiffstats
path: root/view/de
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-02-06 21:27:24 +0100
committerfabrixxm <fabrix.xm@gmail.com>2011-02-06 21:27:24 +0100
commit97b608db38edac6e4989c7343e9de8f32f46f263 (patch)
treeb303d7bf32e58abcd22efcc6fe0d9171284a3337 /view/de
parent64be33a3ff9ddae16ba7a57c842441a2d0058a5b (diff)
parentac3f3a6e9fb46ab608f26d4dfc12ee631e0e453a (diff)
downloadvolse-hubzilla-97b608db38edac6e4989c7343e9de8f32f46f263.tar.gz
volse-hubzilla-97b608db38edac6e4989c7343e9de8f32f46f263.tar.bz2
volse-hubzilla-97b608db38edac6e4989c7343e9de8f32f46f263.zip
Merge branch 'friendika-master'
Diffstat (limited to 'view/de')
-rw-r--r--view/de/profile_photo.tpl6
-rw-r--r--view/de/strings.php4
2 files changed, 7 insertions, 3 deletions
diff --git a/view/de/profile_photo.tpl b/view/de/profile_photo.tpl
index 958952240..10d7d7b97 100644
--- a/view/de/profile_photo.tpl
+++ b/view/de/profile_photo.tpl
@@ -11,4 +11,8 @@
<input type="submit" name="submit" id="profile-photo-submit" value="Upload">
</div>
-</form> \ No newline at end of file
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+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:';