From 0e7773b112980c3a38ba9a5d93bef4b415da9c8d Mon Sep 17 00:00:00 2001 From: gambas Date: Fri, 7 May 2021 20:03:59 +0200 Subject: [PATCH] Project properties dialog: Add a button to enable variable prefix check compilation flag. [DEVELOPMENT ENVIRONMENT] * NEW: Project properties dialog: Add a button to enable variable prefix check compilation flag. * BUG: Rename some variables whose datatype prefix was incorrect. --- app/src/gambas3/.lang/fr.po | 749 ++++++++++++------ app/src/gambas3/.project | 1 + app/src/gambas3/.src/Debug/Design.module | 2 +- app/src/gambas3/.src/Debug/FDebugExpr.class | 16 +- app/src/gambas3/.src/Debug/FDebugInfo.class | 2 +- .../Editor/Connection/FConnectionEditor.class | 18 +- .../gambas3/.src/Editor/Form/CControl.class | 8 +- app/src/gambas3/.src/Editor/Form/FForm.class | 20 +- .../.src/Family/Report/CFamilyReport.class | 26 +- app/src/gambas3/.src/Project.module | 11 +- .../.src/Project/FProjectProperty.class | 8 + .../.src/Project/FProjectProperty.form | 40 +- 12 files changed, 587 insertions(+), 314 deletions(-) diff --git a/app/src/gambas3/.lang/fr.po b/app/src/gambas3/.lang/fr.po index a9af34b84..d6899399c 100644 --- a/app/src/gambas3/.lang/fr.po +++ b/app/src/gambas3/.lang/fr.po @@ -222,7 +222,8 @@ msgid "" msgstr "" "Project-Id-Version: gambas3 3.16.90\n" -"PO-Revision-Date: 2021-04-30 03:14 UTC\n" +"POT-Creation-Date: 2021-05-07 18:02 UTC\n" +"PO-Revision-Date: 2021-05-05 01:42 UTC\n" "Last-Translator: Benoît Minisini \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -346,7 +347,7 @@ msgstr "Cette classe se comporte comme un tableau accessible en &1." msgid "write-only" msgstr "écriture seule" -#: CClassInfo.class:704 Project.module:1750 +#: CClassInfo.class:704 Project.module:1751 msgid "read-only" msgstr "lecture seule" @@ -402,7 +403,7 @@ msgstr "Chargement des informations sur le composant &1..." msgid "Loading information on project..." msgstr "Chargement des informations sur le projet..." -#: CComponent.class:525 FProjectProperty.class:1004 +#: CComponent.class:525 FProjectProperty.class:1006 msgid "Classes" msgstr "Classes" @@ -410,7 +411,8 @@ msgstr "Classes" msgid "Class" msgstr "Classe" -#: CComponent.class:571 FConnectionEditor.class:320 FMakeInstall.form:315 FProjectProperty.form:429 FPublish.form:125 FSoftwareFarm.form:328 +#: CComponent.class:571 FConnectionEditor.class:320 FMakeInstall.form:315 +#: FProjectProperty.form:432 FPublish.form:125 FSoftwareFarm.form:328 msgid "Description" msgstr "Description" @@ -426,7 +428,7 @@ msgstr "Ce composant est déprécié." msgid "Author" msgstr "Auteur" -#: CComponent.class:611 FAbout.class:218 FProjectProperty.form:441 +#: CComponent.class:611 FAbout.class:218 FProjectProperty.form:444 msgid "Authors" msgstr "Auteurs" @@ -630,7 +632,7 @@ msgstr "Sélection du composant WebKit QT4 ou QT5" msgid "System tray icon management component" msgstr "Composant de gestion des icônes de notifications système" -#: CDocumentation.class:99 FProjectProperty.form:266 +#: CDocumentation.class:99 FProjectProperty.form:269 msgid "Embedded HTTP server" msgstr "Server HTTP embarqué" @@ -646,7 +648,7 @@ msgstr "Composant de filtrage d'images" msgid "Image routines from the Imlib2 library" msgstr "Gestion des images basée sur la bibliothèque Imlib2" -#: CDocumentation.class:103 FProjectProperty.form:574 +#: CDocumentation.class:103 FProjectProperty.form:577 msgid "Image loading and saving" msgstr "Chargement et sauvegarde d'images" @@ -874,15 +876,15 @@ msgstr "Développement d'applications Web" msgid "Web application development using processes as session" msgstr "Développement d'applications Web utilisant des processus comme sessions" -#: CDocumentation.class:167 FProjectProperty.form:562 +#: CDocumentation.class:167 FProjectProperty.form:565 msgid "Graphical form management" msgstr "Gestion de formulaires graphiques" -#: CDocumentation.class:168 FProjectProperty.form:568 +#: CDocumentation.class:168 FProjectProperty.form:571 msgid "Event loop management" msgstr "Gestion de la boucle d'évènements" -#: CDocumentation.class:170 FProjectProperty.form:585 +#: CDocumentation.class:170 FProjectProperty.form:588 msgid "OpenGL display" msgstr "Affichage OpenGL" @@ -890,7 +892,7 @@ msgstr "Affichage OpenGL" msgid "Complex numbers" msgstr "Nombres complexes" -#: CDocumentation.class:172 FProjectProperty.form:591 +#: CDocumentation.class:172 FProjectProperty.form:594 msgid "XML management" msgstr "Gestion du XML" @@ -906,7 +908,8 @@ msgstr "Insérer la date du jour" msgid "&1: &2" msgstr "&1 : &2" -#: CLibraryInfo.class:206 FDebugInfo.class:52 FMakeExecutable.form:43 FProjectProperty.form:332 LibraryItem.class:54 +#: CLibraryInfo.class:206 FDebugInfo.class:52 FMakeExecutable.form:43 +#: FProjectProperty.form:335 LibraryItem.class:54 msgid "Location" msgstr "Emplacement" @@ -918,7 +921,8 @@ msgstr "ATTENTION ! Bibliothèque introuvable." msgid "Provides" msgstr "Fournit" -#: CModule.class:29 FEditor.form:420 FForm.form:472 FMain.form:959 FToolBox.class:26 +#: CModule.class:29 FEditor.form:420 FForm.form:472 FMain.form:959 +#: FToolBox.class:26 msgid "Form" msgstr "Formulaire" @@ -998,7 +1002,28 @@ msgstr "ici" msgid "IDE extensions" msgstr "Extension de l'EDI" -#: CProjectList.class:553 CVersionControlGit.class:448 CWaitingAnimation.class:63 FColorChooser.form:73 FComponentChooser.form:97 FConflict.class:197 FConnectionEditor.class:470 FCrash.form:100 FCreateFile.form:204 FDebugExpr.form:46 FDebugInfo.form:456 FExportData.class:126 FFarmConfig.form:38 FFarmLogin.form:126 FFarmRegister.form:141 FFarmRequest.form:43 FFieldChooser.form:144 FFileInfoVC.class:88 FFontChooser.form:40 FGotoLine.form:23 FHelpBrowser.form:72 FImageOffsetSelection.form:39 FImageQuality.form:30 FImageResize.form:49 FImageRotate.form:32 FLayout.form:50 FList.form:128 FMain.class:260 FMakeExecutable.form:172 FMakeInstall.class:376 FMenu.form:438 FNewConnection.form:318 FNewTable.form:86 FNewTranslation.form:21 FOption.class:855 FPasteSpecial.form:86 FPasteTable.form:105 FProjectChooser.form:64 FProjectProperty.form:1021 FProjectVersion.class:211 FProxy.form:57 FPublish.class:273 FReportBorderChooser.form:48 FReportBoxShadowChooser.form:27 FReportBrushChooser.form:36 FReportCoordChooser.form:26 FReportPaddingChooser.form:75 FSave.form:29 FSaveProjectAs.form:81 FSearch.class:942 FSelectComponent.form:39 FSelectExtraFile.form:43 FSelectIcon.form:99 FSelectLibrary.form:66 FSnippet.form:57 FSoftwareFarm.class:563 FTableChooser.form:68 FTestSuite.class:292 FText.form:40 FTranslate.class:682 FVersionControl.form:130 FWebFontChooser.form:129 Project.module:582 VersionControl.module:432 +#: CProjectList.class:553 CVersionControlGit.class:448 +#: CWaitingAnimation.class:63 FColorChooser.form:73 FComponentChooser.form:97 +#: FConflict.class:197 FConnectionEditor.class:470 FCrash.form:100 +#: FCreateFile.form:204 FDebugExpr.form:46 FDebugInfo.form:456 +#: FExportData.class:126 FFarmConfig.form:38 FFarmLogin.form:126 +#: FFarmRegister.form:141 FFarmRequest.form:43 FFieldChooser.form:144 +#: FFileInfoVC.class:88 FFontChooser.form:40 FGotoLine.form:23 +#: FHelpBrowser.form:72 FImageOffsetSelection.form:39 FImageQuality.form:30 +#: FImageResize.form:49 FImageRotate.form:32 FLayout.form:50 FList.form:128 +#: FMain.class:260 FMakeExecutable.form:172 FMakeInstall.class:376 +#: FMenu.form:438 FNewConnection.form:318 FNewTable.form:86 +#: FNewTranslation.form:21 FOption.class:855 FPasteSpecial.form:86 +#: FPasteTable.form:105 FProjectChooser.form:64 FProjectProperty.form:1051 +#: FProjectVersion.class:211 FProxy.form:57 FPublish.class:273 +#: FReportBorderChooser.form:48 FReportBoxShadowChooser.form:27 +#: FReportBrushChooser.form:36 FReportCoordChooser.form:26 +#: FReportPaddingChooser.form:75 FSave.form:29 FSaveProjectAs.form:81 +#: FSearch.class:942 FSelectComponent.form:39 FSelectExtraFile.form:43 +#: FSelectIcon.form:99 FSelectLibrary.form:66 FSnippet.form:57 +#: FSoftwareFarm.class:563 FTableChooser.form:68 FTestSuite.class:292 +#: FText.form:40 FTranslate.class:682 FVersionControl.form:130 +#: FWebFontChooser.form:129 Project.module:583 VersionControl.module:432 msgid "Cancel" msgstr "Annuler" @@ -1022,7 +1047,8 @@ msgstr "Le logiciel a été désinstallé avec succès." msgid "Files" msgstr "Fichiers" -#: CProjectTree.class:370 FHelpShortcut.form:21 FMain.form:437 FSearch.class:124 FSelectIcon.form:32 +#: CProjectTree.class:370 FHelpShortcut.form:21 FMain.form:437 +#: FSearch.class:124 FSelectIcon.form:32 msgid "Project" msgstr "Projet" @@ -1194,7 +1220,20 @@ msgstr "URL du référentiel distant" msgid "A new Git repository will be created for this project." msgstr "Un nouveau référentiel Git sera créé pour ce projet." -#: CVersionControlGit.class:448 FColorChooser.form:67 FConnectionEditor.class:721 FCrash.form:94 FCreateFile.form:210 FFarmConfig.form:33 FFarmLogin.form:121 FFieldChooser.form:138 FFontChooser.form:34 FGotoLine.form:17 FImageOffsetSelection.form:33 FImageQuality.form:24 FImageResize.form:105 FImageRotate.form:26 FLayout.form:44 FList.form:122 FMakeExecutable.form:166 FMenu.form:433 FNewConnection.form:312 FNewTable.form:80 FNewTranslation.form:15 FPasteSpecial.form:80 FProjectProperty.form:1015 FProxy.form:63 FReportBorderChooser.form:54 FReportBoxShadowChooser.form:33 FReportBrushChooser.form:42 FReportCoordChooser.form:32 FReportPaddingChooser.form:69 FSelectComponent.form:34 FSelectExtraFile.form:37 FSelectIcon.form:105 FSelectLibrary.form:60 FSnippet.form:51 FTableChooser.form:62 FText.form:34 FVersionError.form:53 FWebFontChooser.form:123 Project.module:2642 +#: CVersionControlGit.class:448 FColorChooser.form:67 +#: FConnectionEditor.class:721 FCrash.form:94 FCreateFile.form:210 +#: FFarmConfig.form:33 FFarmLogin.form:121 FFieldChooser.form:138 +#: FFontChooser.form:34 FGotoLine.form:17 FImageOffsetSelection.form:33 +#: FImageQuality.form:24 FImageResize.form:105 FImageRotate.form:26 +#: FLayout.form:44 FList.form:122 FMakeExecutable.form:166 FMenu.form:433 +#: FNewConnection.form:312 FNewTable.form:80 FNewTranslation.form:15 +#: FPasteSpecial.form:80 FProjectProperty.form:1045 FProxy.form:63 +#: FReportBorderChooser.form:54 FReportBoxShadowChooser.form:33 +#: FReportBrushChooser.form:42 FReportCoordChooser.form:32 +#: FReportPaddingChooser.form:69 FSelectComponent.form:34 +#: FSelectExtraFile.form:37 FSelectIcon.form:105 FSelectLibrary.form:60 +#: FSnippet.form:51 FTableChooser.form:62 FText.form:34 FVersionError.form:53 +#: FWebFontChooser.form:123 Project.module:2646 msgid "OK" msgstr "OK" @@ -1202,7 +1241,8 @@ msgstr "OK" msgid "Solve conflict." msgstr "Résolution du conflit." -#: CVersionControlGit.class:511 FConnectionEditor.class:842 FProjectVersion.class:290 MConnection.module:141 +#: CVersionControlGit.class:511 FConnectionEditor.class:842 +#: FProjectVersion.class:290 MConnection.module:141 msgid "Date" msgstr "Date" @@ -1230,15 +1270,15 @@ msgstr "La police Gambas est publiée sous licence « SIL Open Font License »." msgid "This program is published under the GNU General Public License." msgstr "Ce programme est publié sous la « Licence Publique Générale GNU »." -#: Design.module:227 Project.module:2324 +#: Design.module:227 Project.module:2325 msgid "first" msgstr "premier" -#: Design.module:229 Project.module:2326 +#: Design.module:229 Project.module:2327 msgid "second" msgstr "deuxième" -#: Design.module:231 Project.module:2328 +#: Design.module:231 Project.module:2329 msgid "third" msgstr "troisième" @@ -1251,8 +1291,12 @@ msgid "The program has been terminated." msgstr "Le programme a été terminé." #: Design.module:473 -msgid "The program has returned\nthe value: &1" -msgstr "Le programme a retourné\nla valeur : &1" +msgid "" +"The program has returned\n" +"the value: &1" +msgstr "" +"Le programme a retourné\n" +"la valeur : &1" #: Design.module:745 msgid "The project has no test module." @@ -1282,7 +1326,8 @@ msgstr "Ce programme est un LOGICIEL LIBRE; vous pouvez le redistribuer et/ou le msgid "Run with arguments" msgstr "Démarrer avec des arguments" -#: FArguments.form:30 FImageProperty.form:712 FProjectProperty.form:1009 FTestSuite.form:161 +#: FArguments.form:30 FImageProperty.form:712 FProjectProperty.form:1039 +#: FTestSuite.form:161 msgid "Reset" msgstr "Réinitialiser" @@ -1290,11 +1335,16 @@ msgstr "Réinitialiser" msgid "Run" msgstr "Démarrer" -#: FArguments.form:46 FConflict.form:166 FConflictEditor.form:306 FDebugInfo.form:463 FEditor.form:378 FFileInfoVC.form:81 FFileProperty.form:46 FForm.form:455 FImageEditor.form:395 FMain.form:412 FPatch.form:88 FProjectVersion.form:322 FSystemInfo.form:44 FTestSuite.form:154 FTextEditor.form:407 FTips.form:87 FTranslate.form:411 +#: FArguments.form:46 FConflict.form:166 FConflictEditor.form:306 +#: FDebugInfo.form:463 FEditor.form:378 FFileInfoVC.form:81 +#: FFileProperty.form:46 FForm.form:455 FImageEditor.form:395 FMain.form:412 +#: FPatch.form:88 FProjectVersion.form:322 FSystemInfo.form:44 +#: FTestSuite.form:154 FTextEditor.form:407 FTips.form:87 FTranslate.form:411 msgid "Close" msgstr "Fermer" -#: FColorChooser.class:85 FImageProperty.form:143 FOption.form:277 FReportBrushChooser.form:49 +#: FColorChooser.class:85 FImageProperty.form:143 FOption.form:277 +#: FReportBrushChooser.form:49 msgid "Color" msgstr "Couleur" @@ -1322,11 +1372,11 @@ msgstr "Système" msgid "Free" msgstr "Libre" -#: FComponentChooser.class:352 FProjectProperty.form:479 +#: FComponentChooser.class:352 FProjectProperty.form:482 msgid "Not finished but stable" msgstr "Non terminé mais stable" -#: FComponentChooser.class:354 FProjectProperty.form:479 +#: FComponentChooser.class:354 FProjectProperty.form:482 msgid "Experimental" msgstr "Expérimental" @@ -1334,7 +1384,7 @@ msgstr "Expérimental" msgid "Stable" msgstr "Stable" -#: FComponentChooser.class:358 FProjectProperty.form:479 FToolBox.class:26 +#: FComponentChooser.class:358 FProjectProperty.form:482 FToolBox.class:26 msgid "Deprecated" msgstr "Déprécié" @@ -1378,15 +1428,21 @@ msgstr "Choisissez un composant" msgid "Show deprecated components" msgstr "Afficher les composants dépréciés" -#: FComponentChooser.form:103 FConflictEditor.form:293 FConnectionEditor.form:120 FEditor.form:362 FForm.form:439 FHelpBrowser.form:78 FImageEditor.form:378 FMain.form:387 FTextEditor.form:391 FTranslate.form:93 Project.module:924 +#: FComponentChooser.form:103 FConflictEditor.form:293 +#: FConnectionEditor.form:120 FEditor.form:362 FForm.form:439 +#: FHelpBrowser.form:78 FImageEditor.form:378 FMain.form:387 +#: FProjectEditor.form:35 FTextEditor.form:391 FTranslate.form:93 +#: Project.module:925 msgid "Reload" msgstr "Recharger" -#: FComponentChooser.form:114 FHelpBrowser.form:88 FImageEditor.form:336 FTextEditor.form:782 +#: FComponentChooser.form:114 FHelpBrowser.form:88 FImageEditor.form:336 +#: FTextEditor.form:782 msgid "Zoom in" msgstr "Zoom avant" -#: FComponentChooser.form:120 FHelpBrowser.form:94 FImageEditor.form:344 FTextEditor.form:789 +#: FComponentChooser.form:120 FHelpBrowser.form:94 FImageEditor.form:344 +#: FTextEditor.form:789 msgid "Zoom out" msgstr "Zoom arrière" @@ -1410,13 +1466,18 @@ msgstr "Impossible de charger le fichier :" msgid "Text" msgstr "Texte" -#: FConflict.class:141 FMain.form:997 FReportBrushChooser.form:49 Project.module:243 +#: FConflict.class:141 FMain.form:997 FReportBrushChooser.form:49 +#: Project.module:244 msgid "Image" msgstr "Image" #: FConflict.class:197 -msgid "The file has been modified.\nDo you really want to close the dialog?" -msgstr "Le fichier a été modifié.\nDésirez-vous réellement fermer la boite de dialogue ?" +msgid "" +"The file has been modified.\n" +"Do you really want to close the dialog?" +msgstr "" +"Le fichier a été modifié.\n" +"Désirez-vous réellement fermer la boite de dialogue ?" #: FConflict.class:225 msgid "Some conflicts are not yet resolved." @@ -1427,8 +1488,12 @@ msgid "Unable to resolve the conflict." msgstr "Impossible de résoudre le conflit." #: FConflict.class:259 -msgid "The file has been modified.\nDo you really want to open another file?" -msgstr "Le fichier a été modifié.\nDésirez-vous réellement ouvrir un autre fichier ?" +msgid "" +"The file has been modified.\n" +"Do you really want to open another file?" +msgstr "" +"Le fichier a été modifié.\n" +"Désirez-vous réellement ouvrir un autre fichier ?" #: FConflict.class:267 msgid "Conflict files" @@ -1438,39 +1503,60 @@ msgstr "Fichiers en conflits" msgid "Version conflict" msgstr "Conflit de version" -#: FConflict.form:70 FConflictEditor.form:114 FConnectionEditor.form:246 FEditor.form:132 FForm.form:165 FImageEditor.form:139 FMain.form:1079 FMenu.form:158 FProjectVersion.form:234 FTextEditor.form:147 +#: FConflict.form:70 FConflictEditor.form:114 FConnectionEditor.form:246 +#: FEditor.form:132 FForm.form:165 FImageEditor.form:139 FMain.form:1079 +#: FMenu.form:158 FProjectEditor.form:113 FProjectVersion.form:234 +#: FTextEditor.form:147 msgid "Cut" msgstr "Couper" -#: FConflict.form:76 FConflictEditor.form:121 FConnectionEditor.form:152 FEditor.form:139 FForm.form:172 FImageEditor.form:147 FList.form:99 FMain.form:1086 FMakeInstall.form:921 FMenu.form:165 FOutput.form:40 FProjectVersion.form:240 FSystemInfo.form:38 FTextEditor.form:154 FTranslate.form:114 +#: FConflict.form:76 FConflictEditor.form:121 FConnectionEditor.form:152 +#: FEditor.form:139 FForm.form:172 FImageEditor.form:147 FList.form:99 +#: FMain.form:1086 FMakeInstall.form:921 FMenu.form:165 FOutput.form:40 +#: FProjectEditor.form:106 FProjectVersion.form:240 FSystemInfo.form:38 +#: FTextEditor.form:154 FTranslate.form:114 msgid "Copy" msgstr "Copier" -#: FConflict.form:82 FConflictEditor.form:128 FConnectionEditor.form:161 FEditor.form:146 FForm.form:185 FImageEditor.form:154 FList.form:105 FMain.form:1093 FMenu.form:172 FOutput.form:47 FPasteTable.form:99 FProjectVersion.form:246 FTextEditor.form:161 +#: FConflict.form:82 FConflictEditor.form:128 FConnectionEditor.form:161 +#: FEditor.form:146 FForm.form:185 FImageEditor.form:154 FList.form:105 +#: FMain.form:1093 FMenu.form:172 FOutput.form:47 FPasteTable.form:99 +#: FProjectEditor.form:120 FProjectVersion.form:246 FTextEditor.form:161 msgid "Paste" msgstr "Coller" -#: FConflict.form:88 FConflictEditor.form:97 FConnectionEditor.form:267 FEditor.form:115 FFieldChooser.form:127 FForm.form:148 FImageEditor.form:120 FList.form:111 FOption.form:1740 FProjectVersion.form:252 FTextEditor.form:130 +#: FConflict.form:88 FConflictEditor.form:97 FConnectionEditor.form:267 +#: FEditor.form:115 FFieldChooser.form:127 FForm.form:148 FImageEditor.form:120 +#: FList.form:111 FOption.form:1740 FProjectVersion.form:252 +#: FTextEditor.form:130 msgid "Undo" msgstr "Annuler" -#: FConflict.form:94 FConflictEditor.form:104 FConnectionEditor.form:274 FEditor.form:122 FForm.form:155 FImageEditor.form:128 FProjectVersion.form:258 FTextEditor.form:137 +#: FConflict.form:94 FConflictEditor.form:104 FConnectionEditor.form:274 +#: FEditor.form:122 FForm.form:155 FImageEditor.form:128 +#: FProjectVersion.form:258 FTextEditor.form:137 msgid "Redo" msgstr "Rétablir" -#: FConflict.form:100 FConflictEditor.form:441 FEditor.form:586 FMenu.form:126 FProjectVersion.form:264 FTextEditor.form:607 +#: FConflict.form:100 FConflictEditor.form:441 FEditor.form:586 FMenu.form:126 +#: FProjectVersion.form:264 FTextEditor.form:607 msgid "Indent" msgstr "Indenter" -#: FConflict.form:106 FConflictEditor.form:449 FEditor.form:594 FMenu.form:133 FProjectVersion.form:270 FTextEditor.form:615 +#: FConflict.form:106 FConflictEditor.form:449 FEditor.form:594 FMenu.form:133 +#: FProjectVersion.form:270 FTextEditor.form:615 msgid "Unindent" msgstr "Désindenter" -#: FConflict.form:141 FMain.form:380 FOpenProject.form:35 FProjectChooser.form:70 +#: FConflict.form:141 FMain.form:380 FOpenProject.form:35 +#: FProjectChooser.form:70 msgid "Open" msgstr "Ouvrir" -#: FConflict.form:149 FConflictEditor.form:299 FConnectionEditor.form:112 FEditor.form:368 FForm.form:445 FImageEditor.form:385 FMain.form:396 FMenu.class:99 FOption.form:1406 FSaveProjectAs.form:87 FTextEditor.form:397 FTranslate.form:234 +#: FConflict.form:149 FConflictEditor.form:299 FConnectionEditor.form:112 +#: FEditor.form:368 FForm.form:445 FImageEditor.form:385 FMain.form:396 +#: FMenu.class:99 FOption.form:1406 FSaveProjectAs.form:87 FTextEditor.form:397 +#: FTranslate.form:234 msgid "Save" msgstr "Enregistrer" @@ -1506,15 +1592,18 @@ msgstr "Mettre en commentaire" msgid "Uncomment" msgstr "Retirer les commentaires" -#: FConflictEditor.form:172 FEditor.form:190 FPasteSpecial.form:19 FTextEditor.form:220 +#: FConflictEditor.form:172 FEditor.form:190 FPasteSpecial.form:19 +#: FTextEditor.form:220 msgid "Paste special" msgstr "Collage spécial" -#: FConflictEditor.form:183 FEditor.form:224 FImageEditor.form:223 FTextEditor.form:255 +#: FConflictEditor.form:183 FEditor.form:224 FImageEditor.form:223 +#: FTextEditor.form:255 msgid "Select All" msgstr "Tout sélectionner" -#: FConflictEditor.form:193 FEditor.form:239 FGotoLine.form:12 FTextEditor.form:265 +#: FConflictEditor.form:193 FEditor.form:239 FGotoLine.form:12 +#: FTextEditor.form:265 msgid "Go to line" msgstr "Aller à la ligne" @@ -1530,7 +1619,8 @@ msgstr "Poursuivre la recherche" msgid "Find previous" msgstr "Recherche en arrière" -#: FConflictEditor.form:222 FEditor.form:275 FImageEditor.form:331 FMain.form:776 FTextEditor.form:294 FToolBox.class:26 +#: FConflictEditor.form:222 FEditor.form:275 FImageEditor.form:331 +#: FMain.form:776 FTextEditor.form:294 FToolBox.class:26 msgid "View" msgstr "Affichage" @@ -1577,15 +1667,18 @@ msgstr "" msgid "Open code" msgstr "Ouvrir le code" -#: FConflictEditor.form:316 FEditor.form:388 FPasteSpecial.form:60 FTextEditor.form:417 +#: FConflictEditor.form:316 FEditor.form:388 FPasteSpecial.form:60 +#: FTextEditor.form:417 msgid "Paste as string" msgstr "Coller comme chaîne" -#: FConflictEditor.form:321 FEditor.form:393 FPasteSpecial.form:65 FTextEditor.form:422 +#: FConflictEditor.form:321 FEditor.form:393 FPasteSpecial.form:65 +#: FTextEditor.form:422 msgid "Paste as multi-line string" msgstr "Coller comme chaîne sur plusieurs lignes" -#: FConflictEditor.form:326 FEditor.form:398 FPasteSpecial.form:50 FTextEditor.form:427 +#: FConflictEditor.form:326 FEditor.form:398 FPasteSpecial.form:50 +#: FTextEditor.form:427 msgid "Paste as comments" msgstr "Coller comme commentaires" @@ -1625,11 +1718,15 @@ msgstr "Conserver tous mes changements" msgid "Take all their changes" msgstr "Prendre tous leurs changements" -#: FConnectionEditor.class:51 FCreateFile.form:62 FMakeInstall.form:265 FNewConnection.form:70 FNewTable.form:33 FOption.form:323 FProjectProperty.form:320 +#: FConnectionEditor.class:51 FCreateFile.form:62 FMakeInstall.form:265 +#: FNewConnection.form:70 FNewTable.form:33 FOption.form:323 +#: FProjectProperty.form:323 msgid "Name" msgstr "Nom" -#: FConnectionEditor.class:56 FCreateFile.form:113 FDebugInfo.class:59 FNewConnection.form:84 FNewTable.form:48 FProjectProperty.form:356 FProxy.form:27 +#: FConnectionEditor.class:56 FCreateFile.form:113 FDebugInfo.class:59 +#: FNewConnection.form:84 FNewTable.form:48 FProjectProperty.form:359 +#: FProxy.form:27 msgid "Type" msgstr "Type" @@ -1697,7 +1794,7 @@ msgstr "Exécution de la requête" msgid "Unable to run query." msgstr "Impossible d'exécuter la requête." -#: FConnectionEditor.class:722 Project.module:2644 +#: FConnectionEditor.class:722 Project.module:2648 msgid "(in &1 s)" msgstr "(en &1 s)" @@ -1797,7 +1894,9 @@ msgstr "Nouvelle table" msgid "Delete table" msgstr "Supprimer la table" -#: FConnectionEditor.form:134 FDebugInfo.form:211 FMain.form:1273 FMakeInstall.form:762 FOption.form:1225 FProjectProperty.form:636 FPublish.form:268 FSoftwareFarm.form:427 FTestSuite.class:292 +#: FConnectionEditor.form:134 FDebugInfo.form:211 FMain.form:1273 +#: FMakeInstall.form:762 FOption.form:1225 FProjectProperty.form:639 +#: FPublish.form:268 FSoftwareFarm.form:427 FTestSuite.class:292 msgid "Remove" msgstr "Supprimer" @@ -1821,7 +1920,8 @@ msgstr "Copier la table" msgid "Import text file" msgstr "Importer un fichier texte" -#: FConnectionEditor.form:170 FImportTable.form:48 FMain.form:1032 FOption.form:1204 FTranslate.form:431 +#: FConnectionEditor.form:170 FImportTable.form:48 FMain.form:1032 +#: FOption.form:1204 FTranslate.form:431 msgid "Import" msgstr "Importer" @@ -1833,7 +1933,8 @@ msgstr "Exécuter la requête" msgid "New query" msgstr "Nouvelle requête" -#: FConnectionEditor.form:225 FMain.form:921 FOption.form:1211 FTranslate.form:88 +#: FConnectionEditor.form:225 FMain.form:921 FOption.form:1211 +#: FTranslate.form:88 msgid "New" msgstr "Nouveau" @@ -1841,7 +1942,9 @@ msgstr "Nouveau" msgid "Remove query" msgstr "Supprimer la requête" -#: FConnectionEditor.form:239 FDebugInfo.class:279 FImageProperty.form:380 FList.form:93 FMakeInstall.form:780 FOption.class:855 FOutput.form:54 FPublish.form:170 +#: FConnectionEditor.form:239 FDebugInfo.class:279 FImageProperty.form:380 +#: FList.form:93 FMakeInstall.form:780 FOption.class:855 FOutput.form:54 +#: FPublish.form:170 msgid "Clear" msgstr "Effacer" @@ -1849,15 +1952,18 @@ msgstr "Effacer" msgid "Fields" msgstr "Champs" -#: FConnectionEditor.form:325 FMain.class:2227 FMakeInstall.form:756 FProjectProperty.form:708 FPublish.form:158 +#: FConnectionEditor.form:325 FMain.class:2227 FMakeInstall.form:756 +#: FProjectProperty.form:711 FPublish.form:158 msgid "Add" msgstr "Ajouter" -#: FConnectionEditor.form:339 FList.form:77 FMakeInstall.form:774 FPublish.form:280 +#: FConnectionEditor.form:339 FList.form:77 FMakeInstall.form:774 +#: FPublish.form:280 msgid "Down" msgstr "Descendre" -#: FConnectionEditor.form:346 FList.form:71 FMakeInstall.form:768 FPublish.form:274 +#: FConnectionEditor.form:346 FList.form:71 FMakeInstall.form:768 +#: FPublish.form:274 msgid "Up" msgstr "Monter" @@ -1873,7 +1979,8 @@ msgstr "Index" msgid "New index" msgstr "Nouvel index" -#: FConnectionEditor.form:455 FDebugExpr.form:28 FMain.form:428 FOption.form:1218 +#: FConnectionEditor.form:455 FDebugExpr.form:28 FMain.form:428 +#: FOption.form:1218 msgid "Edit" msgstr "Editer" @@ -1885,7 +1992,9 @@ msgstr "Exporter vers un fichier CSV" msgid "Export" msgstr "Exporter" -#: FConnectionEditor.form:492 FForm.form:192 FList.form:65 FMain.form:1113 FMenu.form:116 FNewConnection.class:402 FOption.form:1413 FSoftwareFarm.class:665 FTranslate.form:98 +#: FConnectionEditor.form:492 FForm.form:192 FList.form:65 FMain.form:1113 +#: FMenu.form:116 FNewConnection.class:402 FOption.form:1413 +#: FProjectEditor.form:127 FSoftwareFarm.class:665 FTranslate.form:98 msgid "Delete" msgstr "Supprimer" @@ -1901,7 +2010,7 @@ msgstr "Déselectionner tout" msgid "Gambas 3 project conversion" msgstr "Conversion en projet Gambas 3" -#: FCrash.class:73 FTranslate.class:245 Project.module:4814 +#: FCrash.class:73 FTranslate.class:245 Project.module:4823 msgid "The '&1' command has failed." msgstr "La commande '&1' a échoué." @@ -1941,7 +2050,8 @@ msgstr "Impossible d'ajouter le fichier." msgid "New file" msgstr "Nouveau fichier" -#: FCreateFile.form:72 FImportTable.form:58 FMakeExecutable.form:51 FMakePatch.form:65 FProjectProperty.form:805 FSearch.form:100 +#: FCreateFile.form:72 FImportTable.form:58 FMakeExecutable.form:51 +#: FMakePatch.form:65 FProjectProperty.form:808 FSearch.form:100 msgid "Options" msgstr "Options" @@ -2001,7 +2111,7 @@ msgstr "Nouveau projet" msgid "Project type" msgstr "Type de projet" -#: FCreateProject.form:82 +#: FCreateProject.form:82 FProjectEditor.form:43 msgid "Parent directory" msgstr "Répertoire parent" @@ -2029,7 +2139,7 @@ msgstr "Titre du projet" msgid "The project title is the true name of the application." msgstr "Le titre du projet est le nom complet de l'application." -#: FCreateProject.form:154 FProjectProperty.form:928 +#: FCreateProject.form:154 FProjectProperty.form:956 msgid "Project is translatable" msgstr "Le projet est traduisible" @@ -2069,7 +2179,8 @@ msgstr "Notes" msgid "Unit tests" msgstr "Tests unitaires" -#: FDebugButton.form:87 FDebugInfo.form:365 FMain.form:508 FProjectProperty.form:959 FVersionControl.class:95 +#: FDebugButton.form:87 FDebugInfo.form:365 FMain.form:508 +#: FProjectProperty.form:988 FVersionControl.class:95 msgid "Version control" msgstr "Suivi de version" @@ -2109,7 +2220,8 @@ msgstr "Afficher tous les symboles" msgid "No element" msgstr "Aucun élément" -#: FDebugInfo.class:46 FEditor.class:411 FImageEditor.form:592 FImportTable.class:66 +#: FDebugInfo.class:46 FEditor.class:411 FImageEditor.form:592 +#: FImportTable.class:66 msgid "Line" msgstr "Ligne" @@ -2213,11 +2325,13 @@ msgstr "Effacer la console" msgid "Run test" msgstr "Démarrer le test" -#: FDebugInfo.form:379 FMain.form:513 FProjectVersion.form:89 FVersionControl.form:110 +#: FDebugInfo.form:379 FMain.form:513 FProjectVersion.form:89 +#: FVersionControl.form:110 msgid "Commit" msgstr "Publier" -#: FDebugInfo.form:386 FMain.form:519 FReportBorderChooser.form:60 FReportPaddingChooser.form:64 +#: FDebugInfo.form:386 FMain.form:519 FReportBorderChooser.form:60 +#: FReportPaddingChooser.form:64 msgid "Synchronize" msgstr "Synchroniser" @@ -2342,8 +2456,14 @@ msgid "&Overwrite" msgstr "&Remplacer" #: FExportData.class:126 -msgid "This file already exists.\n\nDo you want to overwrite it?" -msgstr "Ce fichier existe déjà.\n\nDésirez-vous le remplacer ?" +msgid "" +"This file already exists.\n" +"\n" +"Do you want to overwrite it?" +msgstr "" +"Ce fichier existe déjà.\n" +"\n" +"Désirez-vous le remplacer ?" #: FExportData.form:31 FImportTable.form:101 msgid "Delimiter character" @@ -2377,11 +2497,13 @@ msgstr "S'identifier" msgid "Server" msgstr "Serveur" -#: FFarmLogin.form:59 FFarmRegister.form:61 FNewConnection.form:144 FProjectVersion.form:127 FProxy.form:42 +#: FFarmLogin.form:59 FFarmRegister.form:61 FNewConnection.form:144 +#: FProjectVersion.form:127 FProxy.form:42 msgid "User" msgstr "Utilisateur" -#: FFarmLogin.form:74 FFarmRegister.form:76 FNewConnection.form:164 FProjectVersion.form:142 FProxy.form:47 +#: FFarmLogin.form:74 FFarmRegister.form:76 FNewConnection.form:164 +#: FProjectVersion.form:142 FProxy.form:47 msgid "Password" msgstr "Mot de passe" @@ -2406,8 +2528,14 @@ msgid "Unable to register user." msgstr "Impossible d'enregistrer l'utilisateur." #: FFarmRegister.class:40 -msgid "You have been successfully registered.\n\nYou will receive a confirmation e-mail soon." -msgstr "Vous avez été enregistré avec succès.\n\nVous recevrez un courriel de confirmation bientôt." +msgid "" +"You have been successfully registered.\n" +"\n" +"You will receive a confirmation e-mail soon." +msgstr "" +"Vous avez été enregistré avec succès.\n" +"\n" +"Vous recevrez un courriel de confirmation bientôt." #: FFarmRegister.form:28 FPublish.form:319 FSoftwareFarm.form:115 msgid "Register" @@ -2422,8 +2550,14 @@ msgid "E-mail" msgstr "E-mail" #: FFarmRegister.form:121 -msgid "A confirmation mail will be sent to the specified e-mail address. Click on the link included in that mail to activate your account.\n

