aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-02-04 04:46:05 -0800
committerFriendika <info@friendika.com>2011-02-04 04:46:05 -0800
commit6bb8f677c243ab5242919215cece97125143f943 (patch)
treef06c2e17e5c56753590b177a7c3d3ca169bfe04b
parent2a9bfae2b7341ebe4d420c627867160c7e1427d9 (diff)
parentebbdb7b301d8ab5a1eb249a68888d1dd772a06c3 (diff)
downloadvolse-hubzilla-6bb8f677c243ab5242919215cece97125143f943.tar.gz
volse-hubzilla-6bb8f677c243ab5242919215cece97125143f943.tar.bz2
volse-hubzilla-6bb8f677c243ab5242919215cece97125143f943.zip
Merge branch 'fabrixxm-master'
-rw-r--r--view/it/profile_photo.tpl6
-rw-r--r--view/it/strings.php2
2 files changed, 6 insertions, 2 deletions
diff --git a/view/it/profile_photo.tpl b/view/it/profile_photo.tpl
index d941743d4..4d77e87cf 100644
--- a/view/it/profile_photo.tpl
+++ b/view/it/profile_photo.tpl
@@ -1,4 +1,4 @@
-<h1>Upload Profile Photo</h1>
+<h1>Carica foto del profilo</h1>
<form enctype="multipart/form-data" action="profile_photo" method="post">
@@ -12,3 +12,7 @@
</div>
</form>
+
+<div id="profile-photo-link-select-wrapper">
+o <a href='photos/$user'>seleziona una foto da un album</a>
+</div> \ No newline at end of file
diff --git a/view/it/strings.php b/view/it/strings.php
index 6ae9285ad..2c429cc8a 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -270,7 +270,7 @@ $a->strings['Edit photo'] = 'Modifica foto';
$a->strings['View Full Size'] = 'Vedi dimensione intera';
$a->strings['Tags: '] = 'Tag: ';
$a->strings['[Remove any tag]'] = '[Rimuovi tutti i tag]';
-$a->strings['New album name'] = 'Nome nuovo album';
+$a->strings['New album name'] = 'Nuovo nome album';
$a->strings['Caption'] = 'Didascalia';
$a->strings['Add a Tag'] = 'Aggiungi un tag';
$a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Esempio: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping';