diff --git a/app/src/gambas3/.lang/fr.po b/app/src/gambas3/.lang/fr.po index 9424d577b..5ff914945 100644 --- a/app/src/gambas3/.lang/fr.po +++ b/app/src/gambas3/.lang/fr.po @@ -222,8 +222,7 @@ msgid "" msgstr "" "Project-Id-Version: gambas3 3.13.90\n" -"POT-Creation-Date: 2019-05-18 17:02 UTC\n" -"PO-Revision-Date: 2019-05-03 11:42 UTC\n" +"PO-Revision-Date: 2019-05-25 16:00 UTC\n" "Last-Translator: benoit \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -406,8 +405,7 @@ msgstr "Classes" msgid "Class" msgstr "Classe" -#: CComponent.class:1640 FConnectionEditor.class:320 FMakeInstall.form:291 -#: FProjectProperty.form:367 FPublish.form:126 FSoftwareFarm.form:324 +#: CComponent.class:1640 FConnectionEditor.class:320 FMakeInstall.form:288 FProjectProperty.form:367 FPublish.form:126 FSoftwareFarm.form:324 msgid "Description" msgstr "Description" @@ -963,27 +961,7 @@ msgstr "ici" msgid "IDE extensions" msgstr "Extension de l'EDI" -#: CProjectList.class:544 CVersionControlGit.class:373 -#: CWaitingAnimation.class:63 FColorChooser.form:68 FComponentChooser.form:97 -#: FConflict.class:197 FConnectionEditor.class:470 FCrash.form:97 -#: FCreateFile.form:204 FDebugExpr.form:46 FDebugInfo.form:289 -#: FExportData.class:126 FFarmConfig.form:38 FFarmLogin.form:126 -#: FFarmRegister.form:141 FFarmRequest.form:43 FFieldChooser.form:144 -#: FFileProperty.class:144 FFontChooser.form:40 FGotoLine.form:23 -#: FHelpBrowser.form:60 FImageOffsetSelection.form:33 FImageQuality.form:30 -#: FImageResize.form:49 FImageRotate.form:32 FList.form:128 FMain.class:245 -#: FMakeInstall.class:345 FMenu.form:414 FNewConnection.form:318 -#: FNewTable.form:86 FNewTranslation.form:21 FOption.class:863 -#: FPasteSpecial.form:86 FPasteTable.form:105 FProjectChooser.form:73 -#: FProjectProperty.form:932 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:28 -#: FSaveProjectAs.form:81 FSearch.class:946 FSelectComponent.form:39 -#: FSelectExtraFile.form:43 FSelectIcon.form:87 FSelectLibrary.form:66 -#: FSnippet.form:57 FSoftwareFarm.class:545 FTableChooser.form:68 FText.form:40 -#: FTranslate.class:670 FVersionControl.form:78 FWebFontChooser.form:129 -#: Project.module:555 VersionControl.module:383 +#: CProjectList.class:544 CVersionControlGit.class:373 CWaitingAnimation.class:63 FColorChooser.form:68 FComponentChooser.form:97 FConflict.class:197 FConnectionEditor.class:470 FCrash.form:97 FCreateFile.form:204 FDebugExpr.form:46 FDebugInfo.form:289 FExportData.class:126 FFarmConfig.form:38 FFarmLogin.form:126 FFarmRegister.form:141 FFarmRequest.form:43 FFieldChooser.form:144 FFileProperty.class:144 FFontChooser.form:40 FGotoLine.form:23 FHelpBrowser.form:73 FImageOffsetSelection.form:33 FImageQuality.form:30 FImageResize.form:49 FImageRotate.form:32 FList.form:128 FMain.class:245 FMakeInstall.class:345 FMenu.form:414 FNewConnection.form:318 FNewTable.form:86 FNewTranslation.form:21 FOption.class:863 FPasteSpecial.form:86 FPasteTable.form:105 FProjectChooser.form:73 FProjectProperty.form:932 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:28 FSaveProjectAs.form:81 FSearch.class:946 FSelectComponent.form:39 FSelectExtraFile.form:43 FSelectIcon.form:87 FSelectLibrary.form:66 FSnippet.form:57 FSoftwareFarm.class:545 FTableChooser.form:68 FText.form:40 FTranslate.class:670 FVersionControl.form:78 FWebFontChooser.form:129 Project.module:555 VersionControl.module:383 msgid "Cancel" msgstr "Annuler" @@ -1007,8 +985,7 @@ msgstr "Le logiciel a été désinstallé avec succès." msgid "Files" msgstr "Fichiers" -#: CProjectTree.class:343 FHelpShortcut.form:22 FMain.form:413 -#: FSearch.class:111 FSelectIcon.form:31 +#: CProjectTree.class:343 FHelpShortcut.form:22 FMain.form:413 FSearch.class:111 FSelectIcon.form:31 msgid "Project" msgstr "Projet" @@ -1180,19 +1157,7 @@ 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:373 Design.module:508 FColorChooser.form:62 -#: FConnectionEditor.class:700 FCrash.form:91 FCreateFile.form:210 -#: FFarmConfig.form:33 FFarmLogin.form:121 FFieldChooser.form:138 -#: FFontChooser.form:34 FGotoLine.form:17 FImageOffsetSelection.form:27 -#: FImageQuality.form:24 FImageResize.form:103 FImageRotate.form:26 -#: FList.form:122 FMenu.form:409 FNewConnection.form:312 FNewTable.form:80 -#: FNewTranslation.form:15 FPasteSpecial.form:80 FProjectProperty.form:926 -#: 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:82 FSelectLibrary.form:60 -#: FSnippet.form:51 FTableChooser.form:62 FText.form:34 FVersionError.form:69 -#: FWebFontChooser.form:123 +#: CVersionControlGit.class:373 Design.module:508 FColorChooser.form:62 FConnectionEditor.class:700 FCrash.form:91 FCreateFile.form:210 FFarmConfig.form:33 FFarmLogin.form:121 FFieldChooser.form:138 FFontChooser.form:34 FGotoLine.form:17 FImageOffsetSelection.form:27 FImageQuality.form:24 FImageResize.form:103 FImageRotate.form:26 FList.form:122 FMenu.form:409 FNewConnection.form:312 FNewTable.form:80 FNewTranslation.form:15 FPasteSpecial.form:80 FProjectProperty.form:926 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:82 FSelectLibrary.form:60 FSnippet.form:51 FTableChooser.form:62 FText.form:34 FVersionError.form:69 FWebFontChooser.form:123 msgid "OK" msgstr "OK" @@ -1216,11 +1181,11 @@ msgstr "Auteur de la dernière publication distante" msgid "Remote last commit date" msgstr "Date de la dernière publication distante" -#: CWelcome.class:114 +#: CWelcome.class:116 msgid "The Gambas font is published under the SIL Open Font License." msgstr "La police Gambas est publiée sous licence « SIL Open Font License »." -#: CWelcome.class:114 +#: CWelcome.class:116 msgid "This program is published under the GNU General Public License." msgstr "Ce programme est publié sous la « Licence Publique Générale GNU »." @@ -1249,12 +1214,8 @@ msgid "The program has been terminated." msgstr "Le programme a été terminé." #: Design.module:442 -msgid "" -"The program has returned\n" -"the value: &1" -msgstr "" -"Le programme a retourné\n" -"la valeur : &1" +msgid "The program has returned\nthe value: &1" +msgstr "Le programme a retourné\nla valeur : &1" #: Design.module:968 msgid "Output terminal" @@ -1273,14 +1234,8 @@ msgid "About Gambas" msgstr "À propos de Gambas" #: FAbout.form:25 -#, fuzzy -msgid "" -"