\nYour e-mail will not be stored on the publishing server." -msgstr "Un mail de confirmation sera envoyé à l'adresse spécifiée. Cliquez sur le lien contenu dans ce mail pour activer votre compte.\n

\nVotre e-mail ne sera pas stocké sur le serveur de publication." +msgid "" +"A confirmation mail will be sent to the specified e-mail address. Click on the link included in that mail to activate your account.\n" +"

\n" +"Your e-mail will not be stored on the publishing server." +msgstr "" +"Un mail de confirmation sera envoyé à l'adresse spécifiée. Cliquez sur le lien contenu dans ce mail pour activer votre compte.\n" +"

\n" +"Votre e-mail ne sera pas stocké sur le serveur de publication." #: FFieldChooser.class:54 FTableChooser.class:66 msgid "Unable to open connection." @@ -2465,7 +2599,9 @@ msgstr "Le fichier n'est pas versionné, et doit être ajouté au référentiel. msgid "This file has not been modified since the last commit." msgstr "Ce fichier est inchangé depuis la dernière publication." -#: FFileInfoVC.class:88 FMain.class:1252 FMakeInstall.class:376 FProjectVersion.class:211 FSave.form:22 Project.module:614 VersionControl.module:432 +#: FFileInfoVC.class:88 FMain.class:1252 FMakeInstall.class:376 +#: FProjectVersion.class:211 FSave.form:22 Project.module:615 +#: VersionControl.module:432 msgid "Continue" msgstr "Continuer" @@ -2733,7 +2869,7 @@ msgstr "Déplacer vers le bas" msgid "Move bottom" msgstr "Déplacer tout en bas" -#: FHelpBrowser.class:24 FProjectProperty.form:944 +#: FHelpBrowser.class:24 FProjectProperty.form:973 msgid "Default language" msgstr "Langage par défaut" @@ -2761,7 +2897,8 @@ msgstr "Raccourcis claviers de l'EDI" msgid "Debugger" msgstr "Débogueur" -#: FHelpShortcut.form:27 FOption.form:604 FProjectProperty.form:234 FTranslate.form:154 +#: FHelpShortcut.form:27 FOption.form:604 FProjectProperty.form:237 +#: FTranslate.form:154 msgid "Translation" msgstr "Traduction" @@ -3364,8 +3501,14 @@ msgid "New folder" msgstr "Nouveau dossier" #: FMain.class:1042 -msgid "The GNU translation tools are not installed on your system.\n\nPlease install them to be able to do the translation." -msgstr "Les outils de traduction GNU ne sont pas installés sur votre système.\n\nVeuillez les installer pour pouvoir effectuer la traduction." +msgid "" +"The GNU translation tools are not installed on your system.\n" +"\n" +"Please install them to be able to do the translation." +msgstr "" +"Les outils de traduction GNU ne sont pas installés sur votre système.\n" +"\n" +"Veuillez les installer pour pouvoir effectuer la traduction." #: FMain.class:1781 msgid "Unable to drop file into the project." @@ -3399,9 +3542,15 @@ msgstr "Choisissez un fichier" msgid "This file is located inside the project." msgstr "Le fichier est situé à l'intérieur du projet." -#: FMain.class:2787 Project.module:924 -msgid "The file has been modified.\n\nAll your changes will be lost." -msgstr "Le fichier a été modifié.\n\nToutes les modifications seront perdues." +#: FMain.class:2787 Project.module:925 +msgid "" +"The file has been modified.\n" +"\n" +"All your changes will be lost." +msgstr "" +"Le fichier a été modifié.\n" +"\n" +"Toutes les modifications seront perdues." #: FMain.form:307 FWelcome.class:70 msgid "Open project" @@ -3435,7 +3584,7 @@ msgstr "Recharger le projet" msgid "Quit" msgstr "Quitter" -#: FMain.form:402 Project.module:6989 +#: FMain.form:402 Project.module:6998 msgid "Save as" msgstr "Enregistrer sous" @@ -3559,7 +3708,7 @@ msgstr "Afficher les messages de débogage du compilateur « just-in-time »" msgid "Show database requests" msgstr "Afficher les requêtes de bases de données" -#: FMain.form:709 FProjectProperty.form:164 +#: FMain.form:709 FProjectProperty.form:167 msgid "GUI component" msgstr "Composant graphique" @@ -3775,7 +3924,7 @@ msgstr "Raccourcis claviers" msgid "System information" msgstr "Informations système" -#: FMain.form:1421 FProjectProperty.form:153 +#: FMain.form:1421 FProjectProperty.form:156 msgid "Project properties" msgstr "Propriétés du projet" @@ -3783,7 +3932,7 @@ msgstr "Propriétés du projet" msgid "Refresh project" msgstr "Rafraîchir le projet" -#: FMain.form:1456 FMakeExecutable.form:30 Project.module:3197 +#: FMain.form:1456 FMakeExecutable.form:30 Project.module:3201 msgid "Make executable" msgstr "Générer l'exécutable" @@ -3896,8 +4045,24 @@ msgid "Run this shell command after" msgstr "Exécuter cette commande « shell » ensuite" #: FMakeExecutable.form:149 -msgid "The following patterns will be substituted in the command :
\n• $(FILE) will be replaced by the executable path.
\n• $(DIR) by the project directory.
\n• $(NAME) by the project name.
\n• $(TITLE) by the project title.
\n• $(VERSION) by the project version.
\n
\nNote : all substitutions will be quoted." -msgstr "Les motifs suivants seront substitués dans la commande :
\n• $(FILE) sera remplacé par le chemin de l'exécutable.
\n• $(DIR) par le répertoire du projet.
\n• $(NAME) par le nom du projet.
\n• $(TITLE) par le titre du projet.
\n• $(VERSION) par la version du projet.
\n
\nNote : toutes les substitutions seront « échappées »." +msgid "" +"The following patterns will be substituted in the command :
\n" +"• $(FILE) will be replaced by the executable path.
\n" +"• $(DIR) by the project directory.
\n" +"• $(NAME) by the project name.
\n" +"• $(TITLE) by the project title.
\n" +"• $(VERSION) by the project version.
\n" +"
\n" +"Note : all substitutions will be quoted." +msgstr "" +"Les motifs suivants seront substitués dans la commande :
\n" +"• $(FILE) sera remplacé par le chemin de l'exécutable.
\n" +"• $(DIR) par le répertoire du projet.
\n" +"• $(NAME) par le nom du projet.
\n" +"• $(TITLE) par le titre du projet.
\n" +"• $(VERSION) par la version du projet.
\n" +"
\n" +"Note : toutes les substitutions seront « échappées »." #: FMakeInstall.class:136 msgid "Package" @@ -4084,8 +4249,12 @@ msgid "Mimetypes" msgstr "Types MIME" #: FMakeInstall.form:677 -msgid "Enter the mimetypes handled by your application there.\nPlease enter one mimetype by line.\n" -msgstr "Saisissez les types MIME gérés par votre application.\nVeuillez saisir un type MIME par ligne.\n" +msgid "" +"Enter the mimetypes handled by your application there.\n" +"Please enter one mimetype by line.\n" +msgstr "" +"Saisissez les types MIME gérés par votre application.\n" +"Veuillez saisir un type MIME par ligne.\n" #: FMakeInstall.form:689 msgid "Additional configuration" @@ -4124,8 +4293,12 @@ msgid "Extra autoconf tests" msgstr "Tests autoconf supplémentaires" #: FMakeInstall.form:867 -msgid "Add extra tests for the configuration process.\n

