Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
rbbrioso28 committed Oct 14, 2019
2 parents e2bb935 + 3c29e08 commit 281278c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
7 changes: 5 additions & 2 deletions language/en_EN.interface.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,10 @@
'tr_front_minify_assets_error_occurred' => 'An error occurred while compiling assets.',
'tr_front_minify_assets_success' => 'Compiling assets successful.',

// Plugins
'tr_front_plugin_common_tab_properties' => 'Properties',
'tr_front_plugin_common_no_param' => 'No parameters to edit',

//DragDrop Zone
'tr_front_drag_drop_zone_label' => 'DRAG PLUGIN HERE!',
);
?>
);
7 changes: 5 additions & 2 deletions language/fr_FR.interface.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@
'tr_front_minify_assets_error_occurred' => 'An error occurred while compiling assets.',
'tr_front_minify_assets_success' => 'Compiling assets successful.',

// Plugins
'tr_front_plugin_common_tab_properties' => 'Propriétés',
'tr_front_plugin_common_no_param' => 'Aucun paramètre à éditer',

//DragDrop Zone
'tr_front_drag_drop_zone_label' => 'Déposez le plugin ici',
);
?>
);

0 comments on commit 281278c

Please sign in to comment.