Skip to content

Commit

Permalink
Merge branch 'lang_update_543' of git://github.com/dokuwiki-translate…
Browse files Browse the repository at this point in the history
…/dokuwiki-plugin-gallery into pull-request-47

* 'lang_update_543' of git://github.com/dokuwiki-translate/dokuwiki-plugin-gallery:
  translation update

Conflicts:
	lang/fr/lang.php
  • Loading branch information
splitbrain committed Dec 19, 2013
2 parents 3d6af50 + b1e45ac commit ce6e6ac
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 3 additions & 1 deletion lang/fr/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
* @author Christian "Na_kai" Sueur <sueur.christian@gmail.com>
* @author NicolasFriedli <nicolas@theologique.ch>
*/
$lang['pages'] = 'Gallerie d\'images';
$lang['pages'] = 'Pages galerie:';
$lang['js']['addgal'] = 'Utiliser un espace de nom comme galerie';
3 changes: 2 additions & 1 deletion lang/fr/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
*
* @author Dmitry Baikov <dsbaikov@gmail.com>
* @author Emmanuel Dupin <seedfloyd@gmail.com>
* @author NicolasFriedli <nicolas@theologique.ch>
*/
$lang['thumbnail_width'] = 'Largeur des miniatures';
$lang['thumbnail_height'] = 'Hauteur des miniatures';
$lang['image_width'] = 'Largeur des images';
$lang['image_height'] = 'Hauteur des images';
$lang['cols'] = 'Nombre d\'images par ligne';
$lang['sort'] = 'Ordre de tri des images';
$lang['sort'] = 'Critère de tri des images';
$lang['sort_o_file'] = 'trier par nom du fichier';
$lang['sort_o_mod'] = 'trier par date de modification du fichier';
$lang['sort_o_date'] = 'trier par date EXIF';
Expand Down

0 comments on commit ce6e6ac

Please sign in to comment.