Commits October 2008

commits@lists.geany.org

3 participants
118 discussions

SF.net SVN: geany:[3153] trunk
by eht16＠users.sourceforge.net 25 Oct '08

25 Oct '08

Revision: 3153 http://geany.svn.sourceforge.net/geany/?rev=3153&view=rev Author: eht16 Date: 2008-10-25 18:56:27 +0000 (Sat, 25 Oct 2008) Log Message: ----------- Add main_locale_init() to the plugin API. Modified Paths: -------------- trunk/ChangeLog trunk/src/main.c trunk/src/main.h trunk/src/plugindata.h trunk/src/plugins.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-25 18:56:12 UTC (rev 3152) +++ trunk/ChangeLog 2008-10-25 18:56:27 UTC (rev 3153) @@ -3,6 +3,8 @@ * src/main.c, src/plugins.c: Fix deprecated usage of g_win32_get_package_installation_directory(), pass NULL as package name. + * src/main.c, src/plugins.c, src/plugindata.h: + Add main_locale_init() to the plugin API. 2008-10-24 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-10-25 18:56:12 UTC (rev 3152) +++ trunk/src/main.c 2008-10-25 18:56:27 UTC (rev 3153) @@ -412,10 +412,30 @@ } -static void locale_init(void) +/** + * Initialises the gettext translation system. + * This is a convenience function to set up gettext for internationalisation support + * in external plugins. You should call this function early in @ref plugin_init(). + * If the macro HAVE_LOCALE_H is defined, @a setlocale(LC_ALL, "") is called. + * The codeset for the mesaage translations is set to UTF-8. + * + * Note that this function only setup the gettext textdomain for you. You still have + * to adjust the build system of your plugin to get internationalisation support + * working properly. + * + * @param locale_dir The location where the translation files should be searched. This is + * usually the @a LOCALEDIR macro, defined by the build system. + * E.g. $prefix/share/locale. + * Only used on non-Windows systems. On Windows, the directory is determined + * by @c g_win32_get_package_installation_directory(). + * @param package The package name, usually this is the @a GETTEXT_PACKAGE macro, + * defined by the build system. + * + * @since 0.16 + **/ +void main_locale_init(const gchar *locale_dir, const gchar *package) { -#ifdef ENABLE_NLS - gchar *locale_dir = NULL; + gchar *l_locale_dir = NULL; #ifdef HAVE_LOCALE_H setlocale(LC_ALL, ""); @@ -423,18 +443,17 @@ #ifdef G_OS_WIN32 gchar *install_dir = g_win32_get_package_installation_directory(NULL, NULL); - /* e.g. C:\Program Files\Geany\share\locale */ - locale_dir = g_strconcat(install_dir, "\\share\\locale", NULL); + /* e.g. C:\Program Files\geany\lib\locale */ + l_locale_dir = g_strconcat(install_dir, "\\share\\locale", NULL); g_free(install_dir); #else - locale_dir = g_strdup(GEANY_LOCALEDIR); + l_locale_dir = g_strdup(locale_dir); #endif - bindtextdomain(GETTEXT_PACKAGE, locale_dir); - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); - textdomain(GETTEXT_PACKAGE); - g_free(locale_dir); -#endif + bindtextdomain(package, l_locale_dir); + bind_textdomain_codeset(package, "UTF-8"); + textdomain(package); + g_free(l_locale_dir); } @@ -763,7 +782,9 @@ memset(&ui_widgets, 0, sizeof(UIWidgets)); setup_paths(); - locale_init(); +#ifdef ENABLE_NLS + main_locale_init(GEANY_LOCALEDIR, GETTEXT_PACKAGE); +#endif parse_command_line_options(&argc, &argv); signal(SIGTERM, signal_cb); @@ -1032,6 +1053,7 @@ * Plugins may call this function if they changed any of these files (e.g. a configuration file * editor plugin). * + * @since 0.15 **/ void main_reload_configuration(void) { Modified: trunk/src/main.h =================================================================== --- trunk/src/main.h 2008-10-25 18:56:12 UTC (rev 3152) +++ trunk/src/main.h 2008-10-25 18:56:27 UTC (rev 3153) @@ -61,4 +61,6 @@ void main_reload_configuration(void); +void main_locale_init(const gchar *locale_dir, const gchar *gettext_package); + #endif Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-10-25 18:56:12 UTC (rev 3152) +++ trunk/src/plugindata.h 2008-10-25 18:56:27 UTC (rev 3153) @@ -41,7 +41,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 102, + GEANY_API_VERSION = 103, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ @@ -333,6 +333,8 @@ typedef struct MainFuncs { void (*reload_configuration) (void); + void (*locale_init) (const gchar *locale_dir, const gchar *package); + } MainFuncs; Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2008-10-25 18:56:12 UTC (rev 3152) +++ trunk/src/plugins.c 2008-10-25 18:56:27 UTC (rev 3153) @@ -263,7 +263,8 @@ }; static MainFuncs main_funcs = { - &main_reload_configuration + &main_reload_configuration, + &main_locale_init }; static GeanyFunctions geany_functions = { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3152] trunk/src/filetypes.c
by eht16＠users.sourceforge.net 25 Oct '08

25 Oct '08

Revision: 3152 http://geany.svn.sourceforge.net/geany/?rev=3152&view=rev Author: eht16 Date: 2008-10-25 18:56:12 +0000 (Sat, 25 Oct 2008) Log Message: ----------- Fix doc comment. Modified Paths: -------------- trunk/src/filetypes.c Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2008-10-25 18:56:04 UTC (rev 3151) +++ trunk/src/filetypes.c 2008-10-25 18:56:12 UTC (rev 3152) @@ -804,7 +804,14 @@ #ifdef HAVE_PLUGINS /* Currently only used by external plugins (e.g. geanyprj). */ -/** Detect filetype based on a shebang line in the file, or the filename extension. */ +/** + * Detect filetype based on a shebang line in the file, or the filename extension. + * + * @param utf8_filename The filename in UTF-8 encoding. + * + * @return The detected filetype for @c utf8_filename or @c filetypes[GEANY_FILETYPES_NONE] + * if it could not be detected. + **/ GeanyFiletype *filetypes_detect_from_file(const gchar *utf8_filename) { gchar line[1024]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3151] trunk
by eht16＠users.sourceforge.net 25 Oct '08

25 Oct '08

Revision: 3151 http://geany.svn.sourceforge.net/geany/?rev=3151&view=rev Author: eht16 Date: 2008-10-25 18:56:04 +0000 (Sat, 25 Oct 2008) Log Message: ----------- Fix deprecated usage of g_win32_get_package_installation_directory(), pass NULL as package name. Modified Paths: -------------- trunk/ChangeLog trunk/src/main.c trunk/src/plugins.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-25 18:55:51 UTC (rev 3150) +++ trunk/ChangeLog 2008-10-25 18:56:04 UTC (rev 3151) @@ -1,3 +1,10 @@ +2008-10-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/main.c, src/plugins.c: + Fix deprecated usage of g_win32_get_package_installation_directory(), + pass NULL as package name. + + 2008-10-24 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * THANKS: Added Roland Baudin to list of contributors of translations. Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-10-25 18:55:51 UTC (rev 3150) +++ trunk/src/main.c 2008-10-25 18:56:04 UTC (rev 3151) @@ -392,7 +392,7 @@ #ifdef G_OS_WIN32 /* use the installation directory(the one where geany.exe is located) as the base for the * documentation and data files */ - gchar *install_dir = g_win32_get_package_installation_directory("geany", NULL); + gchar *install_dir = g_win32_get_package_installation_directory(NULL, NULL); data_dir = g_strconcat(install_dir, "\\data", NULL); /* e.g. C:\Program Files\geany\data */ doc_dir = g_strconcat(install_dir, "\\doc", NULL); @@ -422,7 +422,7 @@ #endif #ifdef G_OS_WIN32 - gchar *install_dir = g_win32_get_package_installation_directory("geany", NULL); + gchar *install_dir = g_win32_get_package_installation_directory(NULL, NULL); /* e.g. C:\Program Files\Geany\share\locale */ locale_dir = g_strconcat(install_dir, "\\share\\locale", NULL); g_free(install_dir); Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2008-10-25 18:55:51 UTC (rev 3150) +++ trunk/src/plugins.c 2008-10-25 18:56:04 UTC (rev 3151) @@ -755,7 +755,7 @@ #ifdef G_OS_WIN32 static gchar *get_plugin_path() { - gchar *install_dir = g_win32_get_package_installation_directory("geany", NULL); + gchar *install_dir = g_win32_get_package_installation_directory(NULL, NULL); gchar *path; path = g_strconcat(install_dir, "\\lib", NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3150] trunk/src/document.c
by eht16＠users.sourceforge.net 25 Oct '08

25 Oct '08

Revision: 3150 http://geany.svn.sourceforge.net/geany/?rev=3150&view=rev Author: eht16 Date: 2008-10-25 18:55:51 +0000 (Sat, 25 Oct 2008) Log Message: ----------- Issue a warning message when closing document fails. Modified Paths: -------------- trunk/src/document.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-10-24 22:46:49 UTC (rev 3149) +++ trunk/src/document.c 2008-10-25 18:55:51 UTC (rev 3150) @@ -447,7 +447,7 @@ if (doc == NULL) { - geany_debug("Error: page_num: %d", page_num); + g_warning("%s: page_num: %d", __func__, page_num); return FALSE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3149] trunk
by frlan＠users.sourceforge.net 25 Oct '08

25 Oct '08

Revision: 3149 http://geany.svn.sourceforge.net/geany/?rev=3149&view=rev Author: frlan Date: 2008-10-24 22:46:49 +0000 (Fri, 24 Oct 2008) Log Message: ----------- Added some more HTML entities. Modified Paths: -------------- trunk/ChangeLog trunk/data/html_entities.tags Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-24 19:30:43 UTC (rev 3148) +++ trunk/ChangeLog 2008-10-24 22:46:49 UTC (rev 3149) @@ -1,6 +1,8 @@ 2008-10-24 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * THANKS: Added Roland Baudin to list of contributors of translations. + * data/html_entities.tags: + Added some more HTML entities. 2008-10-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/data/html_entities.tags =================================================================== --- trunk/data/html_entities.tags 2008-10-24 19:30:43 UTC (rev 3148) +++ trunk/data/html_entities.tags 2008-10-24 22:46:49 UTC (rev 3149) @@ -1,109 +1,242 @@ # each of the following lines represent a html entity # used in HTML and PHP files when typing &... +á Á -á +â Â +´ æ Æ +à À α +Α & +&and; +&ang; +' å Å +≈ +ã Ã ä Ä &bdquo; +β +Β +¦ • +∩ ç Ç +¸ ¢ +χ +Χ +&circ; +&clubs; +&cong; © +&crarr; +∪ ¤ +&dagger; +&Dagger; +↓ ° +δ +Δ +&diams; ÷ +é É -é ê Ê è È ∅ +&emsp; +&ensp; +ε +Ε +&equiv; +η +Η +ð +Ð ë Ë € +&fnof; +∀ ½ ¼ ¾ +γ +Γ +≥ > +↔ +&hearts; … +í Í -í î Î +¡ ì Ì ∞ +∫ +ι +Ι +¿ ∈ ï Ï +κ +Κ +λ +Λ « +← +&lceil; “ +≤ +&lfloor; &lowast; +&loz; +&lrm; +&lsaquo; ‘ < +¯ — µ · − +μ +Μ +∇   – +≠ +&ni; +¬ +∉ +&nsub; ñ Ñ +ν +Ν ó Ó ô Ô +&oelig; +&OElig; ò Ò +&oline; ω Ω +ο +Ο +&oplus; +&or; ª º ø Ø õ Õ +&otimes; ö Ö ¶ +∂ +&permil; +&perp; +φ +Φ π +Π +ϖ ± £ +′ +″ ∏ &prop; +ψ +Ψ " +√ » +→ +&rceil; ” ® +&rfloor; +ρ +Ρ +&rlm; +&rsaquo; ’ +&sbquo; +&scaron; +&Scaron; +⋅ § + +σ +Σ +&sigmaf; +&sim; +&spades; +⊂ +&sube; ∑ +⊃ ¹ ² ³ +&supe; ß +τ +Τ +&there4; +θ +Θ +&thetasym; +  +þ +Þ +&tilde; × ™ ú Ú +↑ û Û ù Ù ¨ +&upsih; +υ +Υ ü Ü +ξ +Ξ ý +Ý ¥ ÿ +&Yuml; +ζ +Ζ +&zwj; +&zwnj; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3148] trunk
by frlan＠users.sourceforge.net 24 Oct '08

24 Oct '08

