diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-02-06 21:27:24 +0100 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-02-06 21:27:24 +0100 |
| commit | 97b608db38edac6e4989c7343e9de8f32f46f263 (patch) | |
| tree | b303d7bf32e58abcd22efcc6fe0d9171284a3337 /view/fr | |
| parent | 64be33a3ff9ddae16ba7a57c842441a2d0058a5b (diff) | |
| parent | ac3f3a6e9fb46ab608f26d4dfc12ee631e0e453a (diff) | |
| download | volse-hubzilla-97b608db38edac6e4989c7343e9de8f32f46f263.tar.gz volse-hubzilla-97b608db38edac6e4989c7343e9de8f32f46f263.tar.bz2 volse-hubzilla-97b608db38edac6e4989c7343e9de8f32f46f263.zip | |
Merge branch 'friendika-master'
Diffstat (limited to 'view/fr')
| -rw-r--r-- | view/fr/profile_photo.tpl | 6 | ||||
| -rw-r--r-- | view/fr/strings.php | 2 |
2 files changed, 6 insertions, 2 deletions
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]'; |