diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui index 6d6987d2..548c6b59 100644 --- a/resources/forms/mainWindow.ui +++ b/resources/forms/mainWindow.ui @@ -1465,7 +1465,7 @@ - :/images/extraPalette/trapFlash.png:/images/extraPalette/trapFlash.png + :/images/toolbar/addToolToLibrary.png:/images/toolbar/addToolToLibrary.png Flash Trap diff --git a/resources/i18n/sankore_fr.qm b/resources/i18n/sankore_fr.qm index eef8f22e..c4ab4e7f 100644 Binary files a/resources/i18n/sankore_fr.qm and b/resources/i18n/sankore_fr.qm differ diff --git a/resources/i18n/sankore_fr.ts b/resources/i18n/sankore_fr.ts index 1884a29e..daf42af8 100644 --- a/resources/i18n/sankore_fr.ts +++ b/resources/i18n/sankore_fr.ts @@ -1,6 +1,6 @@ - + BlackoutWidget @@ -1608,7 +1608,7 @@ Interactives Interactives category element - Interactivités + Interactivités Creating image thumbnail for %1. @@ -1724,6 +1724,11 @@ All Files (*.*) Tous les fichiers (*.*) + + Interactivities + Interactives category element + Interactivités + UBLibraryTreeWidget @@ -2848,7 +2853,21 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#1a1a1a;">Sankoré 3.1 version , Copyright (C) year name of author Sankoré 3.1 comes with ABSOLUTELY NO WARRANTY; for details type `show w'.</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#1a1a1a;">This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.</span><span style=" font-size:9pt;"> </span></p></body></html> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#1a1a1a;">Sankoré 3.1 version , Copyright (C) 2010 Sankoré 3.1 comes with ABSOLUTELY NO WARRANTY.</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#35382a;"> </span></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#35382a;">This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</span></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt; color:#35382a;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#35382a;">This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</span></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt; color:#35382a;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#35382a;">You should have received a copy of the GNU General Public License along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</span></p></body></html> + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#3c3c3c;">GIPENA</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#3c3c3c;">Délégation Interministérielle à l'Education Numérique en Afrique</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#3c3c3c;">20 Avenue Ségur Paris 75007</span><span style=" font-size:9pt;"><br /><br /></span><span style=" font-size:9pt; color:#3c3c3c;">Téléphone : 01 43 17 68 08</span><span style=" font-size:9pt;"><br /><br /></span><span style=" font-size:9pt; color:#3c3c3c;">email: </span><a href="mailto:contact@sankore.org"><span style=" font-size:9pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-size:9pt;"> </span></p></body></html> diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp index e1981e65..da040f22 100644 --- a/src/board/UBLibraryController.cpp +++ b/src/board/UBLibraryController.cpp @@ -218,7 +218,7 @@ QList UBLibraryController::rootCategoriesList() categoryImage = new QImage(":images/libpalette/InteractivesCategory.svg"); mInteractiveCategoryPath = QUrl::fromLocalFile(UBSettings::settings()->uniboardGipLibraryDirectory()); - element = new UBLibElement(eUBLibElementType_Folder, mInteractiveCategoryPath, tr("Interactives", "Interactives category element")); + element = new UBLibElement(eUBLibElementType_Folder, mInteractiveCategoryPath, tr("Interactivities", "Interactives category element")); element->setThumbnail(categoryImage); element->setMoveable(false); categories << element; diff --git a/src/gui/UBWebToolsPalette.cpp b/src/gui/UBWebToolsPalette.cpp index c8600d92..bee96a71 100644 --- a/src/gui/UBWebToolsPalette.cpp +++ b/src/gui/UBWebToolsPalette.cpp @@ -23,13 +23,13 @@ UBWebToolsPalette::UBWebToolsPalette(QWidget *parent,bool tutorialMode=false) } else{ actions << UBApplication::mainWindow->actionWebTrapFlash; - actions << UBApplication::mainWindow->actionWebTrap; + //actions << UBApplication::mainWindow->actionWebTrap; actions << UBApplication::mainWindow->actionWebCustomCapture; actions << UBApplication::mainWindow->actionWebWindowCapture; actions << UBApplication::mainWindow->actionWebOEmbed; - actions << UBApplication::mainWindow->actionEduMedia; + //actions << UBApplication::mainWindow->actionEduMedia; actions << UBApplication::mainWindow->actionWebShowHideOnDisplay;