LICENCE

\n" -"\n" -"

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 2, or (at your option) any later version.

\n" -"\n" -"

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.

\n" -msgstr "

Licence

Ce programme est un LOGICIEL LIBRE. Vous pouvez le redistribuer ET/OU le modifier selon les termes de la Licence Publique Générale GNU telle qu'elle est publiée par la Free Software Foundation ; soit la version 2, ou bien n'importe quelle version ultérieure de votre choix.

Ce programme est distribué en espérant qu'il soit utile MAIS SANS GARANTIE D'AUCUNE SORTE ; y compris les garanties implicites de COMMERCIABILITÉ ET DE CONFORMITÉ À UNE UTILISATION PARTICULIÈRE. Se reporter à la Licence Publique Générale GNU pour plus d'information.

\n" +msgid "

LICENCE

\n\n

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 2, or (at your option) any later version.

\n\n

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.

\n" +msgstr "" #: FColorChooser.form:15 msgid "Select a color" @@ -1350,28 +1305,25 @@ 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:354 FForm.form:439 -#: FHelpBrowser.form:66 FImageEditor.form:377 FMain.form:363 -#: FTextEditor.form:351 FTranslate.form:92 Project.module:846 +#: FComponentChooser.form:103 FConflictEditor.form:293 FConnectionEditor.form:120 FEditor.form:354 FForm.form:439 FHelpBrowser.form:79 FImageEditor.form:377 FMain.form:363 FTextEditor.form:351 FTranslate.form:92 Project.module:846 msgid "Reload" msgstr "Recharger" -#: FComponentChooser.form:114 FHelpBrowser.form:84 FImageEditor.form:335 +#: FComponentChooser.form:114 FHelpBrowser.form:89 FImageEditor.form:335 msgid "Zoom in" msgstr "Zoom avant" -#: FComponentChooser.form:120 FHelpBrowser.form:90 FImageEditor.form:343 +#: FComponentChooser.form:120 FHelpBrowser.form:95 FImageEditor.form:343 msgid "Zoom out" msgstr "Zoom arrière" -#: FComponentChooser.form:126 FHelpBrowser.form:96 +#: FComponentChooser.form:126 FHelpBrowser.form:101 msgid "No zoom" msgstr "Taille normale" #: FConflict.class:14 FMain.form:1594 msgid "&Edit" -msgstr "&Éditer" +msgstr "&Editer" #: FConflict.class:14 msgid "This file is in conflict. You must resolve the conflict in order to use the file again." @@ -1385,18 +1337,13 @@ msgstr "Impossible de charger le fichier :" msgid "Text" msgstr "Texte" -#: FConflict.class:141 FMain.form:920 FReportBrushChooser.form:49 -#: Project.module:232 +#: FConflict.class:141 FMain.form:920 FReportBrushChooser.form:49 Project.module:232 msgid "Image" msgstr "Image" #: FConflict.class:197 -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 ?" +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 ?" #: FConflict.class:225 msgid "Some conflicts are not yet resolved." @@ -1407,12 +1354,8 @@ msgid "Unable to resolve the conflict." msgstr "Impossible de résoudre le conflit." #: FConflict.class:259 -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 ?" +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 ?" #: FConflict.class:267 msgid "Conflict files" @@ -1422,59 +1365,39 @@ msgstr "Fichiers en conflits" msgid "Version conflict" msgstr "Conflit de version" -#: FConflict.form:70 FConflictEditor.form:114 FConnectionEditor.form:382 -#: FEditor.form:124 FForm.form:158 FImageEditor.form:138 FMain.form:1013 -#: FMenu.form:120 FProjectVersion.form:234 FTextEditor.form:125 +#: FConflict.form:70 FConflictEditor.form:114 FConnectionEditor.form:382 FEditor.form:124 FForm.form:158 FImageEditor.form:138 FMain.form:1013 FMenu.form:120 FProjectVersion.form:234 FTextEditor.form:125 msgid "Cut" msgstr "Couper" -#: FConflict.form:76 FConflictEditor.form:121 FConnectionEditor.form:152 -#: FEditor.form:131 FForm.form:165 FImageEditor.form:146 FList.form:99 -#: FMain.form:1020 FMakeInstall.form:902 FMenu.form:126 FOutput.form:40 -#: FProjectVersion.form:240 FSystemInfo.form:62 FTextEditor.form:132 -#: FTranslate.form:113 +#: FConflict.form:76 FConflictEditor.form:121 FConnectionEditor.form:152 FEditor.form:131 FForm.form:165 FImageEditor.form:146 FList.form:99 FMain.form:1020 FMakeInstall.form:873 FMenu.form:126 FOutput.form:40 FProjectVersion.form:240 FSystemInfo.form:62 FTextEditor.form:132 FTranslate.form:113 msgid "Copy" msgstr "Copier" -#: FConflict.form:82 FConflictEditor.form:128 FConnectionEditor.form:161 -#: FEditor.form:138 FForm.form:178 FImageEditor.form:153 FList.form:105 -#: FMain.form:1027 FMenu.form:132 FOutput.form:47 FPasteTable.form:99 -#: FProjectVersion.form:246 FTextEditor.form:139 +#: FConflict.form:82 FConflictEditor.form:128 FConnectionEditor.form:161 FEditor.form:138 FForm.form:178 FImageEditor.form:153 FList.form:105 FMain.form:1027 FMenu.form:132 FOutput.form:47 FPasteTable.form:99 FProjectVersion.form:246 FTextEditor.form:139 msgid "Paste" msgstr "Coller" -#: FConflict.form:88 FConflictEditor.form:97 FConnectionEditor.form:403 -#: FEditor.form:107 FFieldChooser.form:127 FForm.form:141 FImageEditor.form:119 -#: FList.form:111 FOption.form:1129 FProjectVersion.form:252 -#: FTextEditor.form:108 +#: FConflict.form:88 FConflictEditor.form:97 FConnectionEditor.form:403 FEditor.form:107 FFieldChooser.form:127 FForm.form:141 FImageEditor.form:119 FList.form:111 FOption.form:1129 FProjectVersion.form:252 FTextEditor.form:108 msgid "Undo" msgstr "Annuler" -#: FConflict.form:94 FConflictEditor.form:104 FConnectionEditor.form:410 -#: FEditor.form:114 FForm.form:148 FImageEditor.form:127 -#: FProjectVersion.form:258 FTextEditor.form:115 +#: FConflict.form:94 FConflictEditor.form:104 FConnectionEditor.form:410 FEditor.form:114 FForm.form:148 FImageEditor.form:127 FProjectVersion.form:258 FTextEditor.form:115 msgid "Redo" msgstr "Rétablir" -#: FConflict.form:100 FConflictEditor.form:441 FEditor.form:533 FMenu.form:142 -#: FProjectVersion.form:264 FTextEditor.form:517 +#: FConflict.form:100 FConflictEditor.form:441 FEditor.form:533 FMenu.form:142 FProjectVersion.form:264 FTextEditor.form:517 msgid "Indent" msgstr "Indenter" -#: FConflict.form:106 FConflictEditor.form:449 FEditor.form:541 FMenu.form:148 -#: FProjectVersion.form:270 FTextEditor.form:525 +#: FConflict.form:106 FConflictEditor.form:449 FEditor.form:541 FMenu.form:148 FProjectVersion.form:270 FTextEditor.form:525 msgid "Unindent" msgstr "Désindenter" -#: FConflict.form:141 FMain.form:356 FOpenProject.form:35 -#: FProjectChooser.form:85 +#: FConflict.form:141 FMain.form:356 FOpenProject.form:35 FProjectChooser.form:85 msgid "Open" msgstr "Ouvrir" -#: FConflict.form:149 FConflictEditor.form:299 FConnectionEditor.form:112 -#: FEditor.form:360 FForm.form:445 FImageEditor.form:384 FMain.form:372 -#: FMenu.class:74 FSaveProjectAs.form:87 FTextEditor.form:357 -#: FTranslate.form:226 +#: FConflict.form:149 FConflictEditor.form:299 FConnectionEditor.form:112 FEditor.form:360 FForm.form:445 FImageEditor.form:384 FMain.form:372 FMenu.class:74 FSaveProjectAs.form:87 FTextEditor.form:357 FTranslate.form:226 msgid "Save" msgstr "Enregistrer" @@ -1482,10 +1405,7 @@ msgstr "Enregistrer" msgid "Solve" msgstr "Résoudre" -#: FConflict.form:166 FConflictEditor.form:306 FDebugInfo.form:296 -#: FEditor.form:347 FFileProperty.form:76 FForm.form:432 FImageEditor.form:391 -#: FMain.form:388 FPatch.form:88 FProjectVersion.form:322 FSystemInfo.form:68 -#: FTextEditor.form:364 FTips.form:83 FTranslate.form:403 +#: FConflict.form:166 FConflictEditor.form:306 FDebugInfo.form:296 FEditor.form:347 FFileProperty.form:76 FForm.form:432 FImageEditor.form:391 FMain.form:388 FPatch.form:88 FProjectVersion.form:322 FSystemInfo.form:68 FTextEditor.form:364 FTips.form:83 FTranslate.form:403 msgid "Close" msgstr "Fermer" @@ -1517,18 +1437,15 @@ msgstr "Mettre en commentaire" msgid "Uncomment" msgstr "Retirer les commentaires" -#: FConflictEditor.form:172 FEditor.form:182 FPasteSpecial.form:19 -#: FTextEditor.form:198 +#: FConflictEditor.form:172 FEditor.form:182 FPasteSpecial.form:19 FTextEditor.form:198 msgid "Paste special" msgstr "Collage spécial" -#: FConflictEditor.form:183 FEditor.form:215 FImageEditor.form:222 -#: FTextEditor.form:234 +#: FConflictEditor.form:183 FEditor.form:215 FImageEditor.form:222 FTextEditor.form:234 msgid "Select All" msgstr "Tout sélectionner" -#: FConflictEditor.form:193 FEditor.form:230 FGotoLine.form:12 -#: FTextEditor.form:244 +#: FConflictEditor.form:193 FEditor.form:230 FGotoLine.form:12 FTextEditor.form:244 msgid "Go to line" msgstr "Aller à la ligne" @@ -1544,8 +1461,7 @@ msgstr "Poursuivre la recherche" msgid "Find previous" msgstr "Recherche en arrière" -#: FConflictEditor.form:222 FEditor.form:266 FImageEditor.form:330 -#: FMain.form:705 FTextEditor.form:273 +#: FConflictEditor.form:222 FEditor.form:266 FImageEditor.form:330 FMain.form:705 FTextEditor.form:273 msgid "View" msgstr "Affichage" @@ -1589,18 +1505,15 @@ msgstr "-" msgid "Open code" msgstr "Ouvrir le code" -#: FConflictEditor.form:316 FEditor.form:370 FPasteSpecial.form:60 -#: FTextEditor.form:374 +#: FConflictEditor.form:316 FEditor.form:370 FPasteSpecial.form:60 FTextEditor.form:374 msgid "Paste as string" msgstr "Coller comme chaîne" -#: FConflictEditor.form:321 FEditor.form:375 FPasteSpecial.form:65 -#: FTextEditor.form:379 +#: FConflictEditor.form:321 FEditor.form:375 FPasteSpecial.form:65 FTextEditor.form:379 msgid "Paste as multi-line string" msgstr "Coller comme chaîne sur plusieurs lignes" -#: FConflictEditor.form:326 FEditor.form:380 FPasteSpecial.form:50 -#: FTextEditor.form:384 +#: FConflictEditor.form:326 FEditor.form:380 FPasteSpecial.form:50 FTextEditor.form:384 msgid "Paste as comments" msgstr "Coller comme commentaires" @@ -1640,13 +1553,11 @@ msgstr "Conserver tous mes changements" msgid "Take all their changes" msgstr "Prendre tous leurs changements" -#: FConnectionEditor.class:51 FCreateFile.form:62 FMakeInstall.form:241 -#: FNewConnection.form:70 FNewTable.form:33 FOption.form:325 +#: FConnectionEditor.class:51 FCreateFile.form:62 FMakeInstall.form:238 FNewConnection.form:70 FNewTable.form:33 FOption.form:325 msgid "Name" msgstr "Nom" -#: FConnectionEditor.class:56 FCreateFile.form:113 FDebugInfo.class:60 -#: FNewConnection.form:84 FNewTable.form:48 FProxy.form:27 +#: FConnectionEditor.class:56 FCreateFile.form:113 FDebugInfo.class:60 FNewConnection.form:84 FNewTable.form:48 FProxy.form:27 msgid "Type" msgstr "Type" @@ -1662,7 +1573,7 @@ msgstr "Valeur par défaut" msgid "Collation" msgstr "Collation" -#: FConnectionEditor.class:82 FDebugExpr.class:502 FHelpBrowser.form:52 +#: FConnectionEditor.class:82 FDebugExpr.class:502 FHelpBrowser.form:49 msgid "Index" msgstr "Index" @@ -1814,9 +1725,7 @@ msgstr "Nouvelle table" msgid "Delete table" msgstr "Supprimer la table" -#: FConnectionEditor.form:134 FDebugInfo.form:185 FMain.form:1157 -#: FMakeInstall.form:743 FOption.form:1563 FProjectProperty.form:573 -#: FPublish.form:269 FSoftwareFarm.form:423 +#: FConnectionEditor.form:134 FDebugInfo.form:185 FMain.form:1157 FMakeInstall.form:714 FOption.form:1563 FProjectProperty.form:573 FPublish.form:269 FSoftwareFarm.form:423 msgid "Remove" msgstr "Supprimer" @@ -1840,8 +1749,7 @@ msgstr "Copier la table" msgid "Import text file" msgstr "Importer un fichier texte" -#: FConnectionEditor.form:170 FImportTable.form:48 FMain.form:956 -#: FOption.form:1549 FTranslate.form:423 +#: FConnectionEditor.form:170 FImportTable.form:48 FMain.form:956 FOption.form:1549 FTranslate.form:423 msgid "Import" msgstr "Importer" @@ -1849,18 +1757,15 @@ msgstr "Importer" msgid "Fields" msgstr "Champs" -#: FConnectionEditor.form:229 FMain.class:2164 FMakeInstall.form:737 -#: FProjectProperty.form:628 FPublish.form:159 +#: FConnectionEditor.form:229 FMain.class:2164 FMakeInstall.form:708 FProjectProperty.form:628 FPublish.form:159 msgid "Add" msgstr "Ajouter" -#: FConnectionEditor.form:243 FList.form:77 FMakeInstall.form:755 -#: FPublish.form:281 +#: FConnectionEditor.form:243 FList.form:77 FMakeInstall.form:726 FPublish.form:281 msgid "Down" msgstr "Descendre" -#: FConnectionEditor.form:250 FList.form:71 FMakeInstall.form:749 -#: FPublish.form:275 +#: FConnectionEditor.form:250 FList.form:71 FMakeInstall.form:720 FPublish.form:275 msgid "Up" msgstr "Monter" @@ -1884,8 +1789,7 @@ msgstr "Exécuter la requête" msgid "New query" msgstr "Nouvelle requête" -#: FConnectionEditor.form:361 FMain.form:851 FOption.form:1541 -#: FTranslate.form:87 +#: FConnectionEditor.form:361 FMain.form:851 FOption.form:1541 FTranslate.form:87 msgid "New" msgstr "Nouveau" @@ -1893,16 +1797,13 @@ msgstr "Nouveau" msgid "Remove query" msgstr "Supprimer la requête" -#: FConnectionEditor.form:375 FDebugInfo.class:270 FImageProperty.form:379 -#: FList.form:93 FMakeInstall.form:761 FOption.class:863 FOutput.form:54 -#: FPublish.form:171 +#: FConnectionEditor.form:375 FDebugInfo.class:270 FImageProperty.form:379 FList.form:93 FMakeInstall.form:732 FOption.class:863 FOutput.form:54 FPublish.form:171 msgid "Clear" msgstr "Effacer" -#: FConnectionEditor.form:455 FDebugExpr.form:28 FMain.form:404 -#: FOption.form:1556 +#: FConnectionEditor.form:455 FDebugExpr.form:28 FMain.form:404 FOption.form:1556 msgid "Edit" -msgstr "Éditer" +msgstr "Editer" #: FConnectionEditor.form:462 FExportData.form:15 msgid "Export to CSV file" @@ -1912,9 +1813,7 @@ msgstr "Exporter vers un fichier CSV" msgid "Export" msgstr "Exporter" -#: FConnectionEditor.form:492 FForm.form:185 FList.form:65 FMain.form:1041 -#: FMenu.form:110 FNewConnection.class:402 FOption.class:1032 -#: FSoftwareFarm.class:647 FTranslate.form:97 +#: FConnectionEditor.form:492 FForm.form:185 FList.form:65 FMain.form:1041 FMenu.form:110 FNewConnection.class:402 FOption.class:1032 FSoftwareFarm.class:647 FTranslate.form:97 msgid "Delete" msgstr "Supprimer" @@ -1970,8 +1869,7 @@ msgstr "Impossible d'ajouter le fichier." msgid "New file" msgstr "Nouveau fichier" -#: FCreateFile.form:72 FImportTable.form:59 FMakePatch.form:66 -#: FProjectProperty.form:736 FSearch.form:98 +#: FCreateFile.form:72 FImportTable.form:59 FMakePatch.form:66 FProjectProperty.form:736 FSearch.form:98 msgid "Options" msgstr "Options" @@ -2099,8 +1997,7 @@ msgstr "Tâches" msgid "Search result" msgstr "Résultat de la recherche" -#: FDebugButton.form:74 FDebugInfo.form:357 FMain.form:484 -#: FProjectProperty.form:897 +#: FDebugButton.form:74 FDebugInfo.form:357 FMain.form:484 FProjectProperty.form:897 msgid "Version control" msgstr "Contrôle de version" @@ -2185,9 +2082,8 @@ msgid "Debug" msgstr "Débogage" #: FDebugInfo.form:72 -#, fuzzy msgid "Menu1" -msgstr "Menus" +msgstr "" #: FDebugInfo.form:118 msgid "Remove current expression" @@ -2237,20 +2133,17 @@ msgstr "Afficher la fenêtre de recherche" msgid "Search string cannot be found." msgstr "La chaîne recherchée est introuvable." -#: FDebugInfo.form:365 FMain.form:489 FProjectVersion.form:89 -#: FVersionControl.form:16 +#: FDebugInfo.form:365 FMain.form:489 FProjectVersion.form:89 FVersionControl.form:16 msgid "Commit" msgstr "Publier" -#: FDebugInfo.form:372 FMain.form:495 FReportBorderChooser.form:60 -#: FReportPaddingChooser.form:64 +#: FDebugInfo.form:372 FMain.form:495 FReportBorderChooser.form:60 FReportPaddingChooser.form:64 msgid "Synchronize" msgstr "Synchroniser" #: FDebugInfo.form:379 FMain.form:508 -#, fuzzy msgid "Revert all changes" -msgstr "Conserver tous mes changements" +msgstr "" #: FDebugInfo.form:386 FMain.form:514 msgid "Add everything to repository" @@ -2329,14 +2222,8 @@ msgid "&Overwrite" msgstr "&Remplacer" #: FExportData.class:126 -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 ?" +msgid "This file already exists.\n\nDo you want to overwrite it?" +msgstr "Ce fichier existe déjà.\n\nDésirez-vous le remplacer ?" #: FExportData.form:31 FImportTable.form:102 msgid "Delimiter character" @@ -2370,13 +2257,11 @@ 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" @@ -2401,14 +2286,8 @@ msgid "Unable to register user." msgstr "Impossible d'enregistrer l'utilisateur." #: FFarmRegister.class:40 -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." +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." #: FFarmRegister.form:28 FPublish.form:320 FSoftwareFarm.form:115 msgid "Register" @@ -2418,19 +2297,13 @@ msgstr "S'enregistrer" msgid "Confirm password" msgstr "Confirmer le mot de passe" -#: FFarmRegister.form:108 FMakeInstall.form:256 FOption.form:341 +#: FFarmRegister.form:108 FMakeInstall.form:253 FOption.form:341 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" -"

