Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 28 insertions, 0 deletions

diff --git a/mod/videolist/languages/fr.php b/mod/videolist/languages/fr.php
new file mode 100644
index 000000000..c21495546
--- /dev/null
+++ b/mod/videolist/languages/fr.php
@@ -0,0 +1,28 @@
+<?php
+$fr = array (
+  'videolist' => 'Mes videos',
+  'videolist:home' => '%s \'s Videos',
+  'videolist:new' => 'ajouter une video',
+  'videolist:find' => 'toutes les videos',
+  'videolist:search' => 'toutes les videos',
+  'videolist:submit' => 'envoie',
+  'videolist:widget' => 'Mes videos',
+  'videolist:widget:description' => 'tes videos de youtube',
+  'videolist:num_videos' => 'nombre de videos à afficher',
+  'profile:videoheader' => 'ma galerie video',
+  'videolist:tags' => 'ajoute des tags',
+  'videolist:browse' => 'cherche des videos - %s',
+  'videolist:browsemenu' => 'cherche des videos',
+  'videolist:title_search_tube' => 'cherche des videos de',
+  'videolist:searchTubeVideos' => 'cherche sur youtube.com',
+  'videolist:comments' => 'commentaires',
+  'videolist:commentspost' => 'poste',
+  'videolist:river:item' => 'une video',
+  'videolist:river:created' => '%s a ajouté',
+  'videolist:group' => 'Videos',
+  'videolist:groupall' => 'toutes les vidoes du groupe',
+  'videolist:none' => 'ce groupe n\'as pas encore de videos',
+);
+
+add_translation("fr", $fr);
+