diff --git a/app/Makefile.am b/app/Makefile.am index 476b3fcf3..d8530c7b0 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -39,6 +39,7 @@ install-exec-local: xdg-icon-resource install --context mimetypes --size 64 $(DESTDIR)$(gbdatadir)/icons/application-x-gambasserverpage.png application-x-gambasserverpage; \ xdg-mime install $(srcdir)/mime/application-x-gambasserverpage.xml; \ fi + @echo "Installing the Gambas appdata file" @$(INSTALL) -d $(DESTDIR)$(datarootdir)/appdata @$(INSTALL) $(srcdir)/desktop/gambas3.appdata.xml $(DESTDIR)$(datarootdir)/appdata diff --git a/app/examples/OpenGL/Md2Model/.icon.png b/app/examples/OpenGL/Md2Model/.icon.png index f9972fedc..fe2f20a3d 100644 Binary files a/app/examples/OpenGL/Md2Model/.icon.png and b/app/examples/OpenGL/Md2Model/.icon.png differ diff --git a/app/examples/OpenGL/Md2Model/.project b/app/examples/OpenGL/Md2Model/.project index 1f9601d66..64a0bf6c7 100644 --- a/app/examples/OpenGL/Md2Model/.project +++ b/app/examples/OpenGL/Md2Model/.project @@ -3,8 +3,7 @@ Title=Md2Model example Startup=FMain Icon=icon.png -Version=3.6.90 -VersionFile=1 +Version=1.0.0 Component=gb.image Component=gb.gui Component=gb.db @@ -13,6 +12,10 @@ Component=gb.gui.opengl Component=gb.opengl Component=gb.opengl.glu Component=gb.opengl.sge +Description="This example shows how to use the 'gb.opengl.sge' component and OpenGL to display a lot of animated monster." +Authors="Benoît Minisini" Environment="GB_GUI=gb.qt4" TabSize=2 +Language=fr +Vendor=Example Packager=1 diff --git a/app/examples/OpenGL/Md2Model/.startup b/app/examples/OpenGL/Md2Model/.startup index 211b39fb2..fa95c1a19 100644 --- a/app/examples/OpenGL/Md2Model/.startup +++ b/app/examples/OpenGL/Md2Model/.startup @@ -2,7 +2,7 @@ FMain Md2Model example 0 0 -3.6.90 +1.0.0 gb.image gb.gui diff --git a/app/examples/OpenGL/NeHeTutorial/.project b/app/examples/OpenGL/NeHeTutorial/.project index 976110119..6796ebaf9 100644 --- a/app/examples/OpenGL/NeHeTutorial/.project +++ b/app/examples/OpenGL/NeHeTutorial/.project @@ -1,9 +1,9 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.5.90 +# Compiled with Gambas 3.6.90 Title=OpenGL tutorials from NeHe Startup=MMain Icon=icon.png -Version=3.6.2 +Version=3.6.90 VersionFile=1 Component=gb.image Component=gb.image.io diff --git a/app/examples/OpenGL/PDFPresentation/.icon.png b/app/examples/OpenGL/PDFPresentation/.icon.png index 348cc784e..0ede98190 100644 Binary files a/app/examples/OpenGL/PDFPresentation/.icon.png and b/app/examples/OpenGL/PDFPresentation/.icon.png differ diff --git a/app/examples/OpenGL/PDFPresentation/.project b/app/examples/OpenGL/PDFPresentation/.project index d123ae15b..b037e0d97 100644 --- a/app/examples/OpenGL/PDFPresentation/.project +++ b/app/examples/OpenGL/PDFPresentation/.project @@ -1,9 +1,9 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.5.90 +# Compiled with Gambas 3.6.90 Title=PDF Presentation Startup=MMain Icon=icon.png -Version=3.6.2 +Version=3.6.90 VersionFile=1 Component=gb.image Component=gb.gui @@ -18,6 +18,7 @@ Description="OpenGL PDF presentation" Authors="Laurent Carlier\nBenoit Minisini" Environment="GB_GUI=gb.qt" TabSize=2 +Language=fr Maintainer=benoit Vendor=Princeton Address=benoit@localhost diff --git a/app/examples/OpenGL/PDFPresentation/.settings b/app/examples/OpenGL/PDFPresentation/.settings index fdd3f3f96..c8c5e6e5a 100644 --- a/app/examples/OpenGL/PDFPresentation/.settings +++ b/app/examples/OpenGL/PDFPresentation/.settings @@ -26,9 +26,9 @@ SearchString=True [OpenFile] File[1]=".src/MMain.module:7.0" -Active=2 +Active=4 File[2]=".src/FMain.class:41.2" -File[3]=".src/CpdfPresentation.class:106.2" +File[3]=".src/CPdfPresentation.class:358.18" File[4]=".src/FMain.form" Count=4 diff --git a/app/examples/OpenGL/PDFPresentation/.src/Clogo.class b/app/examples/OpenGL/PDFPresentation/.src/CLogo.class similarity index 100% rename from app/examples/OpenGL/PDFPresentation/.src/Clogo.class rename to app/examples/OpenGL/PDFPresentation/.src/CLogo.class diff --git a/app/examples/OpenGL/PDFPresentation/.src/CpdfPresentation.class b/app/examples/OpenGL/PDFPresentation/.src/CPdfPresentation.class similarity index 100% rename from app/examples/OpenGL/PDFPresentation/.src/CpdfPresentation.class rename to app/examples/OpenGL/PDFPresentation/.src/CPdfPresentation.class diff --git a/app/examples/OpenGL/PDFPresentation/.src/MMain.module b/app/examples/OpenGL/PDFPresentation/.src/MMain.module index f8e737309..846abef44 100644 --- a/app/examples/OpenGL/PDFPresentation/.src/MMain.module +++ b/app/examples/OpenGL/PDFPresentation/.src/MMain.module @@ -6,7 +6,6 @@ Public FrameRate As Integer = 50 Public Sub Main() - Print Env["GB_GUI"] FMain.Show End diff --git a/app/src/gambas3/.lang/fr.mo b/app/src/gambas3/.lang/fr.mo index fc77f3163..f931ca37a 100644 Binary files a/app/src/gambas3/.lang/fr.mo and b/app/src/gambas3/.lang/fr.mo differ diff --git a/app/src/gambas3/.lang/fr.po b/app/src/gambas3/.lang/fr.po index b38d88d90..ffe862cb7 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.6.90\n" -"POT-Creation-Date: 2015-01-11 00:24 UTC\n" -"PO-Revision-Date: 2015-01-05 23:31 UTC\n" +"PO-Revision-Date: 2015-01-11 15:47 UTC\n" "Last-Translator: Benoît Minisini \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -834,7 +833,6 @@ msgstr "Les exemples sont stockés sur le serveur de la logithèque de Gambas. C msgid "there" msgstr "ici" -#: CProjectTree.class:285 FHelpShortcut.form:22 FMain.form:375 #: FSearch.class:97 FSelectIcon.form:31 Project.module:1807 msgid "Project" msgstr "Projet" @@ -903,23 +901,6 @@ msgstr "Impossible de générer l'exécutable." msgid "Unable to install source directory" msgstr "Impossible d'installer le répertoire source" -#: CWaitingAnimation.class:56 FColorChooser.form:69 FComponentChooser.form:85 -#: FConflict.class:218 FConnectionEditor.class:427 FCrash.form:96 -#: FCreateFile.form:227 FDebugInfo.form:263 FEditor.class:2323 -#: FExportData.class:126 FFarmConfig.form:210 FFarmRequest.form:43 -#: FFieldChooser.form:138 FFileProperty.class:141 FFontChooser.form:40 -#: FForm.class:3187 FGotoLine.form:23 FHelpBrowser.form:60 -#: FImageEditor.class:356 FImageOffsetSelection.form:33 FImageQuality.form:30 -#: FImageResize.form:49 FImageRotate.form:32 FList.form:121 FMain.class:214 -#: FMakeInstall.class:361 FMenu.form:402 FNewConnection.form:284 -#: FNewTable.form:86 FNewTranslation.form:21 FOption.class:720 -#: FPasteSpecial.form:77 FPasteTable.form:107 FProjectChooser.form:62 -#: FProjectProperty.form:992 FProjectVersion.class:209 FProxy.form:57 -#: FPublish.class:286 FReportBorderChooser.form:48 FReportBrushChooser.form:36 -#: FReportCoordChooser.form:26 FReportPaddingChooser.form:75 FSave.form:28 -#: FSaveProjectAs.form:76 FSearch.class:887 FSelectComponent.form:50 -#: FSelectExtraFile.form:43 FSelectIcon.form:87 FSnippet.form:57 -#: FSoftwareFarm.class:437 FTableChooser.form:68 FText.form:41 #: FTextEditor.class:656 FTranslate.class:556 Project.module:488 msgid "Cancel" msgstr "Annuler" @@ -949,23 +930,9 @@ msgid "in &1:&2." msgstr "dans &1:&2." #: Design.module:392 -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:458 FColorChooser.form:63 FConnectionEditor.class:633 -#: FCrash.form:90 FCreateFile.form:233 FFieldChooser.form:132 -#: FFontChooser.form:34 FGotoLine.form:17 FImageOffsetSelection.form:27 -#: FImageQuality.form:24 FImageResize.form:103 FImageRotate.form:26 -#: FList.form:115 FMakeInstall.class:307 FMenu.form:397 -#: FNewConnection.form:278 FNewTable.form:80 FNewTranslation.form:15 -#: FPasteSpecial.form:71 FProjectProperty.form:986 FProxy.form:63 -#: FReportBorderChooser.form:54 FReportBrushChooser.form:42 -#: FReportCoordChooser.form:32 FReportPaddingChooser.form:69 -#: FSelectComponent.form:45 FSelectExtraFile.form:37 FSelectIcon.form:82 #: FSnippet.form:51 FTableChooser.form:62 FText.form:35 msgid "OK" msgstr "OK" @@ -991,20 +958,11 @@ msgid "About Gambas" msgstr "À propos de Gambas" #: FAbout.form:48 -msgid "" -"Gambas
\n" -"Almost
\n" -"Means
\n" -"B A S I C !" +msgid "Gambas
\nAlmost
\nMeans
\nB A S I C !" msgstr "-" #: FAbout.form:61 -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" +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" #: FAbout.form:67 @@ -1072,12 +1030,9 @@ msgid "The &1 component needs the &2 component." msgstr "Le composant &1 nécessite le composant &2." #: FComponentChooser.form:24 -#, fuzzy msgid "Select a component" -msgstr "Choisissez une police" +msgstr "Choisissez un composant" -#: FComponentChooser.form:91 FConnectionEditor.form:110 FEditor.form:327 -#: FForm.form:427 FHelpBrowser.form:66 FImageEditor.form:338 FMain.form:334 #: FTextEditor.form:260 FTranslate.form:76 msgid "Reload" msgstr "Recharger" @@ -1099,12 +1054,8 @@ msgid "&Edit" msgstr "&Éditer" #: FConflict.class:23 -msgid "" -"This file is in conflict with the revision #&1.\n" -"You must resolve the conflict in order to use the file." -msgstr "" -"Ce fichier entre en conflit avec la révision #&1.\n" -"Vous devez résoudre le conflit pour pouvoir utiliser ce fichier de nouveau." +msgid "This file is in conflict with the revision #&1.\nYou must resolve the conflict in order to use the file." +msgstr "Ce fichier entre en conflit avec la révision #&1.\nVous devez résoudre le conflit pour pouvoir utiliser ce fichier de nouveau." #: FConflict.class:116 msgid "Unable to load file:" @@ -1114,18 +1065,13 @@ msgstr "Impossible de charger le fichier :" msgid "Text" msgstr "Texte" -#: FConflict.class:160 FCreateFile.class:142 FMain.form:821 #: FReportBrushChooser.form:49 Project.module:218 msgid "Image" msgstr "Image" #: FConflict.class:218 -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:246 msgid "Some conflicts are not yet resolved." @@ -1136,12 +1082,8 @@ msgid "Unable to resolve the conflict." msgstr "Impossible de résoudre le conflit." #: FConflict.class:281 -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:289 msgid "Conflict files" @@ -1151,50 +1093,34 @@ msgstr "Fichiers en conflits" msgid "Version conflict" msgstr "Conflit de version" -#: FConflict.form:71 FConnectionEditor.form:379 FEditor.form:149 -#: FForm.form:185 FImageEditor.form:128 FMain.form:906 FMenu.form:111 #: FOutput.form:63 FProjectVersion.form:234 FTextEditor.form:121 msgid "Cut" msgstr "Couper" -#: FConflict.form:77 FConnectionEditor.form:149 FEditor.form:156 -#: FForm.form:192 FImageEditor.form:136 FList.form:92 FMain.form:913 -#: FMenu.form:117 FOutput.form:70 FProjectVersion.form:240 FSystemInfo.form:74 #: FTextEditor.form:128 msgid "Copy" msgstr "Copier" -#: FConflict.form:83 FConnectionEditor.form:157 FEditor.form:163 -#: FForm.form:205 FImageEditor.form:143 FList.form:98 FMain.form:920 -#: FMenu.form:123 FOutput.form:77 FPasteTable.form:101 #: FProjectVersion.form:246 FTextEditor.form:135 msgid "Paste" msgstr "Coller" -#: FConflict.form:89 FConnectionEditor.form:407 FEditor.form:132 -#: FFieldChooser.form:121 FForm.form:168 FImageEditor.form:109 FList.form:104 -#: FOption.form:848 FOutput.form:46 FProjectVersion.form:252 #: FTextEditor.form:104 msgid "Undo" msgstr "Annuler" -#: FConflict.form:95 FConnectionEditor.form:414 FEditor.form:139 -#: FForm.form:175 FImageEditor.form:117 FOutput.form:53 #: FProjectVersion.form:258 FTextEditor.form:111 msgid "Redo" msgstr "Rétablir" -#: FConflict.form:101 FEditor.form:479 FMenu.form:133 FProjectVersion.form:264 #: FTextEditor.form:363 msgid "Indent" msgstr "Indenter" -#: FConflict.form:107 FEditor.form:487 FMenu.form:139 FProjectVersion.form:270 #: FTextEditor.form:371 msgid "Unindent" msgstr "Désindenter" -#: FConflict.form:149 FMain.form:327 FOpenProject.form:35 #: FProjectChooser.form:75 msgid "Open" msgstr "Ouvrir" @@ -1203,8 +1129,6 @@ msgstr "Ouvrir" msgid "Open..." msgstr "Ouvrir..." -#: FConflict.form:157 FConnectionEditor.form:102 FEditor.form:333 -#: FForm.form:433 FImageEditor.form:345 FMain.form:343 FMenu.class:72 #: FSaveProjectAs.form:82 FTextEditor.form:266 msgid "Save" msgstr "Enregistrer" @@ -1213,21 +1137,14 @@ msgstr "Enregistrer" msgid "Solve" msgstr "Résoudre" -#: FConflict.form:174 FDebugInfo.form:270 FEditor.form:320 -#: FFarmConfig.form:143 FFileProperty.form:76 FForm.form:420 -#: FImageEditor.form:352 FImportTable.form:222 FMain.form:360 FPatch.form:105 -#: FProjectVersion.form:323 FSystemInfo.form:80 FTextEditor.form:273 #: FTips.form:83 FTranslate.form:308 msgid "Close" msgstr "Fermer" -#: FConnectionEditor.class:45 FCreateFile.form:78 FDebugInfo.class:38 -#: FMakeInstall.form:186 FNewConnection.form:65 FNewTable.form:33 #: FOption.form:257 msgid "Name" msgstr "Nom" -#: FConnectionEditor.class:50 FCreateFile.form:129 FCreateProject.form:98 #: FDebugInfo.class:76 FNewConnection.form:79 FNewTable.form:48 FProxy.form:27 msgid "Type" msgstr "Type" @@ -1256,7 +1173,6 @@ msgstr "Unique" msgid "Field" msgstr "Champ" -#: FConnectionEditor.class:290 FMakeInstall.form:253 FProjectProperty.form:322 #: FPublish.form:128 FSoftwareFarm.form:337 msgid "Description" msgstr "Description" @@ -1293,7 +1209,6 @@ msgstr "Blob" msgid "Boolean" msgstr "Booléen" -#: FConnectionEditor.class:759 FProjectVersion.class:288 #: MConnection.module:120 msgid "Date" msgstr "Date" @@ -1394,8 +1309,6 @@ msgstr "Nouvelle table" msgid "Delete table" msgstr "Supprimer la table" -#: FConnectionEditor.form:133 FMain.form:1032 FMakeInstall.form:644 -#: FOption.form:1261 FProjectProperty.form:519 FPublish.form:270 #: FSoftwareFarm.form:421 msgid "Remove" msgstr "Supprimer" @@ -1420,7 +1333,6 @@ msgstr "Copier la table" msgid "Import text file" msgstr "Importer un fichier texte" -#: FConnectionEditor.form:165 FImportTable.form:215 FOption.form:1269 #: FTranslate.form:328 msgid "Import" msgstr "Importer" @@ -1433,17 +1345,14 @@ msgstr "Requêtes SQL" msgid "Fields" msgstr "Champs" -#: FConnectionEditor.form:233 FMain.class:2070 FMakeInstall.form:638 #: FOption.form:1309 FProjectProperty.form:513 FPublish.form:160 msgid "Add" msgstr "Ajouter" -#: FConnectionEditor.form:247 FList.form:76 FMakeInstall.form:656 #: FPublish.form:282 msgid "Down" msgstr "Descendre" -#: FConnectionEditor.form:254 FList.form:70 FMakeInstall.form:650 #: FPublish.form:276 msgid "Up" msgstr "Monter" @@ -1468,7 +1377,6 @@ msgstr "Exécuter la requête" msgid "New query" msgstr "Nouvelle requête" -#: FConnectionEditor.form:365 FCreateFile.form:53 FMain.form:765 #: FOption.form:1247 FTranslate.form:71 msgid "New" msgstr "Nouveau" @@ -1477,7 +1385,6 @@ msgstr "Nouveau" msgid "Remove query" msgstr "Supprimer la requête" -#: FConnectionEditor.form:452 FEditor.form:128 FForm.form:164 #: FImageEditor.form:104 FOption.form:1254 FTextEditor.form:100 msgid "Edit" msgstr "Éditer" @@ -1490,8 +1397,6 @@ msgstr "Exporter vers un fichier CSV" msgid "Export" msgstr "Exporter" -#: FConnectionEditor.form:485 FForm.form:212 FList.form:64 FMain.form:934 -#: FMenu.form:101 FNewConnection.class:347 FOption.class:885 #: FSoftwareFarm.class:534 FTranslate.form:81 msgid "Delete" msgstr "Supprimer" @@ -1588,7 +1493,6 @@ msgstr "Impossible d'ajouter le fichier." msgid "New file" msgstr "Nouveau fichier" -#: FCreateFile.form:88 FCreateProject.form:274 FImportTable.form:57 #: FMakePatch.form:66 FProjectProperty.form:742 FSearch.form:100 msgid "Options" msgstr "Options" @@ -1674,12 +1578,8 @@ msgid "CGI Web application" msgstr "Application Web CGI" #: FCreateProject.form:259 -msgid "" -"Application stored in a\n" -"Subversion repository" -msgstr "" -"Application stockée dans un\n" -"référentiel Subversion" +msgid "Application stored in a\nSubversion repository" +msgstr "Application stockée dans un\nréférentiel Subversion" #: FCreateProject.form:288 msgid "Internationalization" @@ -1785,7 +1685,6 @@ msgstr "Expression" msgid "Function" msgstr "Fonction" -#: FDebugInfo.class:55 FImageEditor.form:564 FImportTable.class:56 #: FOption.form:648 msgid "Line" msgstr "Ligne" @@ -1810,7 +1709,6 @@ msgstr "Message" msgid "native code" msgstr "code natif" -#: FDebugInfo.class:559 FImageProperty.form:377 FList.form:86 #: FMakeInstall.form:662 FOption.class:720 FOutput.form:84 FPublish.form:172 msgid "Clear" msgstr "Effacer" @@ -1919,16 +1817,9 @@ msgstr "La chaîne recherchée est introuvable." msgid "Stack backtrace" msgstr "Pile des appels" -#: FEditor.class:2323 FImageEditor.class:356 FMain.class:2574 #: FTextEditor.class:656 -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." #: FEditor.class:2777 FTextEditor.class:1067 msgid "(Declarations)" @@ -2067,14 +1958,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:100 msgid "Delimiter character" @@ -2113,14 +1998,8 @@ msgid "Unable to register user." msgstr "Impossible d'enregistrer l'utilisateur." #: FFarmConfig.class:93 -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." #: FFarmConfig.class:128 msgid "Authentication failed." @@ -2142,7 +2021,6 @@ msgstr "Serveur" msgid "Login" msgstr "Identifiant" -#: FFarmConfig.form:95 FNewConnection.form:152 FProjectVersion.form:142 #: FProxy.form:47 msgid "Password" msgstr "Mot de passe" @@ -2164,14 +2042,8 @@ msgid "Confirm password" msgstr "Confirmer le mot de passe" #: FFarmConfig.form:189 -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." #: FFarmConfig.form:204 msgid "Register" @@ -2241,7 +2113,6 @@ 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 le dernier envoi vers le réferentiel." -#: FFileProperty.class:141 FMakeInstall.class:361 FProjectVersion.class:209 #: FSave.form:21 Project.module:3491 msgid "Continue" msgstr "Continuer" @@ -2275,14 +2146,8 @@ msgid "Component missing for control &1" msgstr "Composant introuvable pour le contrôle &1" #: FForm.class:3187 -msgid "" -"The form has been modified.\n" -"\n" -"All your changes will be lost." -msgstr "" -"Le formulaire a été modifié.\n" -"\n" -"Tous vos changements seront perdus." +msgid "The form has been modified.\n\nAll your changes will be lost." +msgstr "Le formulaire a été modifié.\n\nTous vos changements seront perdus." #: FForm.form:131 msgid "Select" @@ -2753,19 +2618,16 @@ msgid "Fill" msgstr "Remplir" #: FImageProperty.form:385 -#, fuzzy msgid "Colorize" -msgstr "Couleur" +msgstr "Colorier" #: FImageProperty.form:393 -#, fuzzy msgid "Desaturate" -msgstr "Saturation" +msgstr "Désaturer" #: FImageProperty.form:401 -#, fuzzy msgid "Make transparent" -msgstr "Enregistrer la traduction" +msgstr "Rendre transparent" #: FImageProperty.form:420 msgid "Opacity" @@ -3036,14 +2898,8 @@ msgid "New folder" msgstr "Nouveau dossier" #: FMain.class:946 -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:1642 msgid "Unable to drop file into the project." @@ -3638,12 +3494,8 @@ msgid "Mimetypes" msgstr "Types MIME" #: FMakeInstall.form:580 -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" +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:592 msgid "Additional configuration" @@ -3678,9 +3530,7 @@ msgid "Extra autoconf tests" msgstr "Tests autoconf supplémentaires" #: FMakeInstall.form:749 -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." +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.

