Merge branch 'fabrixxm-master'

This commit is contained in:
Friendika 2011-02-04 04:46:05 -08:00
commit 6bb8f677c2
2 changed files with 6 additions and 2 deletions

View File

@ -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>

View File

@ -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';