aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-02-05 13:01:28 -0800
committerFriendika <info@friendika.com>2011-02-05 13:01:28 -0800
commitc26463b65b4b98f9aca77781fd74a7fe99f73814 (patch)
tree341d42356870f767cb6711ddf274f9e7665af096
parent8cced061bba8d5ef18e2fa5ead0edcdc90d06e73 (diff)
parentc4ddee005ebcf912c913e12a17e65ab8826650a6 (diff)
downloadvolse-hubzilla-c26463b65b4b98f9aca77781fd74a7fe99f73814.tar.gz
volse-hubzilla-c26463b65b4b98f9aca77781fd74a7fe99f73814.tar.bz2
volse-hubzilla-c26463b65b4b98f9aca77781fd74a7fe99f73814.zip
Merge branch 'omigeot-master'
Conflicts: view/fr/strings.php
-rw-r--r--view/fr/strings.php2
1 files changed, 1 insertions, 1 deletions
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]';