Merge branch 'friendika-master'

7 files changed, 26 insertions, 8 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:';
diff --git a/view/en/profile_photo.tpl b/view/en/profile_photo.tpl
index d518e7331..30e51210a 100644
--- a/view/en/profile_photo.tpl
+++ b/view/en/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">
+or <a href='photos/$user'>select a photo from albums</a>
+</div>
\ No newline at end of file
diff --git a/view/fr/profile_photo.tpl b/view/fr/profile_photo.tpl
index d518e7331..30e51210a 100644
--- a/view/fr/profile_photo.tpl
+++ b/view/fr/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">
+or <a href='photos/$user'>select a photo from albums</a>
+</div>
\ No newline at end of file
diff --git a/view/fr/strings.php b/view/fr/strings.php
index 39e15eccf..8bac6347f 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -293,7 +293,7 @@ $a->strings['Edit Album'] = 'Éditer l\'album';
 $a->strings['View Photo'] = 'Voir la photo';
 $a->strings['Photo not available'] = 'Photo indisponible';
 $a->strings['Edit photo'] = 'Éditer la photo';
-$a->strings['New album name] = 'Nom du nuovel album';
+$a->strings['New album name'] = 'Nom du nouvel album';
 $a->strings['View Full Size'] = 'Voir en taille réelle';
 $a->strings['Tags: '] = 'Étiquettes: ';
 $a->strings['[Remove any tag]'] = '[Retirer toutes les étiquettes]';
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 61782f6e3..5dd0b8712 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -734,6 +734,10 @@ input#dfrn-url {
 	margin-bottom: 20px;
 }
 
+#profile-photo-link-select-wrapper {
+	margin-top: 2em;
+}
+
 #profile-edit-profile-name-label,
 #profile-edit-name-label,
 #profile-edit-pdesc-label,
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index a1098f6a4..c7eb56fb1 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -602,6 +602,10 @@ input#dfrn-url {
 	margin-bottom: 20px;
 }
 
+#profile-photo-link-select-wrapper {
+	margin-top: 2em;
+}
+
 #profile-edit-profile-name-label,
 #profile-edit-name-label,
 #profile-edit-pdesc-label,
@@ -1853,8 +1857,6 @@ a.mail-list-link {
 	margin-bottom: 25px;
 }
 
-
-
 /* end from defautlt */