diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-12-14 15:15:05 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-12-14 15:15:05 +0000 |
| commit | 5fe61296981343a3f877618aeecfc33ea7fed3c1 (patch) | |
| tree | 919ea533c8d98f71f7c77d534eb0595207d22a17 /lib/l10n/fr.php | |
| parent | 4facd766e3712d4c714f2e1bf2ad4be41461a7cc (diff) | |
| parent | f0893fb8fe7f0642ae30de2e1168472377c127e2 (diff) | |
| download | nextcloud-server-5fe61296981343a3f877618aeecfc33ea7fed3c1.tar.gz nextcloud-server-5fe61296981343a3f877618aeecfc33ea7fed3c1.zip | |
Merge master into ocs_api, fix conflicts.
Diffstat (limited to 'lib/l10n/fr.php')
| -rw-r--r-- | lib/l10n/fr.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php index ff2356464a2..218c22c1d53 100644 --- a/lib/l10n/fr.php +++ b/lib/l10n/fr.php @@ -18,14 +18,17 @@ "seconds ago" => "à l'instant", "1 minute ago" => "il y a 1 minute", "%d minutes ago" => "il y a %d minutes", +"1 hour ago" => "Il y a une heure", +"%d hours ago" => "Il y a %d heures", "today" => "aujourd'hui", "yesterday" => "hier", "%d days ago" => "il y a %d jours", "last month" => "le mois dernier", -"months ago" => "il y a plusieurs mois", +"%d months ago" => "Il y a %d mois", "last year" => "l'année dernière", "years ago" => "il y a plusieurs années", "%s is available. Get <a href=\"%s\">more information</a>" => "%s est disponible. Obtenez <a href=\"%s\">plus d'informations</a>", "up to date" => "À jour", -"updates check is disabled" => "la vérification des mises à jour est désactivée" +"updates check is disabled" => "la vérification des mises à jour est désactivée", +"Could not find category \"%s\"" => "Impossible de trouver la catégorie \"%s\"" ); |