Laissez ce champ vide si vous n'en avez pas besoin, ou si vous ne connaissez rien aux scripts autoconf." #: FMakeInstall.form:757 @@ -3696,18 +3546,8 @@ msgid "Create package" msgstr "Création du paquet" #: FMakeInstall.form:775 -msgid "" -"All needed information have been collected. You can now create the installation packages for your application...\n" -"

Click on the OK button to create the packages.\n" -"

Click on the Previous button if you had made a mistake.\n" -"

Click on the Cancel button to cancel the operation.\n" -"\n" -msgstr "" -"Toutes les informations nécessaires ont été collectées. Vous pouvez maintenant créer les paquets d'installations de votre application...\n" -"

Cliquez sur le bouton OK pour créer les paquets.\n" -"

Cliquez sur le bouton Précédent pour corriger une erreur.\n" -"

Cliquez sur le bouton Annuler pour abandonner l'opération.\n" -"\n" +msgid "All needed information have been collected. You can now create the installation packages for your application...\n

Click on the OK button to create the packages.\n

Click on the Previous button if you had made a mistake.\n

Click on the Cancel button to cancel the operation.\n\n" +msgstr "Toutes les informations nécessaires ont été collectées. Vous pouvez maintenant créer les paquets d'installations de votre application...\n

Cliquez sur le bouton OK pour créer les paquets.\n

