diff options
author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-14 10:20:00 -0400 |
---|---|---|
committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-14 10:22:13 -0400 |
commit | 4c7fd8cd0191871e48704f693f48554d4ee7a726 (patch) | |
tree | a66a930783de938deaa3d2362dcf779e5c2b45af /l10n/fr/settings.po | |
parent | 64ef1e21819979d7fdc406d2628bc175b16fe554 (diff) | |
parent | 62e4f55f721971dacd06649cecefe0487626aa75 (diff) | |
download | nextcloud-server-4c7fd8cd0191871e48704f693f48554d4ee7a726.tar.gz nextcloud-server-4c7fd8cd0191871e48704f693f48554d4ee7a726.zip |
Merge branch 'master' into share_api
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
Diffstat (limited to 'l10n/fr/settings.po')
-rw-r--r-- | l10n/fr/settings.po | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index 5904706ab71..6682f4c9e0a 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-07 02:05+0200\n" -"PO-Revision-Date: 2012-08-06 20:25+0000\n" -"Last-Translator: Cyril Glapa <kyriog@gmail.com>\n" +"POT-Creation-Date: 2012-08-12 02:02+0200\n" +"PO-Revision-Date: 2012-08-12 00:03+0000\n" +"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,11 +77,27 @@ msgstr "Français" msgid "Security Warning" msgstr "Alertes de sécurité" -#: templates/admin.php:28 +#: templates/admin.php:29 +msgid "Cron" +msgstr "" + +#: templates/admin.php:31 +msgid "execute one task with each page loaded" +msgstr "" + +#: templates/admin.php:33 +msgid "cron.php is registered at a webcron service" +msgstr "" + +#: templates/admin.php:35 +msgid "use systems cron service" +msgstr "" + +#: templates/admin.php:39 msgid "Log" msgstr "Journaux" -#: templates/admin.php:56 +#: templates/admin.php:67 msgid "More" msgstr "Plus" |