Revision: 3148 http://geany.svn.sourceforge.net/geany/?rev=3148&view=rev Author: frlan Date: 2008-10-24 19:30:43 +0000 (Fri, 24 Oct 2008) Log Message: ----------- Update of French translation Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/po/ChangeLog trunk/po/fr.po Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-23 20:55:55 UTC (rev 3147) +++ trunk/ChangeLog 2008-10-24 19:30:43 UTC (rev 3148) @@ -1,3 +1,8 @@ +2008-10-24 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * THANKS: Added Roland Baudin to list of contributors of translations. + + 2008-10-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/filetypes.c: Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2008-10-23 20:55:55 UTC (rev 3147) +++ trunk/THANKS 2008-10-24 19:30:43 UTC (rev 3148) @@ -67,6 +67,7 @@ Nacho Cabanes <ncabanes(at)gmail(dot)com> - es Harri Koskinen <harri(at)fastmonkey(dot)org> - fi_FI Jean-Philippe Moal <skateinmars(at)skateinmars(dot)net> - fr +Roland Baudin <roland(dot)baudin(at)thalesaleniaspace(dot)com> - fr Gabor Kmetyko aka kilo <kg_kilo(at)freemail(dot)hu> - hu M.Baldinelli <m(dot)baldinelli(at)agora(dot)it> - it Dario Santomarco <dariello(at)yahoo(dot)it> - it Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2008-10-23 20:55:55 UTC (rev 3147) +++ trunk/po/ChangeLog 2008-10-24 19:30:43 UTC (rev 3148) @@ -1,3 +1,8 @@ +2008-10-24 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * fr.po: Update of French translation. Thanks to Roland Baudin. + + 2008-10-20 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * it.po: Update of Italian translation (Thanks M. Baldinelli). Modified: trunk/po/fr.po =================================================================== --- trunk/po/fr.po 2008-10-23 20:55:55 UTC (rev 3147) +++ trunk/po/fr.po 2008-10-24 19:30:43 UTC (rev 3148) @@ -1,15 +1,16 @@ # French translations for geany package. -# Copyright (C) 2006 THE geany'S COPYRIGHT HOLDER +# Copyright (C) 2006-2008 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. # Jean-Philippe Moal <skateinmars(a)skateinmars.net>, 2006, 2007, 2008. +# Roland Baudin <roland.baudin(a)thalesaleniaspace.com>, 2008 # msgid "" msgstr "" -"Project-Id-Version: geany 0.14\n" +"Project-Id-Version: geany 0.16svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-12 15:00+0200\n" -"PO-Revision-Date: 2008-04-22 11:42+0200\n" -"Last-Translator: Moal Jean-Philippe <skateinmars(a)skateinmars.net>\n" +"POT-Creation-Date: 2008-10-24 20:44+0200\n" +"PO-Revision-Date: 2008-10-24 14:28+0200\n" +"Last-Translator: Roland Baudin <roland.baudin(a)thalesaleniaspace.com>\n" "Language-Team: French <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -19,7 +20,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Un EDI rapide et léger utilisant GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:291 ../src/interface.c:1744 +#: ../geany.desktop.in.h:2 ../src/interface.c:297 ../src/interface.c:1785 msgid "Geany" msgstr "Geany" @@ -27,68 +28,69 @@ msgid "Integrated Development Environment" msgstr "Environnement de Développement Intégré" -#: ../src/about.c:134 +#: ../src/about.c:135 msgid "About Geany" msgstr "À propos de Geany" -#: ../src/about.c:184 +#: ../src/about.c:185 msgid "A fast and lightweight IDE" msgstr "Un EDI rapide et léger" -#: ../src/about.c:205 +#: ../src/about.c:206 #, c-format msgid "(built on or after %s)" msgstr "(construit le %s ou ultérieurement)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:236 +#: ../src/about.c:237 msgid "Info" msgstr "Infos" -#: ../src/about.c:252 +#: ../src/about.c:253 msgid "Developers" msgstr "Développeurs" -#: ../src/about.c:261 +#: ../src/about.c:262 msgid "maintainer" msgstr "mainteneur" -#: ../src/about.c:269 +#: ../src/about.c:270 msgid "developer" msgstr "développeur" -#: ../src/about.c:277 +#: ../src/about.c:278 msgid "translation maintainer" msgstr "mainteneur des traductions" -#: ../src/about.c:286 +#: ../src/about.c:287 msgid "Translators" msgstr "Traducteurs" -#: ../src/about.c:306 +#: ../src/about.c:307 msgid "Previous Translators" msgstr "Traducteurs précédents" -#: ../src/about.c:327 -#, fuzzy +#: ../src/about.c:328 msgid "Contributors" -msgstr "Constructeurs de type" +msgstr "Contributeurs" -#: ../src/about.c:337 +#: ../src/about.c:338 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" +"Quelques uns des principaux contributeurs (pour une liste plus détaillé, " +"voir le fichier %s) :" -#: ../src/about.c:363 +#: ../src/about.c:364 msgid "Credits" msgstr "Crédits" -#: ../src/about.c:377 +#: ../src/about.c:378 msgid "License" msgstr "Licence" -#: ../src/about.c:386 +#: ../src/about.c:387 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -125,7 +127,7 @@ #: ../src/build.c:484 #, c-format msgid "%s (in directory: %s)" -msgstr "%s (dans le répertoire : %s)" +msgstr "%s (dans le dossier : %s)" #: ../src/build.c:564 msgid "Command stopped because the current file has no extension." @@ -139,7 +141,7 @@ #: ../src/build.c:643 #, c-format msgid "Failed to change the working directory to \"%s\"" -msgstr "Impossible de changer le répertoire de travail pour \"%s\"" +msgstr "Impossible de changer le dossier de travail pour \"%s\"" #: ../src/build.c:736 msgid "" @@ -166,9 +168,9 @@ msgstr "Compile le fichier courant" #. build the code -#: ../src/build.c:1051 ../src/interface.c:992 +#: ../src/build.c:1051 ../src/interface.c:998 msgid "_Build" -msgstr "Cons_truire" +msgstr "Const_ruire" #: ../src/build.c:1055 msgid "Builds the current file (generate an executable file)" @@ -207,11 +209,10 @@ msgstr "Erreur suiva_nte" #: ../src/build.c:1109 ../src/build.c:1226 -#, fuzzy msgid "_Previous Error" -msgstr "_Précédent" +msgstr "_Erreur précédente" -#: ../src/build.c:1124 ../src/interface.c:1154 +#: ../src/build.c:1124 ../src/interface.c:1184 msgid "Run or view the current file" msgstr "Exécuter ou voir le fichier courant" @@ -317,7 +318,7 @@ #: ../src/build.c:1536 #, c-format msgid "%s commands" -msgstr "commandes pour %s" +msgstr "Commandes pour %s" #: ../src/build.c:1551 msgid "Compile:" @@ -327,7 +328,7 @@ msgid "Build:" msgstr "Construire :" -#: ../src/build.c:1593 ../src/dialogs.c:1231 +#: ../src/build.c:1593 ../src/dialogs.c:1216 msgid "Execute:" msgstr "Exécuter :" @@ -359,7 +360,7 @@ msgid "Do you really want to quit?" msgstr "Voulez-vous réellement quitter ?" -#: ../src/callbacks.c:460 ../src/document.c:2537 ../src/interface.c:365 +#: ../src/callbacks.c:460 ../src/document.c:2537 ../src/interface.c:371 #: ../src/treeviews.c:454 msgid "_Reload" msgstr "_Recharger" @@ -373,45 +374,53 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Êtes-vous sur de vouloir recharger '%s' ?" -#: ../src/callbacks.c:1287 ../src/callbacks.c:1312 +#: ../src/callbacks.c:1177 ../src/keybindings.c:348 +msgid "Go to Line" +msgstr "Aller à la ligne" + +#: ../src/callbacks.c:1177 +msgid "Enter the line you want to go to:" +msgstr "Entrez le numéro de la ligne à laquelle vous voulez vous rendre :" + +#: ../src/callbacks.c:1292 ../src/callbacks.c:1317 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Veuillez définir le type du fichier courant avant d'utiliser cette fonction." -#: ../src/callbacks.c:1423 ../src/ui_utils.c:516 +#: ../src/callbacks.c:1428 ../src/ui_utils.c:516 msgid "dd.mm.yyyy" msgstr "jj.mm.aaaa" -#: ../src/callbacks.c:1425 ../src/ui_utils.c:517 +#: ../src/callbacks.c:1430 ../src/ui_utils.c:517 msgid "mm.dd.yyyy" msgstr "mm.jj.aaaa" -#: ../src/callbacks.c:1427 ../src/ui_utils.c:518 +#: ../src/callbacks.c:1432 ../src/ui_utils.c:518 msgid "yyyy/mm/dd" msgstr "aaaa/mm/jj" -#: ../src/callbacks.c:1429 ../src/ui_utils.c:527 +#: ../src/callbacks.c:1434 ../src/ui_utils.c:527 msgid "dd.mm.yyyy hh:mm:ss" msgstr "jj.mm.aaaa hh:mm:ss" -#: ../src/callbacks.c:1431 ../src/ui_utils.c:528 +#: ../src/callbacks.c:1436 ../src/ui_utils.c:528 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.jj.aaaa hh:mm:ss" -#: ../src/callbacks.c:1433 ../src/ui_utils.c:529 +#: ../src/callbacks.c:1438 ../src/ui_utils.c:529 msgid "yyyy/mm/dd hh:mm:ss" msgstr "aaaa/mm/jj hh:mm:ss" -#: ../src/callbacks.c:1435 ../src/ui_utils.c:538 +#: ../src/callbacks.c:1440 ../src/ui_utils.c:538 msgid "_Use Custom Date Format" msgstr "_Utiliser le format de date personnalisé" -#: ../src/callbacks.c:1446 +#: ../src/callbacks.c:1451 msgid "Custom Date Format" msgstr "Format de date personnalisé" -#: ../src/callbacks.c:1447 +#: ../src/callbacks.c:1452 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -420,20 +429,20 @@ "tous les spécificateurs de conversion qui peuvent être utilisés avec la " "fonction C ANSI strftime." -#: ../src/callbacks.c:1466 +#: ../src/callbacks.c:1471 msgid "Date format string could not be converted (possibly too long)." msgstr "Le format de date n'a pas pu être converti (peut-être trop long)." -#: ../src/callbacks.c:1748 ../src/callbacks.c:1758 +#: ../src/callbacks.c:1753 ../src/callbacks.c:1763 msgid "No more message items." msgstr "Plus d'éléments de messages." #. initialize the dialog -#: ../src/dialogs.c:178 ../src/prefs.c:1689 +#: ../src/dialogs.c:178 ../src/prefs.c:1701 msgid "Open File" msgstr "Ouvrir un fichier" -#: ../src/dialogs.c:182 ../src/interface.c:718 +#: ../src/dialogs.c:182 ../src/interface.c:724 msgid "_View" msgstr "_Affichage" @@ -449,7 +458,7 @@ msgid "Detect by file extension" msgstr "Détecter depuis l'extension du fichier" -#: ../src/dialogs.c:231 ../src/interface.c:3697 +#: ../src/dialogs.c:231 ../src/interface.c:3755 msgid "Detect from file" msgstr "Détecter depuis le fichier" @@ -492,7 +501,7 @@ "Notez que si vous choisissez plusieurs fichier, ils seront tous ouverts avec " "le type de fichier choisi." -#: ../src/dialogs.c:451 ../plugins/export.c:333 +#: ../src/dialogs.c:451 ../plugins/export.c:336 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Le fichier '%s' existe déjà. Voulez-vous l'écraser ?" @@ -521,32 +530,24 @@ "Conserver le document en cours non enregistré et ouvrir le nouveau fichier " "enregistré dans un nouvel onglet." -#: ../src/dialogs.c:682 +#: ../src/dialogs.c:673 +msgid "_Don't save" +msgstr "Ne pas enre_gistrer" + +#: ../src/dialogs.c:707 #, c-format msgid "The file '%s' is not saved." msgstr "Le fichier '%s' n'est pas enregistré." -#: ../src/dialogs.c:684 +#: ../src/dialogs.c:709 msgid "Do you want to save it before closing?" msgstr "Voulez-vous l'enregistrer avant la fermeture ?" -#: ../src/dialogs.c:696 -msgid "_Don't save" -msgstr "Ne pas enre_gistrer" - -#: ../src/dialogs.c:773 +#: ../src/dialogs.c:784 msgid "Choose font" msgstr "Choisir la police" -#: ../src/dialogs.c:961 ../src/keybindings.c:348 -msgid "Go to Line" -msgstr "Aller à la ligne" - -#: ../src/dialogs.c:968 -msgid "Enter the line you want to go to:" -msgstr "Entrez la ligne à laquelle vous voulez vous rendre :" - -#: ../src/dialogs.c:1015 +#: ../src/dialogs.c:1000 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -554,87 +555,87 @@ "Une erreur s'est produite ou une information sur un fichier n'a pas pu être " "récupérée (ex. depuis un nouveau fichier)." -#: ../src/dialogs.c:1034 ../src/dialogs.c:1035 ../src/dialogs.c:1036 -#: ../src/dialogs.c:1042 ../src/dialogs.c:1043 ../src/dialogs.c:1044 -#: ../src/symbols.c:1378 ../src/symbols.c:1399 ../src/symbols.c:1451 +#: ../src/dialogs.c:1019 ../src/dialogs.c:1020 ../src/dialogs.c:1021 +#: ../src/dialogs.c:1027 ../src/dialogs.c:1028 ../src/dialogs.c:1029 +#: ../src/symbols.c:1386 ../src/symbols.c:1407 ../src/symbols.c:1459 #: ../src/ui_utils.c:195 msgid "unknown" msgstr "inconnu" -#: ../src/dialogs.c:1048 +#: ../src/dialogs.c:1033 msgid "Properties" msgstr "Propriétés" -#: ../src/dialogs.c:1078 +#: ../src/dialogs.c:1063 msgid "Type:" msgstr "Type :" -#: ../src/dialogs.c:1092 +#: ../src/dialogs.c:1077 msgid "Size:" msgstr "Taille :" -#: ../src/dialogs.c:1108 +#: ../src/dialogs.c:1093 msgid "Location:" msgstr "Emplacement :" -#: ../src/dialogs.c:1122 +#: ../src/dialogs.c:1107 msgid "Read-only:" msgstr "Lecture seule :" -#: ../src/dialogs.c:1129 +#: ../src/dialogs.c:1114 msgid "(only inside Geany)" msgstr "(seulement pour Geany)" -#: ../src/dialogs.c:1138 +#: ../src/dialogs.c:1123 msgid "Encoding:" msgstr "Encodage :" #. BOM = byte order mark -#: ../src/dialogs.c:1148 ../src/ui_utils.c:198 +#: ../src/dialogs.c:1133 ../src/ui_utils.c:198 msgid "(with BOM)" msgstr "(avec BOM)" -#: ../src/dialogs.c:1148 +#: ../src/dialogs.c:1133 msgid "(without BOM)" msgstr "(sans BOM)" -#: ../src/dialogs.c:1159 +#: ../src/dialogs.c:1144 msgid "Modified:" msgstr "Modifié :" -#: ../src/dialogs.c:1173 +#: ../src/dialogs.c:1158 msgid "Changed:" msgstr "Changé :" -#: ../src/dialogs.c:1187 +#: ../src/dialogs.c:1172 msgid "Accessed:" msgstr "Accédé :" -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1194 msgid "Permissions:" msgstr "Permissions :" #. Header -#: ../src/dialogs.c:1217 +#: ../src/dialogs.c:1202 msgid "Read:" msgstr "Lecture :" -#: ../src/dialogs.c:1224 +#: ../src/dialogs.c:1209 msgid "Write:" msgstr "Écriture :" #. Owner -#: ../src/dialogs.c:1239 +#: ../src/dialogs.c:1224 msgid "Owner:" msgstr "Propriétaire :" #. Group -#: ../src/dialogs.c:1275 +#: ../src/dialogs.c:1260 msgid "Group:" msgstr "Groupe :" #. Other -#: ../src/dialogs.c:1311 +#: ../src/dialogs.c:1296 msgid "Other:" msgstr "Autres :" @@ -689,16 +690,15 @@ msgstr "Tabulations" #: ../src/document.c:967 -#, fuzzy msgid "Tabs and Spaces" -msgstr "_Remplacer les tabulations par des espaces" +msgstr "Tabulations et espaces" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename #: ../src/document.c:972 -#, fuzzy, c-format +#, c-format msgid "Setting %s indentation mode for %s." -msgstr "Activation du mode d'indentation %s." +msgstr "Définir le mode d'indentation %s pour %s." #: ../src/document.c:1009 msgid "Invalid filename" @@ -792,12 +792,12 @@ #: ../src/document.c:2583 msgid "Try to resave the file?" -msgstr "" +msgstr "Essayer de sauvegarder à nouveau le fichier ?" #: ../src/document.c:2584 -#, fuzzy, c-format +#, c-format msgid "File \"%s\" was not found on disk!" -msgstr "\"%s\" n'a pu être trouvé." +msgstr "Le fichier \"%s\" n'a pu être trouvé!" #: ../src/editor.c:3504 ../src/utils.c:291 msgid "Win (CRLF)" @@ -812,13 +812,12 @@ msgstr "Unix (LF)" #: ../src/editor.c:3632 -#, fuzzy msgid "Enter Tab Width" -msgstr "Largeur des tabulations :" +msgstr "Largeur des tabulations" #: ../src/editor.c:3633 msgid "Enter the amount of spaces which should be replaced by a tab character." -msgstr "" +msgstr "Entrer le nombre d'espaces à remplacer par une tabulation." #: ../src/encodings.c:75 msgid "Celtic" @@ -995,14 +994,13 @@ msgstr "Fichier de Config" #: ../src/filetypes.c:457 -#, fuzzy msgid "Gettext translation file" -msgstr "mainteneur des traductions" +msgstr "Fichier de traduction Gettext" #: ../src/filetypes.c:479 -#, fuzzy, c-format +#, c-format msgid "%s script file" -msgstr "Script Shell" +msgstr "fichier de script %sl" #: ../src/filetypes.c:490 msgid "reStructuredText file" @@ -1028,280 +1026,276 @@ msgid "M_iscellaneous Languages" msgstr "Langages D_ivers" -#: ../src/filetypes.c:612 ../src/interface.c:3616 ../src/templates.c:347 +#: ../src/filetypes.c:612 ../src/interface.c:3674 ../src/templates.c:347 #: ../src/ui_utils.c:148 msgid "None" msgstr "Aucun" -#: ../src/filetypes.c:1149 ../src/win32.c:107 +#: ../src/filetypes.c:1154 ../src/win32.c:107 msgid "All Source" msgstr "Tout fichier source" -#: ../src/filetypes.c:1227 +#: ../src/filetypes.c:1232 #, c-format +#, fuzzy msgid "Bad regex for filetype %s: %s" -msgstr "" +msgstr "Mauvaise expression régulière pour le type de fichier %s %s" #: ../src/geany.h:50 msgid "untitled" msgstr "sans titre" -#: ../src/interface.c:301 +#: ../src/interface.c:307 msgid "_File" msgstr "_Fichier" -#: ../src/interface.c:312 +#: ../src/interface.c:318 msgid "New (with _Template)" -msgstr "Nouveau (selon un _modèle)" +msgstr "Nou_veau (selon un modèle)" -#: ../src/interface.c:323 ../src/interface.c:384 ../src/interface.c:562 -#: ../src/interface.c:622 ../src/interface.c:636 ../src/interface.c:866 -#: ../src/interface.c:876 ../src/interface.c:2287 ../src/interface.c:2347 -#: ../src/interface.c:2361 +#: ../src/interface.c:329 ../src/interface.c:390 ../src/interface.c:568 +#: ../src/interface.c:628 ../src/interface.c:642 ../src/interface.c:872 +#: ../src/interface.c:882 ../src/interface.c:2333 ../src/interface.c:2393 +#: ../src/interface.c:2407 msgid "invisible" msgstr "invisible" -#: ../src/interface.c:335 ../src/interface.c:2213 +#: ../src/interface.c:341 ../src/interface.c:2259 msgid "Open Selected F_ile" -msgstr "Ouvrir le F_ichier sélectionné" +msgstr "Ou_vrir le fichier sélectionné" -#: ../src/interface.c:339 +#: ../src/interface.c:345 msgid "Recent _Files" msgstr "_Fichiers récents" -#: ../src/interface.c:356 +#: ../src/interface.c:362 msgid "Save A_ll" msgstr "Tout enre_gistrer" -#: ../src/interface.c:359 +#: ../src/interface.c:365 msgid "Saves all open files" msgstr "Enregistrer tous les fichiers ouverts" -#: ../src/interface.c:373 +#: ../src/interface.c:379 msgid "R_eload As" msgstr "R_echarger en tant que" -#: ../src/interface.c:401 +#: ../src/interface.c:407 msgid "Page Set_up" -msgstr "M_ise en page" +msgstr "_Mise en page" -#: ../src/interface.c:408 +#: ../src/interface.c:414 msgid "Prints the current file" msgstr "Imprime le fichier courant" -#: ../src/interface.c:419 -#, fuzzy +#: ../src/interface.c:425 msgid "Close Ot_her Documents" -msgstr "Fermer le fichier courant" +msgstr "Fermer les _autres fichiers" -#: ../src/interface.c:427 +#: ../src/interface.c:433 msgid "C_lose All" -msgstr "To_ut fermer" +msgstr "_Tout fermer" -#: ../src/interface.c:430 +#: ../src/interface.c:436 msgid "Closes all open files" msgstr "Ferme tous les fichiers ouverts" -#: ../src/interface.c:444 ../src/interface.c:1246 +#: ../src/interface.c:450 ../src/interface.c:1278 msgid "Quit Geany" msgstr "Quitter Geany" -#: ../src/interface.c:446 +#: ../src/interface.c:452 msgid "_Edit" msgstr "Édit_er" -#: ../src/interface.c:487 ../src/interface.c:2204 +#: ../src/interface.c:493 ../src/interface.c:2250 msgid "Select _All" msgstr "Sélectionner _tout" -#: ../src/interface.c:496 ../src/interface.c:2222 +#: ../src/interface.c:502 ../src/interface.c:2268 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:499 +#: ../src/interface.c:505 msgid "Convert the case of the current selection" msgstr "Convertir la casse de la sélection courante" -#: ../src/interface.c:504 ../src/interface.c:2229 +#: ../src/interface.c:510 ../src/interface.c:2275 msgid "T_oggle Case of Selection" msgstr "M_odifier la casse de la séléction" -#: ../src/interface.c:513 ../src/interface.c:2238 +#: ../src/interface.c:519 ../src/interface.c:2284 msgid "_Comment Line(s)" msgstr "_Commenter la(les) ligne(s)" -#: ../src/interface.c:517 ../src/interface.c:2242 +#: ../src/interface.c:523 ../src/interface.c:2288 msgid "U_ncomment Line(s)" msgstr "Décomme_nter la(les) ligne(s)" -#: ../src/interface.c:521 ../src/interface.c:2246 +#: ../src/interface.c:527 ../src/interface.c:2292 msgid "_Toggle Line Commentation" msgstr "Commen_ter/Décommenter la ligne" -#: ../src/interface.c:525 ../src/interface.c:2250 +#: ../src/interface.c:531 ../src/interface.c:2296 msgid "Du_plicate Line or Selection" msgstr "Du_pliquer la ligne ou la sélection" -#: ../src/interface.c:534 ../src/interface.c:2259 +#: ../src/interface.c:540 ../src/interface.c:2305 msgid "_Increase Indent" msgstr "Augmenter l'_indentation" -#: ../src/interface.c:542 ../src/interface.c:2267 +#: ../src/interface.c:548 ../src/interface.c:2313 msgid "_Decrease Indent" msgstr "_Diminuer l'indentation" -#: ../src/interface.c:555 ../src/interface.c:2280 +#: ../src/interface.c:561 ../src/interface.c:2326 msgid "_Send Selection to" msgstr "Envoyer la _sélection vers" -#: ../src/interface.c:570 ../src/interface.c:2295 +#: ../src/interface.c:576 ../src/interface.c:2341 msgid "I_nsert Comments" -msgstr "I_nsérer des commentaires" +msgstr "Insérer des co_mmentaires" -#: ../src/interface.c:581 ../src/interface.c:2306 +#: ../src/interface.c:587 ../src/interface.c:2352 msgid "Insert _ChangeLog Entry" msgstr "Insérer une entrée de _changelog" -#: ../src/interface.c:584 ../src/interface.c:2309 +#: ../src/interface.c:590 ../src/interface.c:2355 msgid "Inserts a typical ChangeLog entry in the current file" msgstr "Insère une entrée de changelog classique dans le fichier courant" -#: ../src/interface.c:586 ../src/interface.c:2311 +#: ../src/interface.c:592 ../src/interface.c:2357 msgid "Insert File _Header" msgstr "Insérer un en-tête de fic_hier" -#: ../src/interface.c:589 ../src/interface.c:2314 +#: ../src/interface.c:595 ../src/interface.c:2360 msgid "Inserts a file header at the beginning of the file" msgstr "Insère un en-tête au début du fichier courant" -#: ../src/interface.c:591 ../src/interface.c:2316 +#: ../src/interface.c:597 ../src/interface.c:2362 msgid "Insert _Function Description" msgstr "Insérer une description de _fonction" -#: ../src/interface.c:594 ../src/interface.c:2319 +#: ../src/interface.c:600 ../src/interface.c:2365 msgid "Inserts a description before the current function" msgstr "Insère une description avant la fonction courante" -#: ../src/interface.c:596 ../src/interface.c:2321 +#: ../src/interface.c:602 ../src/interface.c:2367 msgid "Insert _Multiline Comment" msgstr "Insérer un commentaire _multilignes" -#: ../src/interface.c:599 ../src/interface.c:2324 +#: ../src/interface.c:605 ../src/interface.c:2370 msgid "Inserts a multiline comment" msgstr "Insère un commentaire sur plusieurs lignes" -#: ../src/interface.c:601 ../src/interface.c:2326 +#: ../src/interface.c:607 ../src/interface.c:2372 msgid "Insert _GPL Notice" msgstr "Insérer une note _GPL" -#: ../src/interface.c:604 ../src/interface.c:2329 +#: ../src/interface.c:610 ../src/interface.c:2375 msgid "Inserts a GPL notice (should be done at the beginning of the file)" msgstr "" -"Insère une partie de la GPL (cela devrait être fait au début du fichier)" +"Insère une partie de la GPL (ceci devrait être fait au début du fichier)" -#: ../src/interface.c:606 ../src/interface.c:2331 +#: ../src/interface.c:612 ../src/interface.c:2377 msgid "Insert _BSD License Notice" msgstr "Insérer une note _BSD" -#: ../src/interface.c:609 ../src/interface.c:2334 -#, fuzzy +#: ../src/interface.c:615 ../src/interface.c:2380 msgid "" "Inserts a BSD license notice (should be done at the beginning of the file)" msgstr "" -"Insère une note de la licence BSD (ceci devrait être fait au début du " -"fichier)" +"Insère une note de licence BSD (ceci devrait être fait au début du fichier)" -#: ../src/interface.c:611 ../src/interface.c:2336 +#: ../src/interface.c:617 ../src/interface.c:2382 msgid "Insert Dat_e" msgstr "Insérer la dat_e" -#: ../src/interface.c:625 ../src/interface.c:2350 +#: ../src/interface.c:631 ../src/interface.c:2396 msgid "_Insert \"include <...>\"" msgstr "_Insérer \"include <...>\"" -#: ../src/interface.c:648 +#: ../src/interface.c:654 msgid "_Search" msgstr "_Rechercher" -#: ../src/interface.c:659 +#: ../src/interface.c:665 msgid "Find _Next" msgstr "Rechercher le suiva_nt" -#: ../src/interface.c:663 +#: ../src/interface.c:669 msgid "Find _Previous" -msgstr "Rechercher le _précédent" +msgstr "Re_chercher le précédent" -#: ../src/interface.c:667 +#: ../src/interface.c:673 msgid "Find in F_iles" msgstr "Rechercher dans les f_ichiers" -#: ../src/interface.c:671 ../src/search.c:437 +#: ../src/interface.c:677 ../src/search.c:437 msgid "_Replace" -msgstr "_Remplacer" +msgstr "R_emplacer" -#: ../src/interface.c:684 +#: ../src/interface.c:690 msgid "Find _Selected" -msgstr "Rechercher la _Sélection" +msgstr "Rechercher la _sélection" -#: ../src/interface.c:688 -#, fuzzy +#: ../src/interface.c:694 msgid "Find Pre_vious Selected" msgstr "Rechercher la sélection _vers l'arrière" -#: ../src/interface.c:697 +#: ../src/interface.c:703 msgid "Next _Message" msgstr "_Message suivant" -#: ../src/interface.c:701 -#, fuzzy +#: ../src/interface.c:707 msgid "Pr_evious Message" -msgstr "Message suivant" +msgstr "Message _précédent" -#: ../src/interface.c:710 ../src/interface.c:2402 +#: ../src/interface.c:716 ../src/interface.c:2448 msgid "_Go to Line" msgstr "Aller à la li_gne" -#: ../src/interface.c:725 +#: ../src/interface.c:731 msgid "Change _Font" msgstr "Changer la _police" -#: ../src/interface.c:728 +#: ../src/interface.c:734 msgid "Change the default font" msgstr "Changer la police par défaut" -#: ../src/interface.c:739 +#: ../src/interface.c:745 msgid "To_ggle All Additional Widgets" msgstr "Afficher/Cacher toutes les fenêtres _supplémentaires" -#: ../src/interface.c:743 +#: ../src/interface.c:749 msgid "Full_screen" msgstr "Plein é_cran" -#: ../src/interface.c:747 +#: ../src/interface.c:753 msgid "Show Message _Window" msgstr "Afficher la _fenêtre de messages" -#: ../src/interface.c:750 +#: ../src/interface.c:756 msgid "Toggle the window with status and compiler messages on and off" msgstr "Affiche/Masque la fenêtre de statut et des messages du compilateur" -#: ../src/interface.c:753 +#: ../src/interface.c:759 msgid "Show _Toolbar" msgstr "Afficher la barre d'ou_tils" -#: ../src/interface.c:756 +#: ../src/interface.c:762 msgid "Toggle the toolbar on and off" msgstr "Affiche/Masque la barre d'outils" -#: ../src/interface.c:759 +#: ../src/interface.c:765 msgid "Show Side_bar" msgstr "Afficher la _barre latérale" -#: ../src/interface.c:764 +#: ../src/interface.c:770 msgid "Show _Markers Margin" msgstr "Afficher la marge des _marqueurs" -#: ../src/interface.c:767 +#: ../src/interface.c:773 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines." @@ -1309,23 +1303,23 @@ "Affiche ou masque la petite marge à droite des numéros des lignes, qui est " "utilisée pour marquer les lignes." -#: ../src/interface.c:770 +#: ../src/interface.c:776 msgid "Show _Line Numbers" msgstr "Afficher les numéros de _ligne" -#: ../src/interface.c:773 +#: ../src/interface.c:779 msgid "Shows or hides the Line Number margin." msgstr "Affiche ou masque la marge des numéros de ligne." -#: ../src/interface.c:793 +#: ../src/interface.c:799 msgid "_Document" msgstr "_Document" -#: ../src/interface.c:800 +#: ../src/interface.c:806 msgid "_Line Wrapping" -msgstr "Renvoi à la _ligne automatique" +msgstr "Ren_voi à la ligne automatique" -#: ../src/interface.c:803 ../src/interface.c:3731 +#: ../src/interface.c:809 ../src/interface.c:3789 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1335,155 +1329,151 @@ "Note : le renvoi automatique à la ligne a un coût élevé en performances pour " "les gros documents et devrait donc être désactivé sur les machines lentes." -#: ../src/interface.c:806 -#, fuzzy +#: ../src/interface.c:812 msgid "Line _Breaking" -msgstr "Renvoi à la ligne" +msgstr "_Renvoi à la ligne" -#: ../src/interface.c:810 +#: ../src/interface.c:816 msgid "_Auto-indentation" msgstr "Indentation _automatique" -#: ../src/interface.c:815 +#: ../src/interface.c:821 msgid "In_dent Type" -msgstr "Type d'in_dentation" +msgstr "T_ype d'indentation" -#: ../src/interface.c:822 ../src/interface.c:3655 +#: ../src/interface.c:828 ../src/interface.c:3713 msgid "_Tabs" msgstr "_Tabulations" -#: ../src/interface.c:828 ../src/interface.c:3646 +#: ../src/interface.c:834 ../src/interface.c:3704 msgid "_Spaces" msgstr "E_spaces" -#: ../src/interface.c:834 ../src/interface.c:3664 -#, fuzzy +#: ../src/interface.c:840 ../src/interface.c:3722 msgid "T_abs and Spaces" -msgstr "_Remplacer les tabulations par des espaces" +msgstr "Tabulations et _espaces" -#: ../src/interface.c:845 +#: ../src/interface.c:851 msgid "Read _Only" msgstr "_Lecture seule" -#: ../src/interface.c:848 +#: ../src/interface.c:854 msgid "Treat this file as read-only. No changes can be made." msgstr "" "Traiter ce fichier en lecture seule. Aucun changement ne peut être effectué." -#: ../src/interface.c:850 +#: ../src/interface.c:856 msgid "_Write Unicode BOM" msgstr "Écrire le _BOM Unicode" -#: ../src/interface.c:859 +#: ../src/interface.c:865 msgid "Set File_type" msgstr "Définir le _type de fichier" -#: ../src/interface.c:869 +#: ../src/interface.c:875 msgid "Set _Encoding" msgstr "Définir l'_encodage" -#: ../src/interface.c:879 +#: ../src/interface.c:885 msgid "Set Line E_ndings" msgstr "Définir les fi_ns de lignes" -#: ../src/interface.c:886 +#: ../src/interface.c:892 msgid "Convert and Set to _CR/LF (Win)" msgstr "Convertir en _CR/LF (Win)" -#: ../src/interface.c:892 +#: ../src/interface.c:898 msgid "Convert and Set to _LF (Unix)" msgstr "Convertir en _LF (Unix)" -#: ../src/interface.c:898 +#: ../src/interface.c:904 msgid "Convert and Set to CR (_Mac)" msgstr "Convertir en CR (_Mac)" -#: ../src/interface.c:909 +#: ../src/interface.c:915 msgid "_Strip Trailing Spaces" msgstr "Enlever les e_spaces de fin" -#: ../src/interface.c:913 +#: ../src/interface.c:919 msgid "_Replace Tabs by Spaces" -msgstr "_Remplacer les tabulations par des espaces" +msgstr "Remplacer les tabulati_ons par des espaces" -#: ../src/interface.c:916 ../src/interface.c:4182 +#: ../src/interface.c:922 ../src/interface.c:4240 msgid "Replaces all tabs in document by spaces." msgstr "Remplace toutes les tabulations du document par des espaces." -#: ../src/interface.c:918 -#, fuzzy +#: ../src/interface.c:924 msgid "Replace Spaces b_y Tabs" -msgstr "_Remplacer les tabulations par des espaces" +msgstr "Rempla_cer les espaces par des tabulations" -#: ../src/interface.c:921 -#, fuzzy +#: ../src/interface.c:927 msgid "Replaces all spaces in the document by tab characters." -msgstr "Remplace toutes les tabulations du document par des espaces." +msgstr "Remplace tous les espaces du document par des tabulations." -#: ../src/interface.c:928 +#: ../src/interface.c:934 msgid "_Fold All" msgstr "Tout _plier" -#: ../src/interface.c:931 +#: ../src/interface.c:937 msgid "Folds all contractible code blocks" msgstr "Plie tous les blocs de code pliables." -#: ../src/interface.c:933 +#: ../src/interface.c:939 msgid "_Unfold All" msgstr "Tout _déplier" -#: ../src/interface.c:936 +#: ../src/interface.c:942 msgid "Unfolds all contracted code blocks" msgstr "Déplie tous les blocs de code pliés" -#: ../src/interface.c:943 +#: ../src/interface.c:949 msgid "Remove _Markers" msgstr "Effacer les _marqueurs" -#: ../src/interface.c:947 +#: ../src/interface.c:953 msgid "Remove Error _Indicators" msgstr "Supprimer les _indicateurs d'erreurs" -#: ../src/interface.c:950 +#: ../src/interface.c:956 msgid "Removes all error indicators in the current document." msgstr "Enlève toutes les indications d'erreur dans le document courant." -#: ../src/interface.c:952 +#: ../src/interface.c:958 msgid "_Project" msgstr "_Projet" -#: ../src/interface.c:959 +#: ../src/interface.c:965 msgid "_New" msgstr "_Nouveau" -#: ../src/interface.c:967 +#: ../src/interface.c:973 msgid "_Open" msgstr "_Ouvrir" -#: ../src/interface.c:975 +#: ../src/interface.c:981 msgid "_Close" msgstr "_Fermer" -#: ../src/interface.c:996 +#: ../src/interface.c:1002 msgid "_Tools" -msgstr "Ou_tils" +msgstr "_Outils" -#: ../src/interface.c:1003 +#: ../src/interface.c:1009 msgid "_Color Chooser" -msgstr "Sélecteur de _couleur" +msgstr "_Sélecteur de couleur" -#: ../src/interface.c:1006 ../src/interface.c:1165 +#: ../src/interface.c:1012 ../src/interface.c:1195 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette." msgstr "" "Ouvre une fenêtre de choix de couleur, pour sélectionner de manière " "interactive des couleurs depuis une palette." -#: ../src/interface.c:1012 +#: ../src/interface.c:1018 msgid "_Word Count" -msgstr "Compteur de _mots" +msgstr "_Compteur de mots" -#: ../src/interface.c:1015 +#: ../src/interface.c:1021 msgid "" "Counts the words and characters in the current selection or the whole " "document" @@ -1491,218 +1481,237 @@ "Compte les mots et les caractères de la sélection courante ou du document " "entier" -#: ../src/interface.c:1017 +#: ../src/interface.c:1023 msgid "Load Ta_gs" msgstr "Charger les Ta_gs" -#: ../src/interface.c:1020 +#: ../src/interface.c:1026 msgid "Load global tags file" msgstr "Charger un fichier de tags global" -#: ../src/interface.c:1022 +#: ../src/interface.c:1028 msgid "_Reload Configuration" -msgstr "" +msgstr "_Mettre à jour la configuration" -#: ../src/interface.c:1025 +#: ../src/interface.c:1031 msgid "" "Reload configuration data like snippets, templates and filetype extensions." msgstr "" +"Mettre à jour les données de configuration, telles que snippets, templates " +"et types de fichiers. " -#: ../src/interface.c:1031 ../src/interface.c:1038 +#: ../src/interface.c:1037 ../src/interface.c:1044 msgid "_Help" msgstr "A_ide" -#: ../src/interface.c:1046 +#: ../src/interface.c:1052 msgid "_Website" msgstr "Site _Web" -#: ../src/interface.c:1050 +#: ../src/interface.c:1056 msgid "_Keyboard Shortcuts" msgstr "_Raccourcis clavier" -#: ../src/interface.c:1053 +#: ../src/interface.c:1059 msgid "Shows a list of all keyboard shortcuts for Geany." msgstr "Affiche une liste de tous les raccourcis claviers pour Geany." -#: ../src/interface.c:1055 -#, fuzzy +#: ../src/interface.c:1061 msgid "_Debug Messages" -msgstr "Messages" +msgstr "_Messages de débogage" -#: ../src/interface.c:1078 +#: ../src/interface.c:1084 msgid "Create a new file" msgstr "Créer un nouveau fichier" -#: ../src/interface.c:1084 +#: ../src/interface.c:1090 msgid "Open an existing file" msgstr "Ouvrir un fichier existant" -#: ../src/interface.c:1089 +#: ../src/interface.c:1095 msgid "Save the current file" msgstr "Enregistrer le fichier courant" -#: ../src/interface.c:1091 ../src/keybindings.c:196 +#: ../src/interface.c:1097 ../src/keybindings.c:196 msgid "Save all" msgstr "Tout enregistrer" -#: ../src/interface.c:1094 +#: ../src/interface.c:1100 msgid "Save all open files" msgstr "Enregistrer tous les fichiers ouverts" -#: ../src/interface.c:1103 +#: ../src/interface.c:1109 msgid "Reload the current file from disk" msgstr "Recharger le fichier courant depuis le disque" -#: ../src/interface.c:1108 +#: ../src/interface.c:1114 msgid "Close the current file" msgstr "Fermer le fichier courant" -#: ../src/interface.c:1117 +#: ../src/interface.c:1123 +#, fuzzy +msgid "Cut the current selection" +msgstr "Convertir la casse de la sélection courante" + +#: ../src/interface.c:1128 +#, fuzzy +msgid "Copy the current selection" +msgstr "Compiler le fichier courant" + +#: ../src/interface.c:1133 +msgid "Paste the contents of the clipboard" +msgstr "" + +#: ../src/interface.c:1138 +#, fuzzy +msgid "Delete the current selection" +msgstr "Convertir la casse de la sélection courante" + +#: ../src/interface.c:1147 msgid "Undo the last modification" msgstr "Annuler la dernière modification" -#: ../src/interface.c:1122 +#: ../src/interface.c:1152 msgid "Redo the last modification" msgstr "Répéter la dernière modification" -#: ../src/interface.c:1132 ../src/keybindings.c:344 +#: ../src/interface.c:1162 ../src/keybindings.c:344 msgid "Navigate back a location" msgstr "Naviguer en arrière vers une position" -#: ../src/interface.c:1138 ../src/keybindings.c:346 +#: ../src/interface.c:1168 ../src/keybindings.c:346 msgid "Navigate forward a location" msgstr "Naviguer en avant vers une position" -#: ../src/interface.c:1146 ../src/keybindings.c:445 +#: ../src/interface.c:1176 ../src/keybindings.c:445 msgid "Compile" msgstr "Compiler" -#: ../src/interface.c:1149 +#: ../src/interface.c:1179 msgid "Compile the current file" msgstr "Compiler le fichier courant" -#: ../src/interface.c:1162 +#: ../src/interface.c:1192 msgid "Color" msgstr "Couleur" -#: ../src/interface.c:1174 +#: ../src/interface.c:1204 msgid "Zoom in the text" msgstr "Zoomer en avant sur le texte" -#: ../src/interface.c:1179 +#: ../src/interface.c:1209 msgid "Zoom out the text" msgstr "Zoomer en arrière" -#: ../src/interface.c:1188 +#: ../src/interface.c:1218 msgid "Decrease indentation" msgstr "Diminuer l'indentation" -#: ../src/interface.c:1193 +#: ../src/interface.c:1223 msgid "Increase indentation" msgstr "Augmenter l'indentation" -#: ../src/interface.c:1206 ../src/interface.c:1211 +#: ../src/interface.c:1236 ../src/interface.c:1241 msgid "Find the entered text in the current file" msgstr "Rechercher le texte entré dans le fichier courant" -#: ../src/interface.c:1224 +#: ../src/interface.c:1255 msgid "Enter a line number and jump to it." -msgstr "Entrer un numéro de ligne et s'y rendre." +msgstr "Entrer un numéro de ligne et s'y rendre" -#: ../src/interface.c:1231 +#: ../src/interface.c:1263 msgid "Jump to the entered line number." -msgstr "Se rendre à la ligne choisie." +msgstr "Se rendre à la ligne choisie" -#: ../src/interface.c:1274 ../src/treeviews.c:112 +#: ../src/interface.c:1306 ../src/treeviews.c:112 msgid "Symbols" msgstr "Symboles" -#: ../src/interface.c:1288 ../src/treeviews.c:268 +#: ../src/interface.c:1320 ../src/treeviews.c:268 msgid "Documents" msgstr "Documents" -#: ../src/interface.c:1325 +#: ../src/interface.c:1357 msgid "Status" msgstr "Statut" -#: ../src/interface.c:1339 +#: ../src/interface.c:1371 msgid "Compiler" msgstr "Compilateur" -#: ../src/interface.c:1354 +#: ../src/interface.c:1386 msgid "Messages" msgstr "Messages" -#: ../src/interface.c:1367 +#: ../src/interface.c:1399 msgid "Scribble" msgstr "Notes" -#: ../src/interface.c:2019 ../src/interface.c:3525 +#: ../src/interface.c:2065 ../src/interface.c:3583 msgid "Images _and Text" msgstr "Im_ages et texte" -#: ../src/interface.c:2025 ../src/interface.c:3557 +#: ../src/interface.c:2071 ../src/interface.c:3615 msgid "_Images Only" msgstr "_Images seulement" -#: ../src/interface.c:2031 ../src/interface.c:3549 +#: ../src/interface.c:2077 ../src/interface.c:3607 msgid "_Text Only" msgstr "_Texte seulement" -#: ../src/interface.c:2042 ../src/interface.c:3541 +#: ../src/interface.c:2088 ../src/interface.c:3599 msgid "_Large Icons" msgstr "_Grosses icônes" -#: ../src/interface.c:2047 ../src/interface.c:3533 +#: ../src/interface.c:2093 ../src/interface.c:3591 msgid "_Small Icons" msgstr "Petite_s icônes" -#: ../src/interface.c:2057 +#: ../src/interface.c:2103 msgid "_Hide toolbar" msgstr "Cac_her la barre d'outils" -#: ../src/interface.c:2369 +#: ../src/interface.c:2415 msgid "Find _Usage" -msgstr "Lancer _une recherche" +msgstr "_Rechercher dans tous les documents" -#: ../src/interface.c:2377 -#, fuzzy +#: ../src/interface.c:2423 msgid "Find _Document Usage" -msgstr "Lancer _une recherche" +msgstr "Rechercher dans le _document" -#: ../src/interface.c:2385 +#: ../src/interface.c:2431 msgid "Go to _Tag Definition" -msgstr "Aller à la _définition du symbole" +msgstr "Aller à la définition du s_ymbole" -#: ../src/interface.c:2389 +#: ../src/interface.c:2435 msgid "Go to T_ag Declaration" msgstr "Aller à la déclaration du _symbole" -#: ../src/interface.c:2393 +#: ../src/interface.c:2439 msgid "Conte_xt Action" msgstr "Action conte_xtuelle" -#: ../src/interface.c:2405 +#: ../src/interface.c:2451 msgid "Go to the entered line" msgstr "Se rendre à la ligne choisie" -#: ../src/interface.c:2921 ../src/keybindings.c:311 +#: ../src/interface.c:2969 ../src/keybindings.c:311 msgid "Preferences" msgstr "Préférences" -#: ../src/interface.c:2954 +#: ../src/interface.c:3002 msgid "Load files from the last session" msgstr "Charger les fichiers depuis la session précédente" -#: ../src/interface.c:2957 +#: ../src/interface.c:3005 msgid "Opens at startup the files from the last session" msgstr "Ouvre les fichiers de la dernière session au démarrage" -#: ../src/interface.c:2959 +#: ../src/interface.c:3007 msgid "Load virtual terminal support" msgstr "Charger le support du terminal virtuel" -#: ../src/interface.c:2961 +#: ../src/interface.c:3009 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup. " "Disable it if you do not need it." @@ -1710,41 +1719,41 @@ "Charger ou non l'émulateur virtuel de terminal (VTE) au lancement. " "Désactivez le si vous n'en avez pas besoin." -#: ../src/interface.c:2963 +#: ../src/interface.c:3011 msgid "Enable plugin support" msgstr "Activer le support des plugins" -#: ../src/interface.c:2967 +#: ../src/interface.c:3015 msgid "Startup" msgstr "Démarrage" -#: ../src/interface.c:2986 +#: ../src/interface.c:3034 msgid "Save window position and geometry" msgstr "Enregistrer la position et la géométrie de la fenêtre" -#: ../src/interface.c:2989 +#: ../src/interface.c:3037 msgid "Saves the window position and geometry and restores it at the start" msgstr "" "Enregistre la position et la géométrie de la fenêtre et la restaure au " "démarrage" -#: ../src/interface.c:2991 +#: ../src/interface.c:3039 msgid "Confirm exit" msgstr "Confirmer la fermeture" -#: ../src/interface.c:2994 +#: ../src/interface.c:3042 msgid "Shows a confirmation dialog on exit." msgstr "Affiche une boite de dialogue de confirmation lors de la fermeture." -#: ../src/interface.c:2996 +#: ../src/interface.c:3044 msgid "Shutdown" msgstr "Fermeture" -#: ../src/interface.c:3015 +#: ../src/interface.c:3063 msgid "Use project-based session files" msgstr "Utiliser des fichiers de session basés sur les projets" -#: ../src/interface.c:3018 +#: ../src/interface.c:3066 msgid "" "Whether to store a project's session files and open them when re-opening the " "project." @@ -1752,28 +1761,31 @@ "Conserver ou non des fichiers de session des projets et les ouvrir lors de " "la réouverture d'un projet." -#: ../src/interface.c:3020 -#, fuzzy +#: ../src/interface.c:3068 msgid "Store project file inside the project base directory" -msgstr "Créer le répertoire de base du projet ?" +msgstr "Enregistrer le fichier projet dans le dossier de base du projet" -#: ../src/interface.c:3023 +#: ../src/interface.c:3071 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " "directory. You can still change the path of the project file in the New " "Project dialog." msgstr "" +"Quand cette case est cochée, un fichier projet est créé par défaut dans le " +"dossier de base du projet à chaque création d'un nouveau projet, plutôt qu'à " +"un niveau au dessus du dossier de projet. Vous pouvez toujours changer le " +"chemin du projet dans le dialogue Nouveau projet." -#: ../src/interface.c:3025 +#: ../src/interface.c:3073 msgid "Projects" msgstr "Projets" -#: ../src/interface.c:3044 +#: ../src/interface.c:3092 msgid "Beep on errors or when compilation has finished" msgstr "Émettre un bip sur les erreurs ou lorsque la compilation est terminée" -#: ../src/interface.c:3047 +#: ../src/interface.c:3095 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished." @@ -1781,11 +1793,11 @@ "Émettre ou non un bip si une erreur s'est produite ou lorsque le processus " "de compilation est fini." -#: ../src/interface.c:3049 +#: ../src/interface.c:3097 msgid "Switch to status message list at new message" msgstr "Se rendre à la liste des messages de statut aux nouveaux messages" -#: ../src/interface.c:3052 +#: ../src/interface.c:3100 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives." @@ -1793,11 +1805,11 @@ "Se rendre à l'onglet des messages de statut (dans la fenêtre des messages " "dans au bas de la fenêtre) lorsqu'un nouveau message de statut arrive." -#: ../src/interface.c:3054 +#: ../src/interface.c:3102 msgid "Suppress status messages in the status bar" msgstr "Supprimer les messages de statut de la barre de statut" -#: ../src/interface.c:3057 +#: ../src/interface.c:3105 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1805,11 +1817,11 @@ "Supprime tous les messages de la barre de statut. Les messages sont toujours " "affichés dans la fenêtre des messages de statut." -#: ../src/interface.c:3059 +#: ../src/interface.c:3107 msgid "Auto focus widgets (focus follows mouse)" msgstr "Auto focus des fenêtres (le focus suit la souris)" -#: ../src/interface.c:3062 +#: ../src/interface.c:3110 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1819,100 +1831,100 @@ "Fonctionne pour la fenêtre de l'éditeur, les notes, la barre de recherche, " "les champs aller à la ligne et le VTE." -#: ../src/interface.c:3064 ../src/interface.c:3393 ../src/interface.c:4244 +#: ../src/interface.c:3112 ../src/interface.c:3441 ../src/interface.c:4302 msgid "Miscellaneous" msgstr "Divers" -#: ../src/interface.c:3085 +#: ../src/interface.c:3133 msgid "Startup path:" -msgstr "Répertoire de démarrage :" +msgstr "Dossier de démarrage :" -#: ../src/interface.c:3097 +#: ../src/interface.c:3145 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." msgstr "" -"Le répertoire ou commencer lors de l'ouverture ou de l'enregistrement des " -"fichiers. Entrez un chemin absolu. Laissez vide pour utiliser le répertoire " -"de travail courant." +"Le dossier où commencer lors de l'ouverture ou de l'enregistrement des " +"fichiers. Entrez un chemin absolu. Laissez vide pour utiliser le dossier de " +"travail courant." -#: ../src/interface.c:3110 +#: ../src/interface.c:3158 msgid "Project files:" msgstr "Fichiers de projet :" -#: ../src/interface.c:3122 +#: ../src/interface.c:3170 msgid "Path to start in when opening project files" msgstr "Chemin de départ lors de l'ouverture des fichiers de projet" -#: ../src/interface.c:3135 +#: ../src/interface.c:3183 msgid "Paths" msgstr "Chemins" -#: ../src/interface.c:3140 +#: ../src/interface.c:3188 msgid "General" msgstr "Général" -#: ../src/interface.c:3163 +#: ../src/interface.c:3211 msgid "Show symbol list" msgstr "Afficher la liste des symboles" -#: ../src/interface.c:3166 +#: ../src/interface.c:3214 msgid "Toggle the symbol list on and off" msgstr "Affiche/Cache la liste des symboles" -#: ../src/interface.c:3168 +#: ../src/interface.c:3216 msgid "Show documents list" msgstr "Afficher la liste des documents" -#: ../src/interface.c:3171 +#: ../src/interface.c:3219 msgid "Toggle the documents list on and off" msgstr "Affiche/Cache la liste des documents" -#: ../src/interface.c:3173 +#: ../src/interface.c:3221 msgid "Show full path name in documents list" msgstr "Afficher le chemin complet dans la liste des documents" -#: ../src/interface.c:3177 +#: ../src/interface.c:3225 msgid "Sidebar" msgstr "Barre latérale" -#: ../src/interface.c:3198 +#: ../src/interface.c:3246 msgid "Symbol list:" msgstr "Liste des symboles :" -#: ../src/interface.c:3205 ../src/interface.c:3315 +#: ../src/interface.c:3253 ../src/interface.c:3363 msgid "Message window:" msgstr "Fenêtre de message :" -#: ../src/interface.c:3212 ../src/interface.c:3351 +#: ../src/interface.c:3260 ../src/interface.c:3399 msgid "Editor:" msgstr "Éditeur :" -#: ../src/interface.c:3224 +#: ../src/interface.c:3272 msgid "Sets the font for the message window" msgstr "Définit la police utilisée pour la fenêtre de message" -#: ../src/interface.c:3232 +#: ../src/interface.c:3280 msgid "Sets the font for the symbol list" msgstr "Définit la police utilisée pour la liste des symboles" -#: ../src/interface.c:3240 +#: ../src/interface.c:3288 msgid "Sets the editor font" msgstr "Définit la police de l'éditeur" -#: ../src/interface.c:3242 +#: ../src/interface.c:3290 msgid "Fonts" msgstr "Polices" -#: ../src/interface.c:3261 +#: ../src/interface.c:3309 msgid "Show editor tabs" msgstr "Afficher les onglets de l'éditeur" -#: ../src/interface.c:3265 +#: ../src/interface.c:3313 msgid "Show close buttons" msgstr "Afficher les boutons de fermeture" -#: ../src/interface.c:3268 +#: ../src/interface.c:3316 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)." @@ -1920,237 +1932,260 @@ "Affiche un petit bouton croix sur les onglets des fichiers pour les fermer " "facilement en cliquant dessus (nécessite un redémarrage de Geany)." -#: ../src/interface.c:3274 +#: ../src/interface.c:3322 msgid "Placement of new file tabs:" msgstr "Placement des nouveaux onglets de fichier :" -#: ../src/interface.c:3279 ../src/interface.c:3328 ../src/interface.c:3346 -#: ../src/interface.c:3364 +#: ../src/interface.c:3327 ../src/interface.c:3376 ../src/interface.c:3394 +#: ../src/interface.c:3412 msgid "Left" msgstr "Gauche" -#: ../src/interface.c:3282 +#: ../src/interface.c:3330 msgid "File tabs will be placed on the left of the notebook" msgstr "" "Les nouveaux onglets de fichier seront placés à droite de la liste des " "onglets" -#: ../src/interface.c:3287 ../src/interface.c:3329 ../src/interface.c:3347 -#: ../src/interface.c:3365 +#: ../src/interface.c:3335 ../src/interface.c:3377 ../src/interface.c:3395 +#: ../src/interface.c:3413 msgid "Right" msgstr "Droite" -#: ../src/interface.c:3290 +#: ../src/interface.c:3338 msgid "File tabs will be placed on the right of the notebook" msgstr "" "Les nouveaux onglets de fichier seront placés à gauche de la liste des " "onglets" -#: ../src/interface.c:3294 +#: ../src/interface.c:3342 msgid "Editor tabs" msgstr "Onglets de l'éditeur" -#: ../src/interface.c:3330 ../src/interface.c:3348 ../src/interface.c:3366 +#: ../src/interface.c:3378 ../src/interface.c:3396 ../src/interface.c:3414 msgid "Top" msgstr "Haut" -#: ../src/interface.c:3331 ../src/interface.c:3349 ../src/interface.c:3367 +#: ../src/interface.c:3379 ../src/interface.c:3397 ../src/interface.c:3415 msgid "Bottom" msgstr "Bas" -#: ../src/interface.c:3333 +#: ../src/interface.c:3381 msgid "Sidebar:" msgstr "Barre latérale :" -#: ../src/interface.c:3369 +#: ../src/interface.c:3417 msgid "Tab positions" msgstr "Position des onglets" -#: ../src/interface.c:3388 +#: ../src/interface.c:3436 msgid "Show status bar" msgstr "Afficher la barre d'état" -#: ../src/interface.c:3391 +#: ../src/interface.c:3439 msgid "Whether to show the status bar at the bottom of the main window." msgstr "Montrer ou cacher la barre d'état au bas de la fenêtre principale. " -#: ../src/interface.c:3398 +#: ../src/interface.c:3446 msgid "Interface" msgstr "Interface" -#: ../src/interface.c:3417 +#: ../src/interface.c:3465 msgid "Show Toolbar" msgstr "Afficher la barre d'outils" -#: ../src/interface.c:3421 +#: ../src/interface.c:3469 msgid "Toolbar" msgstr "Barre d'outils" -#: ../src/interface.c:3440 -msgid "Show file operation buttons" +#: ../src/interface.c:3488 +#, fuzzy +msgid "Show File Operation buttons" msgstr "Afficher les boutons d'opération sur les fichiers" -#: ../src/interface.c:3443 +#: ../src/interface.c:3491 msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" msgstr "" "Afficher les boutons Nouveau, Ouvrir, Fermer, Enregistrer et Recharger dans " "la barre d'outils" -#: ../src/interface.c:3445 +#: ../src/interface.c:3493 +#, fuzzy +msgid "Show Cut and Delete buttons" +msgstr "Afficher les boutons Compiler et Lancer" + +#: ../src/interface.c:3496 +#, fuzzy +msgid "Display the Cut and Delete buttons in the toolbar" +msgstr "" +"Afficher les boutons Compiler et Lancer un programme dans la barre d'outils" + +#: ../src/interface.c:3498 +#, fuzzy +msgid "Show Copy and Paste buttons" +msgstr "Afficher les boutons Compiler et Lancer" + +#: ../src/interface.c:3501 +#, fuzzy +msgid "Display the Copy and Paste buttons in the toolbar" +msgstr "" +"Afficher les boutons Compiler et Lancer un programme dans la barre d'outils" + +#: ../src/interface.c:3503 msgid "Show Redo and Undo buttons" msgstr "Afficher les boutons d'annulation et de répétition" -#: ../src/interface.c:3448 +#: ../src/interface.c:3506 msgid "Display the Redo and Undo buttons in the toolbar" msgstr "" "Afficher les boutons d'annulation et de répétition dans la barre d'outils" -#: ../src/interface.c:3450 +#: ../src/interface.c:3508 msgid "Show Back and Forward buttons" msgstr "Afficher les boutons suivant et précédent" -#: ../src/interface.c:3453 +#: ../src/interface.c:3511 msgid "" "Display the Back and Forward buttons in the toolbar used for code navigation" msgstr "" "Afficher les boutons suivant et précédent utilisés pour la navigation dans " "le code dans la barre d'outils" -#: ../src/interface.c:3455 +#: ../src/interface.c:3513 msgid "Show Compile and Run buttons" msgstr "Afficher les boutons Compiler et Lancer" -#: ../src/interface.c:3458 +#: ../src/interface.c:3516 msgid "Display the Compile and Run buttons in the toolbar" msgstr "" "Afficher les boutons Compiler et Lancer un programme dans la barre d'outils" -#: ../src/interface.c:3460 +#: ../src/interface.c:3518 msgid "Show Color Chooser button" -msgstr "Afficher le bouton du sélecteur de couleur" +msgstr "Afficher le bouton du sélecteur de couleurs" -#: ../src/interface.c:3463 +#: ../src/interface.c:3521 msgid "Display the Color Chooser button in the toolbar" msgstr "Affiche le bouton du sélecteur de couleur dans la barre d'outils" -#: ../src/interface.c:3465 +#: ../src/interface.c:3523 msgid "Show Zoom In and Zoom Out buttons" msgstr "Afficher les boutons de zoom avant et arrière" -#: ../src/interface.c:3468 +#: ../src/interface.c:3526 msgid "Display the Zoom In and Zoom Out buttons in the toolbar" msgstr "Afficher les boutons de zoom avant et arrière dans la barre d'outils" -#: ../src/interface.c:3470 +#: ../src/interface.c:3528 msgid "Show Increase and Decrease Indentation buttons" msgstr "Afficher les boutons d'indentation" -#: ../src/interface.c:3473 -#, fuzzy +#: ../src/interface.c:3531 msgid "Display the Increase and Decrease Indentation buttons in the toolbar" msgstr "" -"Afficher les boutons d'annulation et de répétition dans la barre d'outils" +"Afficher les boutons d'augmentation et de diminution d'indentation dans la " +"barre d'outils" -#: ../src/interface.c:3475 +#: ../src/interface.c:3533 msgid "Show Search field" msgstr "Afficher le champ de recherche" -#: ../src/interface.c:3478 +#: ../src/interface.c:3536 msgid "Display the search field and button in the toolbar" msgstr "" "Afficher le champ de recherche et le bouton associé dans la barre d'outils" -#: ../src/interface.c:3480 +#: ../src/interface.c:3538 msgid "Show Go to Line field" msgstr "Afficher le champ Aller à la ligne" -#: ../src/interface.c:3483 +#: ../src/interface.c:3541 msgid "Display the line number field and button in the toolbar" msgstr "" "Afficher le champ de numéro de ligne et son bouton dans la barre d'outils" -#: ../src/interface.c:3485 +#: ../src/interface.c:3543 msgid "Show Quit button" msgstr "Afficher le bouton Quitter" -#: ../src/interface.c:3488 +#: ../src/interface.c:3546 msgid "Display the quit button in the toolbar" msgstr "Afficher le bouton Quitter dans la barre d'outils" -#: ../src/interface.c:3490 +#: ../src/interface.c:3548 msgid "Items" msgstr "Éléments" -#: ../src/interface.c:3511 +#: ../src/interface.c:3569 msgid "Icon style:" msgstr "Style des icônes :" -#: ../src/interface.c:3518 +#: ../src/interface.c:3576 msgid "Icon size:" msgstr "Taille des icônes :" -#: ../src/interface.c:3565 +#: ../src/interface.c:3623 msgid "Appearance" msgstr "Apparence" -#: ../src/interface.c:3570 +#: ../src/interface.c:3628 msgid "Toolbar" msgstr "Barre d'outils" -#: ../src/interface.c:3604 +#: ../src/interface.c:3662 msgid "Auto-indent mode:" msgstr "Mode d'indentation automatique :" -#: ../src/interface.c:3617 +#: ../src/interface.c:3675 msgid "Basic" msgstr "Basique" -#: ../src/interface.c:3618 +#: ../src/interface.c:3676 msgid "Current chars" msgstr "Caractères courants" -#: ../src/interface.c:3619 +#: ../src/interface.c:3677 msgid "Match braces" msgstr "Accolades correspondantes" -#: ../src/interface.c:3621 ../src/interface.c:3975 +#: ../src/interface.c:3679 ../src/interface.c:4033 msgid "Type:" msgstr "Type :" -#: ../src/interface.c:3628 -#, fuzzy +#: ../src/interface.c:3686 msgid "Width:" -msgstr "Écriture :" +msgstr "Largeur :" -#: ../src/interface.c:3641 -#, fuzzy +#: ../src/interface.c:3699 msgid "The width in chars of a single indent" -msgstr "La largeur, en caractères, qu'un caractère tabulation prendra" +msgstr "La largeur, en caractères, d'une indentation simple" -#: ../src/interface.c:3651 -#, fuzzy +#: ../src/interface.c:3709 msgid "Use spaces when inserting indentation" -msgstr "Utiliser des tabulations lors de l'insertion d'espaces blancs" +msgstr "Utiliser des espaces pour l'indentation" -#: ../src/interface.c:3660 +#: ../src/interface.c:3718 msgid "Use one tab per indent" -msgstr "" +msgstr "Utiliser une tabulation par indentation" -#: ../src/interface.c:3669 +#: ../src/interface.c:3727 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" +"Utiliser des espaces si l'indentation totale est inférieure à la taille de " +"la tabulation, sinon utiliser les deux" -#: ../src/interface.c:3684 -#, fuzzy +#: ../src/interface.c:3742 msgid "Hard tab width:" msgstr "Largeur des tabulations :" -#: ../src/interface.c:3692 +#: ../src/interface.c:3750 msgid "The width of a tab when Tabs & Spaces is set for a document" msgstr "" +"La largeur d'une tabulation, quand tabulations et espaces sont définis pour " +"un document" -#: ../src/interface.c:3702 +#: ../src/interface.c:3760 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened." @@ -2158,30 +2193,31 @@ "Détecter ou non le type d'indentation depuis le contenu d'un fichier à son " "ouverture." -#: ../src/interface.c:3704 -#, fuzzy +#: ../src/interface.c:3762 msgid "Tab key indents" -msgstr "Indentation intelligente des lignes " +msgstr "Indentation par la touche Tab " -#: ../src/interface.c:3707 +#: ../src/interface.c:3765 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab " "character." msgstr "" +"Appuyer sur Tab ou Shift-Tab indente les lignes au lieu d'insérer une " +"tabulation" -#: ../src/interface.c:3709 +#: ../src/interface.c:3767 msgid "Indentation" msgstr "Indentation" -#: ../src/interface.c:3728 +#: ../src/interface.c:3786 msgid "Line wrapping" msgstr "Renvoi à la ligne" -#: ../src/interface.c:3733 +#: ../src/interface.c:3791 msgid "Enable \"smart\" home key" msgstr "Activer la touche home \"intelligente\"" -#: ../src/interface.c:3736 +#: ../src/interface.c:3794 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -2195,11 +2231,11 @@ "fonctionnalité est désactivée, la touche HOME déplace toujours le curseur au " "début de la ligne courante, peu importe sa position actuelle." -#: ../src/interface.c:3738 +#: ../src/interface.c:3796 msgid "Disable Drag and Drop" msgstr "Désactiver le glisser-déposer" -#: ../src/interface.c:3741 +#: ../src/interface.c:3799 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window." @@ -2208,21 +2244,19 @@ "éviter de pouvoir glisser-déposer toute sélection à l'intérieur ou " "l'extérieur de la fenêtre d'édition." -#: ../src/interface.c:3743 +#: ../src/interface.c:3801 msgid "Enable folding" msgstr "Activer le pliage" -#: ../src/interface.c:3746 +#: ../src/interface.c:3804 msgid "Whether to enable folding the code" msgstr "Active ou non le pliage du code" -#: ../src/interface.c:3748 -#, fuzzy +#: ../src/interface.c:3806 msgid "Fold/unfold all children of a fold point" msgstr "Déplier/Replier tous les éléments fils d'un point de pliage" -#: ../src/interface.c:3751 -#, fuzzy +#: ../src/interface.c:3809 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -2231,12 +2265,12 @@ "sur la touche Shift lors d'un clic sur un symbole de repli le comportement " "inverse se produit." -#: ../src/interface.c:3753 +#: ../src/interface.c:3811 msgid "Use indicators to show compile errors" msgstr "Utiliser les indicateurs d'erreurs de compilation" # squiggly fait reference au style du soulignage (une ligne brisée) -#: ../src/interface.c:3756 +#: ../src/interface.c:3814 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error." @@ -2244,45 +2278,45 @@ "Utilise ou non les indicateurs (un soulignage) pour mettre en avant les " "lignes ou le compilateur a trouvé un avertissement ou une erreur." -#: ../src/interface.c:3758 +#: ../src/interface.c:3816 msgid "Newline strips trailing spaces" msgstr "Un passage à la ligne enlève les espaces de fin de ligne" -#: ../src/interface.c:3761 +#: ../src/interface.c:3819 msgid "Enable newline to strip the trailing spaces on the previous line." msgstr "" "Autoriser le retour à la ligne à supprimer les espaces de fin de la ligne " "précédente." -#: ../src/interface.c:3767 +#: ../src/interface.c:3825 msgid "Line breaking column:" -msgstr "" +msgstr "Colonne de retour à la ligne :" -#: ../src/interface.c:3781 -#, fuzzy +#: ../src/interface.c:3839 msgid "Comment toggle marker:" -msgstr "Ajouter/Supprimer un marqueur" +msgstr "Marqueur de commentaire :" -#: ../src/interface.c:3788 +#: ../src/interface.c:3846 msgid "" "A string which is added when toggling a line comment in a source file. It is " "used to mark the comment as toggled." msgstr "" +"Une chaîne de caractères insérée quand une ou des lignes de code sont " +"commentées. Elle est utilisée pour marquer la mise en commentaires." -#: ../src/interface.c:3790 +#: ../src/interface.c:3848 msgid "Features" msgstr "Fonctionnalités" -#: ../src/interface.c:3795 -#, fuzzy +#: ../src/interface.c:3853 msgid "Features" -msgstr "Fonctionnalités" +msgstr "Fonctionnalités" -#: ../src/interface.c:3814 +#: ../src/interface.c:3872 msgid "Snippet completion" msgstr "Complétion des snippets" -#: ../src/interface.c:3817 +#: ../src/interface.c:3875 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress." @@ -2290,32 +2324,34 @@ "Entrez une courte séquence de caractères prédéfinie et complétez la pour " "obtenir une chaîne plus complexe en utilisant un seule raccourci." -#: ../src/interface.c:3819 -#, fuzzy +#: ../src/interface.c:3877 msgid "XML tag auto completion" msgstr "Complétion automatique des balises XML" -#: ../src/interface.c:3822 +#: ../src/interface.c:3880 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "Complétion et fermeture automatique des balises XML ouvertes (cela inclut " "les balises HTML)" -#: ../src/interface.c:3824 +#: ../src/interface.c:3882 msgid "Automatic continuation of multi-line comments" -msgstr "" +msgstr "Continuation automatique des commentaires multi-lignes" -#: ../src/interface.c:3827 +#: ../src/interface.c:3885 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment." msgstr "" +"Continue automatiquement les commentaires multi-lignes dans des langages " +"tels que C, C++ et Java, quand une nouvelle ligne est entrée dans un tel " +"commentaire." -#: ../src/interface.c:3829 +#: ../src/interface.c:3887 msgid "Automatic symbol completion" msgstr "Complétion automatique des symboles" -#: ../src/interface.c:3832 +#: ../src/interface.c:3890 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2323,19 +2359,19 @@ "Complétion automatique des symboles connus dans les fichiers ouverts (noms " "des fonctions, variables globales...)" -#: ../src/interface.c:3840 +#: ../src/interface.c:3898 msgid "Max. symbol name suggestions:" -msgstr "" +msgstr "Nombre maximum de suggestions de nom de symbole :" -#: ../src/interface.c:3847 +#: ../src/interface.c:3905 msgid "Completion list height:" -msgstr "" +msgstr "Hauteur de la liste de complétion :" -#: ../src/interface.c:3854 +#: ../src/interface.c:3912 msgid "Characters to type for completion:" msgstr "Caractères à taper pour la complétion :" -#: ../src/interface.c:3867 +#: ../src/interface.c:3925 msgid "" "The amount of characters which are necessary to show the symbol auto " "completion list." @@ -2343,92 +2379,90 @@ "Le nombre de caractères nécessaires pour afficher la liste de complétion " "automatique des symboles." -#: ../src/interface.c:3876 -#, fuzzy +#: ../src/interface.c:3934 msgid "Display height in rows for the auto completion list." msgstr "Nombre de lignes à afficher dans la liste de complétion automatique." -#: ../src/interface.c:3885 -#, fuzzy +#: ../src/interface.c:3943 msgid "Maximum number of entries to display in the auto completion list." -msgstr "Nombre de lignes à afficher dans la liste de complétion automatique." +msgstr "" +"Nombre maximum de lignes à afficher dans la liste de complétion automatique." -#: ../src/interface.c:3888 +#: ../src/interface.c:3946 msgid "Completions" msgstr "Complétions" -#: ../src/interface.c:3893 -#, fuzzy +#: ../src/interface.c:3951 msgid "Completions" -msgstr "Complétions" +msgstr "Complétions" -#: ../src/interface.c:3916 +#: ../src/interface.c:3974 msgid "Invert syntax highlighting colors" msgstr "Inverser les couleurs de la coloration syntaxique" -#: ../src/interface.c:3918 +#: ../src/interface.c:3976 msgid "Use white text on a black background." msgstr "Utiliser un texte blanc sur fond noir." -#: ../src/interface.c:3920 +#: ../src/interface.c:3978 msgid "Show indentation guides" msgstr "Afficher les guides d'indentation" -#: ../src/interface.c:3923 +#: ../src/interface.c:3981 msgid "Shows small dotted lines to help you to use the right indentation." msgstr "" "Affiche de petites lignes en pointillés pour aider à l'utilisation de la " "bonne indentation." -#: ../src/interface.c:3925 +#: ../src/interface.c:3983 msgid "Show white space" msgstr "Afficher les espaces" -#: ../src/interface.c:3928 +#: ../src/interface.c:3986 msgid "Marks spaces with dots and tabs with arrows." msgstr "" "Marque les espaces avec des points et les tabulations avec des flèches." -#: ../src/interface.c:3930 +#: ../src/interface.c:3988 msgid "Show line endings" msgstr "Afficher les fins de lignes" -#: ../src/interface.c:3933 -#, fuzzy +#: ../src/interface.c:3991 msgid "Show the line ending character." -msgstr "Affiche le caractère de fin de ligne" +msgstr "Afficher le caractère de fin de ligne" -#: ../src/interface.c:3935 -#, fuzzy +#: ../src/interface.c:3993 msgid "Stop scrolling at last line" -msgstr "Défiler vers la ligne courante" +msgstr "Arrêter le défilement à la dernière ligne" -#: ../src/interface.c:3938 +#: ../src/interface.c:3996 msgid "Whether to stop scrolling one page past the last line of a document." msgstr "" +"Permet d'arrêter le défilement une page après la dernière ligne d'un " +"document." -#: ../src/interface.c:3940 +#: ../src/interface.c:3998 msgid "Display" msgstr "Affichage" -#: ../src/interface.c:3961 +#: ../src/interface.c:4019 msgid "Long line marker:" msgstr "Marqueur des longues lignes :" -#: ../src/interface.c:3968 +#: ../src/interface.c:4026 msgid "Long line marker color:" msgstr "Couleur du marqueur des longues lignes :" -#: ../src/interface.c:3987 +#: ../src/interface.c:4045 msgid "Sets the color of the long line marker" msgstr "Définit la couleur du marqueur des longues lignes" -#: ../src/interface.c:3988 ../src/tools.c:743 ../src/vte.c:737 +#: ../src/interface.c:4046 ../src/tools.c:743 ../src/vte.c:737 #: ../src/vte.c:744 msgid "Color Chooser" msgstr "Sélecteur de couleur" -#: ../src/interface.c:3996 +#: ../src/interface.c:4054 msgid "" "The long line marker is a thin vertical line in the editor. It helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2439,11 +2473,11 @@ "ligne. Définissez une valeur supérieure à 0 pour spécifier à quelle colonne " "il devrait apparaître." -#: ../src/interface.c:4006 +#: ../src/interface.c:4064 msgid "Line" msgstr "Ligne" -#: ../src/interface.c:4009 +#: ../src/interface.c:4067 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)." @@ -2451,11 +2485,11 @@ "Affiche une ligne verticale dans la fenêtre de l'éditeur à la position " "donnée (voir plus bas)." -#: ../src/interface.c:4013 +#: ../src/interface.c:4071 msgid "Background" msgstr "Fond" -#: ../src/interface.c:4016 +#: ../src/interface.c:4074 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below. (This is recommended if you use " @@ -2465,64 +2499,65 @@ "est changée pour la couleur définie plus bas. (Cela est recommandé si vous " "utilisez des polices proportionnelles)" -#: ../src/interface.c:4020 +#: ../src/interface.c:4078 msgid "Disabled" msgstr "Désactivé" -#: ../src/interface.c:4026 +#: ../src/interface.c:4084 msgid "Long line marker" msgstr "Marqueur des longues lignes" -#: ../src/interface.c:4031 +#: ../src/interface.c:4089 msgid "Display" msgstr "Affichage" -#: ../src/interface.c:4035 ../src/keybindings.c:213 +#: ../src/interface.c:4093 ../src/keybindings.c:213 msgid "Editor" msgstr "Éditeur" -#: ../src/interface.c:4062 +#: ../src/interface.c:4120 msgid "Open new documents from the command-line" -msgstr "" +msgstr "Ouvrir les nouveaux documents depuis la ligne de commande" -#: ../src/interface.c:4065 +#: ../src/interface.c:4123 msgid "Start a new file for each command-line filename that doesn't exist." msgstr "" +"Ouvrir un nouveau fichier pour chaque nom de fichier inexistant spécifié en " +"ligne de commande." -#: ../src/interface.c:4079 -#, fuzzy +#: ../src/interface.c:4137 msgid "Default end of line characters:" -msgstr "Encodage par défaut (nouveaux fichiers) :" +msgstr "Caractères de fin de ligne par défaut :" -#: ../src/interface.c:4086 +#: ../src/interface.c:4144 msgid "New files" msgstr "Nouveaux fichiers" -#: ../src/interface.c:4112 +#: ../src/interface.c:4170 msgid "Sets the default encoding for newly created files." msgstr "" "Définit le jeu de caractères utilisés par défaut lors de la création de " "nouveaux fichiers." -#: ../src/interface.c:4118 +#: ../src/interface.c:4176 msgid "Default encoding (new files):" msgstr "Encodage par défaut (nouveaux fichiers) :" -#: ../src/interface.c:4125 +#: ../src/interface.c:4183 msgid "Default encoding (existing files):" msgstr "Encodage par défaut (fichiers existants) :" -#: ../src/interface.c:4137 +#: ../src/interface.c:4195 msgid "Sets the default encoding for opening existing files." msgstr "" "Définit le jeu de caractères utilisé par défaut lors de l'ouverture de " "fichiers existants." -#: ../src/interface.c:4143 +#: ../src/interface.c:4201 msgid "Use fixed encoding when opening files" msgstr "Utiliser un encodage fixe lors de l'ouverture des fichiers" -#: ../src/interface.c:4148 +#: ../src/interface.c:4206 msgid "" "This option disables the automatic detection of the file encoding when " "opening files and opens the file with the specified encoding (usually not " @@ -2532,81 +2567,81 @@ "l'ouverture des fichiers et ouvre le fichier avec l'encodage spécifié " "(habituellement non requis)." -#: ../src/interface.c:4150 -#, fuzzy +#: ../src/interface.c:4208 msgid "Encodings" -msgstr "Encodage :" +msgstr "Encodage" -#: ../src/interface.c:4169 +#: ../src/interface.c:4227 msgid "Ensure new line at file end" msgstr "Nouvelle ligne à la fin du fichier" -#: ../src/interface.c:4172 +#: ../src/interface.c:4230 msgid "Ensures that at the end of the file is a new line" msgstr "Garantit que la dernière ligne du fichier est une nouvelle ligne" -#: ../src/interface.c:4174 -#, fuzzy +#: ../src/interface.c:4232 msgid "Strip trailing spaces and tabs" -msgstr "Enlever les espaces de fin" +msgstr "Enlever les espaces et tabulations de fin" -#: ../src/interface.c:4177 +#: ../src/interface.c:4235 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Enlève les espaces et tabulations restants à la fin des lignes" -#: ../src/interface.c:4179 ../src/keybindings.c:430 +#: ../src/interface.c:4237 ../src/keybindings.c:430 msgid "Replace tabs by space" msgstr "Remplacer les tabulations par des espaces" -#: ../src/interface.c:4184 +#: ../src/interface.c:4242 msgid "Saving files" msgstr "Enregistrement des fichiers" -#: ../src/interface.c:4209 +#: ../src/interface.c:4267 msgid "Recent files list length:" msgstr "Longueur de la liste des fichiers récents :" -#: ../src/interface.c:4223 +#: ../src/interface.c:4281 msgid "" "Specifies the number of files which are stored in the Recent files list." msgstr "" "Spécifie le nombre de fichiers conservés dans la liste des fichiers récents." -#: ../src/interface.c:4227 +#: ../src/interface.c:4285 msgid "Disk check timeout:" -msgstr "" +msgstr "Intervalle de vérification du disque :" -#: ../src/interface.c:4240 +#: ../src/interface.c:4298 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" +"Intervalle de vérification périodique des modifications des fichiers sur le " +"disque, en secondes. Zéro signifie qu'aucune vérification péridoque n'est " +"faite." -#: ../src/interface.c:4249 ../src/symbols.c:581 ../plugins/filebrowser.c:925 +#: ../src/interface.c:4307 ../src/symbols.c:581 ../plugins/filebrowser.c:924 msgid "Files" msgstr "Fichiers" # Adaptation de wrap -#: ../src/interface.c:4268 +#: ../src/interface.c:4326 msgid "Always wrap search and hide the Find dialog" msgstr "" "Toujours reprendre la recherche en boucle et cacher la fenêtre de recherche" # Adaptation de wrap -#: ../src/interface.c:4271 -#, fuzzy +#: ../src/interface.c:4329 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous." msgstr "" "Toujours reprendre la recherche en boucle et cacher la fenêtre de recherche " -"après un clic sur Suivant/Précédent" +"après un clic sur Suivant/Précédent." -#: ../src/interface.c:4273 +#: ../src/interface.c:4331 msgid "Use the current word under the cursor for Find dialogs" msgstr "Utiliser le mot courant sous le curseur pour la recherche." -#: ../src/interface.c:4276 +#: ../src/interface.c:4334 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection." @@ -2615,37 +2650,36 @@ "dialogue de recherche, recherche dans les fichiers, ou remplacement et si " "aucun texte n'est sélectionné." -#: ../src/interface.c:4278 -#, fuzzy +#: ../src/interface.c:4336 msgid "Use the current file's directory for Find in Files" -msgstr "Utiliser le mot courant sous le curseur pour la recherche." +msgstr "" +"Utiliser le dossier du fichier courant pour la recherche dans les fichiers" -#: ../src/interface.c:4282 -#, fuzzy +#: ../src/interface.c:4340 msgid "Search" -msgstr "Barre latérale" +msgstr "Recherche" -#: ../src/interface.c:4287 ../src/keybindings.c:314 +#: ../src/interface.c:4345 ../src/keybindings.c:314 msgid "Search" msgstr "Recherche" -#: ../src/interface.c:4320 +#: ../src/interface.c:4378 msgid "Make:" msgstr "Make :" -#: ../src/interface.c:4327 +#: ../src/interface.c:4385 msgid "Terminal:" msgstr "Terminal :" -#: ../src/interface.c:4334 +#: ../src/interface.c:4392 msgid "Browser:" msgstr "Navigateur :" -#: ../src/interface.c:4346 +#: ../src/interface.c:4404 msgid "Path and options for the make tool" msgstr "Chemin et options pour l'outil make" -#: ../src/interface.c:4353 +#: ../src/interface.c:4411 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2653,25 +2687,25 @@ "Un émulateur de terminal comme xterm, gnome-terminal ou konsole (doit " "accepter l'option -e )" -#: ../src/interface.c:4360 +#: ../src/interface.c:4418 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "" "Chemin (et options supplémentaires si nécessaire) vers votre navigateur " "favori" -#: ../src/interface.c:4392 +#: ../src/interface.c:4450 msgid "Grep:" msgstr "Grep :" -#: ../src/interface.c:4415 +#: ../src/interface.c:4473 msgid "Tool paths" msgstr "Chemins des outils" -#: ../src/interface.c:4436 +#: ../src/interface.c:4494 msgid "Context action:" msgstr "Action contextuelle :" -#: ../src/interface.c:4447 +#: ../src/interface.c:4505 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2682,157 +2716,152 @@ "s. Il peut être placé n'importe où dans la commande donnée et sera remplacé " "avant exécution." -#: ../src/interface.c:4460 +#: ../src/interface.c:4518 msgid "Commands" msgstr "Commandes" -#: ../src/interface.c:4465 ../src/keybindings.c:466 +#: ../src/interface.c:4523 ../src/keybindings.c:466 msgid "Tools" msgstr "Outils" -#: ../src/interface.c:4499 +#: ../src/interface.c:4557 msgid "email address of the developer" msgstr "adresse e-mail du développeur" -#: ../src/interface.c:4506 +#: ../src/interface.c:4564 msgid "Initials of the developer name" msgstr "Initiales du nom du développeur" -#: ../src/interface.c:4508 +#: ../src/interface.c:4566 msgid "Initial version:" msgstr "Version initiale :" -#: ../src/interface.c:4520 +#: ../src/interface.c:4578 msgid "Version number, which a new file initially has" msgstr "Numéro de version, qu'un nouveau fichier contient initialement" -#: ../src/interface.c:4527 +#: ../src/interface.c:4585 msgid "Company name" msgstr "Nom de l'entreprise" -#: ../src/interface.c:4529 +#: ../src/interface.c:4587 msgid "Developer:" msgstr "Développeur :" -#: ../src/interface.c:4536 +#: ../src/interface.c:4594 msgid "Company:" msgstr "Entreprise :" -#: ../src/interface.c:4543 +#: ../src/interface.c:4601 msgid "Mail address:" msgstr "Adresse e-mail :" -#: ../src/interface.c:4550 +#: ../src/interface.c:4608 msgid "Initials:" msgstr "Initiales :" -#: ../src/interface.c:4562 +#: ../src/interface.c:4620 msgid "The name of the developer" msgstr "Le nom du développeur" -#: ../src/interface.c:4564 -#, fuzzy +#: ../src/interface.c:4622 msgid "Year:" -msgstr "Barre latérale :" +msgstr "Année :" -#: ../src/interface.c:4571 -#, fuzzy +#: ../src/interface.c:4629 msgid "Date:" -msgstr "Make :" +msgstr "Date :" -#: ../src/interface.c:4578 +#: ../src/interface.c:4636 msgid "Date & Time:" -msgstr "" +msgstr "Date et heure :" -#: ../src/interface.c:4590 -#, fuzzy +#: ../src/interface.c:4648 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"Entrez ici un format de date et d'heure personnalisé qui sera ajouté à l'en-" -"tête de chaque page. Vous pouvez utiliser tous les spécificateurs de " -"conversion qui peuvent être utilisés avec la fonction C ANSI strftime." +"Entrez ici un format de date et d'heure personnalisé. Vous pouvez utiliser " +"tous les spécificateurs de conversion qui peuvent être utilisés avec la " +"fonction C ANSI strftime." -#: ../src/interface.c:4597 -#, fuzzy +#: ../src/interface.c:4655 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"Entrez ici un format de date et d'heure personnalisé qui sera ajouté à l'en-" -"tête de chaque page. Vous pouvez utiliser tous les spécificateurs de " -"conversion qui peuvent être utilisés avec la fonction C ANSI strftime." +"Entrez ici un format d'année personnalisé. Vous pouvez utiliser tous les " +"spécificateurs de conversion qui peuvent être utilisés avec la fonction C " +"ANSI strftime." -#: ../src/interface.c:4604 -#, fuzzy +#: ../src/interface.c:4662 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"Entrez ici un format de date et d'heure personnalisé qui sera ajouté à l'en-" -"tête de chaque page. Vous pouvez utiliser tous les spécificateurs de " -"conversion qui peuvent être utilisés avec la fonction C ANSI strftime." +"Entrez ici un format de date personnalisé. Vous pouvez utiliser tous les " +"spécificateurs de conversion qui peuvent être utilisés avec la fonction C " +"ANSI strftime." -#: ../src/interface.c:4606 +#: ../src/interface.c:4664 msgid "Template data" msgstr "Données des modèles" -#: ../src/interface.c:4611 +#: ../src/interface.c:4669 msgid "Templates" msgstr "Modèles" -#: ../src/interface.c:4649 +#: ../src/interface.c:4707 msgid "C_hange" msgstr "C_hanger" -#: ../src/interface.c:4653 +#: ../src/interface.c:4711 msgid "Keyboard shortcuts" msgstr "Raccourcis clavier" -#: ../src/interface.c:4658 +#: ../src/interface.c:4716 msgid "Keybindings" msgstr "Raccourcis" -#: ../src/interface.c:4681 +#: ../src/interface.c:4739 msgid "Command:" msgstr "Commande :" -#: ../src/interface.c:4688 +#: ../src/interface.c:4746 #, c-format msgid "Path to the command for printing files (use %f for the filename)." msgstr "" "Chemin vers la commande à utiliser pour imprimer les fichiers (utiliser %f " "pour le nom du fichier)." -#: ../src/interface.c:4698 +#: ../src/interface.c:4756 msgid "Use an external command for printing" msgstr "Utiliser une commande externe pour imprimer" -#: ../src/interface.c:4718 ../src/printing.c:343 +#: ../src/interface.c:4776 ../src/printing.c:343 msgid "Print line numbers" msgstr "Afficher les numéros de ligne" -#: ../src/interface.c:4721 ../src/printing.c:345 +#: ../src/interface.c:4779 ../src/printing.c:345 msgid "Add line numbers to the printed page." msgstr "Ajouter les numéros de lignes à la page imprimée." -#: ../src/interface.c:4723 ../src/printing.c:348 +#: ../src/interface.c:4781 ../src/printing.c:348 msgid "Print page numbers" msgstr "Afficher les numéros de ligne" -#: ../src/interface.c:4726 ../src/printing.c:350 +#: ../src/interface.c:4784 ../src/printing.c:350 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" "Ajouter la numérotation des pages en bas de chaque pages. Cela prend 2 " "lignes par pages." -#: ../src/interface.c:4728 ../src/printing.c:353 +#: ../src/interface.c:4786 ../src/printing.c:353 msgid "Print page header" msgstr "Afficher les en-têtes des pages" -#: ../src/interface.c:4731 ../src/printing.c:355 +#: ../src/interface.c:4789 ../src/printing.c:355 msgid "" "Adds a little header to every page containing the page number, the filename " "and the current date(see below). It takes 3 lines of the page." @@ -2840,20 +2869,20 @@ "Ajoute un court en-tête à chaque page contenant le numéro de page, le nom du " "fichier et la date (voir ci-après). Cela prend 3 lignes par page." -#: ../src/interface.c:4748 ../src/printing.c:371 +#: ../src/interface.c:4806 ../src/printing.c:371 msgid "Use the basename of the printed file" msgstr "Utiliser le nom court du fichier à imprimer" -#: ../src/interface.c:4751 ../src/printing.c:373 +#: ../src/interface.c:4809 ../src/printing.c:373 msgid "Print only the basename(without the path) of the printed file." msgstr "" "Imprimer seulement le nom de base (sans le chemin) du fichier à imprimer." -#: ../src/interface.c:4757 ../src/printing.c:379 +#: ../src/interface.c:4815 ../src/printing.c:379 msgid "Date format:" msgstr "Format de date :" -#: ../src/interface.c:4764 ../src/printing.c:384 +#: ../src/interface.c:4822 ../src/printing.c:384 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2863,15 +2892,15 @@ "tête de chaque page. Vous pouvez utiliser tous les spécificateurs de " "conversion qui peuvent être utilisés avec la fonction C ANSI strftime." -#: ../src/interface.c:4767 +#: ../src/interface.c:4825 msgid "Use native GTK printing" msgstr "Utiliser l'impression GTK native" -#: ../src/interface.c:4773 +#: ../src/interface.c:4831 msgid "Printing" msgstr "Imprimer" -#: ../src/keybindings.c:182 ../src/plugins.c:1012 +#: ../src/keybindings.c:182 ../src/plugins.c:1032 msgid "File" msgstr "Fichier" @@ -3081,7 +3110,6 @@ msgstr "Insérer la date" #: ../src/keybindings.c:306 -#, fuzzy msgid "Insert alternative white space" msgstr "Insérer un espacement alternatif" @@ -3122,18 +3150,16 @@ msgstr "Message suivant" #: ../src/keybindings.c:335 -#, fuzzy msgid "Previous Message" -msgstr "Message suivant" +msgstr "Message précédent" #: ../src/keybindings.c:337 msgid "Find Usage" msgstr "Utiliser la recherche" #: ../src/keybindings.c:339 -#, fuzzy msgid "Find Document Usage" -msgstr "Utiliser la recherche" +msgstr "Rechercher dans le document" #: ../src/keybindings.c:341 msgid "Go to" @@ -3164,24 +3190,20 @@ msgstr "Aller à la déclaration du symbole" #: ../src/keybindings.c:366 -#, fuzzy msgid "Go to Start of Line" -msgstr "Aller à la ligne" +msgstr "Aller au début de la ligne" #: ../src/keybindings.c:368 -#, fuzzy msgid "Go to End of Line" -msgstr "Aller à la ligne" +msgstr "Aller à la fin de la ligne" #: ../src/keybindings.c:370 -#, fuzzy msgid "Go to Previous Word Part" -msgstr "Se rendre au marqueur précédent" +msgstr "Aller à la section de mot précédente" #: ../src/keybindings.c:372 -#, fuzzy msgid "Go to Next Word Part" -msgstr "Se rendre au marqueur suivant" +msgstr "Aller à la section de mot suivante" #: ../src/keybindings.c:374 msgid "View" @@ -3236,9 +3258,8 @@ msgstr "Basculer vers la barre latérale" #: ../src/keybindings.c:404 -#, fuzzy msgid "Switch to Compiler" -msgstr "Basculer vers la barre latérale" +msgstr "Basculer vers le compilateur" #: ../src/keybindings.c:406 msgid "Notebook tab" @@ -3277,24 +3298,20 @@ msgstr "Document" #: ../src/keybindings.c:426 -#, fuzzy msgid "Toggle Line wrapping" -msgstr "Renvoi à la ligne" +msgstr "Basculer le renvoi à la ligne" #: ../src/keybindings.c:428 -#, fuzzy msgid "Toggle Line breaking" -msgstr "Commen_ter/Décommenter la ligne" +msgstr "Basculer le retour à la ligne" #: ../src/keybindings.c:432 -#, fuzzy msgid "Replace spaces by tabs" -msgstr "_Remplacer les tabulations par des espaces" +msgstr "Remplacer les espaces par des tabulations" #: ../src/keybindings.c:434 -#, fuzzy msgid "Toggle current fold" -msgstr "Selectionner le mot courant" +msgstr "Basculer le pliage courant" #: ../src/keybindings.c:436 msgid "Fold all" @@ -3329,9 +3346,8 @@ msgstr "Erreur suivante" #: ../src/keybindings.c:458 -#, fuzzy msgid "Previous error" -msgstr "Traducteurs précédents" +msgstr "Erreur précédente" #: ../src/keybindings.c:460 msgid "Run" @@ -3347,36 +3363,35 @@ #: ../src/keybindings.c:469 msgid "Show Color Chooser" -msgstr "Afficher le sélecteur de couleur" +msgstr "Afficher le sélecteur de couleurs" #: ../src/keybindings.c:471 ../src/keybindings.c:474 msgid "Help" msgstr "Aide" -#: ../src/keybindings.c:712 +#: ../src/keybindings.c:713 msgid "Keyboard Shortcuts" msgstr "Raccourcis clavier" -#: ../src/keybindings.c:725 +#: ../src/keybindings.c:726 msgid "The following keyboard shortcuts are configurable:" msgstr "Les raccourcis clavier suivants peuvent être configurés :" -#: ../src/keyfile.c:817 +#: ../src/keyfile.c:821 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Écrivez ici ce que vous souhaitez, utilisez cela comme comme un tableau de " "notes" -#: ../src/keyfile.c:1012 +#: ../src/keyfile.c:1016 msgid "Failed to load one or more session files." msgstr "Impossible de charger un ou plusieurs fichiers de session." #: ../src/log.c:177 -#, fuzzy msgid "Debug Messages" -msgstr "Messages" +msgstr "Messages de débogage" -#: ../src/main.c:123 +#: ../src/main.c:120 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" @@ -3384,121 +3399,128 @@ "Définit la colonne initiale pour le premier fichier ouvert (utile en " "association avec --line)" -#: ../src/main.c:124 +#: ../src/main.c:121 msgid "Use an alternate configuration directory" -msgstr "Utiliser un répertoire de configuration alternatif" +msgstr "Utiliser un dossier de configuration alternatif" # on laisse debug. -#: ../src/main.c:125 +#: ../src/main.c:122 msgid "Runs in debug mode (means being verbose)" msgstr "Exécution en mode de debug (mode verbeux)" -#: ../src/main.c:126 +#: ../src/main.c:123 msgid "Print internal filetype names" msgstr "Afficher les types de fichier internes" -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Generate global tags file (see documentation)" msgstr "Générer un fichier de tags global (voir la documentation)" -#: ../src/main.c:131 +#: ../src/main.c:125 +msgid "Don't preprocess C/C++ files when generating tags" +msgstr "" + +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "" "Ne pas ouvrir les fichiers dans l'instance courante, forcer l'ouverture dans " "une nouvelle instance" -#: ../src/main.c:133 +#: ../src/main.c:130 msgid "Set initial line number for the first opened file" msgstr "Définit la ligne initiale pour le premier fichier ouvert" -#: ../src/main.c:134 +#: ../src/main.c:131 msgid "Don't show message window at startup" msgstr "Ne pas afficher la fenêtre de message au démarrage" -#: ../src/main.c:135 +#: ../src/main.c:132 msgid "Don't load auto completion data (see documentation)" msgstr "" "Ne pas charger les données de complétion automatique (voir la documentation)" -#: ../src/main.c:137 +#: ../src/main.c:134 msgid "Don't load plugins" msgstr "Ne pas charger les plugins" -#: ../src/main.c:139 +#: ../src/main.c:136 msgid "Print Geany's installation prefix" msgstr "Imprime le préfixe de l'installation de Geany" -#: ../src/main.c:140 +#: ../src/main.c:137 msgid "don't load the previous session's files" msgstr "ne pas charger les fichiers des sessions précédentes" -#: ../src/main.c:142 +#: ../src/main.c:139 msgid "Don't load terminal support" msgstr "Ne pas charger le support du terminal" -#: ../src/main.c:143 +#: ../src/main.c:140 msgid "Filename of libvte.so" msgstr "Nom du fichier libvte.so" -#: ../src/main.c:145 +#: ../src/main.c:142 msgid "Show version and exit" msgstr "Afficher la version et quitter" -#: ../src/main.c:481 +#: ../src/main.c:477 msgid "[FILES...]" msgstr "[FICHIERS...]" -#: ../src/main.c:498 +#: ../src/main.c:494 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(construit le %s avec GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:602 +#: ../src/main.c:596 #, c-format msgid "" "Configuration directory could not be created (%s).\n" "There could be some problems using Geany without a configuration directory.\n" "Start Geany anyway?" msgstr "" -"Le répertoire de configuration n'a pas pu être créé (%s).\n" -"Il peut y avoir des problèmes à l'utilisation de Geany sans répertoire de " +"Le dossier de configuration n'a pas pu être créé (%s).\n" +"Il peut y avoir des problèmes à l'utilisation de Geany sans dossier de " "configuration.\n" "Lancer Geany quand même ?" -#: ../src/main.c:672 ../src/socket.c:157 +#: ../src/main.c:666 ../src/socket.c:157 #, c-format msgid "Could not find file '%s'." msgstr "Impossible de trouver le fichier '%s'." -#: ../src/main.c:829 +#: ../src/main.c:716 #, c-format +msgid "Ignoring extra filenames after %s" +msgstr "" + +#: ../src/main.c:859 +#, c-format msgid "This is Geany %s." msgstr "Voici Geany %s." -#: ../src/main.c:831 +#: ../src/main.c:861 #, c-format msgid "Configuration directory could not be created (%s)." -msgstr "Le répertoire de configuration n'a pas pu être créé (%s)." +msgstr "Le dossier de configuration n'a pas pu être créé (%s)." -#: ../src/main.c:1051 -#, fuzzy +#: ../src/main.c:1061 msgid "Configuration files reloaded." -msgstr "fichier de configuration %s, éditez le selon vos besoins" +msgstr "Fichiers de configuration rechargés." #: ../src/msgwindow.c:114 msgid "Status messages" msgstr "Messages de statut" #: ../src/msgwindow.c:495 -#, fuzzy msgid "Copy _All" -msgstr "To_ut fermer" +msgstr "To_ut copier" #: ../src/msgwindow.c:525 msgid "_Hide Message Window" msgstr "Cac_her la fenêtre de message" -#: ../src/plugins.c:375 +#: ../src/plugins.c:394 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3507,11 +3529,11 @@ "Le plugin \"%s\" n'est pas compatible au niveau binaire avec cette version " "de Geany - Veuillez le recompiler." -#: ../src/plugins.c:767 +#: ../src/plugins.c:823 msgid "_Plugin Manager" msgstr "Gestionnaire de _plugin" -#: ../src/plugins.c:934 +#: ../src/plugins.c:954 #, c-format msgid "" "Plugin: %s %s\n" @@ -3522,23 +3544,23 @@ "Description : %s\n" "Auteur(s) : %s" -#: ../src/plugins.c:1000 +#: ../src/plugins.c:1020 msgid "Active" msgstr "Actif" -#: ../src/plugins.c:1006 +#: ../src/plugins.c:1026 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1050 msgid "No plugins available." msgstr "Aucun plugin disponible." -#: ../src/plugins.c:1139 +#: ../src/plugins.c:1159 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1159 +#: ../src/plugins.c:1179 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3546,7 +3568,7 @@ "Ci-dessous se trouve la liste des modules disponibles. Sélectionnez les " "modules qui pourraient être chargés quand Geany est démarré." -#: ../src/plugins.c:1167 +#: ../src/plugins.c:1187 msgid "Plugin details:" msgstr "Détails du plugin :" @@ -3558,39 +3580,39 @@ msgid "Shortcut" msgstr "Raccourci" -#: ../src/prefs.c:1283 +#: ../src/prefs.c:1295 msgid "Grab Key" msgstr "Entrer une touche" -#: ../src/prefs.c:1289 -#, fuzzy, c-format +#: ../src/prefs.c:1301 +#, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "" -"Tapez la combinaison de touches que vous souhaitez utiliser pour \"%s\"" +"Tapez la combinaison de touches que vous souhaitez utiliser pour \"%s\"" -#: ../src/prefs.c:1476 +#: ../src/prefs.c:1488 msgid "_Override" msgstr "Écras_er" -#: ../src/prefs.c:1477 +#: ../src/prefs.c:1489 msgid "Override that keybinding?" msgstr "Écraser ce raccourci ?" -#: ../src/prefs.c:1478 +#: ../src/prefs.c:1490 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "La combinaison '%s' est déjà utilisée pour \"%s\"." #. add manually GeanyWrapLabels because it can't be added with Glade #. * page Tools -#: ../src/prefs.c:1590 +#: ../src/prefs.c:1602 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Entrer les chemins vers les outils ici. Les chemins vers les outils dont " "vous n'avez pas besoin peuvent être laissés vides." #. page Templates -#: ../src/prefs.c:1595 +#: ../src/prefs.c:1607 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3598,18 +3620,18 @@ "Spécifier ici les informations à utiliser dans les modèles. Voir la " "documentation pour plus de détails." -#: ../src/prefs.c:1599 -#, fuzzy +#: ../src/prefs.c:1611 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." "" msgstr "" "Note : vous devrez relancer Geany pour que tous les changements effectués " -"ici prennent effet." +"ici prennent effet, ou bien vous pouvez forcer Geany à recharger les " +"paramètres en utilisant le menu Outils -> Recharger la configuration." #. page Keybindings -#: ../src/prefs.c:1605 +#: ../src/prefs.c:1617 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3621,7 +3643,7 @@ "caractères représentant le raccourci." #. page Printing -#: ../src/prefs.c:1610 +#: ../src/prefs.c:1622 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3699,7 +3721,7 @@ #: ../src/project.c:154 ../src/project.c:410 msgid "Base path:" -msgstr "Répertoire de base :" +msgstr "Dossier de base :" #: ../src/project.c:159 ../src/project.c:418 msgid "" @@ -3707,13 +3729,13 @@ "path, or an existing directory tree. You can use paths relative to the " "project filename." msgstr "" -"Répertoire de base pour tous les fichiers du projet. Cela peut être un " -"nouveau chemin, ou un répertoire existant. Vous pouvez utiliser des chemins " -"relatifs au nom du projet." +"Dossier de base pour tous les fichiers du projet. Cela peut être un nouveau " +"chemin, ou un dossier existant. Vous pouvez utiliser des chemins relatifs au " +"nom du projet." #: ../src/project.c:162 ../src/project.c:421 msgid "Choose Project Base Path" -msgstr "Choisir le répertoire de base du projet" +msgstr "Choisir le dossier de base du projet" #: ../src/project.c:207 ../src/project.c:244 ../src/project.c:869 #, c-format @@ -3743,7 +3765,7 @@ #: ../src/project.c:427 msgid "Make in base path" -msgstr "Lancer Make dans le répertoire de base" +msgstr "Lancer Make dans le dossier de base" #: ../src/project.c:432 msgid "Run command:" @@ -3754,7 +3776,7 @@ "Command-line to run in the project base directory. Options can be appended " "to the command. Leave blank to use the default run command." msgstr "" -"Ligne de commande à exécuter dans le répertoire de base du projet. Des " +"Ligne de commande à exécuter dans le dossier de base du projet. Des " "paramètres peuvent être ajoutés à la commande. Laissez vide pour utiliser la " "commande à exécuter par défaut." @@ -3786,7 +3808,7 @@ #: ../src/project.c:617 msgid "Create the project's base path directory?" -msgstr "Créer le répertoire de base du projet ?" +msgstr "Créer le dossier de base du projet ?" #: ../src/project.c:618 #, c-format @@ -3794,9 +3816,9 @@ msgstr "Le chemin \"%s\" est inexistant." #: ../src/project.c:627 -#, fuzzy, c-format +#, c-format msgid "Project base directory could not be created (%s)." -msgstr "Le répertoire de configuration n'a pas pu être créé (%s)." +msgstr "Le dossier de base du projet n'a pu être créé (%s)." #: ../src/project.c:639 #, c-format @@ -3867,7 +3889,7 @@ #: ../src/search.c:188 msgid "Match from s_tart of word" -msgstr "Correspondre avec le débu_t du mot" +msgstr "Co_rrespondre avec le début du mot" #: ../src/search.c:311 msgid "_Previous" @@ -3956,7 +3978,7 @@ #: ../src/search.c:647 msgid "_Recurse in subfolders" -msgstr "Recherche _récursive dans les sous-répertoires" +msgstr "Recherche _récursive dans les sous-dossiers" #: ../src/search.c:663 msgid "_Invert search results" @@ -3992,7 +4014,7 @@ #: ../src/search.c:1138 msgid "Invalid directory for find in files." -msgstr "Répertoire invalide pour la recherche dans les fichiers." +msgstr "Dossier invalide pour la recherche dans les fichiers." #: ../src/search.c:1156 msgid "No text to find." @@ -4008,12 +4030,12 @@ #: ../src/search.c:1244 #, c-format msgid "%s %s -- %s (in directory: %s)" -msgstr "%s %s -- %s (dans le répertoire : %s)" +msgstr "%s %s -- %s (dans le dossier : %s)" #: ../src/search.c:1272 #, c-format msgid "Could not open directory (%s)" -msgstr "Impossible d'ouvrir le répertoire (%s)" +msgstr "Impossible d'ouvrir le dossier (%s)" #: ../src/search.c:1321 msgid "Search failed." @@ -4035,11 +4057,11 @@ msgid "Couldn't find pixmap file: %s" msgstr "Impossible de trouver le fichier pixmap : %s" -#: ../src/symbols.c:587 ../src/symbols.c:621 ../src/symbols.c:668 +#: ../src/symbols.c:587 ../src/symbols.c:621 ../src/symbols.c:676 msgid "Chapter" msgstr "Chapitre" -#: ../src/symbols.c:588 ../src/symbols.c:617 ../src/symbols.c:669 +#: ../src/symbols.c:588 ../src/symbols.c:617 ../src/symbols.c:677 msgid "Section" msgstr "Section" @@ -4061,18 +4083,18 @@ #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:593 ../src/symbols.c:622 ../src/symbols.c:727 -#: ../src/symbols.c:739 ../src/symbols.c:751 ../src/symbols.c:766 -#: ../src/symbols.c:810 +#: ../src/symbols.c:593 ../src/symbols.c:622 ../src/symbols.c:735 +#: ../src/symbols.c:747 ../src/symbols.c:759 ../src/symbols.c:774 +#: ../src/symbols.c:818 msgid "Other" msgstr "Autre" -#: ../src/symbols.c:600 ../src/symbols.c:759 ../src/symbols.c:791 +#: ../src/symbols.c:600 ../src/symbols.c:767 ../src/symbols.c:799 msgid "Module" msgstr "Module" -#: ../src/symbols.c:601 ../src/symbols.c:737 ../src/symbols.c:749 -#: ../src/symbols.c:764 ../src/symbols.c:776 @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3147] trunk
by eht16＠users.sourceforge.net 23 Oct '08