Leave this blank if you don't need it, or if you don't know anything about autoconf scripts." -msgstr "Ajout de tests supplémentaires au processus de configuration.\n

Laissez ce champ vide si vous n'en avez pas besoin, ou si vous ne connaissez rien aux scripts autoconf." +msgid "" +"Add extra tests for the configuration process.\n" +"

Leave this blank if you don't need it, or if you don't know anything about autoconf scripts." +msgstr "" +"Ajout de tests supplémentaires au processus de configuration.\n" +"

Laissez ce champ vide si vous n'en avez pas besoin, ou si vous ne connaissez rien aux scripts autoconf." #: FMakeInstall.form:875 msgid "Destination directory" @@ -4221,7 +4394,7 @@ msgstr "" msgid "Patch/Diff files" msgstr "Fichiers Patch/Diff" -#: FMakeSourceArchive.form:9 Project.module:4875 +#: FMakeSourceArchive.form:9 Project.module:4884 msgid "Create source package" msgstr "Générer une archive des sources du projet" @@ -4249,7 +4422,7 @@ msgstr "Nom de groupe incorrect !" msgid "This menu is too deep !" msgstr "Ce menu est trop profond !" -#: FMenu.class:1155 Project.module:5753 +#: FMenu.class:1155 Project.module:5762 msgid "modified" msgstr "modifié" @@ -4329,7 +4502,7 @@ msgstr "Emplacement" msgid "No password" msgstr "Pas de mot de passe" -#: FNewConnection.form:189 FProjectProperty.form:282 Project.module:240 +#: FNewConnection.form:189 FProjectProperty.form:285 Project.module:241 msgid "Database" msgstr "Bases de données" @@ -4475,7 +4648,9 @@ msgstr "Voulez-vous vraiment supprimer ce fragment ?" #: FOption.class:1225 msgid "Do you really want to install the Gambas font into your personal font directory?" -msgstr "Voulez-vous vraiment installer la police « Gambas »\ndans votre répertoire personnel de polices ?" +msgstr "" +"Voulez-vous vraiment installer la police « Gambas »\n" +"dans votre répertoire personnel de polices ?" #: FOption.class:1225 FSoftwareFarm.class:604 msgid "Install" @@ -4557,7 +4732,7 @@ msgstr "Projets" msgid "Default tab size" msgstr "Tabulation par défaut" -#: FOption.form:470 FProjectProperty.form:839 +#: FOption.form:470 FProjectProperty.form:844 msgid "space(s)" msgstr "espace(s)" @@ -4577,7 +4752,7 @@ msgstr "Activer le suivi de version" msgid "Restore files when loading a project" msgstr "Restaurer les fichiers à l'ouverture du projet" -#: FOption.form:545 FProjectProperty.form:863 +#: FOption.form:545 FProjectProperty.form:869 msgid "Compilation" msgstr "Compilation" @@ -4797,7 +4972,7 @@ msgstr "Taille des titres" msgid "Debugger size" msgstr "Taille du débogueur" -#: FOption.form:1550 Project.module:247 +#: FOption.form:1550 Project.module:248 msgid "Printing" msgstr "Impression" @@ -4973,199 +5148,222 @@ msgstr "Fonctions appelées" msgid "Callers" msgstr "Fonctions appelantes" +#: FProjectEditor.form:30 +#, fuzzy +msgid "Project browser" +msgstr "Propriétés du projet" + +#: FProjectEditor.form:77 +#, fuzzy +msgid "Image preview" +msgstr "Basculer l'affichage de l'aperçu" + +#: FProjectEditor.form:86 +msgid "Detailed view" +msgstr "" + +#: FProjectEditor.form:95 +#, fuzzy +msgid "File properties" +msgstr "Propriétés statiques" + #: FProjectProperty.class:55 msgid "Variable" msgstr "Variable" -#: FProjectProperty.class:293 +#: FProjectProperty.class:295 msgid "Snapping value is incorrect." msgstr "Le pas de la grille est incorrecte." -#: FProjectProperty.class:826 +#: FProjectProperty.class:828 msgid "&1 does not export any class." msgstr "&1 ne contient aucune classe exportée." -#: FProjectProperty.class:834 +#: FProjectProperty.class:836 msgid "&1 is already used as a library." msgstr "&1 est déjà utilisé comme bibliothèque." -#: FProjectProperty.class:1002 +#: FProjectProperty.class:1004 msgid "Modules" msgstr "Modules" -#: FProjectProperty.class:1003 +#: FProjectProperty.class:1005 msgid "Test modules" msgstr "Modules de test" -#: FProjectProperty.class:1013 +#: FProjectProperty.class:1015 msgid "Functions" msgstr "Fonctions" -#: FProjectProperty.class:1014 +#: FProjectProperty.class:1016 msgid "Lines of code" msgstr "Lignes de code" -#: FProjectProperty.class:1015 +#: FProjectProperty.class:1017 msgid "Average number of lines by function" msgstr "Nombre moyen de lignes par fonction" -#: FProjectProperty.class:1018 +#: FProjectProperty.class:1020 msgid "Executable size" msgstr "Taille de l'exécutable" -#: FProjectProperty.class:1018 +#: FProjectProperty.class:1020 msgid "bytes" msgstr "octets" -#: FProjectProperty.class:1035 +#: FProjectProperty.class:1037 msgid "Information about component" msgstr "Information sur le composant" -#: FProjectProperty.class:1041 +#: FProjectProperty.class:1043 msgid "Information about library" msgstr "Information sur la bibliothèque" -#: FProjectProperty.class:1421 +#: FProjectProperty.class:1423 msgid "Select a Gambas executable" msgstr "Choisissez un exécutable Gambas" -#: FProjectProperty.class:1422 +#: FProjectProperty.class:1424 msgid "Gambas executable" msgstr "Exécutable Gambas" -#: FProjectProperty.form:250 +#: FProjectProperty.form:253 msgid "JIT compiler" msgstr "Compilateur « just-in-time »" -#: FProjectProperty.form:300 +#: FProjectProperty.form:303 msgid "General" msgstr "Général" -#: FProjectProperty.form:366 +#: FProjectProperty.form:369 msgid "Component" msgstr "Composant" -#: FProjectProperty.form:366 FSelectLibrary.class:101 +#: FProjectProperty.form:369 FSelectLibrary.class:101 msgid "Library" msgstr "Bibliothèque" -#: FProjectProperty.form:366 +#: FProjectProperty.form:369 msgid "Normal" msgstr "Normal" -#: FProjectProperty.form:373 +#: FProjectProperty.form:376 msgid "Vendor" msgstr "Fournisseur" -#: FProjectProperty.form:385 FPublish.class:91 FSelectLibrary.class:103 +#: FProjectProperty.form:388 FPublish.class:91 FSelectLibrary.class:103 msgid "Version" msgstr "Version" -#: FProjectProperty.form:411 +#: FProjectProperty.form:414 msgid "Get from 'VERSION' file" msgstr "Obtenir depuis un fichier 'VERSION'" -#: FProjectProperty.form:418 +#: FProjectProperty.form:421 msgid "Title" msgstr "Titre" -#: FProjectProperty.form:452 +#: FProjectProperty.form:455 msgid "Information" msgstr "Information" -#: FProjectProperty.form:473 FTranslate.class:76 +#: FProjectProperty.form:476 FTranslate.class:76 msgid "Progress" msgstr "Avancement" -#: FProjectProperty.form:479 +#: FProjectProperty.form:482 msgid "Finished and stable" msgstr "Terminé et stable" -#: FProjectProperty.form:490 +#: FProjectProperty.form:493 msgid "This component is hidden" msgstr "Ce composant est caché" -#: FProjectProperty.form:506 +#: FProjectProperty.form:509 msgid "Compatible until version" msgstr "Compatible jusqu'à la version" -#: FProjectProperty.form:535 +#: FProjectProperty.form:538 msgid "Include information from" msgstr "Inclure les informations de" -#: FProjectProperty.form:547 +#: FProjectProperty.form:550 msgid "Required features" msgstr "Fonctionnalités nécessaires" -#: FProjectProperty.form:603 +#: FProjectProperty.form:606 msgid "Required and excluded components" msgstr "Composants nécessaires ou exclus" -#: FProjectProperty.form:624 +#: FProjectProperty.form:627 msgid "Require" msgstr "Nécessiter" -#: FProjectProperty.form:630 +#: FProjectProperty.form:633 msgid "Exclude" msgstr "Exclure" -#: FProjectProperty.form:642 +#: FProjectProperty.form:645 msgid "Remove All" msgstr "Tout supprimer" -#: FProjectProperty.form:649 +#: FProjectProperty.form:652 msgid "Components" msgstr "Composants" -#: FProjectProperty.form:657 FSoftwareFarm.class:65 +#: FProjectProperty.form:660 FSoftwareFarm.class:65 msgid "Libraries" msgstr "Bibliothèques" -#: FProjectProperty.form:675 +#: FProjectProperty.form:678 msgid "Runtime library search path" msgstr "Chemin de recherche des bibliothèques à l'exécution" -#: FProjectProperty.form:737 +#: FProjectProperty.form:740 msgid "Additional references" msgstr "Références supplémentaires" -#: FProjectProperty.form:748 +#: FProjectProperty.form:751 msgid "Environment" msgstr "Environnement" -#: FProjectProperty.form:777 +#: FProjectProperty.form:780 msgid "&Add" msgstr "Ajouter" -#: FProjectProperty.form:817 +#: FProjectProperty.form:820 msgid "Edition" msgstr "Édition" -#: FProjectProperty.form:827 +#: FProjectProperty.form:831 msgid "Tab size" msgstr "Taille des tabulations" -#: FProjectProperty.form:850 +#: FProjectProperty.form:856 msgid "Show deprecated components and controls" msgstr "Afficher les composants et les contrôles dépréciés" -#: FProjectProperty.form:873 +#: FProjectProperty.form:880 msgid "Module symbols are public by default" msgstr "Les modules sont publics par défaut" -#: FProjectProperty.form:889 +#: FProjectProperty.form:897 msgid "Form controls are public" msgstr "Les contrôles des formulaires sont publics" -#: FProjectProperty.form:905 +#: FProjectProperty.form:914 msgid "Activate warnings" msgstr "Activer les avertissements" -#: FProjectProperty.form:969 +#: FProjectProperty.form:931 +msgid "Check prefix of variables" +msgstr "Vérifier le préfixe des variables" + +#: FProjectProperty.form:999 msgid "Add branch to version number" msgstr "Ajouter la branche au numéro de version" -#: FProjectProperty.form:979 FTranslate.form:417 +#: FProjectProperty.form:1009 FTranslate.form:417 msgid "Statistics" msgstr "Statistiques" @@ -5601,7 +5799,7 @@ msgstr "Nouveau fragment de code" msgid "Trigger string" msgstr "Chaîne de déclenchement" -#: FSoftwareFarm.class:49 Project.module:242 +#: FSoftwareFarm.class:49 Project.module:243 msgid "Games" msgstr "Jeux" @@ -5621,7 +5819,7 @@ msgstr "Graphique" msgid "Audio" msgstr "Son" -#: FSoftwareFarm.class:55 Project.module:249 +#: FSoftwareFarm.class:55 Project.module:250 msgid "Video" msgstr "Vidéo" @@ -5897,7 +6095,7 @@ msgstr "Réseau" msgid "Special" msgstr "Spécial" -#: FToolBox.class:350 Project.module:865 +#: FToolBox.class:350 Project.module:866 msgid "Current project" msgstr "Projet courant" @@ -6125,7 +6323,7 @@ msgstr "Nouveau projet..." msgid "Recent projects" msgstr "Projets récents" -#: FWelcome.class:73 Project.module:6599 +#: FWelcome.class:73 Project.module:6608 msgid "Installed software" msgstr "Logiciels installés" @@ -7709,7 +7907,7 @@ msgstr "'makepkg' a échoué." msgid "The directory is not a Gambas project" msgstr "Le répertoire n'est pas un projet Gambas" -#: Patch.class:52 Project.module:4832 +#: Patch.class:52 Project.module:4841 msgid "Unsupported source archive format." msgstr "Format d'archive source non supporté." @@ -7717,363 +7915,397 @@ msgstr "Format d'archive source non supporté." msgid "Patch didn't apply:\n" msgstr "Le patch n'a pas été appliqué :\n" -#: Project.module:238 +#: Project.module:239 msgid "Automation" msgstr "Automatisation" -#: Project.module:239 +#: Project.module:240 msgid "Basic" msgstr "Exemples de base" -#: Project.module:241 +#: Project.module:242 msgid "Drawing" msgstr "Dessin" -#: Project.module:244 +#: Project.module:245 msgid "Miscellaneous" msgstr "Divers" -#: Project.module:245 +#: Project.module:246 msgid "Networking" msgstr "Programmation réseau" -#: Project.module:246 +#: Project.module:247 msgid "OpenGL" msgstr "OpenGL" -#: Project.module:248 +#: Project.module:249 msgid "Sound" msgstr "Son" -#: Project.module:250 +#: Project.module:251 msgid "Controls" msgstr "Contrôles" -#: Project.module:251 +#: Project.module:252 msgid "Multimedia" msgstr "Multimedia" -#: Project.module:252 +#: Project.module:253 msgid "Web" msgstr "Web" -#: Project.module:430 +#: Project.module:431 msgid "File not found!" msgstr "Fichier introuvable !" -#: Project.module:545 +#: Project.module:546 msgid "This project does not exist." msgstr "Ce projet n'existe pas." -#: Project.module:557 -msgid "Unable to find Gambas IDE executable in directory:\n\n&1" -msgstr "Impossible de trouver l'exécutable de l'EDI Gambas dans le répertoire :\n\n&1" +#: Project.module:558 +msgid "" +"Unable to find Gambas IDE executable in directory:\n" +"\n" +"&1" +msgstr "" +"Impossible de trouver l'exécutable de l'EDI Gambas dans le répertoire :\n" +"\n" +"&1" -#: Project.module:576 +#: Project.module:577 msgid "This is not a Gambas project." msgstr "Ce n'est pas un projet Gambas." -#: Project.module:579 +#: Project.module:580 msgid "This is a Gambas 1.0 project. Use Gambas 2 to convert it." msgstr "Ceci est un projet Gambas 1.0. Utilisez Gambas 2 pour le convertir." -#: Project.module:582 +#: Project.module:583 msgid "Convert" msgstr "Convertir" -#: Project.module:582 -msgid "This is a Gambas 2.0 project.\n\nDo you want to convert it?" -msgstr "Ceci est un projet Gambas 2.0.\n\nDésirez-vous le convertir ?" +#: Project.module:583 +msgid "" +"This is a Gambas 2.0 project.\n" +"\n" +"Do you want to convert it?" +msgstr "" +"Ceci est un projet Gambas 2.0.\n" +"\n" +"Désirez-vous le convertir ?" -#: Project.module:600 +#: Project.module:601 msgid "Do not open" msgstr "Ne pas ouvrir" -#: Project.module:600 +#: Project.module:601 msgid "Open after all" msgstr "Ouvrir malgré tout" -#: Project.module:600 -msgid "This project seems to be already opened.\n\nOpening the same project twice can lead to data loss." -msgstr "Il semble que ce projet soit déjà ouvert.\n\nOuvrir le même projet deux fois peut provoquer des pertes de données." +#: Project.module:601 +msgid "" +"This project seems to be already opened.\n" +"\n" +"Opening the same project twice can lead to data loss." +msgstr "" +"Il semble que ce projet soit déjà ouvert.\n" +"\n" +"Ouvrir le même projet deux fois peut provoquer des pertes de données." -#: Project.module:606 +#: Project.module:607 msgid "It cannot be converted." msgstr "Il ne peut être converti." -#: Project.module:606 +#: Project.module:607 msgid "This project is read-only." msgstr "Le projet est en lecture seule." -#: Project.module:614 +#: Project.module:615 msgid "Compressed files are now generated with the executable. Consequently they will be removed from the project." msgstr "Les fichiers compressés sont maintenant générés avec l'exécutable. Par conséquent ils seront supprimés du projet." -#: Project.module:614 +#: Project.module:615 msgid "This project includes compressed files." msgstr "Ce projet contient des fichiers compressés." -#: Project.module:635 +#: Project.module:636 msgid "Copying project inside a temporary directory..." msgstr "Copie du projet dans un répertoire temporaire..." -#: Project.module:638 +#: Project.module:639 msgid "Unable to create temporary directory" msgstr "Impossible de créer le répertoire temporaire" -#: Project.module:668 +#: Project.module:669 msgid "Converting project structure..." msgstr "Conversion de la structure du projet..." -#: Project.module:698 +#: Project.module:699 msgid "Applying conversion..." msgstr "Application de la conversion..." -#: Project.module:704 +#: Project.module:705 msgid "Unable to apply conversion" msgstr "Impossible d'appliquer la conversion" -#: Project.module:749 +#: Project.module:750 msgid "Cannot open project file :" msgstr "Impossible d'ouvrir le projet :" -#: Project.module:749 +#: Project.module:750 msgid "This project has duplicated class files!" msgstr "Ce projet possède des fichiers classes dupliqués !" -#: Project.module:855 +#: Project.module:856 msgid "Some libraries used by the project are missing." msgstr "Des bibliothèques utilisées par le projet sont manquantes." -#: Project.module:938 +#: Project.module:939 msgid "Cannot reload file." msgstr "Impossible de recharger le fichier." -#: Project.module:1759 +#: Project.module:1760 msgid "ALPHA VERSION, USE AT YOUR OWN RISK!" msgstr "VERSION ALPHA, À UTILISER À VOS RISQUES ET PÉRILS !" -#: Project.module:1761 +#: Project.module:1762 msgid "DEVELOPMENT VERSION, USE AT YOUR OWN RISK!" msgstr "VERSION DE DÉVELOPPEMENT, À UTILISER À VOS RISQUES ET PÉRILS !" -#: Project.module:2134 +#: Project.module:2135 msgid "Cannot open a binary file." msgstr "Impossible d'ouvrir un fichier binaire." -#: Project.module:2172 +#: Project.module:2173 msgid "Cannot open file." msgstr "Impossible d'ouvrir le fichier." -#: Project.module:2330 +#: Project.module:2331 msgid "&1th" msgstr "&1ème" -#: Project.module:2396 +#: Project.module:2397 msgid "in form definition" msgstr "dans la définition du formulaire" -#: Project.module:2572 -msgid "Some project source files are in conflict.\nPlease solve them if you want to compile the project." -msgstr "Certains fichiers sources du projet sont en conflit.\nVeuillez résoudre ces conflits pour pouvoir compiler le projet." - #: Project.module:2576 +msgid "" +"Some project source files are in conflict.\n" +"Please solve them if you want to compile the project." +msgstr "" +"Certains fichiers sources du projet sont en conflit.\n" +"Veuillez résoudre ces conflits pour pouvoir compiler le projet." + +#: Project.module:2580 msgid "Compiling project" msgstr "Compilation du projet" -#: Project.module:2601 -msgid "