\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." +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." #: FFieldChooser.class:54 FTableChooser.class:66 msgid "Unable to open connection." @@ -2492,8 +2365,7 @@ 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." -#: FFileProperty.class:144 FMakeInstall.class:345 FProjectVersion.class:211 -#: FSave.form:21 Project.module:3528 VersionControl.module:383 +#: FFileProperty.class:144 FMakeInstall.class:345 FProjectVersion.class:211 FSave.form:21 Project.module:3528 VersionControl.module:383 msgid "Continue" msgstr "Continuer" @@ -2717,7 +2589,7 @@ msgstr "Avant-plan" msgid "Lock / unlock form" msgstr "Vérrouiller / déverrouiller le formulaire" -#: FFormStack.form:14 FMain.form:1812 +#: FFormStack.form:14 FMain.form:1818 msgid "Hierarchy" msgstr "Hiérarchie" @@ -2741,23 +2613,23 @@ msgstr "Déplacer tout en bas" msgid "Default language" msgstr "Langage par défaut" -#: FHelpBrowser.form:29 FMain.form:1221 +#: FHelpBrowser.form:30 FMain.form:1221 msgid "Help browser" msgstr "Navigateur d'aide" -#: FHelpBrowser.form:40 FMain.form:755 FProfile.form:48 -msgid "Go back" -msgstr "Revenir en arrière" - -#: FHelpBrowser.form:46 FMain.form:762 FProfile.form:54 -msgid "Go forward" -msgstr "Aller en avant" - -#: FHelpBrowser.form:73 +#: FHelpBrowser.form:42 msgid "Show help tree" msgstr "Afficher l'arborescence de l'aide" -#: FHelpBrowser.form:115 +#: FHelpBrowser.form:61 FMain.form:755 FProfile.form:48 +msgid "Go back" +msgstr "Revenir en arrière" + +#: FHelpBrowser.form:67 FMain.form:762 FProfile.form:54 +msgid "Go forward" +msgstr "Aller en avant" + +#: FHelpBrowser.form:120 msgid "Print" msgstr "Imprimer" @@ -2769,8 +2641,7 @@ msgstr "Raccourcis claviers de l'EDI" msgid "Debugger" msgstr "Débogueur" -#: FHelpShortcut.form:28 FOption.form:604 FProjectProperty.form:849 -#: FTranslate.form:153 +#: FHelpShortcut.form:28 FOption.form:604 FProjectProperty.form:849 FTranslate.form:153 msgid "Translation" msgstr "Traduction" @@ -3343,14 +3214,8 @@ msgid "New folder" msgstr "Nouveau dossier" #: FMain.class:1006 -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." +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." #: FMain.class:1722 msgid "Unable to drop file into the project." @@ -3385,14 +3250,8 @@ msgid "This file is located inside the project." msgstr "Le fichier est situé à l'intérieur du projet." #: FMain.class:2710 Project.module:846 -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." +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:2821 msgid "Edit arguments" @@ -3746,7 +3605,7 @@ msgstr "Générer l'exécutable" msgid "Make source archive" msgstr "Générer une archive des sources" -#: FMain.form:1361 FMakeInstall.form:133 +#: FMain.form:1361 FMakeInstall.form:129 msgid "Make installation package" msgstr "Créer un paquet d'installation" @@ -3782,23 +3641,23 @@ msgstr "Publier un logiciel" msgid "&File" msgstr "&Fichier" -#: FMain.form:1605 +#: FMain.form:1606 msgid "&Project" msgstr "&Projet" -#: FMain.form:1616 +#: FMain.form:1618 msgid "&Debug" msgstr "&Débogage" -#: FMain.form:1627 +#: FMain.form:1630 msgid "&View" msgstr "&Affichage" -#: FMain.form:1638 +#: FMain.form:1642 msgid "&Tools" msgstr "&Outils" -#: FMain.form:1649 +#: FMain.form:1654 msgid "&?" msgstr "&?" @@ -3934,139 +3793,131 @@ msgstr "Voulez-vous vraiment retirer tous les fichiers supplémentaires ?" msgid "Select the destination directory" msgstr "Sélectionnez le répertoire destination" -#: FMakeInstall.form:147 +#: FMakeInstall.form:143 msgid "Create package" msgstr "Créer le paquet" -#: FMakeInstall.form:150 +#: FMakeInstall.form:146 msgid "Package information" msgstr "Information sur le paquet" -#: FMakeInstall.form:156 +#: FMakeInstall.form:152 msgid "Package name" msgstr "Nom du paquet" -#: FMakeInstall.form:177 FOption.form:431 +#: FMakeInstall.form:173 FOption.form:431 msgid "Add vendor prefix or name to package names" msgstr "Ajouter le préfixe ou le nom du vendeur aux noms des paquets" -#: FMakeInstall.form:184 +#: FMakeInstall.form:180 msgid "Package version" msgstr "Version du paquet" -#: FMakeInstall.form:201 FOption.form:363 FPublish.form:84 +#: FMakeInstall.form:198 FOption.form:363 FPublish.form:84 msgid "Vendor name" msgstr "Nom du fournisseur" -#: FMakeInstall.form:217 FOption.form:380 +#: FMakeInstall.form:214 FOption.form:380 msgid "Vendor prefix" msgstr "Prefixe du fournisseur" -#: FMakeInstall.form:231 +#: FMakeInstall.form:228 msgid "Maintainer information" msgstr "Informations sur le mainteneur" -#: FMakeInstall.form:271 FOption.form:415 +#: FMakeInstall.form:268 FOption.form:415 msgid "URL" msgstr "URL" -#: FMakeInstall.form:309 +#: FMakeInstall.form:306 msgid "License" msgstr "Licence" -#: FMakeInstall.form:320 +#: FMakeInstall.form:317 msgid "Changelog" msgstr "Liste des changements" -#: FMakeInstall.form:340 +#: FMakeInstall.form:337 msgid "Target distribution" msgstr "Distribution cible" -#: FMakeInstall.form:609 +#: FMakeInstall.form:580 msgid "Self-extractible" msgstr "Auto-extractible" -#: FMakeInstall.form:614 +#: FMakeInstall.form:585 msgid "Package group" msgstr "Groupe de paquet" -#: FMakeInstall.form:634 +#: FMakeInstall.form:605 msgid "Menu entry" msgstr "Entrée de menu" -#: FMakeInstall.form:656 +#: FMakeInstall.form:627 msgid "Categories" msgstr "Catégories" -#: FMakeInstall.form:665 +#: FMakeInstall.form:636 msgid "Desktop configuration file" msgstr "Fichier de configuration du bureau" -#: FMakeInstall.form:671 +#: FMakeInstall.form:642 msgid "Mimetypes" msgstr "Types MIME" -#: FMakeInstall.form:679 -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:650 +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" -#: FMakeInstall.form:691 +#: FMakeInstall.form:662 msgid "Additional configuration" msgstr "Configuration additionnelle" -#: FMakeInstall.form:699 +#: FMakeInstall.form:670 msgid "The following will be added to the end of the desktop configuration file." msgstr "Le texte suivant sera ajouté à la fin du fichier de configuration du bureau." -#: FMakeInstall.form:707 +#: FMakeInstall.form:678 msgid "Extra dependencies" msgstr "Dépendances supplémentaires" -#: FMakeInstall.form:711 +#: FMakeInstall.form:682 msgid "Same dependencies for all targets" msgstr "Mêmes dépendances pour toutes les cibles" -#: FMakeInstall.form:767 +#: FMakeInstall.form:738 msgid "Extra files" msgstr "Fichiers supplémentaires" -#: FMakeInstall.form:771 +#: FMakeInstall.form:742 msgid "Same files for all targets" msgstr "Mêmes fichiers pour toutes les cibles" -#: FMakeInstall.form:784 +#: FMakeInstall.form:755 msgid "Extra files must be located in the Project folder of the current project, i.e. the .hidden directory of the project on the disk." msgstr "Les fichiers supplémentaires doivent être situés dans le dossier Projet du projet en cours, correspondant au répertoire .hidden du projet sur le disque." -#: FMakeInstall.form:842 +#: FMakeInstall.form:813 msgid "Extra autoconf tests" msgstr "Tests autoconf supplémentaires" -#: FMakeInstall.form:848 -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:819 +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:856 +#: FMakeInstall.form:827 msgid "Destination directory" msgstr "Répertoire de destination" -#: FMakeInstall.form:865 +#: FMakeInstall.form:836 msgid "Create directories for each distribution" msgstr "Créer des répertoires pour chaque distribution" -#: FMakeInstall.form:896 +#: FMakeInstall.form:867 msgid "Commands output" msgstr "Sortie des commandes" -#: FMakeInstall.form:942 +#: FMakeInstall.form:913 msgid "Create package now" msgstr "Créer le paquet maintenant" @@ -5480,7 +5331,7 @@ msgstr "Cette chaîne de déclenchement est déjà utilisée." #: FSnippet.class:64 msgid "Edit code snippet" -msgstr "Edition d'un fragment de code" +msgstr "Édition d'un fragment de code" #: FSnippet.class:67 msgid "New code snippet" @@ -7430,23 +7281,23 @@ msgstr "Création du paquet..." msgid "'dpkg-buildpackage' has failed." msgstr "'dpkg-buildpackage' a échoué." -#: Package.module:1368 +#: Package.module:1363 msgid "Initializing ~/RPM directory." msgstr "Initialisation du répertoire ~/RPM." -#: Package.module:1388 +#: Package.module:1383 msgid "Creating source package." msgstr "Création du paquet des sources." -#: Package.module:1412 +#: Package.module:1407 msgid "Creating .spec file." msgstr "Creation du fichier .spec." -#: Package.module:1671 +#: Package.module:1645 msgid "'rpmbuild' has returned the following error code:" msgstr "'rpmbuild' a retourné le code d'erreur suivant :" -#: Package.module:2091 +#: Package.module:2060 msgid "'tar' has returned the following error code:" msgstr "'tar' a retourné le code d'erreur suivant:" @@ -7515,14 +7366,8 @@ msgid "This project does not exist." msgstr "Ce projet n'existe pas." #: Project.module:530 -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" +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:549 msgid "This is not a Gambas project." @@ -7537,14 +7382,8 @@ msgid "Convert" msgstr "Convertir" #: Project.module:555 -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 ?" +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:573 msgid "Do not open" @@ -7555,14 +7394,8 @@ msgid "Open after all" msgstr "Ouvrir malgré tout" #: Project.module:573 -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." +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:579 msgid "It cannot be converted." @@ -7633,12 +7466,8 @@ msgid "in &1." msgstr "dans &1." #: Project.module:2460 -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." +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:2464 msgid "Compiling project" @@ -7892,5 +7721,3 @@ msgstr "Cette classe n'existe pas." msgid "This symbol does not exist." msgstr "Ce symbole n'existe pas." -#~ msgid "Undo all changes" -#~ msgstr "Annuler tous les changements" diff --git a/app/src/gambas3/.project b/app/src/gambas3/.project index 5e0ac25fb..91f1e6563 100644 --- a/app/src/gambas3/.project +++ b/app/src/gambas3/.project @@ -39,8 +39,9 @@ SourcePath=/tmp Maintainer=gambas Vendor=gambas Address=gambas@users.sourceforge.net +Url=www.endoftheinternet.com License=General Public License -PackageName=gambas3-3.10.90 +PackageName=gambas3-3.13.90 CreateEachDirectory=1 Packager=1 Systems=debian diff --git a/app/src/gambas3/.src/FMain.form b/app/src/gambas3/.src/FMain.form index a52ef84ab..23c1bed5e 100644 --- a/app/src/gambas3/.src/FMain.form +++ b/app/src/gambas3/.src/FMain.form @@ -1108,9 +1108,10 @@ Arrow = False Border = False Menu = "mnuEdit" + MenuOnly = True } { btnMnuProject MenuButton - MoveScaled(43,4,7,4) + MoveScaled(41,4,9,4) Visible = False Action = "menu-project" AutoResize = True @@ -1118,9 +1119,10 @@ Arrow = False Border = False Menu = "mnuProject" + MenuOnly = True } { btnMnuDebug MenuButton - MoveScaled(50,4,7,4) + MoveScaled(50,4,8,4) Visible = False Action = "menu-debug" AutoResize = True @@ -1128,6 +1130,7 @@ Arrow = False Border = False Menu = "mnuDebug" + MenuOnly = True } { btnMnuView MenuButton MoveScaled(58,4,7,4) @@ -1138,6 +1141,7 @@ Arrow = False Border = False Menu = "mnuView" + MenuOnly = True } { btnMnuTool MenuButton MoveScaled(65,4,7,4) @@ -1148,6 +1152,7 @@ Arrow = False Border = False Menu = "mnuTool" + MenuOnly = True } { btnMnuHelp MenuButton MoveScaled(73,4,4,4) @@ -1158,6 +1163,7 @@ Arrow = False Border = False Menu = "mnuHelp" + MenuOnly = True } { btnVersionControl MenuButton MoveScaled(84,4,8,4) diff --git a/app/src/gambas3/.src/Help/FHelpBrowser.form b/app/src/gambas3/.src/Help/FHelpBrowser.form index 2162932e8..da43f5816 100644 --- a/app/src/gambas3/.src/Help/FHelpBrowser.form +++ b/app/src/gambas3/.src/Help/FHelpBrowser.form @@ -11,40 +11,43 @@ Arrangement = Arrange.Vertical { panToolbar HBox MoveScaled(0,0,107,4) - { btnBack ToolButton - MoveScaled(0,0,4,4) - ToolTip = ("Go back") - Picture = Picture["icon:/small/left"] - } - { btnForward ToolButton - MoveScaled(4,0,4,4) - ToolTip = ("Go forward") - Picture = Picture["icon:/small/right"] + { btnShowPanel ToolButton + MoveScaled(1,0,4,4) + Tracking = True + ToolTip = ("Show help tree") + Picture = Picture["icon:/small/view-split-h"] + Toggle = True } { btnHome MenuButton - MoveScaled(6,0,16,4) + MoveScaled(5,0,11,4) ToolTip = ("Index") AutoResize = True Picture = Picture["icon:/small/home"] Border = False } + { Separator3 Separator + MoveScaled(17,0,1,4) + } + { btnBack ToolButton + MoveScaled(21,0,4,4) + ToolTip = ("Go back") + Picture = Picture["icon:/small/left"] + } + { btnForward ToolButton + MoveScaled(25,0,4,4) + ToolTip = ("Go forward") + Picture = Picture["icon:/small/right"] + } { btnStop ToolButton - MoveScaled(23,0,4,4) + MoveScaled(29,0,4,4) ToolTip = ("Cancel") Picture = Picture["icon:/small/delete"] } { btnReload ToolButton - MoveScaled(27,0,4,4) + MoveScaled(33,0,4,4) ToolTip = ("Reload") Picture = Picture["icon:/small/refresh"] } - { btnShowPanel ToolButton - MoveScaled(32,0,4,4) - Tracking = True - ToolTip = ("Show help tree") - Picture = Picture["icon:/small/view-split-h"] - Toggle = True - } { Separator1 Separator MoveScaled(37,0,1,4) } @@ -109,7 +112,7 @@ Alignment = Align.Center } { Printer1 #Printer - #MoveScaled(4,2) + #MoveScaled(90,13) } } diff --git a/app/src/gambas3/.src/Help/HelpView.class b/app/src/gambas3/.src/Help/HelpView.class index d380febb1..0abbd4a1a 100644 --- a/app/src/gambas3/.src/Help/HelpView.class +++ b/app/src/gambas3/.src/Help/HelpView.class @@ -10,7 +10,7 @@ Inherits WebView Property NoHeader As Boolean Private $hObs As Observer -Private $hObsForm As Observer +Private $hWatcher As Watcher Private $hSpinner As Spinner Private $sLastUrl As String Private $bNoHeader As Boolean @@ -18,12 +18,12 @@ Private $bNoHeader As Boolean Public Sub _new() $hObs = New Observer(Me) As "WebView" - $hObsForm = New Observer(Me.Parent) As "Container" + $hWatcher = New Watcher(Me) As "WebView" $hSpinner = New Spinner(Me.Window) $hSpinner.Hide $hSpinner.Ignore = True - $hSpinner.ResizeScaled(4, 4) + $hSpinner.ResizeScaled(8, 8) End @@ -72,7 +72,7 @@ Public Sub WebView_Error() End -Public Sub Container_Arrange() +Public Sub WebView_Move() Dim hWin As Window @@ -85,6 +85,12 @@ Public Sub Container_Arrange() End +Public Sub WebView_Resize() + + WebView_Move + +End + Public Sub WebView_Load() ShowWaiting(False) diff --git a/app/src/gambas3/.src/Packager/FMakeInstall.form b/app/src/gambas3/.src/Packager/FMakeInstall.form index 861180a98..b9adc686c 100644 --- a/app/src/gambas3/.src/Packager/FMakeInstall.form +++ b/app/src/gambas3/.src/Packager/FMakeInstall.form @@ -54,6 +54,7 @@ MoveScaled(72,0,8,4) MinValue = 1 MaxValue = 999 + Value = 1 } } { HBox8 HBox @@ -305,29 +306,6 @@ Text = "Mageia" } } - { HBox17 HBox panDistro - Name = "HBox17" - MoveScaled(43,20,42,9) - Visible = False - Tag = "mandriva" - Padding = 4 - { PictureBox8 PictureBox - MoveScaled(1,1,6,6) - Picture = Picture["img/logo/mandriva.png"] - Stretch = True - Alignment = Align.Center - } - { Panel14 Panel - MoveScaled(9,1,3,6) - } - { chkMandriva CheckBox chkDistro - Name = "chkMandriva" - MoveScaled(15,1,24,4) - #Translate = False - Expand = True - Text = "Mandriva" - } - } { HBox7 HBox panDistro Name = "HBox7" MoveScaled(0,30,42,9) diff --git a/app/src/gambas3/.src/Packager/Package.module b/app/src/gambas3/.src/Packager/Package.module index 01a92ce98..89856dbd0 100644 --- a/app/src/gambas3/.src/Packager/Package.module +++ b/app/src/gambas3/.src/Packager/Package.module @@ -75,7 +75,7 @@ Public Sub CheckSystem(sSys As String) As String Select Case sSys - Case "mageia", "mandriva", "fedora", "suse" + Case "mageia", "fedora", "suse" If Not RPMBUILD_PROG Then Return Subst(("'&1' is missing."), "rpmbuild") Case "debian", "ubuntu" @@ -682,7 +682,7 @@ MAKE_PACKAGE: Select Case sSys - Case "mageia", "mandriva", "fedora", "suse" + Case "mageia", "fedora", "suse" MakeRpmSupportPackage(sSys, sSupport, aPackage) Case "debian", "ubuntu" @@ -716,7 +716,7 @@ Private Function MakePackage(sSys As String) As Boolean Select Case sSys - Case "mageia", "mandriva", "fedora", "suse" + Case "mageia", "fedora", "suse" MakeRpmPackage(sSys) Case "debian", "ubuntu" @@ -1347,11 +1347,6 @@ Private Function MakeRpmPackage(sSys As String) sVendor = "Mageia" sRelease &= "mga" - Case "mandriva" - sDistribution = "Mandriva" - sVendor = "MandrivaSoft" - sRelease &= "mdv" - Case "fedora" sDistribution = "Fedora" sVendor = "Fedora" @@ -1425,7 +1420,9 @@ Private Function MakeRpmPackage(sSys As String) Print #hFile, "Source0: %{name}-%{version}.tar.bz2" Print #hFile, "License: "; If(Project.License, Project.License, "GPL") Print #hFile, "Group: " & Project.Groups[sSys] - Print #hFile, "BuildRoot: %{_tmppath}/%{name}-%{version}-${release}-buildroot" + If sSys <> "mageia" Then + Print #hFile, "BuildRoot: %{_tmppath}/%{name}-%{version}-${release}-buildroot" + Endif Print #hFile, "Prefix: %{_prefix}" 'PRINT #hFile, "BuildRequires: gambas2-ide" Print #hFile, "BuildArch: noarch" @@ -1445,8 +1442,10 @@ Private Function MakeRpmPackage(sSys As String) Print #hFile, "\n%description\n" & $sDescription & "\nThis program is written in Gambas, so you will need Gambas to be installed." - Print #hFile, "\n%prep" - Print #hFile, "rm -rf %{buildroot}" + If sSys <> "mageia" Then + Print #hFile, "\n%prep" + Print #hFile, "rm -rf %{buildroot}" + Endif Print #hFile, "\n%setup -q -n " & Shell$($sName) @@ -1501,27 +1500,6 @@ Private Function MakeRpmPackage(sSys As String) Select Case sSys - Case "mandriva" - - Print #hFile, "install -d %{buildroot}/%{_miconsdir}" - Print #hFile, "install -d %{buildroot}/%{_iconsdir}" - Print #hFile, "install -d %{buildroot}/%{_liconsdir}" - Print #hFile, "install -p .icon/16.png %{buildroot}/%{_miconsdir}" &/ Shell$(sIcon) - Print #hFile, "install -p .icon/32.png %{buildroot}/%{_iconsdir}" &/ Shell$(sIcon) - Print #hFile, "install -p .icon/48.png %{buildroot}/%{_liconsdir}" &/ Shell$(sIcon) - - Print #hFile, "install -d %{buildroot}/%{_datadir}/applications" - Print #hFile, "cat << EOF > %{buildroot}/%{_datadir}/applications/%{name}.desktop" - - PrintDesktopFile(hFile, "%{_bindir}/" & Shell$($sName), sIcon, "X-MandrivaLinux-" & Replace(Replace(Project.Menus[sSys], " ", ""), "/", "-") & ";") - - Print #hFile, "EOF" - Print #hFile, "\n%post" - Print #hFile, "%{update_menus}" - - Print #hFile, "\n%postun" - Print #hFile, "%{clean_menus}" - Case "mageia" Print #hFile, "install -d %{buildroot}/%{_datadir}/icons" @@ -1534,7 +1512,7 @@ Private Function MakeRpmPackage(sSys As String) Print #hFile, "install -d %{buildroot}/%{_datadir}/applications" Print #hFile, "cat << EOF > %{buildroot}/%{_datadir}/applications/%{name}.desktop" - PrintDesktopFile(hFile, "%{_bindir}/" & Shell$($sName), sIcon, "X-MandrivaLinux-" & Replace(Replace(Project.Menus[sSys], " ", ""), "/", "-") & ";") + PrintDesktopFile(hFile, Shell$("%{_bindir}/" & $sName), sIcon) ', "X-MandrivaLinux-" & Replace(Replace(Project.Menus[sSys], " ", ""), "/", "-") & ";") Print #hFile, "EOF" @@ -1568,11 +1546,15 @@ Private Function MakeRpmPackage(sSys As String) Endif - Print #hFile, "\n%clean" - Print #hFile, "rm -rf %{buildroot}" + If sSys <> "mageia" Then - Print #hFile, "\n%files" - Print #hFile, "%defattr(-,root,root)" + Print #hFile, "\n%clean" + Print #hFile, "rm -rf %{buildroot}" + + Print #hFile, "\n%files" + Print #hFile, "%defattr(-,root,root)" + + Endif If Project.Type = Project.TYPE_COMPONENT Then @@ -1601,15 +1583,7 @@ Private Function MakeRpmPackage(sSys As String) Select Case sSys - Case "mandriva" - - Print #hFile, FormatFileInList("/%{_miconsdir}" &/ sIcon) - Print #hFile, FormatFileInList("/%{_iconsdir}" &/ sIcon) - Print #hFile, FormatFileInList("/%{_liconsdir}" &/ sIcon) - 'PRINT #hFile, "/%{_menudir}" &/ sName - Print #hFile, "/%{_datadir}/applications/%{name}.desktop" - - Case "mandriva", "mageia" + Case "mageia" Print #hFile, FormatFileInList("/%{_datadir}/icons/mini" &/ sIcon) Print #hFile, FormatFileInList("/%{_datadir}/icons" &/ sIcon) @@ -1727,11 +1701,6 @@ Private Function MakeRpmSupportPackage(sSys As String, sSupport As String, aComp sVendor = "Mageia" sRelease = "1mga" - Case "mandriva" - sDistribution = "Mandriva" - sVendor = "MandrivaSoft" - sRelease = "1mdv" - Case "fedora" sDistribution = "Fedora" sVendor = "Fedora" diff --git a/app/src/gambas3/.src/Project.module b/app/src/gambas3/.src/Project.module index d17fba128..f1816819a 100644 --- a/app/src/gambas3/.src/Project.module +++ b/app/src/gambas3/.src/Project.module @@ -206,7 +206,7 @@ Public HasAdded As Integer Private $bTesting As Boolean ' All possible packager target systems -Private $aSystems As String[] = ["archlinux", "autotools", "debian", "fedora", "mageia", "mandriva", "slackware", "suse", "ubuntu"] +Private $aSystems As String[] = ["archlinux", "autotools", "debian", "fedora", "mageia", "slackware", "suse", "ubuntu"] ' Pretty background Public DEFAULT_BACKGROUND As String = "gambas" diff --git a/app/src/gambas3/.src/Project/CProjectInfo.class b/app/src/gambas3/.src/Project/CProjectInfo.class index 42fd1afd1..3205bd977 100644 --- a/app/src/gambas3/.src/Project/CProjectInfo.class +++ b/app/src/gambas3/.src/Project/CProjectInfo.class @@ -220,9 +220,6 @@ Private Sub GetTranslation(sStr As String) As String Dim sLang As String Dim sPath As String - Dim aTrans As String[] - Dim iPos As Integer - Dim sTrans As String sLang = Language.Find(System.Language) sPath = $sPath &/ ".lang" &/ sLang & ".po" diff --git a/app/src/gambas3/.src/Project/Farm/FSoftwareFarm.class b/app/src/gambas3/.src/Project/Farm/FSoftwareFarm.class index 1040aeb0f..791a3aa64 100644 --- a/app/src/gambas3/.src/Project/Farm/FSoftwareFarm.class +++ b/app/src/gambas3/.src/Project/Farm/FSoftwareFarm.class @@ -98,6 +98,13 @@ Public Sub Form_Open() End +Public Sub Form_KeyPress() + + If Key.Code = Key.Esc Then Me.Close + +End + + ' Public Sub SoftwareSeparator_Draw() ' ' Paint.Brush = Paint.LinearGradient(0, 0, 0, Paint.H, [Color.Merge(Color.TextBackground, Color.TextForeground, 0.1), Color.Transparent], [0, 1]) diff --git a/app/src/gambas3/.src/Project/Farm/FSoftwareFarm.form b/app/src/gambas3/.src/Project/Farm/FSoftwareFarm.form index b8425b8d6..8aa0eadb4 100644 --- a/app/src/gambas3/.src/Project/Farm/FSoftwareFarm.form +++ b/app/src/gambas3/.src/Project/Farm/FSoftwareFarm.form @@ -51,14 +51,13 @@ } } { wizFarm Wizard - MoveScaled(1,17,96,64) + MoveScaled(1,17,97,64) Expand = True Arrangement = Arrange.Vertical Count = 3 ShowTitle = False ShowButton = False Border = False - Animated = True Index = 0 Text = ("") { panGroup ScrollView diff --git a/app/src/gambas3/.src/Translation/CTranslation.class b/app/src/gambas3/.src/Translation/CTranslation.class index 8c46a9fc6..2b997bcd2 100644 --- a/app/src/gambas3/.src/Translation/CTranslation.class +++ b/app/src/gambas3/.src/Translation/CTranslation.class @@ -201,9 +201,6 @@ Static Public Sub FindTranslation(sPath As String, sFind As String) As String Dim sMsgComment As String Dim iMode As Integer Dim bFuzzy As Boolean - Dim iPos As Integer - Dim cCache As New Collection - Dim cKey As New Collection If Not Exist(sPath) Then Return diff --git a/app/src/gambas3/.src/Util/MSdlDefaultFont.module b/app/src/gambas3/.src/Util/MSdlDefaultFont.module index 9e707fccc..2086a2c16 100644 --- a/app/src/gambas3/.src/Util/MSdlDefaultFont.module +++ b/app/src/gambas3/.src/Util/MSdlDefaultFont.module @@ -10,7 +10,7 @@ Public Sub Main() Dim V As Integer Dim hFile As File - hFile = Open "~/gambas/3.0/trunk/gb.sdl/src/default_font.h" For Create + hFile = Open "~/gambas/git/master/gb.sdl2/src/default_font_data.h" For Create Output To #hFile Print "#define DEFAULT_FONT_WIDTH "; hImage.W @@ -30,6 +30,14 @@ Public Sub Main() GoSub WRITE_CHAR Next Print "};" + + + Print + Print "const char _default_font_880_1319[] = {" + For C = 880 To 1319 + GoSub WRITE_CHAR + Next + Print "};" ' Print ' Print "typedef"