23 Oct '08

Revision: 3147 http://geany.svn.sourceforge.net/geany/?rev=3147&view=rev Author: eht16 Date: 2008-10-23 20:55:55 +0000 (Thu, 23 Oct 2008) Log Message: ----------- Add toolbar buttons for Cut, Copy, Paste and Delete (#2161750). Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/geany.glade trunk/src/callbacks.c trunk/src/interface.c trunk/src/keyfile.c trunk/src/plugindata.h trunk/src/prefs.c trunk/src/ui_utils.c trunk/src/ui_utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-23 20:55:06 UTC (rev 3146) +++ trunk/ChangeLog 2008-10-23 20:55:55 UTC (rev 3147) @@ -8,6 +8,10 @@ Remove dialogs_show_goto_line(), use the more generic dialogs_show_input_numeric() instead. Increase limit of the maximum line number from 99999 to 100000000. + * doc/geany.html, doc/geany.txt, geany.glade, src/callbacks.c, + src/interface.c, src/keyfile.c, src/plugindata.h, src/prefs.c, + src/ui_utils.c, src/ui_utils.h: + Add toolbar buttons for Cut, Copy, Paste and Delete (#2161750). 2008-10-22 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-10-23 20:55:06 UTC (rev 3146) +++ trunk/doc/geany.html 2008-10-23 20:55:55 UTC (rev 3147) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2008-10-19" /> +<meta name="date" content="$Date$" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ Nick Treleaven Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2008-10-19</td></tr> +<td>$Date$</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.16</td></tr> </tbody> @@ -1685,9 +1685,13 @@ <div class="section" id="items"> <h4><a class="toc-backref" href="#id83">Items</a></h4> <dl class="docutils"> -<dt>Show file operation buttons</dt> +<dt>Show File Operation buttons</dt> <dd>Show the buttons to open a new file, open an existing file, save a file, and save all files.</dd> +<dt>Show Cut and Delete buttons</dt> +<dd>Show buttons to cut and delete the current selection.</dd> +<dt>Show Copy and Paste buttons</dt> +<dd>Show buttons to copy the current selection and paste the contents of the clipboard.</dd> <dt>Show Redo and Undo buttons</dt> <dd>Show the undo/redo change buttons.</dd> <dt>Show Back and Forward buttons</dt> @@ -4399,7 +4403,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2008-10-19 13:50 UTC. +Generated on: 2008-10-23 20:49 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2008-10-23 20:55:06 UTC (rev 3146) +++ trunk/doc/geany.txt 2008-10-23 20:55:55 UTC (rev 3147) @@ -1429,10 +1429,16 @@ Items ````` -Show file operation buttons +Show File Operation buttons Show the buttons to open a new file, open an existing file, save a file, and save all files. +Show Cut and Delete buttons + Show buttons to cut and delete the current selection. + +Show Copy and Paste buttons + Show buttons to copy the current selection and paste the contents of the clipboard. + Show Redo and Undo buttons Show the undo/redo change buttons. Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2008-10-23 20:55:06 UTC (rev 3146) +++ trunk/geany.glade 2008-10-23 20:55:55 UTC (rev 3147) @@ -1716,6 +1716,83 @@ </child> <child> + <widget class="GtkToolButton" id="toolbutton_cut"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Cut the current selection</property> + <property name="stock_id">gtk-cut</property> + <property name="visible_horizontal">True</property> + <property name="visible_vertical">True</property> + <property name="is_important">False</property> + <signal name="clicked" handler="on_cut1_activate" last_modification_time="Mon, 10 Jul 2006 19:52:02 GMT"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + + <child> + <widget class="GtkToolButton" id="toolbutton_copy"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Copy the current selection</property> + <property name="stock_id">gtk-copy</property> + <property name="visible_horizontal">True</property> + <property name="visible_vertical">True</property> + <property name="is_important">False</property> + <signal name="clicked" handler="on_copy1_activate" last_modification_time="Mon, 10 Jul 2006 19:52:02 GMT"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + + <child> + <widget class="GtkToolButton" id="toolbutton_paste"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Paste the contents of the clipboard</property> + <property name="stock_id">gtk-paste</property> + <property name="visible_horizontal">True</property> + <property name="visible_vertical">True</property> + <property name="is_important">False</property> + <signal name="clicked" handler="on_paste1_activate" last_modification_time="Mon, 10 Jul 2006 19:52:02 GMT"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + + <child> + <widget class="GtkToolButton" id="toolbutton_delete"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Delete the current selection</property> + <property name="stock_id">gtk-delete</property> + <property name="visible_horizontal">True</property> + <property name="visible_vertical">True</property> + <property name="is_important">False</property> + <signal name="clicked" handler="on_delete1_activate" last_modification_time="Thu, 23 Oct 2008 20:48:07 GMT"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + + <child> + <widget class="GtkSeparatorToolItem" id="separatortoolitem12"> + <property name="visible">True</property> + <property name="draw">True</property> + <property name="visible_horizontal">True</property> + <property name="visible_vertical">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + + <child> <widget class="GtkToolButton" id="toolbutton_undo"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Undo the last modification</property> @@ -4881,7 +4958,7 @@ <property name="visible">True</property> <property name="tooltip" translatable="yes">Display the New, Open, Close, Save and Reload buttons in the toolbar</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Show file operation buttons</property> + <property name="label" translatable="yes">Show File Operation buttons</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -4897,6 +4974,46 @@ </child> <child> + <widget class="GtkCheckButton" id="check_toolbar_cutdelete"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Display the Cut and Delete buttons in the toolbar</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Show Cut and Delete buttons</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="check_toolbar_copypaste"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Display the Copy and Paste buttons in the toolbar</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Show Copy and Paste buttons</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> <widget class="GtkCheckButton" id="check_toolbar_undo"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Display the Redo and Undo buttons in the toolbar</property> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-10-23 20:55:06 UTC (rev 3146) +++ trunk/src/callbacks.c 2008-10-23 20:55:55 UTC (rev 3147) @@ -382,7 +382,7 @@ if (GTK_IS_EDITABLE(focusw)) gtk_editable_delete_selection(GTK_EDITABLE(focusw)); else - if (IS_SCINTILLA(focusw) && doc != NULL) + if (IS_SCINTILLA(focusw) && doc != NULL && sci_has_selection(doc->editor->sci)) sci_clear(doc->editor->sci); else if (GTK_IS_TEXT_VIEW(focusw)) Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-10-23 20:55:06 UTC (rev 3146) +++ trunk/src/interface.c 2008-10-23 20:55:55 UTC (rev 3147) @@ -225,6 +225,11 @@ GtkWidget *toolbutton_reload; GtkWidget *toolbutton_close; GtkWidget *separatortoolitem2; + GtkWidget *toolbutton_cut; + GtkWidget *toolbutton_copy; + GtkWidget *toolbutton_paste; + GtkWidget *toolbutton_delete; + GtkWidget *separatortoolitem12; GtkWidget *toolbutton_undo; GtkWidget *toolbutton_redo; GtkWidget *separatortoolitem9; @@ -1112,6 +1117,30 @@ gtk_widget_show (separatortoolitem2); gtk_container_add (GTK_CONTAINER (toolbar1), separatortoolitem2); + toolbutton_cut = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-cut"); + gtk_widget_show (toolbutton_cut); + gtk_container_add (GTK_CONTAINER (toolbar1), toolbutton_cut); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolbutton_cut), tooltips, _("Cut the current selection"), NULL); + + toolbutton_copy = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-copy"); + gtk_widget_show (toolbutton_copy); + gtk_container_add (GTK_CONTAINER (toolbar1), toolbutton_copy); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolbutton_copy), tooltips, _("Copy the current selection"), NULL); + + toolbutton_paste = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-paste"); + gtk_widget_show (toolbutton_paste); + gtk_container_add (GTK_CONTAINER (toolbar1), toolbutton_paste); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolbutton_paste), tooltips, _("Paste the contents of the clipboard"), NULL); + + toolbutton_delete = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-delete"); + gtk_widget_show (toolbutton_delete); + gtk_container_add (GTK_CONTAINER (toolbar1), toolbutton_delete); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolbutton_delete), tooltips, _("Delete the current selection"), NULL); + + separatortoolitem12 = (GtkWidget*) gtk_separator_tool_item_new (); + gtk_widget_show (separatortoolitem12); + gtk_container_add (GTK_CONTAINER (toolbar1), separatortoolitem12); + toolbutton_undo = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-undo"); gtk_widget_show (toolbutton_undo); gtk_container_add (GTK_CONTAINER (toolbar1), toolbutton_undo); @@ -1673,6 +1702,18 @@ g_signal_connect ((gpointer) toolbutton_close, "clicked", G_CALLBACK (on_toolbutton_close_clicked), NULL); + g_signal_connect ((gpointer) toolbutton_cut, "clicked", + G_CALLBACK (on_cut1_activate), + NULL); + g_signal_connect ((gpointer) toolbutton_copy, "clicked", + G_CALLBACK (on_copy1_activate), + NULL); + g_signal_connect ((gpointer) toolbutton_paste, "clicked", + G_CALLBACK (on_paste1_activate), + NULL); + g_signal_connect ((gpointer) toolbutton_delete, "clicked", + G_CALLBACK (on_delete1_activate), + NULL); g_signal_connect ((gpointer) toolbutton_undo, "clicked", G_CALLBACK (on_undo1_activate), NULL); @@ -1937,6 +1978,11 @@ GLADE_HOOKUP_OBJECT (window1, toolbutton_reload, "toolbutton_reload"); GLADE_HOOKUP_OBJECT (window1, toolbutton_close, "toolbutton_close"); GLADE_HOOKUP_OBJECT (window1, separatortoolitem2, "separatortoolitem2"); + GLADE_HOOKUP_OBJECT (window1, toolbutton_cut, "toolbutton_cut"); + GLADE_HOOKUP_OBJECT (window1, toolbutton_copy, "toolbutton_copy"); + GLADE_HOOKUP_OBJECT (window1, toolbutton_paste, "toolbutton_paste"); + GLADE_HOOKUP_OBJECT (window1, toolbutton_delete, "toolbutton_delete"); + GLADE_HOOKUP_OBJECT (window1, separatortoolitem12, "separatortoolitem12"); GLADE_HOOKUP_OBJECT (window1, toolbutton_undo, "toolbutton_undo"); GLADE_HOOKUP_OBJECT (window1, toolbutton_redo, "toolbutton_redo"); GLADE_HOOKUP_OBJECT (window1, separatortoolitem9, "separatortoolitem9"); @@ -2658,6 +2704,8 @@ GtkWidget *alignment14; GtkWidget *vbox16; GtkWidget *check_toolbar_fileops; + GtkWidget *check_toolbar_cutdelete; + GtkWidget *check_toolbar_copypaste; GtkWidget *check_toolbar_undo; GtkWidget *check_toolbar_navigation; GtkWidget *check_toolbar_compile; @@ -3437,11 +3485,21 @@ gtk_widget_show (vbox16); gtk_container_add (GTK_CONTAINER (alignment14), vbox16); - check_toolbar_fileops = gtk_check_button_new_with_mnemonic (_("Show file operation buttons")); + check_toolbar_fileops = gtk_check_button_new_with_mnemonic (_("Show File Operation buttons")); gtk_widget_show (check_toolbar_fileops); gtk_box_pack_start (GTK_BOX (vbox16), check_toolbar_fileops, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, check_toolbar_fileops, _("Display the New, Open, Close, Save and Reload buttons in the toolbar"), NULL); + check_toolbar_cutdelete = gtk_check_button_new_with_mnemonic (_("Show Cut and Delete buttons")); + gtk_widget_show (check_toolbar_cutdelete); + gtk_box_pack_start (GTK_BOX (vbox16), check_toolbar_cutdelete, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, check_toolbar_cutdelete, _("Display the Cut and Delete buttons in the toolbar"), NULL); + + check_toolbar_copypaste = gtk_check_button_new_with_mnemonic (_("Show Copy and Paste buttons")); + gtk_widget_show (check_toolbar_copypaste); + gtk_box_pack_start (GTK_BOX (vbox16), check_toolbar_copypaste, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, check_toolbar_copypaste, _("Display the Copy and Paste buttons in the toolbar"), NULL); + check_toolbar_undo = gtk_check_button_new_with_mnemonic (_("Show Redo and Undo buttons")); gtk_widget_show (check_toolbar_undo); gtk_box_pack_start (GTK_BOX (vbox16), check_toolbar_undo, FALSE, FALSE, 0); @@ -4891,6 +4949,8 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, alignment14, "alignment14"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox16, "vbox16"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_fileops, "check_toolbar_fileops"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_cutdelete, "check_toolbar_cutdelete"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_copypaste, "check_toolbar_copypaste"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_undo, "check_toolbar_undo"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_navigation, "check_toolbar_navigation"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_compile, "check_toolbar_compile"); Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2008-10-23 20:55:06 UTC (rev 3146) +++ trunk/src/keyfile.c 2008-10-23 20:55:55 UTC (rev 3147) @@ -374,6 +374,8 @@ g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_compile", toolbar_prefs.show_compile); g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_colour", toolbar_prefs.show_colour); g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_fileops", toolbar_prefs.show_fileops); + g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_cutdelete", toolbar_prefs.show_cutdelete); + g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_copypaste", toolbar_prefs.show_copypaste); g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_quit", toolbar_prefs.show_quit); g_key_file_set_integer(config, PACKAGE, "pref_toolbar_icon_style", toolbar_prefs.icon_style); g_key_file_set_integer(config, PACKAGE, "pref_toolbar_icon_size", toolbar_prefs.icon_size); @@ -703,6 +705,8 @@ toolbar_prefs.show_navigation = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_navigation", TRUE); toolbar_prefs.show_colour = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_colour", TRUE); toolbar_prefs.show_fileops = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_fileops", TRUE); + toolbar_prefs.show_cutdelete = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_cutdelete", FALSE); + toolbar_prefs.show_copypaste = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_copypaste", FALSE); toolbar_prefs.show_quit = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_quit", TRUE); { GtkIconSize tb_iconsize; Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-10-23 20:55:06 UTC (rev 3146) +++ trunk/src/plugindata.h 2008-10-23 20:55:55 UTC (rev 3147) @@ -41,7 +41,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 101, + GEANY_API_VERSION = 102, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2008-10-23 20:55:06 UTC (rev 3146) +++ trunk/src/prefs.c 2008-10-23 20:55:55 UTC (rev 3147) @@ -467,6 +467,12 @@ widget = lookup_widget(ui_widgets.prefs_dialog, "check_toolbar_fileops"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), toolbar_prefs.show_fileops); + widget = lookup_widget(ui_widgets.prefs_dialog, "check_toolbar_cutdelete"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), toolbar_prefs.show_cutdelete); + + widget = lookup_widget(ui_widgets.prefs_dialog, "check_toolbar_copypaste"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), toolbar_prefs.show_copypaste); + widget = lookup_widget(ui_widgets.prefs_dialog, "check_toolbar_quit"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), toolbar_prefs.show_quit); @@ -873,6 +879,12 @@ widget = lookup_widget(ui_widgets.prefs_dialog, "check_toolbar_fileops"); toolbar_prefs.show_fileops = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = lookup_widget(ui_widgets.prefs_dialog, "check_toolbar_cutdelete"); + toolbar_prefs.show_cutdelete = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + + widget = lookup_widget(ui_widgets.prefs_dialog, "check_toolbar_copypaste"); + toolbar_prefs.show_copypaste = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = lookup_widget(ui_widgets.prefs_dialog, "check_toolbar_quit"); toolbar_prefs.show_quit = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2008-10-23 20:55:06 UTC (rev 3146) +++ trunk/src/ui_utils.c 2008-10-23 20:55:55 UTC (rev 3147) @@ -848,6 +848,12 @@ ui_widget_show_hide(lookup_widget(main_widgets.window, "toolbutton_undo"), toolbar_prefs.show_undo); ui_widget_show_hide(lookup_widget(main_widgets.window, "toolbutton_redo"), toolbar_prefs.show_undo); ui_widget_show_hide(lookup_widget(main_widgets.window, "separatortoolitem9"), toolbar_prefs.show_undo); + /* C&P */ + ui_widget_show_hide(lookup_widget(main_widgets.window, "toolbutton_copy"), toolbar_prefs.show_copypaste); + ui_widget_show_hide(lookup_widget(main_widgets.window, "toolbutton_paste"), toolbar_prefs.show_copypaste); + ui_widget_show_hide(lookup_widget(main_widgets.window, "toolbutton_cut"), toolbar_prefs.show_cutdelete); + ui_widget_show_hide(lookup_widget(main_widgets.window, "toolbutton_delete"), toolbar_prefs.show_cutdelete); + ui_widget_show_hide(lookup_widget(main_widgets.window, "separatortoolitem12"), toolbar_prefs.show_cutdelete || toolbar_prefs.show_copypaste); /* navigation */ ui_widget_show_hide(lookup_widget(main_widgets.window, "toolbutton_back"), toolbar_prefs.show_navigation); ui_widget_show_hide(lookup_widget(main_widgets.window, "toolbutton_forward"), toolbar_prefs.show_navigation); Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2008-10-23 20:55:06 UTC (rev 3146) +++ trunk/src/ui_utils.h 2008-10-23 20:55:55 UTC (rev 3147) @@ -59,6 +59,8 @@ gboolean show_quit; GtkIconSize icon_size; gint icon_style; + gboolean show_cutdelete; + gboolean show_copypaste; } GeanyToolbarPrefs; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3146] trunk
by eht16＠users.sourceforge.net 23 Oct '08