Cliquez sur le bouton Précédent pour corriger une erreur.\n

Cliquez sur le bouton Annuler pour abandonner l'opération.\n\n" #: FMakePatch.class:24 msgid "Please select the origin archive." @@ -6914,14 +6754,8 @@ msgid "This project does not exist." msgstr "Ce projet n'existe pas." #: Project.module:469 -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:482 msgid "This is not a Gambas project." @@ -6936,14 +6770,8 @@ msgid "Convert" msgstr "Convertir" #: Project.module:488 -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:506 msgid "Do not open" @@ -6954,14 +6782,8 @@ msgid "Open after all" msgstr "Ouvrir malgré tout" #: Project.module:506 -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:512 msgid "It cannot be converted." @@ -7040,12 +6862,8 @@ msgid "in &1." msgstr "dans &1." #: Project.module:2513 -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:2517 msgid "Compiling project" @@ -7255,14 +7073,3 @@ msgstr "Cette classe n'existe pas." msgid "This symbol does not exist." msgstr "Ce symbole n'existe pas." -#~ msgid "Reset filter" -#~ msgstr "Réinitialiser le filtre" - -#~ msgid "Implements" -#~ msgstr "Implémente" - -#~ msgid "Excludes" -#~ msgstr "Exclut" - -#~ msgid "Authors" -#~ msgstr "Auteurs" diff --git a/app/src/gbs3/.settings b/app/src/gbs3/.settings index deae923c8..44e27a6a2 100644 --- a/app/src/gbs3/.settings +++ b/app/src/gbs3/.settings @@ -82,14 +82,15 @@ SearchComment=False SearchString=True [OpenFile] -Active=1 +Active=4 File[1]=".src/MMain.module:336.45" File[2]=".src/MServerPage.module:3.0" File[3]=".src/CComponent.class:38.0" -File[4]="usage-gbs:12.0" -File[5]="license:0.13" +File[4]="usage-gbs:0.0" +File[5]="license:0.4" File[6]="usage-gbw:0.0" -Count=6 +Count=7 +File[7]="icon.png" [VersionControl] User="gambas" diff --git a/app/src/gbs3/license b/app/src/gbs3/license index 7c291956a..55b3a7b99 100644 --- a/app/src/gbs3/license +++ b/app/src/gbs3/license @@ -1,4 +1,4 @@ -(c) 2007-2014 Fabien Bodard, Benoît Minisini +(c) Fabien Bodard, Benoît Minisini This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/component.am b/component.am index d5aabb81e..3e00843ce 100644 --- a/component.am +++ b/component.am @@ -38,6 +38,9 @@ install-data-hook: $(INSTALL) $(COMPONENT)/.hidden/control/*.png $(DESTDIR)$(gbdatadir)/control/$(COMPONENT); \ fi @echo "Creating the information files for $(COMPONENT) component..." + @if test "$(EXTRACT_HELP)" = "1"; then \ + $(DESTDIR)$(bindir)/gbh$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) -c $(COMPONENT); \ + fi @$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) > /dev/null @echo diff --git a/main/Makefile.am b/main/Makefile.am index 593792592..aacaa8a3f 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 --install -SUBDIRS = gbc gbx lib share -EXTRA_DIST = TODO reconf spec README mime gb.*.h +SUBDIRS = gbc gbx . lib share +EXTRA_DIST = TODO reconf tools spec README mime gb.*.h BUILT_SOURCES = trunk_version.h CLEANFILES = trunk_version.h @@ -36,6 +36,29 @@ install-exec-local: xdg-mime install $(srcdir)/mime/application-x-gambas3.xml; \ fi + @echo "Creating the information files for gb component..." + @$(INSTALL) -d $(DESTDIR)$(gbdatadir)/info + @$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) gb + @rm -f $(DESTDIR)$(gblibdir)/lib.gb.la + @rm -f $(DESTDIR)$(gblibdir)/lib.gb.so* + @$(INSTALL) lib/gb.component $(DESTDIR)$(gblibdir) + + @echo "Installing the compiler tools..." + @(cd $(srcdir)/tools; d=`pwd`; \ + for p in gb*; do \ + echo "Compiling $$p..."; cd $$d/$$p; \ + $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \ + if test $$? -eq 0; then \ + $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \ + rm -rf .gambas; \ + echo "Installing $$p..."; \ + $(INSTALL) $$p.gambas $(DESTDIR)$(bindir); \ + ln -s $$p.gambas $(DESTDIR)$(bindir)/$$p || true; \ + else \ + echo "|| Unable to compile $$p" >> ../../../warnings.log; \ + fi \ + done) + uninstall-local: @rm -f $(DESTDIR)$(bindir)/gbr$(GAMBAS_VERSION) @rm -rf $(DESTDIR)$(gblibdir)/info @@ -43,6 +66,14 @@ uninstall-local: xdg-mime uninstall $(srcdir)/mime/application-x-gambas3.xml; \ xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3; \ fi + @(cd $(srcdir)/tools; for p in gb*; do rm -f $(DESTDIR)$(bindir)/$$p.gambas $(DESTDIR)$(bindir)/$$p; done) + @rm -f $(DESTDIR)$(gblibdir)gb.component + @rm -rf $(DESTDIR)$(gbdatadir)/info/gb.info + @rm -rf $(DESTDIR)$(gbdatadir)/info/gb.list dist-hook: @rm -f $(distdir)/trunk_version.h + @(cd $(distdir)/tools; \ + rm -rf `find . -name ".gambas" -o -name ".action" -o -name ".lock" -o -name ".xvpics" -o -name "*~" -o -name "*.out" -o -name "*.pot" -o -name "*.gambas" -o -name "core*" -o -name ".kdbg*" -o -name ".svn"`;) + + diff --git a/main/gbc/gbi.c b/main/gbc/gbi.c index 7f977af5e..a51420de1 100644 --- a/main/gbc/gbi.c +++ b/main/gbc/gbi.c @@ -793,7 +793,7 @@ int main(int argc, char **argv) printf( "\nGenerate component description files.\n" "\nUsage: gbi" GAMBAS_VERSION_STRING " [options] [components]\n" - "Options:" + "\nOptions:" #if HAVE_GETOPT_LONG "\n" #if DO_PRELOADING diff --git a/main/lib/Makefile.am b/main/lib/Makefile.am index b627aeae4..2d7e36b25 100644 --- a/main/lib/Makefile.am +++ b/main/lib/Makefile.am @@ -1,20 +1,3 @@ -SUBDIRS = . debug eval db compress vb option geom draw image gui gui.opengl \ +SUBDIRS = debug eval db compress vb option geom draw image gui gui.opengl \ image.effect signal complex data clipper @INOTIFY_DIR@ -dist_gblib_DATA = gb.component -gblib_DATA = gb.component - -install-data-hook: - @echo - @echo "Creating the information files for gb component..." - @$(INSTALL) -d $(DESTDIR)$(gbdatadir)/info - @$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) gb - @rm -f $(DESTDIR)$(gblibdir)/lib.gb.la - @rm -f $(DESTDIR)$(gblibdir)/lib.gb.so* - -uninstall-hook: - @rm -rf $(DESTDIR)$(gblibdir)gb.component - @rm -rf $(DESTDIR)$(gbdatadir)/info/gb.info - @rm -rf $(DESTDIR)$(gbdatadir)/info/gb.list - - diff --git a/main/lib/data/Makefile.am b/main/lib/data/Makefile.am index 01600cf5c..92c42900c 100644 --- a/main/lib/data/Makefile.am +++ b/main/lib/data/Makefile.am @@ -1,4 +1,5 @@ COMPONENT = gb.data +## EXTRACT_HELP = 1 include $(top_srcdir)/component.am gblib_LTLIBRARIES = gb.data.la diff --git a/main/tools/gbh3/.directory b/main/tools/gbh3/.directory new file mode 100644 index 000000000..06dab1c8a --- /dev/null +++ b/main/tools/gbh3/.directory @@ -0,0 +1,2 @@ +[Desktop Entry] +Icon=./.icon.png diff --git a/main/tools/gbh3/.gitignore b/main/tools/gbh3/.gitignore new file mode 100644 index 000000000..cb95c3b71 --- /dev/null +++ b/main/tools/gbh3/.gitignore @@ -0,0 +1,13 @@ +#---- Gambas files to ignore (v1) +*.gambas +.lock +*~ +core +core.* +vgcore +vgcore.* +.kdbg* +.*.prof +.lang/*.pot +.gambas/* +#---- diff --git a/main/tools/gbh3/.icon.png b/main/tools/gbh3/.icon.png new file mode 100644 index 000000000..5d79d7991 Binary files /dev/null and b/main/tools/gbh3/.icon.png differ diff --git a/app/src/gbh3/.project b/main/tools/gbh3/.project similarity index 91% rename from app/src/gbh3/.project rename to main/tools/gbh3/.project index a11060bc4..de92da874 100644 --- a/app/src/gbh3/.project +++ b/main/tools/gbh3/.project @@ -2,7 +2,9 @@ # Compiled with Gambas 3.6.90 Title=gbh3 Startup=MMain +Icon=icon.png Version=3.6.90 +VersionFile=1 Component=gb.pcre Description="Extract help comments from C/C++ source files and format them into a .help file." Authors="(C) 2014 Tobias Boege , GPLv2+" diff --git a/app/src/gbh3/.src/MMain.module b/main/tools/gbh3/.src/MMain.module similarity index 65% rename from app/src/gbh3/.src/MMain.module rename to main/tools/gbh3/.src/MMain.module index bd43b3a03..0579c1e73 100644 --- a/app/src/gbh3/.src/MMain.module +++ b/main/tools/gbh3/.src/MMain.module @@ -1,58 +1,116 @@ ' Gambas module file +Private $sRoot As String +Private $sComponent As String +Private $bVerbose As Boolean + +Private Sub PrintError(sErr As String) + + Error File.Name(Args[0]); ": error: "; sErr + Quit 1 + +End + +Private Sub PrintMessage(sMsg As String) + + If Not $bVerbose Then Return + Error sMsg + +End + Public Sub Main() Dim iInd As Integer, aSources As New String[] Dim sArg, sRec As String, aRec As String[] + Dim sPath As String + Dim hOut As File + Dim bOnlySources As Boolean + Dim sMsg As String - If Args.Count < 2 Then Usage() + $sRoot = System.Path + For iInd = 1 To Args.Max Select Case Args[iInd] Case "-h", "--help" - Usage() + Print File.Load("usage") + Quit Case "-V", "--version" - Version() + Print Application.Version + Quit + Case "-L", "--license" + Print File.Load("license") + Quit + Case "-v", "--verbose" + $bVerbose = True + Case "-r", "--root" + $sRoot = Args[iInd + 1] + If Not $sRoot Then PrintError(Args[iInd] & " requires an argument") + Inc iInd + Case "-c", "--component" + $sComponent = Args[iInd + 1] + If Not $sComponent Then PrintError(Args[iInd] & " requires an argument") + Inc iInd + Case "--" + bOnlySources = True Default + If Not bOnlySources Then + If Args[iInd] Begins "-" Then + PrintError("unknown option: " & Args[iInd]) + Endif + Endif aSources.Add(Args[iInd]) End Select Next + + If aSources.Count = 0 Then aSources.Add(".") + + If $sComponent Then + sPath = $sRoot &/ "share/gambas" & System.Version &/ "info" &/ $sComponent & ".help" + PrintMessage("Output to " & sPath) + hOut = Open sPath For Create + Else + hOut = File.Out + Endif For Each sArg In aSources - sArg = Application.Dir &/ sArg + If Left(sArg) <> "/" Then + If sArg = "." Then + sArg = Application.Dir + Else + sArg = Application.Dir &/ sArg + Endif + Endif If IsDir(sArg) Then - aRec = RDir(sArg, "*.{c,cpp}") + aRec = RDir(sArg, "*.{c,cc,cpp}") For Each sRec In aRec - OneFile(sArg &/ sRec) + OneFile(sArg &/ sRec, hOut) Next Else - OneFile(sArg) + OneFile(sArg, hOut) Endif Next + + If $sComponent Then + Close #hOut + If Stat(sPath).Size = 0 Then + PrintMessage("Removing void data file") + Try Kill sPath + Endif + Endif + +Catch + + sMsg = Error.Text & ": " & Error.Backtrace.Join(" ") + Output To Default + PrintError(sMsg) + End -Private Sub Usage() - Print "Usage:";; Args[0];; "SOURCES..." - Print - Print "Extract Gambas help comments from all SOURCES and output a .help file." - Print "If SOURCES contains directories, they are searched recursively for .c" - Print "and .cpp files." - Print - Print "Options:" - Print "\t-h, --help\t\tDisplay this help text" - Print "\t-V, --version\t\tDisplay project version" - Quit -End - -Private Sub Version() - Print Application.Version - Quit -End - -Private Sub OneFile(sPath As String) +Private Sub OneFile(sPath As String, hOut As File) Dim hFile As File - Error "Processing";; sPath; "..." + PrintMessage("Processing " & sPath & "...") hFile = Open sPath For Input - MakeHelp(Translate(Extract(hFile), sPath), File.Out) + MakeHelp(Translate(Extract(hFile), sPath), hOut) Close #hFile End diff --git a/main/tools/gbh3/.startup b/main/tools/gbh3/.startup new file mode 100644 index 000000000..8cc9ab967 --- /dev/null +++ b/main/tools/gbh3/.startup @@ -0,0 +1,8 @@ +MMain +gbh3 +0 +0 +3.6.90 + +gb.pcre + diff --git a/app/src/gbh3/README b/main/tools/gbh3/README similarity index 100% rename from app/src/gbh3/README rename to main/tools/gbh3/README diff --git a/main/tools/gbh3/icon.png b/main/tools/gbh3/icon.png new file mode 100644 index 000000000..51dfc3e79 Binary files /dev/null and b/main/tools/gbh3/icon.png differ diff --git a/main/tools/gbh3/license b/main/tools/gbh3/license new file mode 100644 index 000000000..cdff94eb6 --- /dev/null +++ b/main/tools/gbh3/license @@ -0,0 +1,6 @@ +(c) Tobias Boege, Benoît Minisini + +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. diff --git a/main/tools/gbh3/usage b/main/tools/gbh3/usage new file mode 100644 index 000000000..835af79c0 --- /dev/null +++ b/main/tools/gbh3/usage @@ -0,0 +1,18 @@ + +Extract Gambas help comments from source files. + +Usage: gbh3 [options] [] + +Options: + -r --root gives the Gambas installation directory + -c --component generate help directly in a component '*.help' file + -V --version display version + -L --license display license + -h --help display this help + +If contains directories, they are searched recursively for '*.c' +and '*.cpp' files. If is not specified, the current directory +is searched. + +The extracted help is printed on the standard output, unless the '-c' +option is specified.