From ba6013aac37ed4819cb6ff7357b19cdeec80d7d0 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 19 Aug 2013 09:44:21 +0200 Subject: [PATCH] lasts modifications --- OpenBoard.pro | 8 ++++---- resources/forms/preferences.ui | 8 ++++---- resources/i18n/OpenBoard_fr.ts | 2 +- resources/i18n/OpenBoard_fr_CH.ts | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OpenBoard.pro b/OpenBoard.pro index 78b0e217..ce83c87c 100644 --- a/OpenBoard.pro +++ b/OpenBoard.pro @@ -8,10 +8,10 @@ CONFIG += debug_and_release \ no_include_pwd -VERSION_MAJ = 0 -VERSION_MIN = 08 -VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error -VERSION_PATCH = 03 +VERSION_MAJ = 1 +VERSION_MIN = 00 +VERSION_TYPE = r # a = alpha, b = beta, r = release, other => error +VERSION_PATCH = 00 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = $$replace(VERSION, "\\.r", "") diff --git a/resources/forms/preferences.ui b/resources/forms/preferences.ui index 91cf0603..fb71b20b 100644 --- a/resources/forms/preferences.ui +++ b/resources/forms/preferences.ui @@ -24,7 +24,7 @@ - 0 + 6 @@ -2732,7 +2732,7 @@ p, li { white-space: pre-wrap; } <td style="border: none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OpenBoard 1.00.00</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OpenBoard is copyright (c) 2013 . All rights reserved.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OpenBoard is copyright © 2013 . All rights reserved.</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OpenBoard is derived from Open-Sankoré. Open-Sankoré is copyright © 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA). All right reserved.</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> @@ -2744,8 +2744,8 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">c/o FBT Avocats SA</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Rue du 31-Décembre 47</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">1207 Genève</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="openeducationfoundation.org"><span style=" text-decoration: underline; color:#0000ff;">openeducationfoundation.org</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="oe-f.org"><span style=" text-decoration: underline; color:#0000ff;">oe-f.org</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.openeducationfoundation.org"><span style=" text-decoration: underline; color:#0000ff;">openeducationfoundation.org</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.oe-f.org"><span style=" text-decoration: underline; color:#0000ff;">oe-f.org</span></a></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">email: <a href="mailto:contact@oe-f.org"><span style=" text-decoration: underline; color:#0000ff;">contact@oe-f.org</span></a></p></td></tr></table></body></html> diff --git a/resources/i18n/OpenBoard_fr.ts b/resources/i18n/OpenBoard_fr.ts index e2d19905..9b539fa2 100644 --- a/resources/i18n/OpenBoard_fr.ts +++ b/resources/i18n/OpenBoard_fr.ts @@ -2537,7 +2537,7 @@ p, li { white-space: pre-wrap; } Check if Open-Sankoré data could be imported at launch - Vérifier si des données Open-Sankoré peuvent être importées au redémarrage. Attention, si vous avez déjà importé des données d’Open-Sankoré vous risquez de perdre vos documents courants dans OpenBoard. + Vérifier si des données Open-Sankoré peuvent être importées au redémarrage. diff --git a/resources/i18n/OpenBoard_fr_CH.ts b/resources/i18n/OpenBoard_fr_CH.ts index e2d19905..9b539fa2 100644 --- a/resources/i18n/OpenBoard_fr_CH.ts +++ b/resources/i18n/OpenBoard_fr_CH.ts @@ -2537,7 +2537,7 @@ p, li { white-space: pre-wrap; } Check if Open-Sankoré data could be imported at launch - Vérifier si des données Open-Sankoré peuvent être importées au redémarrage. Attention, si vous avez déjà importé des données d’Open-Sankoré vous risquez de perdre vos documents courants dans OpenBoard. + Vérifier si des données Open-Sankoré peuvent être importées au redémarrage.