23 Oct '08

Revision: 3146 http://geany.svn.sourceforge.net/geany/?rev=3146&view=rev Author: eht16 Date: 2008-10-23 20:55:06 +0000 (Thu, 23 Oct 2008) Log Message: ----------- Replace Goto line text entry field in the toolbar with a spin button. Remove dialogs_show_goto_line(), use the more generic dialogs_show_input_numeric() instead. Increase limit of the maximum line number from 99999 to 100000000. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/callbacks.c trunk/src/dialogs.c trunk/src/dialogs.h trunk/src/editor.c trunk/src/editor.h trunk/src/interface.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-23 18:44:05 UTC (rev 3145) +++ trunk/ChangeLog 2008-10-23 20:55:06 UTC (rev 3146) @@ -2,6 +2,12 @@ * src/filetypes.c: Add simple auto-detection for HTML files without proper extension. + * geany.glade, src/callbacks.c, src/dialogs.c, src/dialogs.h, + src/editor.c, src/editor.h, src/interface.c: + Replace Goto line text entry field in the toolbar with a spin button. + Remove dialogs_show_goto_line(), use the more generic + dialogs_show_input_numeric() instead. + Increase limit of the maximum line number from 99999 to 100000000. 2008-10-22 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2008-10-23 18:44:05 UTC (rev 3145) +++ trunk/geany.glade 2008-10-23 20:55:06 UTC (rev 3146) @@ -2042,18 +2042,17 @@ <property name="is_important">False</property> <child> - <widget class="GtkEntry" id="toolbutton_goto_entry"> + <widget class="GtkSpinButton" id="toolbutton_goto_entry"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Enter a line number and jump to it.</property> <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">5</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - <property name="width_chars">8</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_IF_VALID</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">True</property> + <property name="adjustment">0 1 100000000 1 10 0</property> <signal name="activate" handler="on_toolbutton_goto_entry_activate" last_modification_time="Mon, 01 Sep 2008 16:06:59 GMT"/> </widget> </child> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-10-23 18:44:05 UTC (rev 3145) +++ trunk/src/callbacks.c 2008-10-23 20:55:06 UTC (rev 3146) @@ -1172,7 +1172,19 @@ on_go_to_line_activate (GtkMenuItem *menuitem, gpointer user_data) { - dialogs_show_goto_line(); + static gdouble val = 1; + + if (dialogs_show_input_numeric(_("Go to Line"), _("Enter the line you want to go to:"), + &val, 1, 100000000, 1)) + { + GeanyDocument *doc = document_get_current(); + + if (doc != NULL) + { + if (! editor_goto_line(doc->editor, val - 1)) + utils_beep(); + } + } } @@ -1184,22 +1196,15 @@ if (response == GTK_RESPONSE_ACCEPT) { GeanyDocument *doc = document_get_current(); - gint line = strtol(gtk_entry_get_text(GTK_ENTRY(user_data)), NULL, 10); + gint line = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(user_data)); - if (doc != NULL && line > 0 && line <= sci_get_line_count(doc->editor->sci)) + if (doc != NULL) { - gint pos; - - line--; /* the user counts lines from 1, we begin at 0 so bring the user line to our one */ - pos = sci_get_position_from_line(doc->editor->sci, line); - editor_goto_pos(doc->editor, pos, TRUE); + if (! editor_goto_line(doc->editor, line - 1)) + utils_beep(); } - else - { - utils_beep(); - } } - if (dialog) + if (dialog != NULL) gtk_widget_destroy(GTK_WIDGET(dialog)); } Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2008-10-23 18:44:05 UTC (rev 3145) +++ trunk/src/dialogs.c 2008-10-23 20:55:06 UTC (rev 3146) @@ -965,32 +965,6 @@ } -void dialogs_show_goto_line() -{ - GtkWidget *dialog, *label, *entry, *vbox; - - dialog = gtk_dialog_new_with_buttons(_("Go to Line"), GTK_WINDOW(main_widgets.window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); - gtk_widget_set_name(dialog, "GeanyDialog"); - - label = gtk_label_new(_("Enter the line you want to go to:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - entry = gtk_entry_new(); - gtk_entry_set_max_length(GTK_ENTRY(entry), 6); - gtk_entry_set_width_chars(GTK_ENTRY(entry), 30); - - g_signal_connect(entry, "activate", G_CALLBACK(on_goto_line_entry_activate), dialog); - g_signal_connect(dialog, "response", G_CALLBACK(on_goto_line_dialog_response), entry); - - gtk_container_add(GTK_CONTAINER(vbox), label); - gtk_container_add(GTK_CONTAINER(vbox), entry); - gtk_widget_show_all(dialog); -} - - void dialogs_show_file_properties(GeanyDocument *doc) { GtkWidget *dialog, *label, *table, *hbox, *image, *perm_table, *check, *vbox; Modified: trunk/src/dialogs.h =================================================================== --- trunk/src/dialogs.h 2008-10-23 18:44:05 UTC (rev 3145) +++ trunk/src/dialogs.h 2008-10-23 20:55:06 UTC (rev 3146) @@ -51,8 +51,6 @@ gboolean dialogs_show_input_numeric(const gchar *title, const gchar *label_text, gdouble *value, gdouble min, gdouble max, gdouble step); -void dialogs_show_goto_line(void); - void dialogs_show_file_properties(GeanyDocument *doc); gboolean dialogs_show_question(const gchar *text, ...) G_GNUC_PRINTF (1, 2); Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-10-23 18:44:05 UTC (rev 3145) +++ trunk/src/editor.c 2008-10-23 20:55:06 UTC (rev 3146) @@ -3780,6 +3780,19 @@ } +/* Convenience function for editor_goto_pos() to pass in a line number. */ +gboolean editor_goto_line(GeanyEditor *editor, gint line) +{ + gint pos; + + g_return_val_if_fail(editor, FALSE); + g_return_val_if_fail(line >= 0 && line <= sci_get_line_count(editor->sci), FALSE); + + pos = sci_get_position_from_line(editor->sci, line); + return editor_goto_pos(editor, pos, TRUE); +} + + /* Move to position @a pos, switching to the document if necessary, * setting a marker if @a mark is set. */ gboolean editor_goto_pos(GeanyEditor *editor, gint pos, gboolean mark) Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2008-10-23 18:44:05 UTC (rev 3145) +++ trunk/src/editor.h 2008-10-23 20:55:06 UTC (rev 3146) @@ -236,6 +236,8 @@ gboolean editor_goto_pos(GeanyEditor *editor, gint pos, gboolean mark); +gboolean editor_goto_line(GeanyEditor *editor, gint line_no); + void editor_set_indentation_guides(GeanyEditor *editor); void editor_apply_update_prefs(GeanyEditor *editor); Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-10-23 18:44:05 UTC (rev 3145) +++ trunk/src/interface.c 2008-10-23 20:55:06 UTC (rev 3146) @@ -248,6 +248,7 @@ GtkWidget *toolbutton_search; GtkWidget *separatortoolitem5; GtkWidget *toolbutton_goto_item; + GtkObject *toolbutton_goto_entry_adj; GtkWidget *toolbutton_goto_entry; GtkWidget *toolbutton_goto; GtkWidget *separatortoolitem8; @@ -1218,12 +1219,14 @@ gtk_widget_show (toolbutton_goto_item); gtk_container_add (GTK_CONTAINER (toolbar1), toolbutton_goto_item); - toolbutton_goto_entry = gtk_entry_new (); + toolbutton_goto_entry_adj = gtk_adjustment_new (0, 1, 100000000, 1, 10, 0); + toolbutton_goto_entry = gtk_spin_button_new (GTK_ADJUSTMENT (toolbutton_goto_entry_adj), 1, 0); gtk_widget_show (toolbutton_goto_entry); gtk_container_add (GTK_CONTAINER (toolbutton_goto_item), toolbutton_goto_entry); gtk_tooltips_set_tip (tooltips, toolbutton_goto_entry, _("Enter a line number and jump to it."), NULL); - gtk_entry_set_max_length (GTK_ENTRY (toolbutton_goto_entry), 5); - gtk_entry_set_width_chars (GTK_ENTRY (toolbutton_goto_entry), 8); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (toolbutton_goto_entry), TRUE); + gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (toolbutton_goto_entry), GTK_UPDATE_IF_VALID); + gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (toolbutton_goto_entry), TRUE); toolbutton_goto = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-jump-to"); gtk_widget_show (toolbutton_goto); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3145] trunk
by eht16＠users.sourceforge.net 23 Oct '08