The compiler has crashed!

\nPlease report it to the Gambas bugtracker at:\n\nhttps://gambaswiki.org/bugtracker\n\nDo not forget to provide the full project so that the crash can be reproduced." -msgstr "

Le compilateur a planté !

\nVeuillez le signaler sur le bugtracker de Gambas à l'adresse:\n\nhttps://gambaswiki.org/bugtracker\n\nN'oubliez-pas de fournir la projet complet afin de pouvoir reproduire le plantage." +#: Project.module:2605 +msgid "" +"

The compiler has crashed!

\n" +"Please report it to the Gambas bugtracker at:\n" +"\n" +"https://gambaswiki.org/bugtracker\n" +"\n" +"Do not forget to provide the full project so that the crash can be reproduced." +msgstr "" +"

Le compilateur a planté !

\n" +"Veuillez le signaler sur le bugtracker de Gambas à l'adresse:\n" +"\n" +"https://gambaswiki.org/bugtracker\n" +"\n" +"N'oubliez-pas de fournir la projet complet afin de pouvoir reproduire le plantage." -#: Project.module:2845 +#: Project.module:2849 msgid "File already exists." msgstr "Ce fichier existe déja." -#: Project.module:2879 +#: Project.module:2883 msgid "Directory already exists." msgstr "Le répertoire existe déja." -#: Project.module:2891 +#: Project.module:2895 msgid "Cannot link template file." msgstr "Impossible de créer le lien vers le fichier modèle." -#: Project.module:2897 +#: Project.module:2901 msgid "Cannot copy template file." msgstr "Impossible de copier le fichier modèle." -#: Project.module:2952 +#: Project.module:2956 msgid "Forbidden directory name." msgstr "Ce nom de répertoire est interdit." -#: Project.module:3120 +#: Project.module:3124 msgid "The contents of VERSION file is incorrect." msgstr "Le contenu du fichier VERSION est incorrect." -#: Project.module:3142 +#: Project.module:3146 msgid "Cannot install library in &1." msgstr "Impossible d'installer la bibliothèque dans &1." -#: Project.module:3187 +#: Project.module:3191 msgid "Making executable..." msgstr "Génération de l'exécutable..." -#: Project.module:3197 +#: Project.module:3201 msgid "Do you really want to increment the project version and make the executable again?" msgstr "Voulez-vous vraiment incrémenter la version du projet et générer de nouveau l'exécutable ?" -#: Project.module:3197 +#: Project.module:3201 msgid "No change has been detected." msgstr "Aucun changement n'a été détecté." -#: Project.module:3298 +#: Project.module:3302 msgid "Cannot make executable." msgstr "Impossible de créer l'exécutable." -#: Project.module:3780 +#: Project.module:3788 msgid "Some components are missing: &1" msgstr "Certains composants ne sont pas installés : &1" -#: Project.module:3996 +#: Project.module:4005 msgid "Cannot write project file." msgstr "Impossible d'écrire le fichier projet." -#: Project.module:4048 +#: Project.module:4057 msgid "Unable to create desktop shortcut." msgstr "Imposible de créer le raccourci sur le bureau." -#: Project.module:4309 +#: Project.module:4318 msgid "The directory will be removed at the next commit." msgstr "Le répertoire sera supprimé à la prochaine publication." -#: Project.module:4327 +#: Project.module:4336 msgid "You must define a startup class or form!" msgstr "Vous devez définir une classe ou un formulaire de démarrage !" -#: Project.module:4358 +#: Project.module:4367 msgid "Please type a name." msgstr "Veuillez saisir un nom." -#: Project.module:4362 +#: Project.module:4371 msgid "This name contains a forbidden character:" msgstr "Ce nom contient un caractère interdit:" -#: Project.module:4366 +#: Project.module:4375 msgid "The name cannot begins with a dot." msgstr "Le nom ne peut pas commencer par un point." -#: Project.module:4370 +#: Project.module:4379 msgid "This name is already used. Choose another one." msgstr "Ce nom est déjà utilisé. Choisissez-en un autre." -#: Project.module:4406 +#: Project.module:4415 msgid "Space" msgstr "Espace" -#: Project.module:4408 +#: Project.module:4417 msgid "A class name must begin with a letter or an underscore, followed by any letter or digit." msgstr "Un nom de classe doit commencer par une lettre ou un caractère '_', et être suivi par des lettres ou des chiffres. " -#: Project.module:4451 +#: Project.module:4460 msgid "Destination already exists." msgstr "La destination existe déjà." -#: Project.module:4609 +#: Project.module:4618 msgid "Unable to rename '&1'" msgstr "Impossible de renommer « &1 »" -#: Project.module:4726 +#: Project.module:4735 msgid "Please type a project name." msgstr "Veuillez saisir un nom de projet." -#: Project.module:4734 +#: Project.module:4743 msgid "The project name cannot begin with a dot." msgstr "Un nom de projet ne peut commencer par un point." -#: Project.module:4737 +#: Project.module:4746 msgid "Non-ASCII characters are forbidden in a project name." msgstr "Un nom de projet ne peut contenir que des caractères ASCII." -#: Project.module:4738 +#: Project.module:4747 msgid "SPACE" msgstr "ESPACE" -#: Project.module:4738 +#: Project.module:4747 msgid "The following characters are forbidden in a project name:" msgstr "Les caractères suivants sont interdits dans un nom de projet :" -#: Project.module:4745 +#: Project.module:4754 msgid "This project already exists." msgstr "Ce projet existe déjà." -#: Project.module:4748 +#: Project.module:4757 msgid "The project directory already exists." msgstr "Le répertoire du projet existe déjà." -#: Project.module:4750 +#: Project.module:4759 msgid "The project directory cannot be created because a file with the same name already exists." msgstr "Le répertoire du projet ne peut être créé car un fichier avec le même nom existe déjà." -#: Project.module:4838 +#: Project.module:4847 msgid "Unable to create source archive." msgstr "Impossible de créer l'archive source." -#: Project.module:5156 +#: Project.module:5165 msgid "Cannot copy file &1." msgstr "Impossible de copier le fichier &1." -#: Project.module:5204 +#: Project.module:5213 msgid "Cannot create link &1." msgstr "Impossible de créer le lien &1." -#: Project.module:5219 +#: Project.module:5228 msgid "Cannot move a directory inside itself." msgstr "Impossible de déplacer un répertoire à l'intérieur de lui-même." -#: Project.module:5283 +#: Project.module:5292 msgid "Cannot move file &1." msgstr "Impossible de déplacer le fichier &1." -#: Project.module:5496 +#: Project.module:5505 msgid "The following files couldn't be removed:" msgstr "Les fichiers suivants n'ont pu être supprimés :" -#: Project.module:5978 +#: Project.module:5987 msgid "Project cleanup..." msgstr "Nettoyage du projet..." -#: Project.module:5984 +#: Project.module:5993 msgid "Project files conversion..." msgstr "Conversion des fichiers du projet..." -#: Project.module:6014 +#: Project.module:6023 msgid "Unable to convert &1" msgstr "Impossible de convertir &1" -#: Project.module:6294 +#: Project.module:6303 msgid "Unable to update forms." msgstr "Impossible de mettre à-jour les formulaires." -#: Project.module:6384 +#: Project.module:6393 msgid "The &1 program is not installed on your system." msgstr "Le programme &1 n'est pas installé sur votre système." -#: Project.module:6386 +#: Project.module:6395 msgid "The following programs are not installed on your system: &1." msgstr "Les programmes suivants ne sont pas installés sur votre système : &1." -#: Project.module:6477 +#: Project.module:6486 msgid "Unable to read component description file." msgstr "Impossible de lire le fichier de description du composant." -#: Project.module:6538 +#: Project.module:6547 msgid "Cannot write component description file." msgstr "Impossible d'écrire le fichier de description du composant." -#: Project.module:6599 +#: Project.module:6608 msgid "Project templates" msgstr "Modèles de projet" -#: Project.module:6645 +#: Project.module:6654 msgid "Unable to run terminal." msgstr "Impossible de démarrer le terminal." @@ -8156,4 +8388,3 @@ msgstr "Cette classe n'existe pas." #: WikiMarkdown.class:187 msgid "This symbol does not exist." msgstr "Ce symbole n'existe pas." - diff --git a/app/src/gambas3/.project b/app/src/gambas3/.project index f16a51ea1..edd389f3d 100644 --- a/app/src/gambas3/.project +++ b/app/src/gambas3/.project @@ -35,6 +35,7 @@ Environment="GB_GUI=gb.qt5\n GTK_DEBUG=interactive" TabSize=2 Translate=1 Language=en +CheckVariablePrefix=1 Maintainer=gambas Vendor=gambas Address=gambas@users.sourceforge.net diff --git a/app/src/gambas3/.src/Debug/Design.module b/app/src/gambas3/.src/Debug/Design.module index 0d6205ea9..0e0658ac2 100644 --- a/app/src/gambas3/.src/Debug/Design.module +++ b/app/src/gambas3/.src/Debug/Design.module @@ -860,7 +860,7 @@ Private Sub GetTestSuite() As String Dim hSettings As Settings Dim iSuite As Integer - Dim sSuite As Variant + Dim sSuite As String Dim aTest As String[] Dim I As Integer diff --git a/app/src/gambas3/.src/Debug/FDebugExpr.class b/app/src/gambas3/.src/Debug/FDebugExpr.class index 719c59519..3db6a4f16 100644 --- a/app/src/gambas3/.src/Debug/FDebugExpr.class +++ b/app/src/gambas3/.src/Debug/FDebugExpr.class @@ -533,17 +533,17 @@ End Public Sub RefreshInfo(sInfo As String) - Dim xStr As String + Dim sStr As String - $sInfo = sInfo - Me.Enabled = True + $sInfo = sInfo + Me.Enabled = True - For Each xStr In $cVal - $cOldVal.Add(xStr, $cVal.Key) - Next + For Each sStr In $cVal + $cOldVal.Add(sStr, $cVal.Key) + Next - $cVal.Clear - Init(sInfo, False) + $cVal.Clear + Init(sInfo, False) End diff --git a/app/src/gambas3/.src/Debug/FDebugInfo.class b/app/src/gambas3/.src/Debug/FDebugInfo.class index 11c227e1d..604e418e1 100644 --- a/app/src/gambas3/.src/Debug/FDebugInfo.class +++ b/app/src/gambas3/.src/Debug/FDebugInfo.class @@ -452,7 +452,7 @@ Public Sub ReadWatchSettings() Dim iCount As Integer Dim iInd As Integer Dim sFlag As String - Dim sExpr As Variant + Dim sExpr As String sFlag = "/Watches" iInd = 0 diff --git a/app/src/gambas3/.src/Editor/Connection/FConnectionEditor.class b/app/src/gambas3/.src/Editor/Connection/FConnectionEditor.class index 6174e2ba5..35a034dbb 100644 --- a/app/src/gambas3/.src/Editor/Connection/FConnectionEditor.class +++ b/app/src/gambas3/.src/Editor/Connection/FConnectionEditor.class @@ -26,7 +26,7 @@ Private $cFieldInfo As New Collection Private $aCollations As String[] Private $bMetadata As Boolean -Private $bTemplate As Variant +Private $bTemplate As Boolean Private Const KEY_REQUEST As String = "$" Private $bInCheckCurrent As Boolean @@ -513,7 +513,7 @@ Private Sub ReloadTable() Dim hCIndexField As CIndexField Dim sField As String Dim bCreate As Boolean - Dim hResult As Result + Dim rResult As Result Dim cDescField As Collection Dim cDescIndex As Collection @@ -530,21 +530,21 @@ Private Sub ReloadTable() cDescField = New Collection cDescIndex = New Collection - Try hResult = $hConn.Find(MConnection.METADATA_TABLE_NAME, "sTableName = &1", $sTable) - If hResult And If hResult.Available Then + Try rResult = $hConn.Find(MConnection.METADATA_TABLE_NAME, "sTableName = &1", $sTable) + If rResult And If rResult.Available Then - For Each hResult + For Each rResult - Select Case hResult!iType + Select Case rResult!iType Case MConnection.MD_TABLE - $sDescription = hResult!sValue + $sDescription = rResult!sValue Case MConnection.MD_FIELD - cDescField[hResult!sKey] = hResult!sValue + cDescField[rResult!sKey] = rResult!sValue Case MConnection.MD_INDEX - cDescIndex[hResult!sKey] = hResult!sValue + cDescIndex[rResult!sKey] = rResult!sValue End Select diff --git a/app/src/gambas3/.src/Editor/Form/CControl.class b/app/src/gambas3/.src/Editor/Form/CControl.class index 5e72c4d23..cf07fd5fc 100644 --- a/app/src/gambas3/.src/Editor/Form/CControl.class +++ b/app/src/gambas3/.src/Editor/Form/CControl.class @@ -1682,12 +1682,12 @@ Private Function GetCoord(iCoord As Integer, Optional bDim As Boolean) As Float End -Private Sub FormatScaledCoord(eCoord As Float) As String +Private Sub FormatScaledCoord(fCoord As Float) As String - If eCoord = Int(eCoord) Then - Return CStr(Int(eCoord)) + If fCoord = Int(fCoord) Then + Return CStr(Int(fCoord)) Else - Return CStr(Int(eCoord)) & "." & Mid$(Format(Frac(eCoord), ".####"), 2) + Return CStr(Int(fCoord)) & "." & Mid$(Format(Frac(fCoord), ".####"), 2) Endif End diff --git a/app/src/gambas3/.src/Editor/Form/FForm.class b/app/src/gambas3/.src/Editor/Form/FForm.class index f7a0d6200..6978c0d6a 100644 --- a/app/src/gambas3/.src/Editor/Form/FForm.class +++ b/app/src/gambas3/.src/Editor/Form/FForm.class @@ -243,7 +243,7 @@ Private Sub FromString(sData As String, Optional hParent As CControl) As String Dim iLevel As Integer Dim sEventName As String Dim aCoord As String[] - Dim eW, eH As Float + Dim fW, fH As Float Dim X, Y, W, H As Integer Dim bFirst As Boolean Dim bPublic As Boolean @@ -528,21 +528,21 @@ Private Sub FromString(sData As String, Optional hParent As CControl) As String Endif If aCoord.Count = 4 Then - eW = CFloat(aCoord[2]) - eH = CFloat(aCoord[3]) + fW = CFloat(aCoord[2]) + fH = CFloat(aCoord[3]) If $bConvert Then - If eW <= 3 Then Inc eW - If eH <= 3 Then Inc eH + If fW <= 3 Then Inc fW + If fH <= 3 Then Inc fH Endif - If eW = 0 Then + If fW = 0 Then W = 1 Else - W = Round(eW * DS) + W = Round(fW * DS) Endif - If eH = 0 Then + If fH = 0 Then H = 1 Else - H = Round(eH * DS) + H = Round(fH * DS) Endif Try hCtrl.MoveAndResize(X, Y, W, H) Else @@ -4376,7 +4376,7 @@ Public Sub mnuFont_Show() Dim I As Integer Dim sParentFont As String Dim hParent As Menu - Dim iCount As Variant + Dim iCount As Integer mnuFont.Children.Clear diff --git a/app/src/gambas3/.src/Family/Report/CFamilyReport.class b/app/src/gambas3/.src/Family/Report/CFamilyReport.class index 420dfd22e..630f9b8c6 100644 --- a/app/src/gambas3/.src/Family/Report/CFamilyReport.class +++ b/app/src/gambas3/.src/Family/Report/CFamilyReport.class @@ -452,7 +452,7 @@ End Static Private Sub RoundRect(x As Float, y As Float, w As Float, h As Float, Radius_X As Float[], radius_y As Float[]) Dim ARC_TO_BEZIER As Float = 0.55228475 - Dim c1, c2 As Float + Dim C1, C2 As Float Dim i As Integer For i = 0 To 3 @@ -481,33 +481,33 @@ Static Private Sub RoundRect(x As Float, y As Float, w As Float, h As Float, Rad Paint.LineTo(x + w - radius_x[1], y) '-->C - c1 = ARC_TO_BEZIER * radius_x[1] - c2 = ARC_TO_BEZIER * radius_y[1] - Paint.RelCurveTo(c1, 0.0, radius_x[1], c2, radius_x[1], radius_y[1]) + C1 = ARC_TO_BEZIER * radius_x[1] + C2 = ARC_TO_BEZIER * radius_y[1] + Paint.RelCurveTo(C1, 0.0, radius_x[1], C2, radius_x[1], radius_y[1]) '-->D Paint.LineTo(x + w, y + h - radius_y[2]) '-->E - c1 = ARC_TO_BEZIER * radius_x[2] - c2 = ARC_TO_BEZIER * radius_y[2] - Paint.RelCurveTo(0.0, c2, c1 - radius_x[2], radius_y[2], -radius_x[2], radius_y[2]) + C1 = ARC_TO_BEZIER * radius_x[2] + C2 = ARC_TO_BEZIER * radius_y[2] + Paint.RelCurveTo(0.0, C2, C1 - radius_x[2], radius_y[2], -radius_x[2], radius_y[2]) '-->F Paint.LineTo(x + radius_x[3], y + h) '-->G - c1 = ARC_TO_BEZIER * radius_x[3] - c2 = ARC_TO_BEZIER * radius_y[3] - Paint.RelCurveTo(-c1, 0, -radius_x[3], -c2, -radius_x[3], -radius_y[3]) + C1 = ARC_TO_BEZIER * radius_x[3] + C2 = ARC_TO_BEZIER * radius_y[3] + Paint.RelCurveTo(-C1, 0, -radius_x[3], -C2, -radius_x[3], -radius_y[3]) '-->H Paint.LineTo(x, y + radius_y[0]) '-->A - c1 = ARC_TO_BEZIER * radius_x[0] - c2 = ARC_TO_BEZIER * radius_y[0] - Paint.relcurveto(0.0, -c2, radius_x[0] - c1, -radius_y[0], radius_x[0], -radius_y[0]) + C1 = ARC_TO_BEZIER * radius_x[0] + C2 = ARC_TO_BEZIER * radius_y[0] + Paint.RelCurveTo(0.0, -C2, radius_x[0] - C1, -radius_y[0], radius_x[0], -radius_y[0]) 'Paint.closepath() diff --git a/app/src/gambas3/.src/Project.module b/app/src/gambas3/.src/Project.module index f6a097eed..512e1e775 100644 --- a/app/src/gambas3/.src/Project.module +++ b/app/src/gambas3/.src/Project.module @@ -53,6 +53,7 @@ Public ControlPublic As Boolean Public ModulePublic As Boolean Public ShowDeprecated As Boolean Public Warnings As Boolean +Public CheckVariablePrefix As Boolean Public MajorVersion As Integer Public MinorVersion As Integer Public ReleaseVersion As Integer @@ -2520,7 +2521,10 @@ Public Function GetCompileCommand(bAll As Boolean, bNoDebug As Boolean, bMakeExe sExec &= "-j" & CStr(Settings["/CompilerJobs", 1]) & " " 'sExec = sExec & "-c " & Quote(CLASSES_FILE) & " " & Quote(Project.Dir) & " > " & OUTPUT_FILE & " 2>&1" If bIDE Then - If Project.Warnings Then sExec &= "-w " + If Project.Warnings Then + sExec &= "-w " + If CheckVariablePrefix Then sExec &= "-fcheck-prefix " + Endif sExec = sExec & Shell$(Project.Dir) sExec = sExec & " > " & OUTPUT_FILE & " 2>&1" Endif @@ -3396,6 +3400,7 @@ Public Sub ReadProject(Optional bConvert As Boolean) ModulePublic = False ShowDeprecated = False Warnings = True + CheckVariablePrefix = False KeepDebugInfo = True CompressFiles = True Localize = False @@ -3577,6 +3582,9 @@ Public Sub ReadProject(Optional bConvert As Boolean) Case "warnings" Warnings = CInt(sVal) <> 0 + + Case "checkvariableprefix" + CheckVariablePrefix = CInt(sVal) <> 0 Case "description" Description = UnQuote(sVal) @@ -3918,6 +3926,7 @@ Public Sub WriteProject(Optional bComponentDoNotChange As Boolean, Optional bMak If ModulePublic Then Print #hFile, "ModulePublic=1" If ShowDeprecated Then Print #hFile, "ShowDeprecated=1" If Not Warnings Then Print #hFile, "Warnings=0" + If CheckVariablePrefix Then Print #hFile, "CheckVariablePrefix=1" If SourcePath Then Print #hFile, "SourcePath="; SourcePath If Maintainer Then Print #hFile, "Maintainer="; Maintainer diff --git a/app/src/gambas3/.src/Project/FProjectProperty.class b/app/src/gambas3/.src/Project/FProjectProperty.class index 1b5b9a056..a02a580fb 100644 --- a/app/src/gambas3/.src/Project/FProjectProperty.class +++ b/app/src/gambas3/.src/Project/FProjectProperty.class @@ -88,6 +88,7 @@ Public Sub Form_Open() btnModulePublic.Value = .ModulePublic btnShowDeprecated.Value = .ShowDeprecated btnWarning.Value = .Warnings + btnCheckPrefix.Value = .CheckVariablePrefix txtMajor.Value = .MajorVersion txtMinor.Value = .MinorVersion txtRelease.Value = .ReleaseVersion @@ -234,6 +235,7 @@ Private Function DoApply() As Boolean Endif .Warnings = btnWarning.Value + .CheckVariablePrefix = btnCheckPrefix.Value .MajorVersion = txtMajor.Value .MinorVersion = txtMinor.Value .ReleaseVersion = txtRelease.Value @@ -1475,3 +1477,9 @@ Public Sub tvwEnv_Hide() UpdateEnv End + +Public Sub btnWarning_Click() + + btnCheckPrefix.Enabled = btnWarning.Value + +End diff --git a/app/src/gambas3/.src/Project/FProjectProperty.form b/app/src/gambas3/.src/Project/FProjectProperty.form index 9219039bc..ad7755312 100644 --- a/app/src/gambas3/.src/Project/FProjectProperty.form +++ b/app/src/gambas3/.src/Project/FProjectProperty.form @@ -565,7 +565,7 @@ Text = ("Options") Picture = Picture["icon:/large/options"] { Panel6 VBox - MoveScaled(1,2,86,60) + MoveScaled(1,2,86,64) Expand = True Spacing = True { Label7 Label @@ -580,6 +580,7 @@ Indent = True { Label1 Label MoveScaled(0,0,46,4) + Expand = True Text = ("Tab size") } { txtTabSize SpinBox @@ -590,6 +591,7 @@ } { Label5 Label MoveScaled(59,0,22,4) + AutoResize = True Text = ("space(s)") } } @@ -599,6 +601,7 @@ Indent = True { Label2 Label MoveScaled(0,0,46,4) + Expand = True Text = ("Show deprecated components and controls") } { btnShowDeprecated SwitchButton @@ -618,6 +621,7 @@ Indent = True { Label21 Label MoveScaled(0,0,46,4) + Expand = True Text = ("Module symbols are public by default") } { btnModulePublic SwitchButton @@ -631,6 +635,7 @@ Indent = True { Label22 Label MoveScaled(0,0,46,4) + Expand = True Text = ("Form controls are public") } { btnControlPublic SwitchButton @@ -644,6 +649,7 @@ Indent = True { Label4 Label MoveScaled(0,0,46,4) + Expand = True Text = ("Activate warnings") } { btnWarning SwitchButton @@ -651,18 +657,34 @@ Animated = True } } + { HBox2 HBox + MoveScaled(1,33,83,4) + Spacing = True + Indent = True + { Label30 Label + MoveScaled(0,0,46,4) + Expand = True + Text = ("Check prefix of variables") + } + { btnCheckPrefix SwitchButton + MoveScaled(47,0,8,4) + Enabled = False + Animated = True + } + } { Label19 Label - MoveScaled(0,33,84,3) + MoveScaled(0,40,84,3) Font = Font["Bold"] Alignment = Align.BottomNormal Text = ("Translation") } { HBox9 HBox - MoveScaled(1,37,83,4) + MoveScaled(1,44,83,4) Spacing = True Indent = True { Label24 Label MoveScaled(0,0,46,4) + Expand = True Text = ("Project is translatable") } { btnTranslate SwitchButton @@ -671,32 +693,34 @@ } } { HBox8 HBox - MoveScaled(1,42,83,4) + MoveScaled(1,49,83,4) Spacing = True Indent = True { Label20 Label - MoveScaled(0,0,46,4) + MoveScaled(0,0,38,4) + Expand = True Text = ("Default language") } { cmbDefaultLanguage ComboBox - MoveScaled(47,0,36,4) + MoveScaled(38,0,45,4) Expand = True ReadOnly = True Sorted = True } } { Label27 Label - MoveScaled(0,47,84,3) + MoveScaled(0,54,84,3) Font = Font["Bold"] Alignment = Align.BottomNormal Text = ("Version control") } { HBox6 HBox - MoveScaled(1,52,83,4) + MoveScaled(1,59,83,4) Spacing = True Indent = True { Label23 Label MoveScaled(0,0,46,4) + Expand = True Text = ("Add branch to version number") } { btnVersionAddBranch SwitchButton