Merge branch 'release-candidate' of github.com:Sankore/Sankore-3.1 into release-candidate

12 years ago · f409802347
parent 77f51fd103 0b1aa07abe
commit f409802347
68 changed files with 1 additions and 1 deletions
--- a/resources/library/interactivities/Transformation.wgt/config.xml
+++ b/resources/library/interactivities/Transformation.wgt/config.xml
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/Lobster/SIL
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/Lobster/SIL
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/Lobster/demo.html
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/Lobster/demo.html
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/Lobster/stylesheet.css
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/Lobster/stylesheet.css
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/ShyFonts
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/ShyFonts
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/demo.html
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/demo.html
--- a/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/stylesheet.css
+++ b/resources/library/interactivities/Transformation.wgt/css/fonts/SF-Toontime/stylesheet.css
--- a/resources/library/interactivities/Transformation.wgt/css/images/bg.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/bg.png
--- a/resources/library/interactivities/Transformation.wgt/css/images/box-bg.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/box-bg.png
--- a/resources/library/interactivities/Transformation.wgt/css/images/card-closed-bg.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/card-closed-bg.png
--- a/resources/library/interactivities/Transformation.wgt/css/images/drop-label-bg.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/drop-label-bg.png
--- a/resources/library/interactivities/Transformation.wgt/css/images/drop-label-ondrop-bg.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/drop-label-ondrop-bg.png
--- a/resources/library/interactivities/Transformation.wgt/css/images/pad-bd.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/pad-bd.png
--- a/resources/library/interactivities/Transformation.wgt/css/images/parameters-bg.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/parameters-bg.png
--- a/resources/library/interactivities/Transformation.wgt/css/images/pile-bg.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/pile-bg.png
--- a/resources/library/interactivities/Transformation.wgt/css/images/pile-with-card-bg.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/pile-with-card-bg.png
--- a/resources/library/interactivities/Transformation.wgt/css/images/slate-bd.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/slate-bd.png
--- a/resources/library/interactivities/Transformation.wgt/css/images/slate-toolbar-edit.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/slate-toolbar-edit.png
--- a/resources/library/interactivities/Transformation.wgt/css/images/slate-toolbar-help.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/slate-toolbar-help.png
--- a/resources/library/interactivities/Transformation.wgt/css/images/slate-toolbar-reload.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/slate-toolbar-reload.png
--- a/resources/library/interactivities/Transformation.wgt/css/images/toolbar-edit.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/toolbar-edit.png
--- a/resources/library/interactivities/Transformation.wgt/css/images/toolbar-help.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/toolbar-help.png
--- a/resources/library/interactivities/Transformation.wgt/css/images/toolbar-reload.png
+++ b/resources/library/interactivities/Transformation.wgt/css/images/toolbar-reload.png
--- a/resources/library/interactivities/Transformation.wgt/css/main.css
+++ b/resources/library/interactivities/Transformation.wgt/css/main.css
--- a/resources/library/interactivities/Transformation.wgt/css/ubw-help.css
+++ b/resources/library/interactivities/Transformation.wgt/css/ubw-help.css
--- a/resources/library/interactivities/Transformation.wgt/css/ubw-main.css
+++ b/resources/library/interactivities/Transformation.wgt/css/ubw-main.css
--- a/resources/library/interactivities/Transformation.wgt/help.html
+++ b/resources/library/interactivities/Transformation.wgt/help.html
--- a/resources/library/interactivities/Transformation.wgt/i18n/Messages.properties
+++ b/resources/library/interactivities/Transformation.wgt/i18n/Messages.properties
--- a/resources/library/interactivities/Transformation.wgt/i18n/Messages_fr.properties
+++ b/resources/library/interactivities/Transformation.wgt/i18n/Messages_fr.properties
@ -5,7 +5,7 @@ fr.njin.i18n.toolbar.view = Afficher
 fr.njin.i18n.toolbar.reload = Recharger
 fr.njin.i18n.toolbar.help = Aide

-fr.njin.i18n.parameters.label.themes = Thèmes
+fr.njin.i18n.parameters.label.themes = Thème
 fr.njin.i18n.parameters.label.slate.themes = ardoise
 fr.njin.i18n.parameters.label.pad.themes = tablette
 fr.njin.i18n.parameters.label.none.themes = aucun
--- a/resources/library/interactivities/Transformation.wgt/icon.png
+++ b/resources/library/interactivities/Transformation.wgt/icon.png
--- a/resources/library/interactivities/Transformation.wgt/index.html
+++ b/resources/library/interactivities/Transformation.wgt/index.html
--- a/resources/library/interactivities/Transformation.wgt/js/help-template.js
+++ b/resources/library/interactivities/Transformation.wgt/js/help-template.js
--- a/resources/library/interactivities/Transformation.wgt/js/help_fr-template.js
+++ b/resources/library/interactivities/Transformation.wgt/js/help_fr-template.js
--- a/resources/library/interactivities/Transformation.wgt/js/lib/jquery-1.7.1.min.js
+++ b/resources/library/interactivities/Transformation.wgt/js/lib/jquery-1.7.1.min.js
--- a/resources/library/interactivities/Transformation.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
+++ b/resources/library/interactivities/Transformation.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
--- a/resources/library/interactivities/Transformation.wgt/js/lib/modernizr.js
+++ b/resources/library/interactivities/Transformation.wgt/js/lib/modernizr.js
--- a/resources/library/interactivities/Transformation.wgt/js/lib/mustache.js
+++ b/resources/library/interactivities/Transformation.wgt/js/lib/mustache.js
--- a/resources/library/interactivities/Transformation.wgt/js/lib/ubw-main.js
+++ b/resources/library/interactivities/Transformation.wgt/js/lib/ubw-main.js
--- a/resources/library/interactivities/Transformation.wgt/js/main.js
+++ b/resources/library/interactivities/Transformation.wgt/js/main.js
--- a/resources/library/interactivities/Transformation.wgt/js/templates.js
+++ b/resources/library/interactivities/Transformation.wgt/js/templates.js