23 Oct '08

Revision: 3145 http://geany.svn.sourceforge.net/geany/?rev=3145&view=rev Author: eht16 Date: 2008-10-23 18:44:05 +0000 (Thu, 23 Oct 2008) Log Message: ----------- Add simple auto-detection for HTML files without proper extension. Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-22 16:32:20 UTC (rev 3144) +++ trunk/ChangeLog 2008-10-23 18:44:05 UTC (rev 3145) @@ -1,3 +1,9 @@ +2008-10-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/filetypes.c: + Add simple auto-detection for HTML files without proper extension. + + 2008-10-22 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * data/html_entities.tags: Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2008-10-22 16:32:20 UTC (rev 3144) +++ trunk/src/filetypes.c 2008-10-23 18:44:05 UTC (rev 3145) @@ -738,8 +738,13 @@ g_free(tmp); } + /* detect HTML files */ + if (strncmp(line, "<!DOCTYPE html", 14) == 0 || strncmp(line, "<html", 5) == 0) + { + ft = filetypes[GEANY_FILETYPES_HTML]; + } /* detect XML files */ - if (utf8_filename && strncmp(line, "<?xml", 5) == 0) + else if (utf8_filename && strncmp(line, "<?xml", 5) == 0) { /* HTML and DocBook files might also start with <?xml, so detect them based on filename * extension and use the detected filetype, else assume XML */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3144] trunk
by frlan＠users.sourceforge.net 22 Oct '08

22 Oct '08

Revision: 3144 http://geany.svn.sourceforge.net/geany/?rev=3144&view=rev Author: frlan Date: 2008-10-22 16:32:20 +0000 (Wed, 22 Oct 2008) Log Message: ----------- Add a few more entities common in e.g. Spanish language Modified Paths: -------------- trunk/ChangeLog trunk/data/html_entities.tags Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-22 15:36:45 UTC (rev 3143) +++ trunk/ChangeLog 2008-10-22 16:32:20 UTC (rev 3144) @@ -1,3 +1,9 @@ +2008-10-22 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * data/html_entities.tags: + Add a few more entities common in e.g. Spanish language. + + 2008-10-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/highlighting.c, data/filetypes.css: Modified: trunk/data/html_entities.tags =================================================================== --- trunk/data/html_entities.tags 2008-10-22 15:36:45 UTC (rev 3143) +++ trunk/data/html_entities.tags 2008-10-22 16:32:20 UTC (rev 3144) @@ -1,6 +1,7 @@ # each of the following lines represent a html entity # used in HTML and PHP files when typing &... Á +á Â æ Æ @@ -22,6 +23,7 @@ ° ÷ É +é ê Ê è @@ -36,6 +38,7 @@ > … Í +í î Î ì This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2008