Commits April 2009

commits@lists.geany.org

4 participants
79 discussions

SF.net SVN: geany:[3695] trunk
by eht16＠users.sourceforge.net 08 Apr '09

08 Apr '09

Revision: 3695 http://geany.svn.sourceforge.net/geany/?rev=3695&view=rev Author: eht16 Date: 2009-04-07 22:08:19 +0000 (Tue, 07 Apr 2009) Log Message: ----------- Fix setting a wrong default window size when starting without an existing configuration. Modified Paths: -------------- trunk/ChangeLog trunk/src/main.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-04-07 15:42:24 UTC (rev 3694) +++ trunk/ChangeLog 2009-04-07 22:08:19 UTC (rev 3695) @@ -1,3 +1,10 @@ +2009-04-07 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/main.c: + Fix setting a wrong default window size when starting without an + existing configuration. + + 2009-04-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/editor.c: Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2009-04-07 15:42:24 UTC (rev 3694) +++ trunk/src/main.c 2009-04-07 22:08:19 UTC (rev 3695) @@ -153,7 +153,7 @@ static void setup_window_position(void) { /* interprets the saved window geometry */ - if (prefs.save_winpos) + if (prefs.save_winpos && ui_prefs.geometry[0] != -1) { gtk_window_move(GTK_WINDOW(main_widgets.window), ui_prefs.geometry[0], ui_prefs.geometry[1]); gtk_window_set_default_size(GTK_WINDOW(main_widgets.window), ui_prefs.geometry[2], ui_prefs.geometry[3]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3694] trunk
by ntrel＠users.sourceforge.net 07 Apr '09

07 Apr '09

Revision: 3694 http://geany.svn.sourceforge.net/geany/?rev=3694&view=rev Author: ntrel Date: 2009-04-07 15:42:24 +0000 (Tue, 07 Apr 2009) Log Message: ----------- Fix 2 old uses of filetype IDs. Modified Paths: -------------- trunk/ChangeLog trunk/src/highlighting.c trunk/src/symbols.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-04-07 15:28:03 UTC (rev 3693) +++ trunk/ChangeLog 2009-04-07 15:42:24 UTC (rev 3694) @@ -2,6 +2,8 @@ * src/editor.c: Add Configuration Files item for snippets.conf. + * src/highlighting.c, src/symbols.c: + Fix 2 old uses of filetype IDs. 2009-04-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2009-04-07 15:28:03 UTC (rev 3693) +++ trunk/src/highlighting.c 2009-04-07 15:42:24 UTC (rev 3694) @@ -337,7 +337,7 @@ { gint i; - for (i = 0; i < GEANY_MAX_BUILT_IN_FILETYPES - 1; i++) + for (i = 0; i < GEANY_MAX_BUILT_IN_FILETYPES; i++) { StyleSet *style_ptr; style_ptr = &style_sets[i]; Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2009-04-07 15:28:03 UTC (rev 3693) +++ trunk/src/symbols.c 2009-04-07 15:42:24 UTC (rev 3694) @@ -1419,7 +1419,7 @@ static void load_user_tags(filetype_id ft_id) { - static guchar tags_loaded[GEANY_MAX_BUILT_IN_FILETYPES - 1] = {0}; + static guchar tags_loaded[GEANY_MAX_BUILT_IN_FILETYPES] = {0}; static GHashTable *lang_hash = NULL; GList *fnames; const GList *node; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3693] trunk
by ntrel＠users.sourceforge.net 07 Apr '09

07 Apr '09

Revision: 3693 http://geany.svn.sourceforge.net/geany/?rev=3693&view=rev Author: ntrel Date: 2009-04-07 15:28:03 +0000 (Tue, 07 Apr 2009) Log Message: ----------- Add Configuration Files item for snippets.conf. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-04-06 22:36:32 UTC (rev 3692) +++ trunk/ChangeLog 2009-04-07 15:28:03 UTC (rev 3693) @@ -1,3 +1,9 @@ +2009-04-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c: + Add Configuration Files item for snippets.conf. + + 2009-04-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/interface.c, src/printing.c, geany.glade: Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-04-06 22:36:32 UTC (rev 3692) +++ trunk/src/editor.c 2009-04-07 15:28:03 UTC (rev 3693) @@ -4355,6 +4355,20 @@ } +static void on_document_save(GObject *obj, GeanyDocument *doc) +{ + g_return_if_fail(NZV(doc->real_path)); + + if (utils_str_equal(doc->real_path, + utils_build_path(app->configdir, "snippets.conf", NULL))) + { + /* reload snippets */ + editor_snippets_free(); + editor_snippets_init(); + } +} + + void editor_init(void) { static GeanyIndentPrefs indent_prefs; @@ -4366,6 +4380,10 @@ /* use g_signal_connect_after() to allow plugins connecting to the signal before the default * handler (on_editor_notify) is called */ g_signal_connect_after(geany_object, "editor-notify", G_CALLBACK(on_editor_notify), NULL); + + ui_add_config_file_menu_item(utils_build_path(app->configdir, "snippets.conf", NULL), + NULL, NULL); + g_signal_connect(geany_object, "document-save", G_CALLBACK(on_document_save), 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:[3692] trunk/po
by frlan＠users.sourceforge.net 07 Apr '09

07 Apr '09

Revision: 3692 http://geany.svn.sourceforge.net/geany/?rev=3692&view=rev Author: frlan Date: 2009-04-06 22:36:32 +0000 (Mon, 06 Apr 2009) Log Message: ----------- Update of French translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/fr.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2009-04-06 16:01:15 UTC (rev 3691) +++ trunk/po/ChangeLog 2009-04-06 22:36:32 UTC (rev 3692) @@ -1,3 +1,8 @@ +2009-04-07 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * fr.po: Update of French translation (Thanks Jean-Philippe Moal). + + 2009-04-05 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * tr.po: Update of Turkish translation. Thanks to Gürkan Gür. Modified: trunk/po/fr.po =================================================================== --- trunk/po/fr.po 2009-04-06 16:01:15 UTC (rev 3691) +++ trunk/po/fr.po 2009-04-06 22:36:32 UTC (rev 3692) @@ -1,26 +1,27 @@ # French translations for geany package. -# Copyright (C) 2006-2008 THE geany'S COPYRIGHT HOLDER +# Copyright (C) 2006-2009 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. +# Jean-Philippe Moal <skateinmars(a)skateinmars.net>, 2006 - 2009. # Roland Baudin <roland.baudin(a)thalesaleniaspace.com>, 2008 # msgid "" msgstr "" "Project-Id-Version: geany 0.16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-03 18:10+0100\n" -"PO-Revision-Date: 2008-10-24 14:28+0200\n" -"Last-Translator: Roland Baudin <roland.baudin(a)thalesaleniaspace.com>\n" +"POT-Creation-Date: 2009-04-07 00:32+0200\n" +"PO-Revision-Date: 2009-04-07 00:11+0100\n" +"Last-Translator: Jean-Philippe Moal <skateinmars(a)skateinmars.net>\n" "Language-Team: French <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bitX-Poedit-Country: FRANCE\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../geany.desktop.in.h:1 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:258 ../src/interface.c:1454 +#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 msgid "Geany" msgstr "Geany" @@ -28,53 +29,53 @@ msgid "Integrated Development Environment" msgstr "Environnement de Développement Intégré" -#: ../src/about.c:136 +#: ../src/about.c:137 msgid "About Geany" msgstr "À propos de Geany" -#: ../src/about.c:186 +#: ../src/about.c:187 msgid "A fast and lightweight IDE" msgstr "Un EDI rapide et léger" -#: ../src/about.c:207 +#: ../src/about.c:208 #, 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:238 +#: ../src/about.c:239 msgid "Info" msgstr "Infos" -#: ../src/about.c:254 +#: ../src/about.c:255 msgid "Developers" msgstr "Développeurs" -#: ../src/about.c:263 +#: ../src/about.c:264 msgid "maintainer" msgstr "mainteneur" -#: ../src/about.c:271 +#: ../src/about.c:272 msgid "developer" msgstr "développeur" -#: ../src/about.c:279 +#: ../src/about.c:280 msgid "translation maintainer" msgstr "mainteneur des traductions" -#: ../src/about.c:288 +#: ../src/about.c:289 msgid "Translators" msgstr "Traducteurs" -#: ../src/about.c:308 +#: ../src/about.c:309 msgid "Previous Translators" msgstr "Traducteurs précédents" -#: ../src/about.c:329 +#: ../src/about.c:330 msgid "Contributors" msgstr "Contributeurs" -#: ../src/about.c:339 +#: ../src/about.c:340 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" @@ -82,15 +83,15 @@ "Quelques uns des principaux contributeurs (pour une liste plus détaillé, " "voir le fichier %s) :" -#: ../src/about.c:365 +#: ../src/about.c:366 msgid "Credits" msgstr "Crédits" -#: ../src/about.c:379 +#: ../src/about.c:380 msgid "License" msgstr "Licence" -#: ../src/about.c:388 +#: ../src/about.c:389 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -98,13 +99,8 @@ "Le texte de la licence n'a pu être trouvé, veuillez visiter http://www.gnu." "org/licenses/gpl-2.0.txt pour le consulter en ligne." -#: ../src/build.c:192 +#: ../src/build.c:215 ../src/build.c:709 #, c-format -msgid "Failed to view %s (make sure it is already compiled)" -msgstr "Impossible de voir %s (assurez-vous qu'il soit déjà compilé)" - -#: ../src/build.c:225 ../src/build.c:719 -#, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " "Preferences)" @@ -112,134 +108,134 @@ "Impossible de trouver le terminal \"%s\" (vérifiez le chemin vers l'outil " "Terminal dans les préférences)" -#: ../src/build.c:240 ../src/build.c:624 +#: ../src/build.c:230 ../src/build.c:614 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "" "Impossible d'exécuter \"%s\" (le script de lancement n'a pas pu être créé)" -#: ../src/build.c:276 ../src/build.c:508 ../src/build.c:752 -#: ../src/search.c:1373 +#: ../src/build.c:266 ../src/build.c:498 ../src/build.c:742 +#: ../src/search.c:1392 #, c-format msgid "Process failed (%s)" msgstr "Processus échoué (%s)" -#: ../src/build.c:495 +#: ../src/build.c:485 #, c-format msgid "%s (in directory: %s)" msgstr "%s (dans le dossier : %s)" -#: ../src/build.c:587 +#: ../src/build.c:577 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Impossible de changer le dossier de travail pour \"%s\"" -#: ../src/build.c:681 +#: ../src/build.c:671 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Impossible d'exécuter le fichier dans le VTE car il contient probablement " "une commande." -#: ../src/build.c:866 +#: ../src/build.c:862 msgid "Compilation failed." msgstr "Compilation échouée." -#: ../src/build.c:880 +#: ../src/build.c:876 msgid "Compilation finished successfully." msgstr "Compilation terminée avec succès." #. compile the code -#: ../src/build.c:986 +#: ../src/build.c:982 msgid "_Compile" msgstr "_Compiler" #. build the code -#: ../src/build.c:994 ../src/build.c:2049 ../src/interface.c:956 +#: ../src/build.c:990 ../src/build.c:2061 ../src/interface.c:976 msgid "_Build" msgstr "Const_ruire" #. build the code with make all -#: ../src/build.c:1006 ../src/build.c:1112 ../src/build.c:2060 +#: ../src/build.c:1002 ../src/build.c:1108 ../src/build.c:2072 msgid "_Make All" msgstr "_Make All" #. build the code with make custom -#: ../src/build.c:1015 ../src/build.c:1121 ../src/build.c:2068 +#: ../src/build.c:1011 ../src/build.c:1117 ../src/build.c:2080 msgid "Make Custom _Target" msgstr "Make Custom _Target" #. build the code with make object -#: ../src/build.c:1024 ../src/build.c:2076 +#: ../src/build.c:1020 ../src/build.c:2088 msgid "Make _Object" msgstr "Make _Object" #. next error -#: ../src/build.c:1037 ../src/build.c:1134 +#: ../src/build.c:1033 ../src/build.c:1130 msgid "_Next Error" msgstr "Erreur suiva_nte" -#: ../src/build.c:1044 ../src/build.c:1141 +#: ../src/build.c:1040 ../src/build.c:1137 msgid "_Previous Error" msgstr "_Erreur précédente" #. arguments -#: ../src/build.c:1069 ../src/build.c:2088 +#: ../src/build.c:1065 ../src/build.c:2100 msgid "_Set Includes and Arguments" msgstr "Définir les include_s et les options" #. DVI -#: ../src/build.c:1090 +#: ../src/build.c:1086 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1099 +#: ../src/build.c:1095 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1153 +#: ../src/build.c:1149 msgid "_View DVI File" msgstr "_Voir le fichier DVI" #. PDF view -#: ../src/build.c:1163 +#: ../src/build.c:1159 msgid "V_iew PDF File" msgstr "Vo_ir le fichier PDF" #. arguments -#: ../src/build.c:1178 +#: ../src/build.c:1174 msgid "_Set Arguments" msgstr "Définir les option_s" -#: ../src/build.c:1253 +#: ../src/build.c:1249 msgid "Set Arguments" msgstr "Définir les options" -#: ../src/build.c:1260 +#: ../src/build.c:1256 msgid "Set programs and options for compiling and viewing (La)TeX files." msgstr "" "Définir les programmes et options utilisées pour compiler et visionner les " "fichiers (La)Tex." -#: ../src/build.c:1271 +#: ../src/build.c:1267 msgid "DVI creation:" msgstr "Création de DVI :" -#: ../src/build.c:1290 +#: ../src/build.c:1287 msgid "PDF creation:" msgstr "Création de PDF :" -#: ../src/build.c:1309 +#: ../src/build.c:1307 msgid "DVI preview:" msgstr "Prévisualisation de DVI :" -#: ../src/build.c:1328 +#: ../src/build.c:1327 msgid "PDF preview:" msgstr "Prévisualisation de PDF :" -#: ../src/build.c:1344 ../src/build.c:1517 +#: ../src/build.c:1344 ../src/build.c:1526 #, c-format msgid "" "%f will be replaced by the current filename, e.g. test_file.c\n" @@ -248,142 +244,138 @@ "%f sera remplacé par le fichier courant, ex. fichier_test.c\n" "%e sera remplacé par le nom du fichier sans extension, ex. fichier_test" -#: ../src/build.c:1423 +#: ../src/build.c:1429 msgid "Set Includes and Arguments" msgstr "Définir les includes et les options" -#: ../src/build.c:1430 +#: ../src/build.c:1436 msgid "Set the commands for building and running programs." msgstr "" "Définir les commandes utilisées pour construire et lancer les programmes." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1438 +#: ../src/build.c:1444 #, c-format msgid "%s commands" msgstr "Commandes pour %s" -#: ../src/build.c:1453 +#: ../src/build.c:1459 msgid "Compile:" msgstr "Compiler :" -#: ../src/build.c:1474 +#: ../src/build.c:1481 msgid "Build:" msgstr "Construire :" -#: ../src/build.c:1495 ../src/dialogs.c:1222 +#: ../src/build.c:1503 ../src/dialogs.c:1245 msgid "Execute:" msgstr "Exécuter :" -#: ../src/build.c:1820 ../src/toolbar.c:194 -#, fuzzy +#: ../src/build.c:1832 ../src/toolbar.c:193 msgid "Build the current file" -msgstr "Compiler le fichier courant" +msgstr "Construit le fichier courant" -#: ../src/build.c:1845 +#: ../src/build.c:1857 msgid "Make Custom Target" msgstr "Make Custom Target" -#: ../src/build.c:1846 +#: ../src/build.c:1858 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "Entrez vos options personnalisées ici, tout texte entré ici est passé à la " "commande make." -#: ../src/build.c:1895 -#, fuzzy +#: ../src/build.c:1907 msgid "Build the current file with Make and the default target" msgstr "Construit le fichier courant avec l'outil make et la cible par défaut" -#: ../src/build.c:1898 -#, fuzzy +#: ../src/build.c:1910 msgid "Build the current file with Make and the specified target" msgstr "Construit le fichier courant avec l'outil make et la cible spécifiée" -#: ../src/build.c:1901 -#, fuzzy +#: ../src/build.c:1913 msgid "Compile the current file with Make" -msgstr "Compiler le fichier courant" +msgstr "Compile le fichier courant avec make" -#: ../src/build.c:1963 +#: ../src/build.c:1975 msgid "Failed to execute the view program" msgstr "Impossible d'exécuter le programme de visualisation" -#: ../src/build.c:2001 +#: ../src/build.c:2013 #, c-format msgid "Process could not be stopped (%s)." msgstr "Le processus n'a pas pu être stoppé (%s)." -#: ../src/build.c:2020 ../src/build.c:2034 +#: ../src/build.c:2032 ../src/build.c:2046 msgid "No more build errors." msgstr "Plus d'erreurs de construction." -#: ../src/callbacks.c:150 +#: ../src/callbacks.c:152 msgid "Do you really want to quit?" msgstr "Voulez-vous réellement quitter ?" -#: ../src/callbacks.c:459 ../src/document.c:2816 ../src/interface.c:332 -#: ../src/treeviews.c:516 +#: ../src/callbacks.c:462 ../src/document.c:2859 ../src/interface.c:340 +#: ../src/treeviews.c:525 msgid "_Reload" msgstr "_Recharger" -#: ../src/callbacks.c:460 +#: ../src/callbacks.c:463 msgid "Any unsaved changes will be lost." msgstr "Tout changement non enregistré sera perdu." -#: ../src/callbacks.c:461 +#: ../src/callbacks.c:464 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Êtes-vous sur de vouloir recharger '%s' ?" -#: ../src/callbacks.c:1212 ../src/keybindings.c:362 +#: ../src/callbacks.c:1225 ../src/keybindings.c:367 msgid "Go to Line" msgstr "Aller à la ligne" -#: ../src/callbacks.c:1212 +#: ../src/callbacks.c:1225 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:1310 ../src/callbacks.c:1335 +#: ../src/callbacks.c:1323 ../src/callbacks.c:1348 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:1443 ../src/ui_utils.c:530 +#: ../src/callbacks.c:1457 ../src/ui_utils.c:543 msgid "dd.mm.yyyy" msgstr "jj.mm.aaaa" -#: ../src/callbacks.c:1445 ../src/ui_utils.c:531 +#: ../src/callbacks.c:1459 ../src/ui_utils.c:544 msgid "mm.dd.yyyy" msgstr "mm.jj.aaaa" -#: ../src/callbacks.c:1447 ../src/ui_utils.c:532 +#: ../src/callbacks.c:1461 ../src/ui_utils.c:545 msgid "yyyy/mm/dd" msgstr "aaaa/mm/jj" -#: ../src/callbacks.c:1449 ../src/ui_utils.c:541 +#: ../src/callbacks.c:1463 ../src/ui_utils.c:554 msgid "dd.mm.yyyy hh:mm:ss" msgstr "jj.mm.aaaa hh:mm:ss" -#: ../src/callbacks.c:1451 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1465 ../src/ui_utils.c:555 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.jj.aaaa hh:mm:ss" -#: ../src/callbacks.c:1453 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1467 ../src/ui_utils.c:556 msgid "yyyy/mm/dd hh:mm:ss" msgstr "aaaa/mm/jj hh:mm:ss" -#: ../src/callbacks.c:1455 ../src/ui_utils.c:552 +#: ../src/callbacks.c:1469 ../src/ui_utils.c:565 msgid "_Use Custom Date Format" msgstr "_Utiliser le format de date personnalisé" -#: ../src/callbacks.c:1466 +#: ../src/callbacks.c:1480 msgid "Custom Date Format" msgstr "Format de date personnalisé" -#: ../src/callbacks.c:1467 +#: ../src/callbacks.c:1481 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." @@ -392,24 +384,24 @@ "tous les spécificateurs de conversion qui peuvent être utilisés avec la " "fonction C ANSI strftime." -#: ../src/callbacks.c:1485 +#: ../src/callbacks.c:1499 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:1758 ../src/callbacks.c:1768 +#: ../src/callbacks.c:1773 ../src/callbacks.c:1783 msgid "No more message items." msgstr "Plus d'éléments de messages." #. initialize the dialog -#: ../src/dialogs.c:177 ../src/prefs.c:1528 +#: ../src/dialogs.c:183 ../src/prefs.c:1581 msgid "Open File" msgstr "Ouvrir un fichier" -#: ../src/dialogs.c:181 ../src/interface.c:675 +#: ../src/dialogs.c:187 ../src/interface.c:691 msgid "_View" msgstr "_Affichage" -#: ../src/dialogs.c:184 +#: ../src/dialogs.c:190 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -417,24 +409,24 @@ "Ouvre le fichier en mode lecture seule. Si vous choisissez plus d'un fichier " "à ouvrir, tous ces fichiers seront ouverts en lecture seule." -#: ../src/dialogs.c:222 +#: ../src/dialogs.c:212 msgid "Detect by file extension" msgstr "Détecter depuis l'extension du fichier" -#: ../src/dialogs.c:233 ../src/interface.c:3442 ../src/interface.c:4983 +#: ../src/dialogs.c:237 ../src/interface.c:3538 ../src/interface.c:5086 msgid "Detect from file" msgstr "Détecter depuis le fichier" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:296 +#: ../src/dialogs.c:304 msgid "Show _hidden files" msgstr "Afficher les fichiers cac_hés" -#: ../src/dialogs.c:307 +#: ../src/dialogs.c:315 msgid "Set encoding:" msgstr "Définir l'encodage :" -#: ../src/dialogs.c:317 +#: ../src/dialogs.c:325 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -448,11 +440,11 @@ "Notez que si vous choisissez plusieurs fichiers, ils seront tous ouverts " "avec l'encodage choisi." -#: ../src/dialogs.c:337 +#: ../src/dialogs.c:346 msgid "Set filetype:" msgstr "Définir le type de fichier :" -#: ../src/dialogs.c:347 +#: ../src/dialogs.c:356 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -464,50 +456,48 @@ "Notez que si vous choisissez plusieurs fichier, ils seront tous ouverts avec " "le type de fichier choisi." -#: ../src/dialogs.c:458 +#: ../src/dialogs.c:467 msgid "Save File" msgstr "Enregistrer le fichier" -#: ../src/dialogs.c:466 +#: ../src/dialogs.c:475 msgid "R_ename" msgstr "R_enommer" -#: ../src/dialogs.c:468 -#, fuzzy +#: ../src/dialogs.c:477 msgid "Save the file and rename it" -msgstr "Enregistrer le fichier et le renommer." +msgstr "Enregistre le fichier et le renomme" -#: ../src/dialogs.c:476 +#: ../src/dialogs.c:485 msgid "_Open file in a new tab" msgstr "_Ouvrir le fichier dans un nouvel onglet" -#: ../src/dialogs.c:478 -#, fuzzy +#: ../src/dialogs.c:487 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" msgstr "" -"Conserver le document en cours non enregistré et ouvrir le nouveau fichier " +"Conserve le document en cours non enregistré et ouvre le nouveau fichier " "enregistré dans un nouvel onglet." -#: ../src/dialogs.c:658 +#: ../src/dialogs.c:678 msgid "_Don't save" msgstr "Ne pas enre_gistrer" -#: ../src/dialogs.c:692 +#: ../src/dialogs.c:712 #, c-format msgid "The file '%s' is not saved." msgstr "Le fichier '%s' n'est pas enregistré." -#: ../src/dialogs.c:694 +#: ../src/dialogs.c:714 msgid "Do you want to save it before closing?" msgstr "Voulez-vous l'enregistrer avant la fermeture ?" -#: ../src/dialogs.c:769 +#: ../src/dialogs.c:789 msgid "Choose font" msgstr "Choisir la police" -#: ../src/dialogs.c:1006 +#: ../src/dialogs.c:1029 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -515,106 +505,106 @@ "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:1025 ../src/dialogs.c:1026 ../src/dialogs.c:1027 -#: ../src/dialogs.c:1033 ../src/dialogs.c:1034 ../src/dialogs.c:1035 -#: ../src/symbols.c:1618 ../src/symbols.c:1639 ../src/symbols.c:1691 -#: ../src/ui_utils.c:203 +#: ../src/dialogs.c:1048 ../src/dialogs.c:1049 ../src/dialogs.c:1050 +#: ../src/dialogs.c:1056 ../src/dialogs.c:1057 ../src/dialogs.c:1058 +#: ../src/symbols.c:1645 ../src/symbols.c:1666 ../src/symbols.c:1718 +#: ../src/ui_utils.c:215 msgid "unknown" msgstr "inconnu" -#: ../src/dialogs.c:1039 +#: ../src/dialogs.c:1062 ../src/symbols.c:735 msgid "Properties" msgstr "Propriétés" -#: ../src/dialogs.c:1069 +#: ../src/dialogs.c:1092 msgid "Type:" msgstr "Type :" -#: ../src/dialogs.c:1083 +#: ../src/dialogs.c:1106 msgid "Size:" msgstr "Taille :" -#: ../src/dialogs.c:1099 +#: ../src/dialogs.c:1122 msgid "Location:" msgstr "Emplacement :" -#: ../src/dialogs.c:1113 +#: ../src/dialogs.c:1136 msgid "Read-only:" msgstr "Lecture seule :" -#: ../src/dialogs.c:1120 +#: ../src/dialogs.c:1143 msgid "(only inside Geany)" msgstr "(seulement pour Geany)" -#: ../src/dialogs.c:1129 +#: ../src/dialogs.c:1152 msgid "Encoding:" msgstr "Encodage :" #. BOM = byte order mark -#: ../src/dialogs.c:1139 ../src/ui_utils.c:206 +#: ../src/dialogs.c:1162 ../src/ui_utils.c:218 msgid "(with BOM)" msgstr "(avec BOM)" -#: ../src/dialogs.c:1139 +#: ../src/dialogs.c:1162 msgid "(without BOM)" msgstr "(sans BOM)" -#: ../src/dialogs.c:1150 +#: ../src/dialogs.c:1173 msgid "Modified:" msgstr "Modifié :" -#: ../src/dialogs.c:1164 +#: ../src/dialogs.c:1187 msgid "Changed:" msgstr "Changé :" -#: ../src/dialogs.c:1178 +#: ../src/dialogs.c:1201 msgid "Accessed:" msgstr "Accédé :" -#: ../src/dialogs.c:1200 +#: ../src/dialogs.c:1223 msgid "Permissions:" msgstr "Permissions :" #. Header -#: ../src/dialogs.c:1208 +#: ../src/dialogs.c:1231 msgid "Read:" msgstr "Lecture :" -#: ../src/dialogs.c:1215 +#: ../src/dialogs.c:1238 msgid "Write:" msgstr "Écriture :" #. Owner -#: ../src/dialogs.c:1230 +#: ../src/dialogs.c:1253 msgid "Owner:" msgstr "Propriétaire :" #. Group -#: ../src/dialogs.c:1266 +#: ../src/dialogs.c:1289 msgid "Group:" msgstr "Groupe :" #. Other -#: ../src/dialogs.c:1302 +#: ../src/dialogs.c:1325 msgid "Other:" msgstr "Autres :" -#: ../src/document.c:645 +#: ../src/document.c:646 #, c-format msgid "File %s closed." msgstr "Fichier %s fermé." -#: ../src/document.c:762 +#: ../src/document.c:763 #, c-format msgid "New file \"%s\" opened." msgstr "Nouveau fichier \"%s\" ouvert." -#: ../src/document.c:935 ../src/document.c:1435 +#: ../src/document.c:936 ../src/document.c:1439 #, c-format msgid "Could not open file %s (%s)" msgstr "Impossible d'ouvrir le fichier %s (%s)" -#: ../src/document.c:964 +#: ../src/document.c:965 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -629,12 +619,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:990 +#: ../src/document.c:991 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Le fichier \"%s\" n'est pas valide %s." -#: ../src/document.c:1000 +#: ../src/document.c:1001 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -643,44 +633,48 @@ "Le fichier \"%s\" ne ressemble pas à un fichier texte ou son encodage n'est " "pas supporté." -#: ../src/document.c:1137 +#: ../src/document.c:1139 msgid "Spaces" msgstr "Espaces" -#: ../src/document.c:1140 +#: ../src/document.c:1142 msgid "Tabs" msgstr "Tabulations" -#: ../src/document.c:1143 +#: ../src/document.c:1145 msgid "Tabs and Spaces" 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:1148 +#: ../src/document.c:1150 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Définir le mode d'indentation %s pour %s." -#: ../src/document.c:1200 +#: ../src/document.c:1202 msgid "Invalid filename" msgstr "Nom de fichier invalide" -#: ../src/document.c:1319 +#: ../src/document.c:1320 #, c-format msgid "File %s reloaded." msgstr "Fichier %s rechargé." -#: ../src/document.c:1321 +#: ../src/document.c:1322 #, c-format msgid "File %s opened(%d%s)." msgstr "Fichier %s ouvert (%d%s)." -#: ../src/document.c:1323 +#: ../src/document.c:1324 msgid ", read-only" msgstr ", lecture seule" -#: ../src/document.c:1597 +#: ../src/document.c:1530 +msgid "Error renaming file." +msgstr "Erreur lors du renommage du fichier." + +#: ../src/document.c:1605 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -689,7 +683,7 @@ "Une erreur s'est produite lors de la conversion du fichier depuis l'UTF-8 " "vers \"%s\". Le fichier reste non sauvegardé." -#: ../src/document.c:1619 +#: ../src/document.c:1627 #, c-format msgid "" "Error message: %s\n" @@ -698,52 +692,52 @@ "Message d'erreur : %s\n" "L'erreur s'est produite à \"%s\" (ligne : %d, colonne : %d)." -#: ../src/document.c:1624 +#: ../src/document.c:1632 #, c-format msgid "Error message: %s." msgstr "Message d'erreur : %s." -#: ../src/document.c:1704 ../src/document.c:1765 +#: ../src/document.c:1712 ../src/document.c:1773 msgid "Error saving file." msgstr "Erreur lors de l'enregistrement du fichier." -#: ../src/document.c:1763 +#: ../src/document.c:1771 #, c-format msgid "Error saving file (%s)." msgstr "Erreur lors de l'enregistrement du fichier (%s)." -#: ../src/document.c:1790 +#: ../src/document.c:1796 #, c-format msgid "File %s saved." msgstr "Fichier %s enregistré." -#: ../src/document.c:1857 ../src/document.c:1912 ../src/document.c:1920 +#: ../src/document.c:1863 ../src/document.c:1920 ../src/document.c:1928 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" n'a pu être trouvé." -#: ../src/document.c:1920 +#: ../src/document.c:1928 msgid "Wrap search and find again?" msgstr "Recommencer la recherche ?" -#: ../src/document.c:1997 ../src/search.c:1048 ../src/search.c:1644 -#: ../src/search.c:1645 +#: ../src/document.c:2008 ../src/search.c:1065 ../src/search.c:1669 +#: ../src/search.c:1670 #, c-format msgid "No matches found for \"%s\"." msgstr "Aucune correspondance trouvée pour \"%s\"." -#: ../src/document.c:2008 ../src/document.c:2017 -#, fuzzy, c-format +#: ../src/document.c:2019 ../src/document.c:2028 +#, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." -msgstr[0] "%s : Remplacement de %d occurrence(s) de \"%s\" par \"%s\"." -msgstr[1] "%s : Remplacement de %d occurrence(s) de \"%s\" par \"%s\"." +msgstr[0] "%s : Remplacement de %d occurrence de \"%s\" par \"%s\"." +msgstr[1] "%s : Remplacement de %d occurrences de \"%s\" par \"%s\"." -#: ../src/document.c:2817 +#: ../src/document.c:2860 msgid "Do you want to reload it?" msgstr "Voulez-vous le recharger ?" -#: ../src/document.c:2818 +#: ../src/document.c:2861 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -752,32 +746,32 @@ "Le fichier '%s' sur le disque est plus récent que\n" "le tampon actuel." -#: ../src/document.c:2839 +#: ../src/document.c:2882 msgid "Try to resave the file?" msgstr "Essayer de sauvegarder à nouveau le fichier ?" -#: ../src/document.c:2840 +#: ../src/document.c:2883 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "Le fichier \"%s\" n'a pu être trouvé!" -#: ../src/editor.c:3816 ../src/utils.c:295 +#: ../src/editor.c:3858 ../src/utils.c:295 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/editor.c:3817 ../src/utils.c:296 +#: ../src/editor.c:3859 ../src/utils.c:296 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/editor.c:3818 ../src/utils.c:297 +#: ../src/editor.c:3860 ../src/utils.c:297 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/editor.c:3944 +#: ../src/editor.c:3986 msgid "Enter Tab Width" msgstr "Largeur des tabulations" -#: ../src/editor.c:3945 +#: ../src/editor.c:3987 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Entrer le nombre d'espaces à remplacer par une tabulation." @@ -914,92 +908,92 @@ msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:85 ../src/filetypes.c:96 ../src/filetypes.c:108 -#: ../src/filetypes.c:119 ../src/filetypes.c:130 ../src/filetypes.c:141 -#: ../src/filetypes.c:152 ../src/filetypes.c:164 ../src/filetypes.c:175 -#: ../src/filetypes.c:186 ../src/filetypes.c:197 ../src/filetypes.c:208 -#: ../src/filetypes.c:219 ../src/filetypes.c:230 ../src/filetypes.c:242 -#: ../src/filetypes.c:254 ../src/filetypes.c:265 ../src/filetypes.c:276 -#: ../src/filetypes.c:287 ../src/filetypes.c:298 ../src/filetypes.c:309 -#: ../src/filetypes.c:320 ../src/filetypes.c:367 ../src/filetypes.c:378 -#: ../src/filetypes.c:412 ../src/filetypes.c:423 ../src/filetypes.c:468 -#: ../src/filetypes.c:502 ../src/filetypes.c:513 ../src/filetypes.c:524 -#: ../src/filetypes.c:535 ../src/filetypes.c:546 +#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 +#: ../src/interface.c:5005 +msgid "None" +msgstr "Aucun" + +#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 +#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 +#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 +#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 +#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 +#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 +#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 +#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 +#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 +#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 +#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 #, c-format msgid "%s source file" msgstr "Fichier source %s" -#: ../src/filetypes.c:331 +#: ../src/filetypes.c:348 msgid "Shell script file" msgstr "Script Shell" -#: ../src/filetypes.c:343 +#: ../src/filetypes.c:360 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:355 +#: ../src/filetypes.c:372 msgid "XML document" msgstr "Document XML" -#: ../src/filetypes.c:390 +#: ../src/filetypes.c:407 msgid "Cascading StyleSheet" msgstr "Feuille de style en cascade" -#: ../src/filetypes.c:401 +#: ../src/filetypes.c:418 msgid "SQL Dump file" msgstr "Dump SQL" -#: ../src/filetypes.c:434 +#: ../src/filetypes.c:451 msgid "Diff file" msgstr "Fichier Diff" -#: ../src/filetypes.c:445 +#: ../src/filetypes.c:462 msgid "Config file" msgstr "Fichier de Config" -#: ../src/filetypes.c:457 +#: ../src/filetypes.c:474 msgid "Gettext translation file" msgstr "Fichier de traduction Gettext" -#: ../src/filetypes.c:479 +#: ../src/filetypes.c:507 #, c-format msgid "%s script file" msgstr "fichier de script %sl" -#: ../src/filetypes.c:490 +#: ../src/filetypes.c:518 msgid "reStructuredText file" msgstr "Fichier reStructuredText" -#: ../src/filetypes.c:557 ../src/project.c:281 -msgid "All files" -msgstr "Tous les fichiers" - -#: ../src/filetypes.c:654 +#: ../src/filetypes.c:697 msgid "_Programming Languages" msgstr "Langages de _Programmation" -#: ../src/filetypes.c:655 +#: ../src/filetypes.c:698 msgid "_Scripting Languages" msgstr "Langages de _Script" -#: ../src/filetypes.c:656 +#: ../src/filetypes.c:699 msgid "_Markup Languages" msgstr "Langages de _Balisage" -#: ../src/filetypes.c:657 +#: ../src/filetypes.c:700 msgid "M_iscellaneous Languages" msgstr "Langages D_ivers" -#: ../src/filetypes.c:686 ../src/interface.c:3361 ../src/interface.c:4902 -#: ../src/templates.c:376 ../src/ui_utils.c:156 -msgid "None" -msgstr "Aucun" - -#: ../src/filetypes.c:1273 ../src/win32.c:107 +#: ../src/filetypes.c:1284 ../src/win32.c:107 msgid "All Source" msgstr "Tout fichier source" -#: ../src/filetypes.c:1354 +#: ../src/filetypes.c:1309 ../src/project.c:287 +msgid "All files" +msgstr "Tous les fichiers" + +#: ../src/filetypes.c:1367 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Mauvaise expression régulière pour le type de fichier %s : %s" @@ -1008,497 +1002,508 @@ msgid "untitled" msgstr "sans titre" -#: ../src/interface.c:268 +#: ../src/interface.c:276 msgid "_File" msgstr "_Fichier" -#: ../src/interface.c:279 +#: ../src/interface.c:287 msgid "New (with _Template)" msgstr "Nou_veau (selon un modèle)" -#: ../src/interface.c:290 ../src/interface.c:351 ../src/interface.c:525 -#: ../src/interface.c:579 ../src/interface.c:593 ../src/interface.c:835 -#: ../src/interface.c:845 ../src/interface.c:1963 ../src/interface.c:2017 -#: ../src/interface.c:2031 +#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 +#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 +#: ../src/interface.c:861 ../src/interface.c:2006 ../src/interface.c:2060 +#: ../src/interface.c:2074 msgid "invisible" msgstr "invisible" -#: ../src/interface.c:292 +#: ../src/interface.c:300 msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:303 ../src/interface.c:1889 +#: ../src/interface.c:311 ../src/interface.c:1928 msgid "Open Selected F_ile" msgstr "Ou_vrir le fichier sélectionné" -#: ../src/interface.c:307 +#: ../src/interface.c:315 msgid "Recent _Files" msgstr "_Fichiers récents" -#: ../src/interface.c:324 +#: ../src/interface.c:332 msgid "Save A_ll" msgstr "Tout enre_gistrer" -#: ../src/interface.c:340 +#: ../src/interface.c:348 msgid "R_eload As" msgstr "R_echarger en tant que" -#: ../src/interface.c:368 +#: ../src/interface.c:376 msgid "Page Set_up" msgstr "_Mise en page" -#: ../src/interface.c:385 +#: ../src/interface.c:393 ../src/notebook.c:233 msgid "Close Ot_her Documents" msgstr "Fermer les _autres fichiers" -#: ../src/interface.c:393 +#: ../src/interface.c:401 ../src/notebook.c:238 msgid "C_lose All" msgstr "_Tout fermer" -#: ../src/interface.c:410 +#: ../src/interface.c:418 msgid "_Edit" msgstr "Édit_er" -#: ../src/interface.c:451 ../src/interface.c:1880 +#: ../src/interface.c:459 ../src/interface.c:1919 msgid "Select _All" msgstr "Sélectionner _tout" -#: ../src/interface.c:460 ../src/interface.c:1898 +#: ../src/interface.c:468 ../src/interface.c:1937 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:467 ../src/interface.c:1905 +#: ../src/interface.c:475 ../src/interface.c:1944 msgid "T_oggle Case of Selection" msgstr "M_odifier la casse de la séléction" -#: ../src/interface.c:476 ../src/interface.c:1914 +#: ../src/interface.c:484 ../src/interface.c:1953 msgid "_Comment Line(s)" msgstr "_Commenter la(les) ligne(s)" -#: ../src/interface.c:480 ../src/interface.c:1918 +#: ../src/interface.c:488 ../src/interface.c:1957 msgid "U_ncomment Line(s)" msgstr "Décomme_nter la(les) ligne(s)" -#: ../src/interface.c:484 ../src/interface.c:1922 +#: ../src/interface.c:492 ../src/interface.c:1961 msgid "_Toggle Line Commentation" msgstr "Commen_ter/Décommenter la ligne" -#: ../src/interface.c:488 ../src/interface.c:1926 +#: ../src/interface.c:496 ../src/interface.c:1965 msgid "Du_plicate Line or Selection" msgstr "Du_pliquer la ligne ou la sélection" -#: ../src/interface.c:497 ../src/interface.c:1935 +#: ../src/interface.c:505 ../src/interface.c:1974 msgid "_Increase Indent" msgstr "Augmenter l'_indentation" -#: ../src/interface.c:505 ../src/interface.c:1943 +#: ../src/interface.c:513 ../src/interface.c:1982 msgid "_Decrease Indent" msgstr "_Diminuer l'indentation" -#: ../src/interface.c:518 ../src/interface.c:1956 +#: ../src/interface.c:526 ../src/interface.c:1995 +msgid "_Send Selection to Terminal" +msgstr "Envoyer la _sélection vers le terminal" + +#: ../src/interface.c:530 ../src/interface.c:1999 msgid "_Send Selection to" msgstr "Envoyer la _sélection vers" -#: ../src/interface.c:533 ../src/interface.c:1971 +#: ../src/interface.c:545 ../src/interface.c:2014 msgid "I_nsert Comments" msgstr "Insérer des co_mmentaires" -#: ../src/interface.c:544 ../src/interface.c:1982 +#: ../src/interface.c:556 ../src/interface.c:2025 msgid "Insert _ChangeLog Entry" msgstr "Insérer une entrée de _changelog" -#: ../src/interface.c:548 ../src/interface.c:1986 +#: ../src/interface.c:560 ../src/interface.c:2029 msgid "Insert File _Header" msgstr "Insérer un en-tête de fic_hier" -#: ../src/interface.c:552 ../src/interface.c:1990 +#: ../src/interface.c:564 ../src/interface.c:2033 msgid "Insert _Function Description" msgstr "Insérer une description de _fonction" -#: ../src/interface.c:556 ../src/interface.c:1994 +#: ../src/interface.c:568 ../src/interface.c:2037 msgid "Insert _Multiline Comment" msgstr "Insérer un commentaire _multilignes" -#: ../src/interface.c:560 ../src/interface.c:1998 +#: ../src/interface.c:572 ../src/interface.c:2041 msgid "Insert _GPL Notice" msgstr "Insérer une note _GPL" -#: ../src/interface.c:564 ../src/interface.c:2002 +#: ../src/interface.c:576 ../src/interface.c:2045 msgid "Insert _BSD License Notice" msgstr "Insérer une note _BSD" -#: ../src/interface.c:568 ../src/interface.c:2006 +#: ../src/interface.c:580 ../src/interface.c:2049 msgid "Insert Dat_e" msgstr "Insérer la dat_e" -#: ../src/interface.c:582 ../src/interface.c:2020 +#: ../src/interface.c:594 ../src/interface.c:2063 msgid "_Insert \"include <...>\"" msgstr "_Insérer \"include <...>\"" -#: ../src/interface.c:605 +#: ../src/interface.c:613 +msgid "Preference_s" +msgstr "Préférence_s" + +#: ../src/interface.c:621 msgid "_Search" msgstr "_Rechercher" -#: ../src/interface.c:616 +#: ../src/interface.c:632 msgid "Find _Next" msgstr "Rechercher le suiva_nt" -#: ../src/interface.c:620 +#: ../src/interface.c:636 msgid "Find _Previous" msgstr "Re_chercher le précédent" -#: ../src/interface.c:624 +#: ../src/interface.c:640 msgid "Find in F_iles" msgstr "Rechercher dans les f_ichiers" -#: ../src/interface.c:628 ../src/search.c:506 +#: ../src/interface.c:644 ../src/search.c:509 msgid "_Replace" msgstr "R_emplacer" -#: ../src/interface.c:641 +#: ../src/interface.c:657 msgid "Find _Selected" msgstr "Rechercher la _sélection" -#: ../src/interface.c:645 +#: ../src/interface.c:661 msgid "Find Pre_vious Selected" msgstr "Rechercher la sélection _vers l'arrière" -#: ../src/interface.c:654 +#: ../src/interface.c:670 msgid "Next _Message" msgstr "_Message suivant" -#: ../src/interface.c:658 +#: ../src/interface.c:674 msgid "Pr_evious Message" msgstr "Message _précédent" -#: ../src/interface.c:667 ../src/interface.c:2072 +#: ../src/interface.c:683 ../src/interface.c:2115 msgid "_Go to Line" msgstr "Aller à la li_gne" -#: ../src/interface.c:682 +#: ../src/interface.c:698 msgid "Change _Font" msgstr "Changer la _police" -#: ../src/interface.c:695 +#: ../src/interface.c:711 msgid "To_ggle All Additional Widgets" msgstr "Afficher/Cacher toutes les fenêtres _supplémentaires" -#: ../src/interface.c:699 +#: ../src/interface.c:715 msgid "Full_screen" msgstr "Plein é_cran" -#: ../src/interface.c:703 +#: ../src/interface.c:719 msgid "Show Message _Window" msgstr "Afficher la _fenêtre de messages" -#: ../src/interface.c:708 +#: ../src/interface.c:724 msgid "Show _Toolbar" msgstr "Afficher la barre d'ou_tils" -#: ../src/interface.c:713 +#: ../src/interface.c:729 msgid "Show Side_bar" msgstr "Afficher la _barre latérale" -#: ../src/interface.c:718 ../src/interface.c:3769 ../src/keybindings.c:224 +#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 msgid "Editor" msgstr "Éditeur" -#: ../src/interface.c:725 +#: ../src/interface.c:741 msgid "Show _Markers Margin" msgstr "Afficher la marge des _marqueurs" -#: ../src/interface.c:730 +#: ../src/interface.c:746 msgid "Show _Line Numbers" msgstr "Afficher les numéros de _ligne" -#: ../src/interface.c:735 -#, fuzzy +#: ../src/interface.c:751 msgid "Show _White Space" -msgstr "Afficher les espaces" +msgstr "Afficher les e_spaces" -#: ../src/interface.c:739 -#, fuzzy +#: ../src/interface.c:755 msgid "Show Line _Endings" -msgstr "Afficher les fins de lignes" +msgstr "Afficher les fins d_e lignes" -#: ../src/interface.c:743 -#, fuzzy +#: ../src/interface.c:759 msgid "Show _Indentation Guides" -msgstr "Afficher les guides d'indentation" +msgstr "Afficher les guides d'_indentation" -#: ../src/interface.c:764 +#: ../src/interface.c:780 msgid "_Document" msgstr "_Document" -#: ../src/interface.c:771 +#: ../src/interface.c:787 msgid "_Line Wrapping" msgstr "Ren_voi à la ligne automatique" -#: ../src/interface.c:776 +#: ../src/interface.c:792 msgid "Line _Breaking" msgstr "_Renvoi à la ligne" -#: ../src/interface.c:780 +#: ../src/interface.c:796 msgid "_Auto-indentation" msgstr "Indentation _automatique" -#: ../src/interface.c:785 +#: ../src/interface.c:801 msgid "In_dent Type" msgstr "T_ype d'indentation" -#: ../src/interface.c:792 ../src/interface.c:3400 ../src/interface.c:4941 +#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 msgid "_Tabs" msgstr "_Tabulations" -#: ../src/interface.c:798 ../src/interface.c:3391 ../src/interface.c:4932 +#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 msgid "_Spaces" msgstr "E_spaces" -#: ../src/interface.c:804 ../src/interface.c:3409 ../src/interface.c:4950 +#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 msgid "T_abs and Spaces" msgstr "Tabulations et _espaces" -#: ../src/interface.c:815 +#: ../src/interface.c:831 msgid "Read _Only" msgstr "_Lecture seule" -#: ../src/interface.c:819 +#: ../src/interface.c:835 msgid "_Write Unicode BOM" msgstr "Écrire le _BOM Unicode" -#: ../src/interface.c:828 +#: ../src/interface.c:844 msgid "Set File_type" msgstr "Définir le _type de fichier" -#: ../src/interface.c:838 +#: ../src/interface.c:854 msgid "Set _Encoding" msgstr "Définir l'_encodage" -#: ../src/interface.c:848 +#: ../src/interface.c:864 msgid "Set Line E_ndings" msgstr "Définir les fi_ns de lignes" -#: ../src/interface.c:855 +#: ../src/interface.c:871 msgid "Convert and Set to _CR/LF (Win)" msgstr "Convertir en _CR/LF (Win)" -#: ../src/interface.c:861 +#: ../src/interface.c:877 msgid "Convert and Set to _LF (Unix)" msgstr "Convertir en _LF (Unix)" -#: ../src/interface.c:867 +#: ../src/interface.c:883 msgid "Convert and Set to CR (_Mac)" msgstr "Convertir en CR (_Mac)" -#: ../src/interface.c:878 +#: ../src/interface.c:894 msgid "_Strip Trailing Spaces" msgstr "Enlever les e_spaces de fin" -#: ../src/interface.c:882 +#: ../src/interface.c:898 msgid "_Replace Tabs by Spaces" msgstr "Remplacer les tabulati_ons par des espaces" -#: ../src/interface.c:886 +#: ../src/interface.c:902 msgid "Replace Spaces b_y Tabs" msgstr "Rempla_cer les espaces par des tabulations" -#: ../src/interface.c:895 +#: ../src/interface.c:911 msgid "_Fold All" msgstr "Tout _plier" -#: ../src/interface.c:899 +#: ../src/interface.c:915 msgid "_Unfold All" msgstr "Tout _déplier" -#: ../src/interface.c:908 +#: ../src/interface.c:924 msgid "Remove _Markers" msgstr "Effacer les _marqueurs" -#: ../src/interface.c:912 +#: ../src/interface.c:928 msgid "Remove Error _Indicators" msgstr "Supprimer les _indicateurs d'erreurs" -#: ../src/interface.c:916 +#: ../src/interface.c:932 msgid "_Project" msgstr "_Projet" -#: ../src/interface.c:923 +#: ../src/interface.c:939 msgid "_New" msgstr "_Nouveau" -#: ../src/interface.c:931 +#: ../src/interface.c:947 msgid "_Open" msgstr "_Ouvrir" -#: ../src/interface.c:939 +#: ../src/interface.c:955 +msgid "_Recent Projects" +msgstr "Projets _récents" + +#: ../src/interface.c:959 msgid "_Close" msgstr "_Fermer" -#: ../src/interface.c:960 +#: ../src/interface.c:980 msgid "_Tools" msgstr "_Outils" -#: ../src/interface.c:967 +#: ../src/interface.c:987 msgid "_Color Chooser" msgstr "_Sélecteur de couleur" -#: ../src/interface.c:975 +#: ../src/interface.c:995 msgid "_Word Count" msgstr "_Compteur de mots" -#: ../src/interface.c:979 +#: ../src/interface.c:999 msgid "Load Ta_gs" msgstr "Charger les Ta_gs" -#: ../src/interface.c:983 +#: ../src/interface.c:1003 msgid "_Reload Configuration" msgstr "_Mettre à jour la configuration" -#: ../src/interface.c:991 ../src/interface.c:998 +#: ../src/interface.c:1011 ../src/interface.c:1018 msgid "_Help" msgstr "A_ide" -#: ../src/interface.c:1006 +#: ../src/interface.c:1026 msgid "_Website" msgstr "Site _Web" -#: ../src/interface.c:1010 +#: ../src/interface.c:1030 msgid "_Keyboard Shortcuts" msgstr "_Raccourcis clavier" -#: ../src/interface.c:1014 +#: ../src/interface.c:1034 msgid "_Debug Messages" msgstr "_Messages de débogage" -#: ../src/interface.c:1053 ../src/treeviews.c:112 +#: ../src/interface.c:1073 ../src/treeviews.c:113 msgid "Symbols" msgstr "Symboles" -#: ../src/interface.c:1067 ../src/treeviews.c:240 +#: ../src/interface.c:1087 msgid "Documents" msgstr "Documents" -#: ../src/interface.c:1104 +#: ../src/interface.c:1123 msgid "Status" msgstr "Statut" -#: ../src/interface.c:1118 +#: ../src/interface.c:1137 msgid "Compiler" msgstr "Compilateur" -#: ../src/interface.c:1133 +#: ../src/interface.c:1152 msgid "Messages" msgstr "Messages" -#: ../src/interface.c:1146 +#: ../src/interface.c:1165 msgid "Scribble" msgstr "Notes" -#: ../src/interface.c:1698 ../src/interface.c:3178 +#: ../src/interface.c:1725 ../src/interface.c:3266 msgid "Images _and Text" msgstr "Im_ages et texte" -#: ../src/interface.c:1704 ../src/interface.c:3210 +#: ../src/interface.c:1731 ../src/interface.c:3298 msgid "_Images Only" msgstr "_Images seulement" -#: ../src/interface.c:1710 ../src/interface.c:3202 +#: ../src/interface.c:1737 ../src/interface.c:3290 msgid "_Text Only" msgstr "_Texte seulement" -#: ../src/interface.c:1721 ../src/interface.c:3194 +#: ../src/interface.c:1748 ../src/interface.c:3282 msgid "_Large Icons" msgstr "_Grosses icônes" -#: ../src/interface.c:1726 ../src/interface.c:3186 +#: ../src/interface.c:1754 ../src/interface.c:3274 msgid "_Small Icons" msgstr "Petite_s icônes" -#: ../src/interface.c:1736 +#: ../src/interface.c:1760 ../src/interface.c:3306 +msgid "_Very Small Icons" +msgstr "T_rès petites icônes" + +#: ../src/interface.c:1770 msgid "_Hide toolbar" msgstr "Cac_her la barre d'outils" -#: ../src/interface.c:2039 +#: ../src/interface.c:2082 msgid "Find _Usage" msgstr "_Rechercher dans tous les documents" -#: ../src/interface.c:2047 +#: ../src/interface.c:2090 msgid "Find _Document Usage" msgstr "Rechercher dans le _document" -#: ../src/interface.c:2055 +#: ../src/interface.c:2098 msgid "Go to _Tag Definition" msgstr "Aller à la définition du s_ymbole" -#: ../src/interface.c:2059 +#: ../src/interface.c:2102 msgid "Go to T_ag Declaration" msgstr "Aller à la déclaration du _symbole" -#: ../src/interface.c:2063 +#: ../src/interface.c:2106 msgid "Conte_xt Action" msgstr "Action conte_xtuelle" -#: ../src/interface.c:2593 ../src/keybindings.c:325 +#: ../src/interface.c:2647 ../src/keybindings.c:330 msgid "Preferences" msgstr "Préférences" -#: ../src/interface.c:2629 +#: ../src/interface.c:2683 msgid "Load files from the last session" msgstr "Charger les fichiers depuis la session précédente" -#: ../src/interface.c:2632 +#: ../src/interface.c:2686 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:2634 +#: ../src/interface.c:2688 msgid "Load virtual terminal support" msgstr "Charger le support du terminal virtuel" -#: ../src/interface.c:2636 -#, fuzzy +#: ../src/interface.c:2690 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" msgstr "" -"Charger ou non l'émulateur virtuel de terminal (VTE) au lancement. " -"Désactivez le si vous n'en avez pas besoin." +"Charger ou non l'émulateur virtuel de terminal (VTE) au lancement, " +"désactivez le si vous n'en avez pas besoin" -#: ../src/interface.c:2638 +#: ../src/interface.c:2692 msgid "Enable plugin support" msgstr "Activer le support des plugins" -#: ../src/interface.c:2642 +#: ../src/interface.c:2696 msgid "Startup" msgstr "Démarrage" -#: ../src/interface.c:2661 +#: ../src/interface.c:2715 msgid "Save window position and geometry" msgstr "Enregistrer la position et la géométrie de la fenêtre" -#: ../src/interface.c:2664 +#: ../src/interface.c:2718 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:2666 +#: ../src/interface.c:2720 msgid "Confirm exit" msgstr "Confirmer la fermeture" -#: ../src/interface.c:2669 -#, fuzzy +#: ../src/interface.c:2723 msgid "Shows a confirmation dialog on exit" -msgstr "Affiche une boite de dialogue de confirmation lors de la fermeture." +msgstr "Affiche une boite de dialogue de confirmation lors de la fermeture" -#: ../src/interface.c:2671 +#: ../src/interface.c:2725 msgid "Shutdown" msgstr "Fermeture" -#: ../src/interface.c:2692 +#: ../src/interface.c:2746 msgid "Startup path:" msgstr "Dossier de démarrage :" -#: ../src/interface.c:2704 +#: ../src/interface.c:2758 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1507,54 +1512,66 @@ "fichiers. Entrez un chemin absolu. Laissez vide pour utiliser le dossier de " "travail courant." -#: ../src/interface.c:2717 +#: ../src/interface.c:2771 msgid "Project files:" msgstr "Fichiers de projet :" -#: ../src/interface.c:2729 +#: ../src/interface.c:2783 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:2742 +#: ../src/interface.c:2796 +msgid "Extra plugin path:" +msgstr "Répertoire de plugin supplémentaire :" + +#: ../src/interface.c:2808 +msgid "" +"Geany looks by default in the global installation path and in the " +"configuration directory. The path entered here will be searched additionally " +"for plugins. Leave blank to disable." +msgstr "" +"Geany cherche par défaut des plugins dans le répertoire d'installation " +"global et dans le dossier de configuration. Le chemin entré ici est " +"également utilisé pour la recherche. Laissez le champ vide pour désactiver " +"cette fonction." + +#: ../src/interface.c:2821 msgid "Paths" msgstr "Chemins" -#: ../src/interface.c:2747 -#, fuzzy +#: ../src/interface.c:2826 msgid "Startup" -msgstr "Statut" +msgstr "Démarrage" -#: ../src/interface.c:2769 +#: ../src/interface.c:2848 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:2772 -#, fuzzy +#: ../src/interface.c:2851 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "" "Émettre ou non un bip si une erreur s'est produite ou lorsque le processus " -"de compilation est fini." +"de compilation est fini" -#: ../src/interface.c:2774 +#: ../src/interface.c:2853 msgid "Switch to status message list at new message" msgstr "Se rendre à la liste des messages de statut aux nouveaux messages" -#: ../src/interface.c:2777 -#, fuzzy +#: ../src/interface.c:2856 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" msgstr "" -"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." +"Se rendre à l'onglet des messages de statut (au bas de la fenêtre des " +"messages) lorsqu'un nouveau message de statut arrive" -#: ../src/interface.c:2779 +#: ../src/interface.c:2858 msgid "Suppress status messages in the status bar" msgstr "Supprimer les messages de statut de la barre de statut" -#: ../src/interface.c:2782 +#: ../src/interface.c:2861 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1562,11 +1579,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:2784 +#: ../src/interface.c:2863 msgid "Auto focus widgets (focus follows mouse)" msgstr "Auto focus des fenêtres (le focus suit la souris)" -#: ../src/interface.c:2787 +#: ../src/interface.c:2866 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 " @@ -1576,255 +1593,258 @@ "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:2789 ../src/interface.c:3115 ../src/interface.c:3978 +#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 msgid "Miscellaneous" msgstr "Divers" # Adaptation de wrap -#: ../src/interface.c:2809 +#: ../src/interface.c:2888 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:2812 -#, fuzzy +#: ../src/interface.c:2891 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:2814 +#: ../src/interface.c:2893 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:2817 -#, fuzzy +#: ../src/interface.c:2896 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" msgstr "" -"Utilise le mot courant sous le curseur lors de l'ouverture d'une boite de " -"dialogue de recherche, recherche dans les fichiers, ou remplacement et si " -"aucun texte n'est sélectionné." +"Utilise le mot courant sous le curseur lors de l'ouverture de la boite de " +"dialogue de recherche, recherche dans les fichiers, ou remplacement si aucun " +"texte n'est sélectionné" -#: ../src/interface.c:2819 +#: ../src/interface.c:2898 msgid "Use the current file's directory for Find in Files" msgstr "" "Utiliser le dossier du fichier courant pour la recherche dans les fichiers" -#: ../src/interface.c:2823 +#: ../src/interface.c:2902 msgid "Search" msgstr "Recherche" -#: ../src/interface.c:2842 +#: ../src/interface.c:2921 msgid "Use project-based session files" msgstr "Utiliser des fichiers de session basés sur les projets" -#: ../src/interface.c:2845 -#, fuzzy +#: ../src/interface.c:2924 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" msgstr "" -"Conserver ou non des fichiers de session des projets et les ouvrir lors de " -"la réouverture d'un projet." +"Conserver ou non des fichiers de session d'un projet et les ouvrir lors de " +"la réouverture du projet" -#: ../src/interface.c:2847 +#: ../src/interface.c:2926 msgid "Store project file inside the project base directory" msgstr "Enregistrer le fichier projet dans le dossier de base du projet" -#: ../src/interface.c:2850 -#, fuzzy +#: ../src/interface.c:2929 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" +"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." +"Quand cette case est cochée, un fichier de 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 la boite de dialogue Nouveau projet." -#: ../src/interface.c:2852 +#: ../src/interface.c:2931 msgid "Projects" msgstr "Projets" -#: ../src/interface.c:2857 -#, fuzzy +#: ../src/interface.c:2936 msgid "Miscellaneous" -msgstr "Divers" +msgstr "Divers" -#: ../src/interface.c:2861 +#: ../src/interface.c:2940 msgid "General" msgstr "Général" -#: ../src/interface.c:2884 +#: ../src/interface.c:2963 msgid "Show symbol list" msgstr "Afficher la liste des symboles" -#: ../src/interface.c:2887 +#: ../src/interface.c:2966 msgid "Toggle the symbol list on and off" msgstr "Affiche/Cache la liste des symboles" -#: ../src/interface.c:2889 +#: ../src/interface.c:2968 msgid "Show documents list" msgstr "Afficher la liste des documents" -#: ../src/interface.c:2892 +#: ../src/interface.c:2971 msgid "Toggle the documents list on and off" msgstr "Affiche/Cache la liste des documents" -#: ../src/interface.c:2894 +#: ../src/interface.c:2973 msgid "Sidebar" msgstr "Barre latérale" -#: ../src/interface.c:2915 +#: ../src/interface.c:2994 msgid "Symbol list:" msgstr "Liste des symboles :" -#: ../src/interface.c:2922 ../src/interface.c:3037 +#: ../src/interface.c:3001 ../src/interface.c:3116 msgid "Message window:" msgstr "Fenêtre de message :" -#: ../src/interface.c:2929 ../src/interface.c:3073 +#: ../src/interface.c:3008 ../src/interface.c:3152 msgid "Editor:" msgstr "Éditeur :" -#: ../src/interface.c:2941 +#: ../src/interface.c:3020 msgid "Sets the font for the message window" msgstr "Définit la police utilisée pour la fenêtre de message" -#: ../src/interface.c:2949 +#: ../src/interface.c:3028 msgid "Sets the font for the symbol list" msgstr "Définit la police utilisée pour la liste des symboles" -#: ../src/interface.c:2957 +#: ../src/interface.c:3036 msgid "Sets the editor font" msgstr "Définit la police de l'éditeur" -#: ../src/interface.c:2959 +#: ../src/interface.c:3038 msgid "Fonts" msgstr "Polices" -#: ../src/interface.c:2978 +#: ../src/interface.c:3057 msgid "Show editor tabs" msgstr "Afficher les onglets de l'éditeur" -#: ../src/interface.c:2982 +#: ../src/interface.c:3061 msgid "Show close buttons" msgstr "Afficher les boutons de fermeture" -#: ../src/interface.c:2985 -#, fuzzy +#: ../src/interface.c:3064 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" msgstr "" "Affiche un petit bouton croix sur les onglets des fichiers pour les fermer " -"facilement en cliquant dessus (nécessite un redémarrage de Geany)." +"facilement en cliquant dessus (nécessite un redémarrage de Geany)" -#: ../src/interface.c:2991 +#: ../src/interface.c:3070 msgid "Placement of new file tabs:" msgstr "Placement des nouveaux onglets de fichier :" -#: ../src/interface.c:2996 ../src/interface.c:3050 ../src/interface.c:3068 -#: ../src/interface.c:3086 +#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 +#: ../src/interface.c:3165 msgid "Left" msgstr "Gauche" -#: ../src/interface.c:2999 +#: ../src/interface.c:3078 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:3004 ../src/interface.c:3051 ../src/interface.c:3069 -#: ../src/interface.c:3087 +#: ../src/interface.c:3083 ../src/interface.c:3130 ../src/interface.c:3148 +#: ../src/interface.c:3166 msgid "Right" msgstr "Droite" -#: ../src/interface.c:3007 +#: ../src/interface.c:3086 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:3011 -#, fuzzy +#: ../src/interface.c:3090 msgid "Double-clicking hides all additional widgets" -msgstr "Afficher/Cacher toutes les fenêtres supplémentaires" +msgstr "Un double-clic cache les fenêtres supplémentaires" -#: ../src/interface.c:3014 -#, fuzzy +#: ../src/interface.c:3093 msgid "Calls the View->Toggle All Additional Widgets command" -msgstr "Afficher/Cacher toutes les fenêtres supplémentaires" +msgstr "" +"Appelle la commande Affichage->Afficher/Cacher toutes les fenêtres " +"supplémentaires" -#: ../src/interface.c:3016 +#: ../src/interface.c:3095 msgid "Editor tabs" msgstr "Onglets de l'éditeur" -#: ../src/interface.c:3052 ../src/interface.c:3070 ../src/interface.c:3088 +#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 msgid "Top" msgstr "Haut" -#: ../src/interface.c:3053 ../src/interface.c:3071 ../src/interface.c:3089 +#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 msgid "Bottom" msgstr "Bas" -#: ../src/interface.c:3055 +#: ../src/interface.c:3134 msgid "Sidebar:" msgstr "Barre latérale :" -#: ../src/interface.c:3091 +#: ../src/interface.c:3170 msgid "Tab positions" msgstr "Position des onglets" -#: ../src/interface.c:3110 +#: ../src/interface.c:3189 msgid "Show status bar" msgstr "Afficher la barre d'état" -#: ../src/interface.c:3113 -#, fuzzy +#: ../src/interface.c:3192 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. " +msgstr "Montrer ou cacher la barre d'état au bas de la fenêtre principale" -#: ../src/interface.c:3120 +#: ../src/interface.c:3199 msgid "Interface" msgstr "Interface" -#: ../src/interface.c:3139 -msgid "Show Toolbar" -msgstr "Afficher la barre d'outils" +#: ../src/interface.c:3222 +msgid "Show T_oolbar" +msgstr "Afficher la barre d'ou_tils" -#: ../src/interface.c:3143 +#: ../src/interface.c:3226 +msgid "_Append Toolbar to the Menu" +msgstr "_Ajouter la barre d'outils au menu" + +#: ../src/interface.c:3229 +msgid "Pack the toolbar to the main menu to save vertical space" +msgstr "" +"Regroupe la barre d'outils avec le menu principal pour gagner de l'espace en " +"hauteur" + +#: ../src/interface.c:3231 msgid "Toolbar" msgstr "Barre d'outils" -#: ../src/interface.c:3164 +#: ../src/interface.c:3252 msgid "Icon style:" msgstr "Style des icônes :" -#: ../src/interface.c:3171 +#: ../src/interface.c:3259 msgid "Icon size:" msgstr "Taille des icônes :" -#: ../src/interface.c:3218 +#: ../src/interface.c:3314 msgid "Appearance" msgstr "Apparence" -#: ../src/interface.c:3223 +#: ../src/interface.c:3319 msgid "Toolbar" msgstr "Barre d'outils" -#: ../src/interface.c:3250 +#: ../src/interface.c:3346 msgid "Line wrapping" msgstr "Renvoi à la ligne" -#: ../src/interface.c:3253 +#: ../src/interface.c:3349 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 " @@ -1834,11 +1854,11 @@ "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:3255 +#: ../src/interface.c:3351 msgid "Enable \"smart\" home key" msgstr "Activer la touche home \"intelligente\"" -#: ../src/interface.c:3258 +#: ../src/interface.c:3354 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 " @@ -1852,217 +1872,208 @@ "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:3260 +#: ../src/interface.c:3356 msgid "Disable Drag and Drop" msgstr "Désactiver le glisser-déposer" -#: ../src/interface.c:3263 -#, fuzzy +#: ../src/interface.c:3359 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" msgstr "" "Désactiver complètement le glisser-déposer dans la fenêtre d'édition pour " "éviter de pouvoir glisser-déposer toute sélection à l'intérieur ou " -"l'extérieur de la fenêtre d'édition." +"l'extérieur de la fenêtre d'édition" -#: ../src/interface.c:3265 +#: ../src/interface.c:3361 msgid "Enable folding" msgstr "Activer le pliage" -#: ../src/interface.c:3268 +#: ../src/interface.c:3364 msgid "Whether to enable folding the code" msgstr "Active ou non le pliage du code" -#: ../src/interface.c:3270 +#: ../src/interface.c:3366 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:3273 -#, fuzzy +#: ../src/interface.c:3369 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" +"clicking on a fold symbol the contrary behavior is used." msgstr "" "Plier ou déplier tous les éléments fils d'un point de pliage. En appuyant " "sur la touche Shift lors d'un clic sur un symbole de repli le comportement " "inverse se produit." -#: ../src/interface.c:3275 +#: ../src/interface.c:3371 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:3278 -#, fuzzy +#: ../src/interface.c:3374 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" msgstr "" "Utilise ou non les indicateurs (un soulignage) pour mettre en avant les " -"lignes ou le compilateur a trouvé un avertissement ou une erreur." +"lignes ou le compilateur a trouvé un avertissement ou une erreur" -#: ../src/interface.c:3280 +#: ../src/interface.c:3376 msgid "Newline strips trailing spaces" msgstr "Un passage à la ligne enlève les espaces de fin de ligne" -#: ../src/interface.c:3283 -#, fuzzy +#: ../src/interface.c:3379 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." +"précédente" -#: ../src/interface.c:3289 +#: ../src/interface.c:3385 msgid "Line breaking column:" msgstr "Colonne de retour à la ligne :" -#: ../src/interface.c:3303 +#: ../src/interface.c:3399 msgid "Comment toggle marker:" msgstr "Marqueur de commentaire :" -#: ../src/interface.c:3310 +#: ../src/interface.c:3406 #, fuzzy 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." +"Une chaîne de caractères insérée quand une ligne de code est commentée dans " +"un fichier source, utilisée pour marquer la mise en commentaire." -#: ../src/interface.c:3312 +#: ../src/interface.c:3408 msgid "Features" msgstr "Fonctionnalités" -#: ../src/interface.c:3317 +#: ../src/interface.c:3413 msgid "Features" msgstr "Fonctionnalités" -#: ../src/interface.c:3349 ../src/interface.c:4890 +#: ../src/interface.c:3445 ../src/interface.c:4993 msgid "Auto-indent mode:" msgstr "Mode d'indentation automatique :" -#: ../src/interface.c:3362 ../src/interface.c:4903 +#: ../src/interface.c:3458 ../src/interface.c:5006 msgid "Basic" msgstr "Basique" -#: ../src/interface.c:3363 ../src/interface.c:4904 +#: ../src/interface.c:3459 ../src/interface.c:5007 msgid "Current chars" msgstr "Caractères courants" -#: ../src/interface.c:3364 ../src/interface.c:4905 +#: ../src/interface.c:3460 ../src/interface.c:5008 msgid "Match braces" msgstr "Accolades correspondantes" -#: ../src/interface.c:3366 ../src/interface.c:3709 ../src/interface.c:4907 +#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 msgid "Type:" msgstr "Type :" -#: ../src/interface.c:3373 ../src/interface.c:4914 +#: ../src/interface.c:3469 ../src/interface.c:5017 msgid "Width:" msgstr "Largeur :" -#: ../src/interface.c:3386 ../src/interface.c:4927 +#: ../src/interface.c:3482 ../src/interface.c:5030 msgid "The width in chars of a single indent" msgstr "La largeur, en caractères, d'une indentation simple" -#: ../src/interface.c:3396 ../src/interface.c:4937 +#: ../src/interface.c:3492 ../src/interface.c:5040 msgid "Use spaces when inserting indentation" msgstr "Utiliser des espaces pour l'indentation" -#: ../src/interface.c:3405 ../src/interface.c:4946 +#: ../src/interface.c:3501 ../src/interface.c:5049 msgid "Use one tab per indent" msgstr "Utiliser une tabulation par indentation" -#: ../src/interface.c:3414 ../src/interface.c:4955 +#: ../src/interface.c:3510 ../src/interface.c:5058 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:3429 ../src/interface.c:4970 +#: ../src/interface.c:3525 ../src/interface.c:5073 msgid "Hard tab width:" msgstr "Largeur des tabulations :" -#: ../src/interface.c:3437 ../src/interface.c:4978 +#: ../src/interface.c:3533 ../src/interface.c:5081 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:3447 ../src/interface.c:4988 -#, fuzzy +#: ../src/interface.c:3543 ../src/interface.c:5091 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "" -"Détecter ou non le type d'indentation depuis le contenu d'un fichier à son " -"ouverture." +"Détecter ou non le type d'indentation depuis le contenu d'un fichier lors de " +"son ouverture" -#: ../src/interface.c:3449 +#: ../src/interface.c:3545 msgid "Tab key indents" msgstr "Indentation par la touche Tab " -#: ../src/interface.c:3452 -#, fuzzy +#: ../src/interface.c:3548 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" +"Appuyer sur Tab/Shift-Tab augmente/diminue l'indentation au lieu d'insérer " +"une tabulation" -#: ../src/interface.c:3454 +#: ../src/interface.c:3550 msgid "Indentation" msgstr "Indentation" -#: ../src/interface.c:3459 ../src/interface.c:4990 -#, fuzzy +#: ../src/interface.c:3555 ../src/interface.c:5093 msgid "Indentation" -msgstr "Indentation" +msgstr "Indentation" -#: ../src/interface.c:3482 +#: ../src/interface.c:3578 msgid "Snippet completion" msgstr "Complétion des snippets" -#: ../src/interface.c:3485 -#, fuzzy +#: ../src/interface.c:3581 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" msgstr "" "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." +"obtenir une chaîne plus complexe en utilisant une seule touche" -#: ../src/interface.c:3487 +#: ../src/interface.c:3583 msgid "XML tag auto completion" msgstr "Complétion automatique des balises XML" -#: ../src/interface.c:3490 +#: ../src/interface.c:3586 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:3492 +#: ../src/interface.c:3588 msgid "Automatic continuation of multi-line comments" msgstr "Continuation automatique des commentaires multi-lignes" -#: ../src/interface.c:3495 -#, fuzzy +#: ../src/interface.c:3591 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." +"commentaire" -#: ../src/interface.c:3497 +#: ../src/interface.c:3593 msgid "Automatic symbol completion" msgstr "Complétion automatique des symboles" -#: ../src/interface.c:3500 +#: ../src/interface.c:3596 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2070,342 +2081,331 @@ "Complétion automatique des symboles connus dans les fichiers ouverts (noms " "des fonctions, variables globales...)" -#: ../src/interface.c:3508 +#: ../src/interface.c:3604 msgid "Max. symbol name suggestions:" msgstr "Nombre maximum de suggestions de nom de symbole :" -#: ../src/interface.c:3515 +#: ../src/interface.c:3611 msgid "Completion list height:" msgstr "Hauteur de la liste de complétion :" -#: ../src/interface.c:3522 +#: ../src/interface.c:3618 msgid "Characters to type for completion:" msgstr "Caractères à taper pour la complétion :" -#: ../src/interface.c:3535 -#, fuzzy +#: ../src/interface.c:3631 msgid "" "The amount of characters which are necessary to show the symbol auto " "completion list" msgstr "" "Le nombre de caractères nécessaires pour afficher la liste de complétion " -"automatique des symboles." +"automatique des symboles" -#: ../src/interface.c:3544 -#, fuzzy +#: ../src/interface.c:3640 msgid "Display height in rows for the auto completion list" -msgstr "Nombre de lignes à afficher dans la liste de complétion automatique." +msgstr "Nombre de lignes à afficher dans la liste de complétion automatique" -#: ../src/interface.c:3553 -#, fuzzy +#: ../src/interface.c:3649 msgid "Maximum number of entries to display in the auto completion list" msgstr "" -"Nombre maximum de lignes à afficher dans la liste de complétion automatique." +"Nombre maximum d'entrées à afficher dans la liste de complétion automatique" -#: ../src/interface.c:3556 +#: ../src/interface.c:3652 msgid "Completions" msgstr "Complétions" -#: ../src/interface.c:3576 +#: ../src/interface.c:3672 msgid "Parenthesis ( )" -msgstr "" +msgstr "Parenthèses ( )" -#: ../src/interface.c:3581 +#: ../src/interface.c:3677 msgid "Auto-close parenthesis when typing an opening one" msgstr "" +"Ferme automatiquement les parenthèses lors de l'écriture d'une parenthèse " +"ouvrante" -#: ../src/interface.c:3583 +#: ../src/interface.c:3679 msgid "Single quotes ' '" -msgstr "" +msgstr "Guillemets simples ' '" -#: ../src/interface.c:3588 +#: ../src/interface.c:3684 msgid "Auto-close simple quote when typing an opening one" msgstr "" +"Ferme automatiquement les guillemets simples lors de l'écriture d'un " +"guillemet ouvrant" -#: ../src/interface.c:3590 +#: ../src/interface.c:3686 msgid "Curly brackets { }" -msgstr "" +msgstr "Accolades { }" -#: ../src/interface.c:3595 +#: ../src/interface.c:3691 msgid "Auto-close curly bracket when typing an opening one" msgstr "" +"Ferme automatiquement les accolades lors de l'écriture d'une accolade " +"ouvrante" -#: ../src/interface.c:3597 +#: ../src/interface.c:3693 msgid "Square brackets [ ]" -msgstr "" +msgstr "Crochets [ ]" -#: ../src/interface.c:3602 -msgid "Auto-close squre-bracket when typing an opening one" +#: ../src/interface.c:3698 +msgid "Auto-close square-bracket when typing an opening one" msgstr "" +"Ferme automatiquement les crochets lors de l'écriture d'un crochet ouvrant" -#: ../src/interface.c:3604 +#: ../src/interface.c:3700 msgid "Double quotes \" \"" -msgstr "" +msgstr "Guillemets doubles \" \"" -#: ../src/interface.c:3609 +#: ../src/interface.c:3705 msgid "Auto-close double quote when typing an opening one" msgstr "" +"Ferme automatiquement les guillemets doubles lors de l'écriture d'un " +"guillemet ouvrant" -#: ../src/interface.c:3611 +#: ../src/interface.c:3707 msgid "Auto-close quotes and brackets" -msgstr "" +msgstr "Fermeture automatique des guillemets, accolades et crochets" -#: ../src/interface.c:3616 +#: ../src/interface.c:3712 msgid "Completions" msgstr "Complétions" -#: ../src/interface.c:3639 +#: ../src/interface.c:3735 msgid "Invert syntax highlighting colors" msgstr "Inverser les couleurs de la coloration syntaxique" -#: ../src/interface.c:3642 +#: ../src/interface.c:3738 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" msgstr "" +"Utilise un texte blanc sur fond noir et inverse toutes les couleurs; cette " +"option nécessite un redémarrage de Geany." -#: ../src/interface.c:3644 +#: ../src/interface.c:3740 msgid "Show indentation guides" msgstr "Afficher les guides d'indentation" -#: ../src/interface.c:3647 -#, fuzzy +#: ../src/interface.c:3743 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." +"Affiche de petites lignes pointillées pour aider à utiliser la bonne " +"indentation" -#: ../src/interface.c:3649 +#: ../src/interface.c:3745 msgid "Show white space" msgstr "Afficher les espaces" -#: ../src/interface.c:3652 -#, fuzzy +#: ../src/interface.c:3748 msgid "Marks spaces with dots and tabs with arrows" -msgstr "" -"Marque les espaces avec des points et les tabulations avec des flèches." +msgstr "Marque les espaces avec des points et les tabulations avec des flèches" -#: ../src/interface.c:3654 +#: ../src/interface.c:3750 msgid "Show line endings" msgstr "Afficher les fins de lignes" -#: ../src/interface.c:3657 -#, fuzzy -msgid "Show the line ending character" -msgstr "Afficher le caractère de fin de ligne" +#: ../src/interface.c:3753 +msgid "Shows the line ending character" +msgstr "Affiche le caractère de fin de ligne" -#: ../src/interface.c:3659 -#, fuzzy +#: ../src/interface.c:3755 msgid "Show line numbers" -msgstr "Afficher les numéros de _ligne" +msgstr "Afficher les numéros de ligne" -#: ../src/interface.c:3662 -#, fuzzy +#: ../src/interface.c:3758 msgid "Shows or hides the Line Number margin" -msgstr "Affiche ou masque la marge des numéros de ligne." +msgstr "Affiche ou masque la marge des numéros de ligne" -#: ../src/interface.c:3664 -#, fuzzy +#: ../src/interface.c:3760 msgid "Show markers margin" -msgstr "Afficher la marge des _marqueurs" +msgstr "Afficher la marge des marqueurs" -#: ../src/interface.c:3667 -#, fuzzy +#: ../src/interface.c:3763 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" msgstr "" "Affiche ou masque la petite marge à droite des numéros des lignes, qui est " -"utilisée pour marquer les lignes." +"utilisée pour marquer les lignes" -#: ../src/interface.c:3669 +#: ../src/interface.c:3765 msgid "Stop scrolling at last line" msgstr "Arrêter le défilement à la dernière ligne" -#: ../src/interface.c:3672 -#, fuzzy +#: ../src/interface.c:3768 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." +"Permet d'arrêter le défilement une page après la dernière ligne d'un document" -#: ../src/interface.c:3674 +#: ../src/interface.c:3770 msgid "Display" msgstr "Affichage" -#: ../src/interface.c:3695 +#: ../src/interface.c:3791 msgid "Long line marker:" msgstr "Marqueur des longues lignes :" -#: ../src/interface.c:3702 +#: ../src/interface.c:3798 msgid "Long line marker color:" msgstr "Couleur du marqueur des longues lignes :" -#: ../src/interface.c:3721 +#: ../src/interface.c:3817 msgid "Sets the color of the long line marker" msgstr "Définit la couleur du marqueur des longues lignes" -#: ../src/interface.c:3722 ../src/toolbar.c:66 ../src/tools.c:743 -#: ../src/vte.c:757 ../src/vte.c:764 +#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:750 +#: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Sélecteur de couleur" -#: ../src/interface.c:3730 -#, fuzzy +#: ../src/interface.c:3826 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 " "greater than 0 to specify the column where it should appear." msgstr "" "Le marqueur des longues lignes est une fine ligne verticale dans l'éditeur. " -"Il aide à marquer les longues lignes ou sert d'indice pour revenir à la " -"ligne. Définissez une valeur supérieure à 0 pour spécifier à quelle colonne " -"il devrait apparaître." +"Il aide à marquer les longues lignes, ou sert d'indice pour revenir à la " +"ligne. Définissez une valeur supérieure à 0 pour spécifier la colonne où il " +"devrait apparaître." -#: ../src/interface.c:3740 +#: ../src/interface.c:3836 msgid "Line" msgstr "Ligne" -#: ../src/interface.c:3743 -#, fuzzy +#: ../src/interface.c:3839 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" msgstr "" "Affiche une ligne verticale dans la fenêtre de l'éditeur à la position " -"donnée (voir plus bas)." +"donnée (voir plus bas)" -#: ../src/interface.c:3747 +#: ../src/interface.c:3843 msgid "Background" msgstr "Fond" -#: ../src/interface.c:3750 -#, fuzzy +#: ../src/interface.c:3846 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 " "proportional fonts)" msgstr "" "La couleur de fond des caractères après la position donnée (voir plus bas) " -"est changée pour la couleur définie plus bas. (Cela est recommandé si vous " +"est changée pour la couleur définie plus bas. (Ceci est recommandé si vous " "utilisez des polices proportionnelles)" -#: ../src/interface.c:3754 +#: ../src/interface.c:3850 msgid "Disabled" msgstr "Désactivé" -#: ../src/interface.c:3760 +#: ../src/interface.c:3856 msgid "Long line marker" msgstr "Marqueur des longues lignes" -#: ../src/interface.c:3765 +#: ../src/interface.c:3861 msgid "Display" msgstr "Affichage" -#: ../src/interface.c:3796 +#: ../src/interface.c:3892 msgid "Open new documents from the command-line" msgstr "Ouvrir les nouveaux documents depuis la ligne de commande" -#: ../src/interface.c:3799 -#, fuzzy +#: ../src/interface.c:3895 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." +"ligne de commande" -#: ../src/interface.c:3813 +#: ../src/interface.c:3909 msgid "Default end of line characters:" msgstr "Caractères de fin de ligne par défaut :" -#: ../src/interface.c:3820 +#: ../src/interface.c:3916 msgid "New files" msgstr "Nouveaux fichiers" -#: ../src/interface.c:3846 -#, fuzzy +#: ../src/interface.c:3942 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." +"nouveaux fichiers" -#: ../src/interface.c:3852 +#: ../src/interface.c:3948 msgid "Default encoding (new files):" msgstr "Encodage par défaut (nouveaux fichiers) :" -#: ../src/interface.c:3859 +#: ../src/interface.c:3955 msgid "Default encoding (existing files):" msgstr "Encodage par défaut (fichiers existants) :" -#: ../src/interface.c:3871 -#, fuzzy +#: ../src/interface.c:3967 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." +"fichiers existants" -#: ../src/interface.c:3877 +#: ../src/interface.c:3973 msgid "Use fixed encoding when opening files" msgstr "Utiliser un encodage fixe lors de l'ouverture des fichiers" -#: ../src/interface.c:3882 -#, fuzzy +#: ../src/interface.c:3978 msgid "" "This option disables the automatic detection of the file encoding when " "opening files and opens the file with the specified encoding (usually not " "needed)" msgstr "" "Cette option désactive la détection automatique de l'encodage lors de " -"l'ouverture des fichiers et ouvre le fichier avec l'encodage spécifié " -"(habituellement non requis)." +"l'ouverture des fichiers et ouvre le fichier avec l'encodage spécifié (non " +"requis habituellement)" -#: ../src/interface.c:3884 +#: ../src/interface.c:3980 msgid "Encodings" msgstr "Encodage" -#: ../src/interface.c:3903 +#: ../src/interface.c:3999 msgid "Ensure new line at file end" msgstr "Nouvelle ligne à la fin du fichier" -#: ../src/interface.c:3906 +#: ../src/interface.c:4002 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:3908 +#: ../src/interface.c:4004 msgid "Strip trailing spaces and tabs" msgstr "Enlever les espaces et tabulations de fin" -#: ../src/interface.c:3911 +#: ../src/interface.c:4007 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:3913 ../src/keybindings.c:444 +#: ../src/interface.c:4009 ../src/keybindings.c:449 msgid "Replace tabs by space" msgstr "Remplacer les tabulations par des espaces" -#: ../src/interface.c:3916 -#, fuzzy +#: ../src/interface.c:4012 msgid "Replaces all tabs in document by spaces" -msgstr "Remplace toutes les tabulations du document par des espaces." +msgstr "Remplace toutes les tabulations du document par des espaces" -#: ../src/interface.c:3918 +#: ../src/interface.c:4014 msgid "Saving files" msgstr "Enregistrement des fichiers" -#: ../src/interface.c:3943 +#: ../src/interface.c:4039 msgid "Recent files list length:" msgstr "Longueur de la liste des fichiers récents :" -#: ../src/interface.c:3957 -#, fuzzy +#: ../src/interface.c:4053 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." +"Spécifie le nombre de fichiers conservés dans la liste des fichiers récents" -#: ../src/interface.c:3961 +#: ../src/interface.c:4057 msgid "Disk check timeout:" msgstr "Intervalle de vérification du disque :" -#: ../src/interface.c:3974 +#: ../src/interface.c:4070 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2414,27 +2414,27 @@ "disque, en secondes. Zéro signifie qu'aucune vérification péridoque n'est " "faite." -#: ../src/interface.c:3983 ../src/symbols.c:554 ../plugins/filebrowser.c:994 +#: ../src/interface.c:4079 ../src/symbols.c:562 ../plugins/filebrowser.c:1016 msgid "Files" msgstr "Fichiers" -#: ../src/interface.c:4016 +#: ../src/interface.c:4112 msgid "Make:" msgstr "Make :" -#: ../src/interface.c:4023 +#: ../src/interface.c:4119 msgid "Terminal:" msgstr "Terminal :" -#: ../src/interface.c:4030 +#: ../src/interface.c:4126 msgid "Browser:" msgstr "Navigateur :" -#: ../src/interface.c:4042 +#: ../src/interface.c:4138 msgid "Path and options for the make tool" msgstr "Chemin et options pour l'outil make" -#: ../src/interface.c:4049 +#: ../src/interface.c:4145 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2442,25 +2442,25 @@ "Un émulateur de terminal comme xterm, gnome-terminal ou konsole (doit " "accepter l'option -e )" -#: ../src/interface.c:4056 +#: ../src/interface.c:4152 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:4088 +#: ../src/interface.c:4184 msgid "Grep:" msgstr "Grep :" -#: ../src/interface.c:4111 +#: ../src/interface.c:4207 msgid "Tool paths" msgstr "Chemins des outils" -#: ../src/interface.c:4132 +#: ../src/interface.c:4228 msgid "Context action:" msgstr "Action contextuelle :" -#: ../src/interface.c:4143 +#: ../src/interface.c:4239 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2471,67 +2471,67 @@ "s. Il peut être placé n'importe où dans la commande donnée et sera remplacé " "avant exécution." -#: ../src/interface.c:4156 +#: ../src/interface.c:4252 msgid "Commands" msgstr "Commandes" -#: ../src/interface.c:4161 ../src/keybindings.c:480 +#: ../src/interface.c:4257 ../src/keybindings.c:485 msgid "Tools" msgstr "Outils" -#: ../src/interface.c:4195 +#: ../src/interface.c:4291 msgid "email address of the developer" msgstr "adresse e-mail du développeur" -#: ../src/interface.c:4202 +#: ../src/interface.c:4298 msgid "Initials of the developer name" msgstr "Initiales du nom du développeur" -#: ../src/interface.c:4204 +#: ../src/interface.c:4300 msgid "Initial version:" msgstr "Version initiale :" -#: ../src/interface.c:4216 +#: ../src/interface.c:4312 msgid "Version number, which a new file initially has" msgstr "Numéro de version, qu'un nouveau fichier contient initialement" -#: ../src/interface.c:4223 +#: ../src/interface.c:4319 msgid "Company name" msgstr "Nom de l'entreprise" -#: ../src/interface.c:4225 +#: ../src/interface.c:4321 msgid "Developer:" msgstr "Développeur :" -#: ../src/interface.c:4232 +#: ../src/interface.c:4328 msgid "Company:" msgstr "Entreprise :" -#: ../src/interface.c:4239 +#: ../src/interface.c:4335 msgid "Mail address:" msgstr "Adresse e-mail :" -#: ../src/interface.c:4246 +#: ../src/interface.c:4342 msgid "Initials:" msgstr "Initiales :" -#: ../src/interface.c:4258 +#: ../src/interface.c:4354 msgid "The name of the developer" msgstr "Le nom du développeur" -#: ../src/interface.c:4260 +#: ../src/interface.c:4356 msgid "Year:" msgstr "Année :" -#: ../src/interface.c:4267 +#: ../src/interface.c:4363 msgid "Date:" msgstr "Date :" -#: ../src/interface.c:4274 +#: ../src/interface.c:4370 msgid "Date & Time:" msgstr "Date et heure :" -#: ../src/interface.c:4286 +#: ../src/interface.c:4382 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." @@ -2540,7 +2540,7 @@ "tous les spécificateurs de conversion qui peuvent être utilisés avec la " "fonction C ANSI strftime." -#: ../src/interface.c:4293 +#: ../src/interface.c:4389 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." @@ -2549,7 +2549,7 @@ "spécificateurs de conversion qui peuvent être utilisés avec la fonction C " "ANSI strftime." -#: ../src/interface.c:4300 +#: ../src/interface.c:4396 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." @@ -2558,89 +2558,85 @@ "spécificateurs de conversion qui peuvent être utilisés avec la fonction C " "ANSI strftime." -#: ../src/interface.c:4302 +#: ../src/interface.c:4398 msgid "Template data" msgstr "Données des modèles" -#: ../src/interface.c:4307 +#: ../src/interface.c:4403 msgid "Templates" msgstr "Modèles" -#: ../src/interface.c:4345 +#: ../src/interface.c:4441 msgid "C_hange" msgstr "C_hanger" -#: ../src/interface.c:4349 +#: ../src/interface.c:4445 msgid "Keyboard shortcuts" msgstr "Raccourcis clavier" -#: ../src/interface.c:4354 +#: ../src/interface.c:4450 msgid "Keybindings" msgstr "Raccourcis" -#: ../src/interface.c:4377 +#: ../src/interface.c:4473 msgid "Command:" msgstr "Commande :" -#: ../src/interface.c:4384 -#, fuzzy, c-format +#: ../src/interface.c:4480 +#, 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)." +"pour le nom du fichier)" -#: ../src/interface.c:4394 +#: ../src/interface.c:4490 msgid "Use an external command for printing" msgstr "Utiliser une commande externe pour imprimer" -#: ../src/interface.c:4414 ../src/printing.c:342 +#: ../src/interface.c:4510 ../src/printing.c:345 msgid "Print line numbers" msgstr "Afficher les numéros de ligne" -#: ../src/interface.c:4417 ../src/printing.c:344 -#, fuzzy +#: ../src/interface.c:4513 ../src/printing.c:347 msgid "Add line numbers to the printed page" -msgstr "Ajouter les numéros de lignes à la page imprimée." +msgstr "Ajouter les numéros de lignes à la page imprimée" -#: ../src/interface.c:4419 ../src/printing.c:347 +#: ../src/interface.c:4515 ../src/printing.c:350 msgid "Print page numbers" msgstr "Afficher les numéros de page" -#: ../src/interface.c:4422 -#, fuzzy +#: ../src/interface.c:4518 ../src/printing.c:352 msgid "" -"Add page numbers at the bottom of each page, it takes 2 lines of the page" +"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." +"Ajouter la numérotation des pages en bas de chaque page. Cela prend 2 lignes " +"par page." -#: ../src/interface.c:4424 ../src/printing.c:352 +#: ../src/interface.c:4520 ../src/printing.c:355 msgid "Print page header" msgstr "Afficher les en-têtes des pages" -#: ../src/interface.c:4427 ../src/printing.c:354 +#: ../src/interface.c:4523 ../src/printing.c:357 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." +"Add 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." msgstr "" "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:4444 ../src/printing.c:370 +#: ../src/interface.c:4540 ../src/printing.c:373 msgid "Use the basename of the printed file" msgstr "Utiliser le nom court du fichier à imprimer" -#: ../src/interface.c:4447 ../src/printing.c:372 -#, fuzzy -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:4543 +msgid "Print only the basename (without the path) of the printed file" +msgstr "Imprimer seulement le nom (sans le chemin) du fichier à imprimer" -#: ../src/interface.c:4453 ../src/printing.c:378 +#: ../src/interface.c:4549 ../src/printing.c:381 msgid "Date format:" msgstr "Format de date :" -#: ../src/interface.c:4460 ../src/printing.c:383 +#: ../src/interface.c:4556 ../src/printing.c:387 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 " @@ -2650,530 +2646,533 @@ "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:4463 +#: ../src/interface.c:4559 msgid "Use native GTK printing" msgstr "Utiliser l'impression GTK native" -#: ../src/interface.c:4469 +#: ../src/interface.c:4565 msgid "Printing" msgstr "Imprimer" -#: ../src/interface.c:4873 +#: ../src/interface.c:4976 msgid "Project Properties" msgstr "Propriétés du projet" -#: ../src/keybindings.c:193 ../src/plugins.c:1091 +#: ../src/keybindings.c:196 ../src/plugins.c:1111 msgid "File" msgstr "Fichier" -#: ../src/keybindings.c:196 +#: ../src/keybindings.c:199 msgid "New" msgstr "Nouveau" -#: ../src/keybindings.c:198 +#: ../src/keybindings.c:201 msgid "Open" msgstr "Ouvrir" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:204 msgid "Open selected file" msgstr "Ouvrir le fichier sélectionné" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:206 msgid "Save" msgstr "Enregistrer" -#: ../src/keybindings.c:205 +#: ../src/keybindings.c:208 msgid "Save as" msgstr "Enregistrer sous" -#: ../src/keybindings.c:207 +#: ../src/keybindings.c:210 msgid "Save all" msgstr "Tout enregistrer" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:213 msgid "Print" msgstr "Imprimer" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:215 msgid "Close" msgstr "Fermer" -#: ../src/keybindings.c:214 +#: ../src/keybindings.c:217 msgid "Close all" msgstr "Tout fermer" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:220 msgid "Reload file" msgstr "Recharger le fichier" -#: ../src/keybindings.c:219 ../src/project.c:476 +#: ../src/keybindings.c:222 ../src/project.c:489 msgid "Project" msgstr "Projet" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:225 msgid "Project properties" msgstr "Propriétés du projet" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:230 msgid "Undo" msgstr "Annuler" -#: ../src/keybindings.c:229 +#: ../src/keybindings.c:232 msgid "Redo" msgstr "Refaire" -#: ../src/keybindings.c:231 +#: ../src/keybindings.c:234 msgid "Duplicate line or selection" msgstr "Dupliquer la ligne ou la sélection" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:237 msgid "Delete current line(s)" msgstr "Effacer le(s) ligne(s) courante(s)" -#: ../src/keybindings.c:236 +#: ../src/keybindings.c:239 msgid "Transpose current line" msgstr "Intervertir la ligne courante" -#: ../src/keybindings.c:238 +#: ../src/keybindings.c:241 msgid "Scroll to current line" msgstr "Défiler vers la ligne courante" -#: ../src/keybindings.c:240 +#: ../src/keybindings.c:243 msgid "Scroll up the view by one line" msgstr "Faire défiler la vue d'une ligne vers le haut" -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:245 msgid "Scroll down the view by one line" msgstr "Faire défiler la vue d'une ligne vers le bas" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:248 msgid "Complete snippet" msgstr "Compléter le snippet" -#: ../src/keybindings.c:247 +#: ../src/keybindings.c:250 msgid "Move cursor in snippet" -msgstr "" +msgstr "Déplacer le curseur dans le snippet" -#: ../src/keybindings.c:249 +#: ../src/keybindings.c:252 msgid "Suppress snippet completion" msgstr "Supprimer la complétion du snippet" -#: ../src/keybindings.c:251 +#: ../src/keybindings.c:254 msgid "Context Action" msgstr "Action contextuelle" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:256 msgid "Complete word" msgstr "Compléter le mot" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:258 msgid "Show calltip" msgstr "Afficher la bulle d'aide" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:260 msgid "Show macro list" msgstr "Afficher la liste des macros" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:262 msgid "Clipboard" msgstr "Presse-papiers" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:265 msgid "Cut" msgstr "Couper" -#: ../src/keybindings.c:264 +#: ../src/keybindings.c:267 msgid "Copy" msgstr "Copier" -#: ../src/keybindings.c:266 +#: ../src/keybindings.c:269 msgid "Paste" msgstr "Coller" -#: ../src/keybindings.c:268 +#: ../src/keybindings.c:271 msgid "Copy current line(s)" msgstr "Copier le(s) ligne(s) courante(s)" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:273 msgid "Cut current line(s)" msgstr "Couper le(s) ligne(s) courante(s)" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:275 msgid "Select" msgstr "Sélection" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:278 msgid "Select All" msgstr "Tout sélectionner" -#: ../src/keybindings.c:277 +#: ../src/keybindings.c:280 msgid "Select current word" msgstr "Selectionner le mot courant" -#: ../src/keybindings.c:279 +#: ../src/keybindings.c:282 msgid "Select current line(s)" msgstr "Sélectionner la(les) ligne(s) courante(s)" -#: ../src/keybindings.c:281 +#: ../src/keybindings.c:284 msgid "Select current paragraph" msgstr "Sélectionner le paragraphe courant" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:286 msgid "Format" msgstr "Format" -#: ../src/keybindings.c:287 +#: ../src/keybindings.c:290 msgid "Toggle Case of Selection" msgstr "Modifier la casse de la sélection" -#: ../src/keybindings.c:289 +#: ../src/keybindings.c:292 msgid "Toggle line commentation" msgstr "Commenter/Décommenter la ligne" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:295 msgid "Comment line(s)" msgstr "Commenter la(les) ligne(s)" -#: ../src/keybindings.c:294 +#: ../src/keybindings.c:297 msgid "Uncomment line(s)" msgstr "Décommenter la(les) ligne(s)" -#: ../src/keybindings.c:296 +#: ../src/keybindings.c:299 msgid "Increase indent" msgstr "Augmenter l'indentation" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:302 msgid "Decrease indent" msgstr "Diminuer l'indentation" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:305 msgid "Increase indent by one space" msgstr "Augmenter l'indentation d'une espace" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:307 msgid "Decrease indent by one space" msgstr "Diminuer l'indentation d'une espace" -#: ../src/keybindings.c:306 +#: ../src/keybindings.c:309 msgid "Smart line indent" msgstr "Indentation intelligente des lignes " -#: ../src/keybindings.c:308 +#: ../src/keybindings.c:311 msgid "Send to Custom Command 1" msgstr "Envoyer vers la commande personnalisée 1" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:313 msgid "Send to Custom Command 2" msgstr "Envoyer vers la commande personnalisée 2" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:315 msgid "Send to Custom Command 3" msgstr "Envoyer vers la commande personnalisée 3" -#: ../src/keybindings.c:314 +#: ../src/keybindings.c:317 +msgid "Send Selection to Terminal" +msgstr "Envoyer la sélection vers le terminal" + +#: ../src/keybindings.c:319 msgid "Insert" msgstr "Insérer" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 msgid "Insert date" msgstr "Insérer la date" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:325 msgid "Insert alternative white space" msgstr "Insérer un espacement alternatif" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:327 msgid "Settings" msgstr "Préférences" -#: ../src/keybindings.c:328 ../src/toolbar.c:200 +#: ../src/keybindings.c:333 ../src/toolbar.c:199 msgid "Search" msgstr "Recherche" -#: ../src/keybindings.c:331 ../src/search.c:363 +#: ../src/keybindings.c:336 ../src/search.c:364 msgid "Find" msgstr "Rechercher" -#: ../src/keybindings.c:333 +#: ../src/keybindings.c:338 msgid "Find Next" msgstr "Rechercher le suivant" -#: ../src/keybindings.c:335 +#: ../src/keybindings.c:340 msgid "Find Previous" msgstr "Rechercher le précédent" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:343 msgid "Find Next Selection" msgstr "Rechercher la sélection" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:345 msgid "Find Previous Selection" msgstr "Rechercher la sélection vers l'arrière" -#: ../src/keybindings.c:342 ../src/search.c:496 +#: ../src/keybindings.c:347 ../src/search.c:499 msgid "Replace" msgstr "Remplacer" -#: ../src/keybindings.c:344 ../src/search.c:659 +#: ../src/keybindings.c:349 ../src/search.c:671 msgid "Find in Files" msgstr "Rechercher dans les fichiers" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:352 msgid "Next Message" msgstr "Message suivant" -#: ../src/keybindings.c:349 +#: ../src/keybindings.c:354 msgid "Previous Message" msgstr "Message précédent" -#: ../src/keybindings.c:351 +#: ../src/keybindings.c:356 msgid "Find Usage" @@ 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:[3691] trunk
by eht16＠users.sourceforge.net 06 Apr '09

06 Apr '09

Revision: 3691 http://geany.svn.sourceforge.net/geany/?rev=3691&view=rev Author: eht16 Date: 2009-04-06 16:01:15 +0000 (Mon, 06 Apr 2009) Log Message: ----------- Minor string improvements (spotted by Jean-Philippe Moal, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c trunk/src/printing.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-04-06 13:39:33 UTC (rev 3690) +++ trunk/ChangeLog 2009-04-06 16:01:15 UTC (rev 3691) @@ -1,3 +1,9 @@ +2009-04-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/interface.c, src/printing.c, geany.glade: + Minor string improvements (spotted by Jean-Philippe Moal, thanks). + + 2009-04-05 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/ui_utils.c: Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2009-04-06 13:39:33 UTC (rev 3690) +++ trunk/geany.glade 2009-04-06 16:01:15 UTC (rev 3691) @@ -6188,7 +6188,7 @@ <child> <widget class="GtkCheckButton" id="check_autoclose_sbracket"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Auto-close squre-bracket when typing an opening one</property> + <property name="tooltip" translatable="yes">Auto-close square-bracket when typing an opening one</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Square brackets [ ]</property> <property name="use_underline">True</property> @@ -6389,7 +6389,7 @@ <child> <widget class="GtkCheckButton" id="check_line_end"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Show the line ending character</property> + <property name="tooltip" translatable="yes">Shows the line ending character</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Show line endings</property> <property name="use_underline">True</property> @@ -8934,7 +8934,7 @@ <child> <widget class="GtkCheckButton" id="check_print_pagenumbers"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Add page numbers at the bottom of each page, it takes 2 lines of the page</property> + <property name="tooltip" translatable="yes">Add page numbers at the bottom of each page. It takes 2 lines of the page.</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Print page numbers</property> <property name="use_underline">True</property> @@ -8954,7 +8954,7 @@ <child> <widget class="GtkCheckButton" id="check_print_pageheader"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">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.</property> + <property name="tooltip" translatable="yes">Add 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.</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Print page header</property> <property name="use_underline">True</property> @@ -8999,7 +8999,7 @@ <child> <widget class="GtkCheckButton" id="check_print_basename"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Print only the basename(without the path) of the printed file</property> + <property name="tooltip" translatable="yes">Print only the basename (without the path) of the printed file</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Use the basename of the printed file</property> <property name="use_underline">True</property> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2009-04-06 13:39:33 UTC (rev 3690) +++ trunk/src/interface.c 2009-04-06 16:01:15 UTC (rev 3691) @@ -3695,7 +3695,7 @@ gtk_table_attach (GTK_TABLE (table16), check_autoclose_sbracket, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, check_autoclose_sbracket, _("Auto-close squre-bracket when typing an opening one"), NULL); + gtk_tooltips_set_tip (tooltips, check_autoclose_sbracket, _("Auto-close square-bracket when typing an opening one"), NULL); check_autoclose_dquote = gtk_check_button_new_with_mnemonic (_("Double quotes \" \"")); gtk_widget_show (check_autoclose_dquote); @@ -3750,7 +3750,7 @@ check_line_end = gtk_check_button_new_with_mnemonic (_("Show line endings")); gtk_widget_show (check_line_end); gtk_box_pack_start (GTK_BOX (vbox12), check_line_end, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, check_line_end, _("Show the line ending character"), NULL); + gtk_tooltips_set_tip (tooltips, check_line_end, _("Shows the line ending character"), NULL); check_line_numbers = gtk_check_button_new_with_mnemonic (_("Show line numbers")); gtk_widget_show (check_line_numbers); @@ -4515,12 +4515,12 @@ check_print_pagenumbers = gtk_check_button_new_with_mnemonic (_("Print page numbers")); gtk_widget_show (check_print_pagenumbers); gtk_box_pack_start (GTK_BOX (vbox29), check_print_pagenumbers, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, check_print_pagenumbers, _("Add page numbers at the bottom of each page, it takes 2 lines of the page"), NULL); + gtk_tooltips_set_tip (tooltips, check_print_pagenumbers, _("Add page numbers at the bottom of each page. It takes 2 lines of the page."), NULL); check_print_pageheader = gtk_check_button_new_with_mnemonic (_("Print page header")); gtk_widget_show (check_print_pageheader); gtk_box_pack_start (GTK_BOX (vbox29), check_print_pageheader, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, check_print_pageheader, _("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."), NULL); + gtk_tooltips_set_tip (tooltips, check_print_pageheader, _("Add 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."), NULL); frame33 = gtk_frame_new (NULL); gtk_widget_show (frame33); @@ -4540,7 +4540,7 @@ check_print_basename = gtk_check_button_new_with_mnemonic (_("Use the basename of the printed file")); gtk_widget_show (check_print_basename); gtk_box_pack_start (GTK_BOX (vbox30), check_print_basename, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, check_print_basename, _("Print only the basename(without the path) of the printed file"), NULL); + gtk_tooltips_set_tip (tooltips, check_print_basename, _("Print only the basename (without the path) of the printed file"), NULL); hbox10 = gtk_hbox_new (FALSE, 5); gtk_widget_show (hbox10); Modified: trunk/src/printing.c =================================================================== --- trunk/src/printing.c 2009-04-06 13:39:33 UTC (rev 3690) +++ trunk/src/printing.c 2009-04-06 16:01:15 UTC (rev 3691) @@ -349,12 +349,12 @@ w->check_print_pagenumbers = gtk_check_button_new_with_mnemonic(_("Print page numbers")); gtk_box_pack_start(GTK_BOX(page), w->check_print_pagenumbers, FALSE, FALSE, 0); - ui_widget_set_tooltip_text(w->check_print_pagenumbers, _("Add page numbers at the bottom of each page. It takes 2 lines of the page")); + ui_widget_set_tooltip_text(w->check_print_pagenumbers, _("Add page numbers at the bottom of each page. It takes 2 lines of the page.")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w->check_print_pagenumbers), printing_prefs.print_page_numbers); w->check_print_pageheader = gtk_check_button_new_with_mnemonic(_("Print page header")); gtk_box_pack_start(GTK_BOX(page), w->check_print_pageheader, FALSE, FALSE, 0); - ui_widget_set_tooltip_text(w->check_print_pageheader, _("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.")); + ui_widget_set_tooltip_text(w->check_print_pageheader, _("Add 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.")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w->check_print_pageheader), printing_prefs.print_page_header); g_signal_connect(w->check_print_pageheader, "toggled", G_CALLBACK(on_page_header_toggled), w); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3690] trunk/src/project.c
by eht16＠users.sourceforge.net 06 Apr '09

06 Apr '09

Revision: 3690 http://geany.svn.sourceforge.net/geany/?rev=3690&view=rev Author: eht16 Date: 2009-04-06 13:39:33 +0000 (Mon, 06 Apr 2009) Log Message: ----------- Fix Windows build (oops). Modified Paths: -------------- trunk/src/project.c Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2009-04-05 21:41:38 UTC (rev 3689) +++ trunk/src/project.c 2009-04-06 13:39:33 UTC (rev 3690) @@ -260,7 +260,7 @@ if (file != NULL) { /* try to load the config */ - if (! project_load_file_full(file)) + if (! project_load_file_with_session(file)) { SHOW_ERR1(_("Project file \"%s\" could not be loaded."), file); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3689] trunk
by eht16＠users.sourceforge.net 06 Apr '09

06 Apr '09

Revision: 3689 http://geany.svn.sourceforge.net/geany/?rev=3689&view=rev Author: eht16 Date: 2009-04-05 21:41:38 +0000 (Sun, 05 Apr 2009) Log Message: ----------- Show a message dialog when renaming a file fails. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-04-05 21:22:49 UTC (rev 3688) +++ trunk/ChangeLog 2009-04-05 21:41:38 UTC (rev 3689) @@ -23,6 +23,8 @@ * src/highlighting.c: Fix typo in the G_LIKELY checks, introduced in last commit. Fix the size of the styles array. + * src/document.c: + Show a message dialog when renaming a file fails. 2009-04-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-04-05 21:22:49 UTC (rev 3688) +++ trunk/src/document.c 2009-04-05 21:41:38 UTC (rev 3689) @@ -1517,13 +1517,18 @@ { gchar *old_locale_filename = utils_get_locale_from_utf8(doc->file_name); gchar *new_locale_filename = utils_get_locale_from_utf8(new_filename); + gint result; /* stop file monitoring to avoid getting events for deleting/creating files, * it's re-setup in document_save_file_as() */ document_stop_file_monitoring(doc); - g_rename(old_locale_filename, new_locale_filename); - + result = g_rename(old_locale_filename, new_locale_filename); + if (G_UNLIKELY(result != 0)) + { + dialogs_show_msgbox_with_secondary(GTK_MESSAGE_ERROR, + _("Error renaming file."), g_strerror(errno)); + } g_free(old_locale_filename); g_free(new_locale_filename); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3688] trunk
by eht16＠users.sourceforge.net 06 Apr '09

06 Apr '09

Revision: 3688 http://geany.svn.sourceforge.net/geany/?rev=3688&view=rev Author: eht16 Date: 2009-04-05 21:22:49 +0000 (Sun, 05 Apr 2009) Log Message: ----------- Fix typo in the G_LIKELY checks, introduced in last commit. Fix the size of the styles array. Modified Paths: -------------- trunk/ChangeLog trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-04-05 21:07:40 UTC (rev 3687) +++ trunk/ChangeLog 2009-04-05 21:22:49 UTC (rev 3688) @@ -20,6 +20,9 @@ src/utils.c, src/utils.h, src/vte.c: Start using G_LIKELY/G_UNLIKELY macros to gain a little more performance when building the code with gcc. + * src/highlighting.c: + Fix typo in the G_LIKELY checks, introduced in last commit. + Fix the size of the styles array. 2009-04-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2009-04-05 21:07:40 UTC (rev 3687) +++ trunk/src/highlighting.c 2009-04-05 21:22:49 UTC (rev 3688) @@ -58,7 +58,7 @@ } StyleSet; /* each filetype has a styleset except GEANY_FILETYPES_NONE, which uses common_style_set */ -static StyleSet style_sets[GEANY_MAX_BUILT_IN_FILETYPES - 1] = {{0, NULL, NULL, NULL}}; +static StyleSet style_sets[GEANY_MAX_BUILT_IN_FILETYPES] = {{0, NULL, NULL, NULL}}; enum /* Geany common styling */ @@ -189,7 +189,7 @@ if (list == NULL) list = g_key_file_get_string_list(config, "styling", key_name, &len, NULL); - if (G_LIKELY(list) != NULL && G_UNLIKELY(list[0] != NULL)) + if (G_LIKELY(list != NULL) && G_UNLIKELY(list[0] != NULL)) style->foreground = (gint) utils_strtod(list[0], NULL, FALSE); else style->foreground = rotate_rgb(default_style->foreground); @@ -199,11 +199,11 @@ else style->background = rotate_rgb(default_style->background); - if (G_LIKELY(list) != NULL && G_LIKELY(list[2] != NULL)) + if (G_LIKELY(list != NULL) && G_LIKELY(list[2] != NULL)) style->bold = utils_atob(list[2]); else style->bold = default_style->bold; - if (G_LIKELY(list) != NULL && list[3] != NULL) + if (G_LIKELY(list != NULL) && list[3] != NULL) style->italic = utils_atob(list[3]); else style->italic = default_style->italic; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3687] trunk
by eht16＠users.sourceforge.net 06 Apr '09

06 Apr '09

Revision: 3687 http://geany.svn.sourceforge.net/geany/?rev=3687&view=rev Author: eht16 Date: 2009-04-05 21:07:40 +0000 (Sun, 05 Apr 2009) Log Message: ----------- Start using G_LIKELY/G_UNLIKELY macros to gain a little more performance when building the code with gcc. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/callbacks.c trunk/src/dialogs.c trunk/src/document.c trunk/src/document.h trunk/src/editor.c trunk/src/encodings.c trunk/src/filetypes.c trunk/src/geanymenubuttonaction.c trunk/src/geanyobject.c trunk/src/geanywraplabel.c trunk/src/highlighting.c trunk/src/keybindings.c trunk/src/keyfile.c trunk/src/log.c trunk/src/main.c trunk/src/msgwindow.c trunk/src/navqueue.c trunk/src/notebook.c trunk/src/plugins.c trunk/src/prefs.c trunk/src/queue.c trunk/src/sciwrappers.c trunk/src/socket.c trunk/src/symbols.c trunk/src/templates.c trunk/src/toolbar.c trunk/src/tools.c trunk/src/tools.h trunk/src/treeviews.c trunk/src/ui_utils.c trunk/src/utils.c trunk/src/utils.h trunk/src/vte.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-04-05 19:58:30 UTC (rev 3686) +++ trunk/ChangeLog 2009-04-05 21:07:40 UTC (rev 3687) @@ -9,6 +9,17 @@ (#2728630, patch by Elias Pschernig, thanks). * doc/geany.txt, doc/geany.html: Describe how to build Geany using the Waf build system. + * src/build.c, src/callbacks.c, src/dialogs.c, src/document.c, + src/document.h, src/editor.c, src/encodings.c, src/filetypes.c, + src/geanymenubuttonaction.c, src/geanyobject.c, src/geanywraplabel.c, + src/highlighting.c, src/keybindings.c, src/keyfile.c, src/log.c, + src/main.c, src/msgwindow.c, src/navqueue.c, src/notebook.c, + src/plugins.c, src/prefs.c, src/queue.c, src/sciwrappers.c, + src/socket.c, src/symbols.c, src/templates.c, src/toolbar.c, + src/tools.c, src/tools.h, src/treeviews.c, src/ui_utils.c, + src/utils.c, src/utils.h, src/vte.c: + Start using G_LIKELY/G_UNLIKELY macros to gain a little more + performance when building the code with gcc. 2009-04-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-04-05 19:58:30 UTC (rev 3686) +++ trunk/src/build.c 2009-04-05 21:07:40 UTC (rev 3687) @@ -1570,11 +1570,11 @@ BuildMenuItems *menu_items; static GtkWidget *menubar_build_menu = NULL; - if (menubar_build_menu == NULL) /* cache the build menu pointer */ + if (G_UNLIKELY(menubar_build_menu == NULL)) /* cache the build menu pointer */ menubar_build_menu = ui_lookup_widget(main_widgets.window, "menu_build1"); if (doc == NULL) doc = document_get_current(); - if (doc == NULL || + if (G_UNLIKELY(doc == NULL) || (FILETYPE_ID(doc->file_type) == GEANY_FILETYPES_NONE && doc->file_name == NULL)) { gtk_widget_set_sensitive(menubar_build_menu, FALSE); @@ -1588,7 +1588,7 @@ gtk_widget_set_sensitive(menubar_build_menu, TRUE); ft = doc->file_type; - g_return_if_fail(ft != NULL); + g_return_if_fail(G_LIKELY(ft != NULL)); menu_items = build_get_menu_items(ft->id); /* Note: don't remove the submenu first because it can now cause an X hang if @@ -1596,7 +1596,7 @@ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menubar_build_menu), menu_items->menu); - have_path = (doc->file_name != NULL); + have_path = G_LIKELY(doc->file_name != NULL); can_make = have_path && build_info.pid <= (GPid) 1; @@ -1853,7 +1853,7 @@ { static GtkWidget *dialog = NULL; /* keep dialog for combo history */ - if (! dialog) + if (G_UNLIKELY(! dialog)) dialog = dialogs_show_input(_("Make Custom Target"), _("Enter custom options here, all entered text is passed to the make command."), build_info.custom_target, TRUE, &on_make_custom_input_response); @@ -2055,7 +2055,7 @@ widgets.build_action = toolbar_get_action_by_name("Build"); toolmenu = geany_menu_button_action_get_menu(GEANY_MENU_BUTTON_ACTION(widgets.build_action)); - if (toolmenu != NULL) + if (G_UNLIKELY(toolmenu != NULL)) { /* build the code */ item = ui_image_menu_item_new(GEANY_STOCK_BUILD, _("_Build")); Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2009-04-05 19:58:30 UTC (rev 3686) +++ trunk/src/callbacks.c 2009-04-05 21:07:40 UTC (rev 3687) @@ -95,7 +95,7 @@ for (i = 0; i < documents_array->len; i++) { - if (documents[i]->is_valid && documents[i]->changed) + if (documents[i]->is_valid && G_UNLIKELY(documents[i]->changed)) { return FALSE; } @@ -179,9 +179,9 @@ gint cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(main_widgets.notebook)); GeanyDocument *doc = document_get_current(); - if (doc != NULL && cur_page >= 0) + if (G_LIKELY(doc != NULL) && G_LIKELY(cur_page >= 0)) { - if (doc->file_name == NULL) + if (G_UNLIKELY(doc->file_name == NULL)) dialogs_show_save_as(); else document_save_file(doc, FALSE); @@ -208,7 +208,7 @@ { doc = document_get_from_page(i); if (! doc->changed) continue; - if (doc->file_name == NULL) + if (G_UNLIKELY(doc->file_name == NULL)) { /* display unnamed document */ gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), @@ -237,7 +237,7 @@ { GeanyDocument *doc = document_get_current(); - if (doc) + if (G_LIKELY(doc)) document_close(doc); } @@ -282,7 +282,7 @@ { GeanyDocument *doc = document_get_current(); - if (doc != NULL && document_can_undo(doc)) + if (G_LIKELY(doc != NULL) && document_can_undo(doc)) { sci_cancel(doc->editor->sci); document_undo(doc); @@ -296,7 +296,7 @@ { GeanyDocument *doc = document_get_current(); - if (doc != NULL && document_can_redo(doc)) + if (G_LIKELY(doc != NULL) && document_can_redo(doc)) { sci_cancel(doc->editor->sci); document_redo(doc); @@ -314,7 +314,7 @@ if (GTK_IS_EDITABLE(focusw)) gtk_editable_cut_clipboard(GTK_EDITABLE(focusw)); else - if (IS_SCINTILLA(focusw) && doc != NULL) + if (IS_SCINTILLA(focusw) && G_LIKELY(doc != NULL)) sci_cut(doc->editor->sci); else if (GTK_IS_TEXT_VIEW(focusw)) @@ -336,7 +336,7 @@ if (GTK_IS_EDITABLE(focusw)) gtk_editable_copy_clipboard(GTK_EDITABLE(focusw)); else - if (IS_SCINTILLA(focusw) && doc != NULL) + if (IS_SCINTILLA(focusw) && G_LIKELY(doc != NULL)) sci_copy(doc->editor->sci); else if (GTK_IS_TEXT_VIEW(focusw)) @@ -358,7 +358,7 @@ if (GTK_IS_EDITABLE(focusw)) gtk_editable_paste_clipboard(GTK_EDITABLE(focusw)); else - if (IS_SCINTILLA(focusw) && doc != NULL) + if (IS_SCINTILLA(focusw) && G_LIKELY(doc != NULL)) { sci_paste(doc->editor->sci); } @@ -383,7 +383,7 @@ if (GTK_IS_EDITABLE(focusw)) gtk_editable_delete_selection(GTK_EDITABLE(focusw)); else - if (IS_SCINTILLA(focusw) && doc != NULL && sci_has_selection(doc->editor->sci)) + if (IS_SCINTILLA(focusw) && G_LIKELY(doc != NULL) && sci_has_selection(doc->editor->sci)) sci_clear(doc->editor->sci); else if (GTK_IS_TEXT_VIEW(focusw)) @@ -449,11 +449,12 @@ gint i = GPOINTER_TO_INT(user_data); gchar *charset = NULL; - if (doc == NULL || doc->file_name == NULL) + if (G_UNLIKELY(doc == NULL) || G_UNLIKELY(doc->file_name == NULL)) return; if (i >= 0) { - if (i >= GEANY_ENCODINGS_MAX || encodings[i].charset == NULL) return; + if (G_UNLIKELY(i >= GEANY_ENCODINGS_MAX) || G_UNLIKELY(encodings[i].charset == NULL)) + return; charset = encodings[i].charset; } @@ -631,9 +632,9 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); - static gboolean done = 1; + static gint done = 1; - if (doc != NULL) + if (G_LIKELY(doc != NULL)) { if (done++ % 3 == 0) sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, @@ -662,7 +663,7 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) { sci_zoom_off(doc->editor->sci); sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); @@ -712,7 +713,7 @@ { GeanyDocument *doc; - if (main_status.opening_session_files || main_status.closing_all) + if (G_UNLIKELY(main_status.opening_session_files) || G_UNLIKELY(main_status.closing_all)) return; if (page_num == (guint) -1 && page != NULL) @@ -720,7 +721,7 @@ else doc = document_get_from_page(page_num); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) { treeviews_select_openfiles_item(doc); document_set_text_changed(doc, doc->changed); /* also sets window title and status bar */ @@ -769,7 +770,8 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); - if (ignore_callback || doc == NULL) return; + if (ignore_callback || G_UNLIKELY(doc == NULL)) + return; sci_convert_eols(doc->editor->sci, SC_EOL_CRLF); sci_set_eol_mode(doc->editor->sci, SC_EOL_CRLF); } @@ -780,7 +782,8 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); - if (ignore_callback || doc == NULL) return; + if (ignore_callback || G_UNLIKELY(doc == NULL)) + return; sci_convert_eols(doc->editor->sci, SC_EOL_LF); sci_set_eol_mode(doc->editor->sci, SC_EOL_LF); } @@ -791,7 +794,8 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); - if (ignore_callback || doc == NULL) return; + if (ignore_callback || G_UNLIKELY(doc == NULL)) + return; sci_convert_eols(doc->editor->sci, SC_EOL_CR); sci_set_eol_mode(doc->editor->sci, SC_EOL_CR); } @@ -803,7 +807,7 @@ { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) editor_replace_tabs(doc->editor); } @@ -854,7 +858,7 @@ gchar *text; gboolean keep_sel = TRUE; - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; sci = doc->editor->sci; @@ -1004,7 +1008,7 @@ if (! ignore_callback) { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) editor_set_line_wrapping(doc->editor, ! doc->editor->line_wrapping); } } @@ -1017,7 +1021,7 @@ if (! ignore_callback) { GeanyDocument *doc = document_get_current(); - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; doc->readonly = ! doc->readonly; sci_set_readonly(doc->editor->sci, doc->readonly); @@ -1034,7 +1038,7 @@ if (! ignore_callback) { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) doc->editor->auto_indent = ! doc->editor->auto_indent; } } @@ -1046,7 +1050,7 @@ gchar *search_text; GeanyDocument *doc = document_get_current(); - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; if (sci_has_selection(doc->editor->sci)) @@ -1090,7 +1094,7 @@ GTK_MENU_ITEM(ui_lookup_widget(main_widgets.editor_menu, "goto_tag_definition1"))); GeanyDocument *doc = document_get_current(); - g_return_if_fail(doc != NULL); + g_return_if_fail(G_LIKELY(doc != NULL)); sci_set_current_position(doc->editor->sci, editor_info.click_pos, FALSE); symbols_goto_tag(editor_info.current_word, definition); @@ -1113,7 +1117,7 @@ GeanyDocument *doc = document_get_current(); gint pos; - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; pos = sci_get_current_position(doc->editor->sci); @@ -1142,7 +1146,7 @@ { GeanyDocument *doc = document_get_current(); - g_return_if_fail(doc != NULL); + g_return_if_fail(G_LIKELY(doc != NULL)); if (search_data.text) { @@ -1223,7 +1227,7 @@ { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) { if (! editor_goto_line(doc->editor, (gint) val - 1)) utils_beep(); @@ -1237,7 +1241,7 @@ { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) { gint line = atoi(text); if (! editor_goto_line(doc->editor, line - 1)) @@ -1313,7 +1317,7 @@ const gchar *cur_tag = NULL; gint line = -1, pos = 0; - if (doc == NULL || doc->file_type == NULL) + if (G_UNLIKELY(doc == NULL) || G_UNLIKELY(doc->file_type == NULL)) { ui_set_statusbar(FALSE, _("Please set the filetype for the current file before using this function.")); @@ -1338,7 +1342,7 @@ { GeanyDocument *doc = document_get_current(); - if (doc == NULL || doc->file_type == NULL) + if (G_UNLIKELY(doc == NULL) || G_UNLIKELY(doc->file_type == NULL)) { ui_set_statusbar(FALSE, _("Please set the filetype for the current file before using this function.")); @@ -1358,7 +1362,7 @@ GeanyDocument *doc = document_get_current(); gchar *text; - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; text = templates_get_template_licence(FILETYPE_ID(doc->file_type), GEANY_TEMPLATE_GPL); @@ -1378,7 +1382,7 @@ GeanyDocument *doc = document_get_current(); gchar *text; - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; text = templates_get_template_licence(FILETYPE_ID(doc->file_type), GEANY_TEMPLATE_BSD); @@ -1398,7 +1402,7 @@ GeanyDocument *doc = document_get_current(); gchar *text; - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; text = templates_get_template_changelog(); @@ -1420,7 +1424,7 @@ gchar *fname; GeanyFiletype *ft; - g_return_if_fail(doc != NULL); + g_return_if_fail(G_LIKELY(doc != NULL)); ft = doc->file_type; fname = doc->file_name; @@ -1447,7 +1451,8 @@ gchar *format; gchar *time_str; - if (doc == NULL) return; + if (G_UNLIKELY(doc == NULL)) + return; if (utils_str_equal(_("dd.mm.yyyy"), (gchar*) user_data)) format = "%d.%m.%Y"; @@ -1479,7 +1484,7 @@ } time_str = utils_get_date_time(format, NULL); - if (time_str != NULL) + if (G_UNLIKELY(time_str != NULL)) { verify_click_pos(doc); /* make sure that the click_pos is valid */ @@ -1504,7 +1509,8 @@ gint pos = -1; gchar *text; - if (doc == NULL || user_data == NULL) return; + if (G_UNLIKELY(doc == NULL) || G_UNLIKELY(user_data == NULL)) + return; verify_click_pos(doc); /* make sure that the click_pos is valid */ @@ -1520,7 +1526,7 @@ sci_insert_text(doc->editor->sci, editor_info.click_pos, text); g_free(text); - if (pos >= 0) + if (G_LIKELY(pos >= 0)) sci_goto_pos(doc->editor->sci, pos, FALSE); } @@ -1539,7 +1545,7 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) editor_fold_all(doc->editor); } @@ -1549,7 +1555,7 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) editor_unfold_all(doc->editor); } @@ -1568,7 +1574,7 @@ { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) editor_indicator_clear(doc->editor, GEANY_INDICATOR_ERROR); } @@ -1580,11 +1586,11 @@ GeanyDocument *doc = document_get_current(); guint i = GPOINTER_TO_INT(user_data); - if (ignore_callback || doc == NULL || encodings[i].charset == NULL || + if (ignore_callback || G_UNLIKELY(doc == NULL) || G_UNLIKELY(encodings[i].charset == NULL) || utils_str_equal(encodings[i].charset, doc->encoding)) return; - if (doc->readonly) + if (G_UNLIKELY(doc->readonly)) { utils_beep(); return; @@ -1600,7 +1606,7 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) printing_print_doc(doc); } @@ -1611,7 +1617,7 @@ { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) sci_select_all(doc->editor->sci); } @@ -1652,9 +1658,9 @@ { GeanyDocument *doc = document_get_current(); - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; - if (doc->readonly) + if (G_UNLIKELY(doc->readonly)) { utils_beep(); return; @@ -1674,7 +1680,7 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) editor_do_comment(doc->editor, -1, FALSE, FALSE); } @@ -1684,7 +1690,7 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) editor_do_uncomment(doc->editor, -1, FALSE); } @@ -1695,7 +1701,7 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) editor_do_comment_toggle(doc->editor); } @@ -1725,7 +1731,7 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; if (sci_get_lines_selected(doc->editor->sci) > 1) @@ -1744,7 +1750,7 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; if (sci_get_lines_selected(doc->editor->sci) > 1) @@ -1862,7 +1868,7 @@ static GtkWidget *item_close = NULL; static GtkWidget *item_properties = NULL; - if (item_close == NULL) + if (G_UNLIKELY(item_close == NULL)) { item_close = ui_lookup_widget(main_widgets.window, "project_close1"); item_properties = ui_lookup_widget(main_widgets.window, "project_properties1"); @@ -1880,7 +1886,7 @@ GeanyDocument *doc = document_get_current(); gchar *sel = NULL; - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; sel = editor_get_default_selection(doc->editor, TRUE, GEANY_WORDCHARS"./-"); @@ -1924,7 +1930,7 @@ { GeanyDocument *doc = document_get_current(); - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; sci_marker_delete_all(doc->editor->sci, 0); /* delete the yellow tag marker */ @@ -1949,7 +1955,7 @@ GError *error = NULL; GeanyDocument *doc = document_get_current(); - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; if (sci_has_selection(doc->editor->sci)) @@ -1974,7 +1980,7 @@ } /* substitute the wildcard %s and run the command if it is non empty */ - if (command != NULL && *command != '\0') + if (NZV(command)) { command = utils_str_replace(command, "%s", word); @@ -2001,7 +2007,7 @@ ui_lookup_widget(main_widgets.window, "menu_show_toolbar1")); /* get the initial state (necessary if Geany was closed with hide_all = TRUE) */ - if (hide_all == -1) + if (G_UNLIKELY(hide_all == -1)) { if (! gtk_check_menu_item_get_active(msgw) && ! interface_prefs.show_notebook_tabs && @@ -2074,7 +2080,7 @@ { GeanyDocument *doc = document_get_current(); - if (doc == NULL || ignore_callback) + if (G_UNLIKELY(doc == NULL) || ignore_callback) return; editor_set_indent_type(doc->editor, type); @@ -2116,7 +2122,7 @@ return; doc = document_get_current(); - g_return_if_fail(doc != NULL); + g_return_if_fail(G_LIKELY(doc != NULL)); editor_strip_trailing_spaces(doc->editor); } @@ -2159,7 +2165,7 @@ return; doc = document_get_current(); - g_return_if_fail(doc != NULL); + g_return_if_fail(G_LIKELY(doc != NULL)); doc->editor->line_breaking = !doc->editor->line_breaking; } @@ -2170,7 +2176,7 @@ { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) editor_replace_spaces(doc->editor); } @@ -2198,13 +2204,13 @@ gpointer user_data) { guint i; - GeanyDocument *cur_doc = document_get_current(); + GeanyDocument *doc, *cur_doc = document_get_current(); for (i = 0; i < documents_array->len; i++) { - GeanyDocument *doc = documents[i]; + doc = documents[i]; - if (doc == cur_doc || ! doc->is_valid) + if (G_UNLIKELY(doc == cur_doc) || ! doc->is_valid) continue; if (! document_close(doc)) Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2009-04-05 19:58:30 UTC (rev 3686) +++ trunk/src/dialogs.c 2009-04-05 21:07:40 UTC (rev 3687) @@ -141,7 +141,7 @@ gchar *filename = gtk_file_chooser_get_filename(filechooser); gboolean is_on = gtk_file_chooser_get_show_hidden(filechooser); - if (filename) + if (G_LIKELY(filename)) { /* try to get the UTF-8 equivalent for the filename, fallback to filename if error */ gchar *utf8_filename = utils_get_utf8_from_locale(filename); @@ -218,7 +218,7 @@ filetypes_create_file_filter_all_source()); foreach_slist(ft, node, filetypes_by_title) { - if (ft->id == GEANY_FILETYPES_NONE) + if (G_UNLIKELY(ft->id == GEANY_FILETYPES_NONE)) continue; gtk_combo_box_append_text(GTK_COMBO_BOX(filetype_combo), ft->title); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(ui_widgets.open_filesel), @@ -268,7 +268,7 @@ /* We use the same file selection widget each time, so first of all we create it * if it hasn't already been created. */ - if (ui_widgets.open_filesel == NULL) + if (G_UNLIKELY(ui_widgets.open_filesel == NULL)) create_open_file_dialog(); if (initdir != NULL) @@ -516,7 +516,7 @@ gint resp; gboolean folder_set = FALSE; - if (ui_widgets.save_filesel == NULL) + if (G_UNLIKELY(ui_widgets.save_filesel == NULL)) create_save_file_dialog(); gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(ui_widgets.save_filesel)); @@ -704,7 +704,7 @@ document_get_notebook_page(doc)); main_status.quitting = old_quitting_state; - if (doc->file_name != NULL) + if (G_LIKELY(doc->file_name != NULL)) { short_fn = g_path_get_basename(doc->file_name); } @@ -959,9 +959,9 @@ GtkWidget *dialog, *label, *spin, *vbox; gboolean res = FALSE; - g_return_val_if_fail(title != NULL, FALSE); - g_return_val_if_fail(label_text != NULL, FALSE); - g_return_val_if_fail(value != NULL, FALSE); + g_return_val_if_fail(G_LIKELY(title != NULL), FALSE); + g_return_val_if_fail(G_LIKELY(label_text != NULL), FALSE); + g_return_val_if_fail(G_LIKELY(value != NULL), FALSE); dialog = gtk_dialog_new_with_buttons(title, GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -1023,7 +1023,7 @@ # define S_IXOTH 0 #endif - if (doc == NULL || doc->file_name == NULL) + if (G_UNLIKELY(doc == NULL) || G_UNLIKELY(doc->file_name == NULL)) { dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("An error occurred or file information could not be retrieved (e.g. from a new file).")); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-04-05 19:58:30 UTC (rev 3686) +++ trunk/src/document.c 2009-04-05 21:07:40 UTC (rev 3687) @@ -131,14 +131,15 @@ { guint i; - if (! realname) + if (G_UNLIKELY(! realname)) return NULL; /* file doesn't exist on disk */ for (i = 0; i < documents_array->len; i++) { GeanyDocument *doc = documents[i]; - if (! documents[i]->is_valid || ! doc->real_path) continue; + if (! doc->is_valid || G_UNLIKELY(! doc->real_path)) + continue; if (filenamecmp(realname, doc->real_path) == 0) { @@ -177,7 +178,7 @@ GeanyDocument *doc; gchar *realname; - if (! utf8_filename) + if (G_UNLIKELY(! utf8_filename)) return NULL; /* First search GeanyDocument::file_name, so we can find documents with a @@ -186,7 +187,8 @@ { doc = documents[i]; - if (! documents[i]->is_valid || doc->file_name == NULL) continue; + if (! doc->is_valid || G_UNLIKELY(doc->file_name == NULL)) + continue; if (filenamecmp(utf8_filename, doc->file_name) == 0) { @@ -206,7 +208,7 @@ { guint i; - if (sci == NULL) + if (G_UNLIKELY(sci == NULL)) return NULL; for (i = 0; i < documents_array->len; i++) @@ -221,7 +223,7 @@ /* returns the index of the notebook page for the document. */ gint document_get_notebook_page(GeanyDocument *doc) { - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return -1; return gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), @@ -240,7 +242,7 @@ { ScintillaObject *sci; - if (page_num >= documents_array->len) + if (G_UNLIKELY(page_num >= documents_array->len)) return NULL; sci = (ScintillaObject*)gtk_notebook_get_nth_page( @@ -259,7 +261,7 @@ { gint cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(main_widgets.notebook)); - if (cur_page == -1) + if (G_UNLIKELY(cur_page == -1)) return NULL; else { @@ -288,7 +290,7 @@ gchar *base_name; GtkWidget *parent; - g_return_if_fail(doc != NULL); + g_return_if_fail(G_LIKELY(doc != NULL)); base_name = g_path_get_basename(DOC_FILENAME(doc)); /* we need to use the event box for the tooltip, labels don't get the necessary events */ @@ -313,12 +315,12 @@ **/ void document_set_text_changed(GeanyDocument *doc, gboolean changed) { - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; doc->changed = changed; - if (! main_status.quitting) + if (G_LIKELY(! main_status.quitting)) { ui_update_tab_status(doc); ui_save_buttons_toggle(changed); @@ -395,7 +397,7 @@ /* Set the file status to 'changed' after a single 'created' event. */ static gboolean monitor_finish_pending_create(gpointer doc) { - g_return_val_if_fail(doc != NULL, FALSE); + g_return_val_if_fail(G_LIKELY(doc != NULL), FALSE); ((GeanyDocument *)doc)->priv->file_disk_status = FILE_CHANGED; ui_update_tab_status(doc); @@ -407,7 +409,7 @@ /* Resets the 'ignore' file status after a reload action. */ static gboolean monitor_reset_ignore(gpointer doc) { - g_return_val_if_fail(doc != NULL, FALSE); + g_return_val_if_fail(G_LIKELY(doc != NULL), FALSE); ((GeanyDocument *)doc)->priv->file_disk_status = FILE_OK; ui_update_tab_status(doc); @@ -419,7 +421,7 @@ static void monitor_file_changed_cb(G_GNUC_UNUSED GFileMonitor *monitor, G_GNUC_UNUSED GFile *file, G_GNUC_UNUSED GFile *other_file, GFileMonitorEvent event, GeanyDocument *doc) { - g_return_if_fail(doc != NULL); + g_return_if_fail(G_LIKELY(doc != NULL)); if (file_prefs.disk_check_timeout == 0) return; @@ -492,7 +494,7 @@ void document_stop_file_monitoring(GeanyDocument *doc) { - g_return_if_fail(doc != NULL); + g_return_if_fail(G_LIKELY(doc != NULL)); if (doc->priv->monitor != NULL) { @@ -504,7 +506,7 @@ static void monitor_file_setup(GeanyDocument *doc) { - g_return_if_fail(doc != NULL); + g_return_if_fail(G_LIKELY(doc != NULL)); /* Disable file monitoring completely for remote files (i.e. remote GIO files) as GFileMonitor * doesn't work at all for remote files and legacy polling is too slow. */ if (! doc->priv->is_remote) @@ -602,7 +604,7 @@ **/ gboolean document_close(GeanyDocument *doc) { - g_return_val_if_fail(doc, FALSE); + g_return_val_if_fail(G_LIKELY(doc), FALSE); return document_remove_page(document_get_notebook_page(doc)); } @@ -620,7 +622,7 @@ { GeanyDocument *doc = document_get_from_page(page_num); - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) { g_warning("%s: page_num: %d", G_STRFUNC, page_num); return FALSE; @@ -710,7 +712,7 @@ { GeanyDocument *doc = document_create(utf8_filename); - g_assert(doc != NULL); + g_assert(G_LIKELY(doc != NULL)); sci_set_undo_collection(doc->editor->sci, FALSE); /* avoid creation of an undo action */ if (text) @@ -812,7 +814,7 @@ { gchar *converted_text = encodings_convert_to_utf8_from_charset( filedata->data, filedata->size, forced_enc, FALSE); - if (converted_text == NULL) + if (G_LIKELY(converted_text == NULL)) { return FALSE; } @@ -834,8 +836,8 @@ static gboolean handle_encoding(FileData *filedata, GeanyEncodingIndex enc_idx) { - g_return_val_if_fail(filedata->enc == NULL, FALSE); - g_return_val_if_fail(filedata->bom == FALSE, FALSE); + g_return_val_if_fail(G_LIKELY(filedata->enc == NULL), FALSE); + g_return_val_if_fail(G_LIKELY(filedata->bom == FALSE), FALSE); if (filedata->size == 0) { @@ -855,7 +857,7 @@ { gchar *converted_text = encodings_convert_to_utf8_from_charset( filedata->data, filedata->size, filedata->enc, FALSE); - if (converted_text != NULL) + if (G_LIKELY(converted_text != NULL)) { g_free(filedata->data); filedata->data = converted_text; @@ -885,7 +887,7 @@ gchar *converted_text = encodings_convert_to_utf8(filedata->data, filedata->size, &filedata->enc); - if (converted_text == NULL) + if (G_UNLIKELY(converted_text == NULL)) { return FALSE; } @@ -1158,7 +1160,7 @@ { GeanyDocument *doc = data; - if (! doc || ! doc->is_valid || doc->tm_file == NULL) + if (G_UNLIKELY(! doc) || G_UNLIKELY(! doc->is_valid) || G_UNLIKELY(doc->tm_file == NULL)) return FALSE; if (gtk_window_get_focus(GTK_WINDOW(main_widgets.window)) != GTK_WIDGET(doc->editor->sci)) @@ -1195,7 +1197,7 @@ else { /* filename must not be NULL when opening a file */ - if (filename == NULL) + if (G_UNLIKELY(filename == NULL)) { ui_set_statusbar(FALSE, _("Invalid filename")); return NULL; @@ -1240,11 +1242,10 @@ if (! reload) { doc = document_create(utf8_filename); - g_return_val_if_fail(doc != NULL, NULL); /* really should not happen */ + g_return_val_if_fail(G_LIKELY(doc != NULL), NULL); /* really should not happen */ /* file exists on disk, set real_path */ - g_free(doc->real_path); - doc->real_path = tm_get_real_path(locale_filename); + setptr(doc->real_path, tm_get_real_path(locale_filename)); doc->priv->is_remote = utils_is_remote_path(locale_filename); monitor_file_setup(doc); @@ -1312,7 +1313,7 @@ if (! main_status.opening_session_files) ui_add_recent_file(utf8_filename); - if (! reload && geany_object) + if (! reload) g_signal_emit_by_name(geany_object, "document-open", doc); if (reload) @@ -1341,7 +1342,8 @@ gchar *filename; gchar **list; - if (data == NULL) return; + if (G_UNLIKELY(data == NULL)) + return; if (length < 0) length = strlen(data); @@ -1356,9 +1358,11 @@ for (i = 0; ; i++) { - if (list[i] == NULL) break; + if (list[i] == NULL) + break; filename = g_filename_from_uri(list[i], NULL, NULL); - if (filename == NULL) continue; + if (G_UNLIKELY(filename == NULL)) + continue; document_open_file(filename, FALSE, NULL, NULL); g_free(filename); } @@ -1401,7 +1405,7 @@ gint pos = 0; GeanyDocument *new_doc; - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return FALSE; /* try to set the cursor to the position before reloading */ @@ -1426,7 +1430,7 @@ #if ! defined(HAVE_GIO) || ! defined(USE_GIO_FILEMON) struct stat st; - g_return_val_if_fail(doc != NULL, FALSE); + g_return_val_if_fail(G_LIKELY(doc != NULL), FALSE); /* stat the file to get the timestamp, otherwise on Windows the actual * timestamp can be ahead of time(NULL) */ @@ -1475,7 +1479,8 @@ gchar *filename; struct TextToFind ttf; - if (doc == NULL || doc->file_type == NULL) return; + if (G_UNLIKELY(doc == NULL) || G_UNLIKELY(doc->file_type == NULL)) + return; filebase = g_strconcat(GEANY_STRING_UNTITLED, ".", (doc->file_type)->extension, NULL); filename = g_path_get_basename(doc->file_name); @@ -1539,13 +1544,11 @@ { gboolean ret; - g_return_val_if_fail(doc != NULL, FALSE); + g_return_val_if_fail(G_LIKELY(doc != NULL), FALSE); if (utf8_fname != NULL) - { - g_free(doc->file_name); - doc->file_name = g_strdup(utf8_fname); - } + setptr(doc->file_name, g_strdup(utf8_fname)); + /* reset real path, it's retrieved again in document_save() */ setptr(doc->real_path, NULL); @@ -1571,7 +1574,7 @@ monitor_file_setup(doc); doc->priv->file_disk_status = FILE_IGNORE; - if (ret) + if (G_LIKELY(ret)) ui_add_recent_file(doc->file_name); return ret; } @@ -1584,14 +1587,14 @@ gsize bytes_read; gsize conv_len; - g_return_val_if_fail(data != NULL || *data == NULL, FALSE); - g_return_val_if_fail(len != NULL, FALSE); + g_return_val_if_fail(G_LIKELY(data != NULL) || G_LIKELY(*data == NULL), FALSE); + g_return_val_if_fail(G_LIKELY(len != NULL), FALSE); /* try to convert it from UTF-8 to original encoding */ conv_file_contents = g_convert(*data, *len - 1, doc->encoding, "UTF-8", &bytes_read, &conv_len, &conv_error); - if (conv_error != NULL) + if (G_UNLIKELY(conv_error != NULL)) { gchar *text = g_strdup_printf( _("An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved."), @@ -1648,15 +1651,15 @@ gint bytes_written; gint err = 0; - g_return_val_if_fail(data != NULL, EINVAL); + g_return_val_if_fail(G_LIKELY(data != NULL), EINVAL); fp = g_fopen(locale_filename, "wb"); - if (fp == NULL) + if (G_UNLIKELY(fp == NULL)) return errno; bytes_written = fwrite(data, sizeof(gchar), len, fp); - if (len != bytes_written) + if (G_UNLIKELY(len != bytes_written)) err = errno; fclose(fp); @@ -1692,14 +1695,14 @@ gint err; gchar *locale_filename; - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return FALSE; /* the "changed" flag should exclude the "readonly" flag, but check it anyway for safety */ if (! force && ! ui_prefs.allow_always_save && (! doc->changed || doc->readonly)) return FALSE; - if (doc->file_name == NULL) + if (G_UNLIKELY(doc->file_name == NULL)) { ui_set_statusbar(TRUE, _("Error saving file.")); utils_beep(); @@ -1758,7 +1761,7 @@ err = write_data_to_disk(doc, locale_filename, data, len); g_free(data); - if (err != 0) + if (G_UNLIKELY(err != 0)) { ui_set_statusbar(TRUE, _("Error saving file (%s)."), g_strerror(err)); dialogs_show_msgbox_with_secondary(GTK_MESSAGE_ERROR, @@ -1773,7 +1776,7 @@ store_saved_encoding(doc); /* ignore the following things if we are quitting */ - if (! main_status.quitting) + if (G_LIKELY(! main_status.quitting)) { sci_set_savepoint(doc->editor->sci); @@ -1807,10 +1810,10 @@ gint start_pos, search_pos; struct TextToFind ttf; - g_return_val_if_fail(text != NULL, FALSE); - if (doc == NULL) + g_return_val_if_fail(G_LIKELY(text != NULL), FALSE); + if (G_UNLIKELY(doc == NULL)) return FALSE; - if (! *text) + if (G_UNLIKELY(! *text)) return TRUE; start_pos = (inc) ? sci_get_selection_start(doc->editor->sci) : @@ -1869,8 +1872,10 @@ { gint selection_end, selection_start, search_pos; - g_return_val_if_fail(doc != NULL && text != NULL, -1); - if (! *text) return -1; + g_return_val_if_fail(G_LIKELY(doc != NULL) && G_LIKELY(text != NULL), -1); + if (G_UNLIKELY(! *text)) + return -1; + /* Sci doesn't support searching backwards with a regex */ if (flags & SCFIND_REGEXP) search_backwards = FALSE; @@ -1939,9 +1944,12 @@ { gint selection_end, selection_start, search_pos; - g_return_val_if_fail(doc != NULL && find_text != NULL && replace_text != NULL, -1); - if (! *find_text) return -1; + g_return_val_if_fail(G_LIKELY(doc != NULL) && G_LIKELY(find_text != NULL) && + G_LIKELY(replace_text != NULL), -1); + if (G_UNLIKELY(! *find_text)) + return -1; + /* Sci doesn't support searching backwards with a regex */ if (flags & SCFIND_REGEXP) search_backwards = FALSE; @@ -2036,9 +2044,13 @@ if (new_range_end != NULL) *new_range_end = -1; - g_return_val_if_fail(doc != NULL && find_text != NULL && replace_text != NULL, 0); - if (! *find_text || doc->readonly) return 0; + g_return_val_if_fail(G_LIKELY(doc != NULL) && G_LIKELY(find_text != NULL) && + G_LIKELY(replace_text != NULL), 0); + + if (G_UNLIKELY(! *find_text) || doc->readonly) + return 0; + sci = doc->editor->sci; sci_start_undo_action(sci); @@ -2110,9 +2122,12 @@ gint max_column = 0, count = 0; gboolean replaced = FALSE; - g_return_if_fail(doc != NULL && find_text != NULL && replace_text != NULL); - if (! *find_text) return; + g_return_if_fail(G_LIKELY(doc != NULL) && G_LIKELY(find_text != NULL) && + G_LIKELY(replace_text != NULL)); + if (G_UNLIKELY(! *find_text)) + return; + selection_start = sci_get_selection_start(doc->editor->sci); selection_end = sci_get_selection_end(doc->editor->sci); /* do we have a selection? */ @@ -2208,9 +2223,12 @@ gint flags, gboolean escaped_chars) { gint len, count; - g_return_val_if_fail(doc != NULL && find_text != NULL && replace_text != NULL, FALSE); - if (! *find_text) return FALSE; + g_return_val_if_fail(G_LIKELY(doc != NULL) && G_LIKELY(find_text != NULL) && + G_LIKELY(replace_text != NULL), FALSE); + if (G_UNLIKELY(! *find_text)) + return FALSE; + len = sci_get_length(doc->editor->sci); count = document_replace_range( doc, find_text, replace_text, flags, 0, len, TRUE, NULL); @@ -2248,16 +2266,16 @@ gboolean success = FALSE; /* if the filetype doesn't have a tag parser or it is a new file */ - if (doc == NULL || doc->file_type == NULL || - app->tm_workspace == NULL || - ! filetype_has_tags(doc->file_type) || ! doc->file_name) + if (G_UNLIKELY(doc == NULL) || G_UNLIKELY(doc->file_type == NULL) || + G_UNLIKELY(app->tm_workspace == NULL) || + ! filetype_has_tags(doc->file_type) || G_UNLIKELY(! doc->file_name)) { /* set the default (empty) tag list */ treeviews_update_tag_list(doc, FALSE); return; } - if (doc->tm_file == NULL) + if (G_UNLIKELY(doc->tm_file == NULL)) { gchar *locale_filename = utils_get_locale_from_utf8(doc->file_name); @@ -2282,7 +2300,7 @@ else { success = update_tags_from_buffer(doc); - if (! success) + if (G_UNLIKELY(! success)) geany_debug("tag list updating failed"); } treeviews_update_tag_list(doc, success); @@ -2297,7 +2315,7 @@ static GString *last_typenames = NULL; GString *s = NULL; - if (app->tm_workspace) + if (G_LIKELY(app->tm_workspace)) { GPtrArray *tags_array = app->tm_workspace->work_object.tags_array; @@ -2319,7 +2337,8 @@ last_typenames = s; *types = s; - if (s == NULL) return FALSE; + if (s == NULL) + return FALSE; return TRUE; } @@ -2336,7 +2355,7 @@ const GString *s; ScintillaObject *sci; - g_return_val_if_fail(doc != NULL, FALSE); + g_return_val_if_fail(G_LIKELY(doc != NULL), FALSE); sci = doc->editor->sci; switch (FILETYPE_ID(doc->file_type)) @@ -2353,7 +2372,7 @@ } sci = doc->editor->sci; - if (sci != NULL && editor_lexer_get_type_keyword_idx(sci_get_lexer(sci)) == -1) + if (G_UNLIKELY(sci != NULL) && editor_lexer_get_type_keyword_idx(sci_get_lexer(sci)) == -1) return FALSE; if (! get_project_typenames(&s, lang)) @@ -2367,7 +2386,7 @@ } return FALSE; } - g_return_val_if_fail(s != NULL, FALSE); + g_return_val_if_fail(G_LIKELY(s != NULL), FALSE); for (n = 0; n < documents_array->len; n++) { @@ -2395,7 +2414,7 @@ { gboolean ft_changed; - if (type == NULL || doc == NULL) + if (G_UNLIKELY(type == NULL) || G_UNLIKELY(doc == NULL)) return; geany_debug("%s : %s (%s)", @@ -2437,8 +2456,9 @@ **/ void document_set_encoding(GeanyDocument *doc, const gchar *new_encoding) { - if (doc == NULL || new_encoding == NULL || - utils_str_equal(new_encoding, doc->encoding)) return; + if (G_UNLIKELY(doc == NULL) || G_UNLIKELY(new_encoding == NULL) || + utils_str_equal(new_encoding, doc->encoding)) + return; g_free(doc->encoding); doc->encoding = g_strdup(new_encoding); @@ -2461,14 +2481,13 @@ while (g_trash_stack_height(&doc->priv->undo_actions) > 0) { a = g_trash_stack_pop(&doc->priv->undo_actions); - if (a != NULL) + if (G_LIKELY(a != NULL)) { switch (a->type) { case UNDO_ENCODING: g_free(a->data); break; default: break; } - g_free(a); } } @@ -2477,14 +2496,13 @@ while (g_trash_stack_height(&doc->priv->redo_actions) > 0) { a = g_trash_stack_pop(&doc->priv->redo_actions); - if (a != NULL) + if (G_LIKELY(a != NULL)) { switch (a->type) { case UNDO_ENCODING: g_free(a->data); break; default: break; } - g_free(a); } } @@ -2492,9 +2510,6 @@ if (! main_status.quitting && doc->editor != NULL) document_set_text_changed(doc, FALSE); - - /*geany_debug("%s: new undo stack height: %d, new redo stack height: %d", G_STRFUNC, - *g_trash_stack_height(&doc->undo_actions), g_trash_stack_height(&doc->redo_actions)); */ } @@ -2502,7 +2517,7 @@ { undo_action *action; - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; action = g_new0(undo_action, 1); @@ -2513,15 +2528,12 @@ document_set_text_changed(doc, TRUE); ui_update_popup_reundo_items(doc); - - /*geany_debug("%s: new stack height: %d, added type: %d", G_STRFUNC, - *g_trash_stack_height(&doc->undo_actions), action->type); */ } gboolean document_can_undo(GeanyDocument *doc) { - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return FALSE; if (g_trash_stack_height(&doc->priv->undo_actions) > 0 || sci_can_undo(doc->editor->sci)) @@ -2545,12 +2557,12 @@ { undo_action *action; - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; action = g_trash_stack_pop(&doc->priv->undo_actions); - if (action == NULL) + if (G_UNLIKELY(action == NULL)) { /* fallback, should not be necessary */ geany_debug("%s: fallback used", G_STRFUNC); @@ -2597,13 +2609,12 @@ update_changed_state(doc); ui_update_popup_reundo_items(doc); - /*geany_debug("%s: new stack height: %d", G_STRFUNC, g_trash_stack_height(&doc->undo_actions));*/ } gboolean document_can_redo(GeanyDocument *doc) { - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return FALSE; if (g_trash_stack_height(&doc->priv->redo_actions) > 0 || sci_can_redo(doc->editor->sci)) @@ -2617,12 +2628,12 @@ { undo_action *action; - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; action = g_trash_stack_pop(&doc->priv->redo_actions); - if (action == NULL) + if (G_UNLIKELY(action == NULL)) { /* fallback, should not be necessary */ geany_debug("%s: fallback used", G_STRFUNC); @@ -2668,7 +2679,6 @@ update_changed_state(doc); ui_update_popup_reundo_items(doc); - /*geany_debug("%s: new stack height: %d", G_STRFUNC, g_trash_stack_height(&doc->redo_actions));*/ } @@ -2676,7 +2686,7 @@ { undo_action *action; - if (doc == NULL) + if G_UNLIKELY((doc == NULL)) return; action = g_new0(undo_action, 1); @@ -2709,7 +2719,7 @@ /*static GdkColor orange = {0, 0xFFFF, 0x7FFF, 0};*/ GdkColor *color = NULL; - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return NULL; if (doc->changed) @@ -2737,7 +2747,8 @@ */ GeanyDocument *document_index(gint idx) { - return (idx >= 0 && idx < (gint) documents_array->len) ? documents[idx] : NULL; + return (G_LIKELY(idx >= 0) && G_LIKELY(idx < (gint) documents_array->len)) ? + documents[idx] : NULL; } @@ -2748,6 +2759,8 @@ gchar *text; GeanyDocument *doc; + g_return_val_if_fail(G_LIKELY(old_doc != NULL), NULL); + len = sci_get_length(old_doc->editor->sci) + 1; text = (gchar*) g_malloc(len); sci_get_text(old_doc->editor->sci, len, text); @@ -2774,12 +2787,12 @@ gboolean document_account_for_unsaved(void) { guint i, p, page_count, len = documents_array->len; + GeanyDocument *doc; page_count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)); for (p = 0; p < page_count; p++) { - GeanyDocument *doc = document_get_from_page(p); - + doc = document_get_from_page(p); if (doc->changed) { if (! dialogs_show_unsaved_file(doc)) @@ -2789,9 +2802,10 @@ /* all documents should now be accounted for, so ignore any changes */ for (i = 0; i < len; i++) { - if (documents[i]->is_valid && documents[i]->changed) + doc = documents[i]; + if (doc->is_valid && doc->changed) { - documents[i]->changed = FALSE; + doc->changed = FALSE; } } return TRUE; @@ -2889,7 +2903,7 @@ doc->priv->file_disk_status = FILE_MISSING; return 0; } - else if (doc->priv->mtime > t || st.st_mtime > t) + else if (G_UNLIKELY(doc->priv->mtime > t) || G_UNLIKELY(st.st_mtime > t)) { g_warning("%s: Something is wrong with the time stamps.", G_STRFUNC); } @@ -2912,7 +2926,7 @@ gboolean ret = FALSE; time_t t; - if (file_prefs.disk_check_timeout == 0 || doc == NULL) + if (file_prefs.disk_check_timeout == 0 || G_UNLIKELY(doc == NULL)) return FALSE; /* ignore documents that have never been saved to disk and remote files */ Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2009-04-05 19:58:30 UTC (rev 3686) +++ trunk/src/document.h 2009-04-05 21:07:40 UTC (rev 3687) @@ -118,7 +118,7 @@ * @note This should not be used to check the result of the main API functions, * these only need a NULL-pointer check - @c document_get_current() != @c NULL. */ #define DOC_VALID(doc_ptr) \ - ((doc_ptr) != NULL && (doc_ptr)->is_valid) + (G_LIKELY((doc_ptr) != NULL) && G_LIKELY((doc_ptr)->is_valid)) /** * DOC_FILENAME returns the filename of the document passed or @@ -126,7 +126,7 @@ * This macro never returns NULL. **/ #define DOC_FILENAME(doc) \ - ((doc->file_name != NULL) ? (doc->file_name) : GEANY_STRING_UNTITLED) + (G_LIKELY(doc->file_name != NULL) ? (doc->file_name) : GEANY_STRING_UNTITLED) Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-04-05 19:58:30 UTC (rev 3686) +++ trunk/src/editor.c 2009-04-05 21:07:40 UTC (rev 3687) @@ -495,7 +495,7 @@ (*line)++; while (*line <= lineMaxSubord) { - if (force) + if (G_UNLIKELY(force)) { if (visLevels > 0) SSM(sci, SCI_SHOWLINES, *line, *line); @@ -511,7 +511,7 @@ levelLine = SSM(sci, SCI_GETFOLDLEVEL, *line, 0); if (levelLine & SC_FOLDLEVELHEADERFLAG) { - if (force) + if (G_UNLIKELY(force)) { if (visLevels > 1) SSM(sci, SCI_SETFOLDEXPANDED, *line, 1); @@ -597,7 +597,7 @@ { SCNotification *nt = data; - g_return_val_if_fail(calltip.sci != NULL, FALSE); + g_return_val_if_fail(G_LIKELY(calltip.sci != NULL), FALSE); SSM(calltip.sci, SCI_CALLTIPCANCEL, 0, 0); /* we use the position where the calltip was previously started as SCI_GETCURRENTPOS @@ -643,7 +643,7 @@ GeanyEditor *editor = data; gboolean retval; - g_return_if_fail(editor != NULL); + g_return_if_fail(G_LIKELY(editor != NULL)); g_signal_emit_by_name(geany_object, "editor-notify", editor, scnt, &retval); } @@ -796,7 +796,7 @@ static gchar * get_whitespace(const GeanyIndentPrefs *iprefs, gint width) { - g_return_val_if_fail(width >= 0, NULL); + g_return_val_if_fail(G_LIKELY(width >= 0), NULL); if (width == 0) return g_strdup(""); @@ -846,7 +846,7 @@ iprefs = *get_default_indent_prefs(); - if (!editor) + if (G_UNLIKELY(editor == NULL)) return &iprefs; iprefs.type = editor->indent_type; @@ -997,7 +997,7 @@ gint size; const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); - g_return_val_if_fail(line >= 0, 0); + g_return_val_if_fail(G_LIKELY(line >= 0), 0); size = sci_get_line_indentation(sci, line); @@ -1019,7 +1019,7 @@ gint size = get_indent_size_after_line(editor, line); const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); - if (size > 0) + if (G_LIKELY(size > 0)) { gchar *text; @@ -1122,8 +1122,7 @@ if (iprefs->auto_indent_mode < GEANY_AUTOINDENT_CURRENTCHARS) return; - if (editor == NULL || editor->document->file_type == NULL) - return; + g_return_if_fail(G_LIKELY(editor != NULL) && G_LIKELY(editor->document->file_type != NULL)); sci = editor->sci; doc = editor->document; @@ -1142,7 +1141,8 @@ line_buf[line_len - eol_char_len] = '\0'; while (x < (line_len - eol_char_len)) { - if (isspace(line_buf[x])) cnt++; + if (isspace(line_buf[x])) + cnt++; x++; } g_free(line_buf); @@ -1195,7 +1195,7 @@ gchar *chunk; ScintillaObject *sci; - if (editor == NULL) + if (G_UNLIKELY(editor == NULL)) return; sci = editor->sci; @@ -1269,7 +1269,7 @@ { static gchar cword[GEANY_MAX_WORD_LENGTH]; - g_return_val_if_fail(editor != NULL, FALSE); + g_return_val_if_fail(G_LIKELY(editor != NULL), FALSE); read_current_word(editor, pos, cword, sizeof(cword), wordchars, FALSE); @@ -1327,7 +1327,8 @@ static gboolean append_calltip(GString *str, const TMTag *tag, filetype_id ft_id) { - if (! tag->atts.entry.arglist) return FALSE; + if (! tag->atts.entry.arglist) + return FALSE; if (tag->atts.entry.var_type) { @@ -1365,7 +1366,7 @@ GString *str = NULL; guint i; - g_return_val_if_fail(ft && word && *word, NULL); + g_return_val_if_fail(G_LIKELY(ft) && G_LIKELY(word) && G_LIKELY(*word), NULL); tags = tm_workspace_find(word, arg_types | tm_tag_class_t, attrs, FALSE, ft->lang); if (tags->len == 0) @@ -1450,7 +1451,7 @@ gchar *str; ScintillaObject *sci; - if (editor == NULL || editor->document->file_type == NULL) + if (G_UNLIKELY(editor == NULL) || G_UNLIKELY(editor->document->file_type == NULL)) return FALSE; sci = editor->sci; @@ -1464,7 +1465,8 @@ orig_pos = pos; pos = (lexer == SCLEX_LATEX) ? find_previous_brace(sci, pos) : find_start_bracket(sci, pos); - if (pos == -1) return FALSE; + if (G_UNLIKELY(pos == -1)) + return FALSE; } /* the style 1 before the brace (which may be highlighted) */ @@ -1474,7 +1476,8 @@ word[0] = '\0'; editor_find_current_word(editor, pos - 1, word, sizeof word, NULL); - if (word[0] == '\0') return FALSE; + if (word[0] == '\0') + return FALSE; str = find_calltip(word, editor->document->file_type); if (str) @@ -1496,7 +1499,7 @@ { GString *str; - g_return_val_if_fail(editor != NULL, NULL); + g_return_val_if_fail(G_LIKELY(editor != NULL), NULL); str = g_string_new(NULL); if (append_calltip(str, tag, FILETYPE_ID(editor->document->file_type))) @@ -1521,21 +1524,26 @@ GString *words; const gchar **entities = symbols_get_html_entities(); - if (*root != '&' || entities == NULL) return FALSE; + if (*root != '&' || G_UNLIKELY(entities == NULL)) + return FALSE; words = g_string_sized_new(500); for (i = 0; ; i++) { - if (entities[i] == NULL) break; - else if (entities[i][0] == '#') continue; + if (G_UNLIKELY(entities[i] == NULL)) + break; + else if (G_UNLIKELY(entities[i][0] == '#')) + continue; if (! strncmp(entities[i], root, rootlen)) { - if (j++ > 0) g_string_append_c(words, '\n'); + if (j++ > 0) + g_string_append_c(words, '\n'); g_string_append(words, entities[i]); } } - if (words->len > 0) show_autocomplete(sci, rootlen, words->str); + if (words->len > 0) + show_autocomplete(sci, rootlen, words->str); g_string_free(words, TRUE); return TRUE; } @@ -1550,8 +1558,9 @@ ScintillaObject *sci; GeanyDocument *doc; - if (editor == NULL || editor->document->file_type == NULL) - return FALSE; + g_return_val_if_fail(G_LIKELY(editor != NULL) && + G_LIKELY(editor->document->file_type != NULL), FALSE); + sci = editor->sci; doc = editor->document; @@ -1563,7 +1572,7 @@ for (j = 0; j < tags->len; ++j) { - if (j > 0) + if (G_LIKELY(j > 0)) g_string_append_c(words, '\n'); if (j == editor_prefs.autocompletion_max_entries) @@ -1610,13 +1619,15 @@ gchar *wordchars; GeanyFiletype *ft; - if ((! editor_prefs.auto_complete_symbols && ! force) || - editor == NULL || editor->document->file_type == NULL) + if (! editor_prefs.auto_complete_symbols && ! force) return FALSE; + g_return_val_if_fail(G_LIKELY(editor != NULL) && + G_LIKELY(editor->document->file_type != NULL), FALSE); + /* If we are at the beginning of the document, we skip autocompletion as we can't determine the * necessary styling information */ - if (pos < 2) + if (G_UNLIKELY(pos < 2)) return FALSE; sci = editor->sci; @@ -1670,8 +1681,8 @@ { ScintillaObject *sci; - if (editor == NULL || editor->document->file_type == NULL) - return; + g_return_if_fail(G_LIKELY(editor != NULL) && G_LIKELY(editor->document->file_type != NULL)); + sci = editor->sci; if (sci_get_char_at(sci, pos - 2) == '}') @@ -1783,7 +1794,7 @@ { gchar *needle; - if (key == NULL || value == NULL) + if (G_UNLIKELY(key == NULL) || G_UNLIKELY(value == NULL)) return; needle = g_strconcat("%", (gchar*) key, "%", NULL); @@ -1854,7 +1865,7 @@ GString *buf; const gchar cur_marker[] = "__GEANY_CURSOR_MARKER__"; - g_return_if_fail(text); + g_return_if_fail(G_LIKELY(text)); buf = g_string_new(text); @@ -1908,7 +1919,7 @@ * Can, and should, be optimized to give better results */ void snippet_goto_next_cursor(ScintillaObject *sci, gint current_pos) { - if (snippet_queue) + if (G_LIKELY(snippet_queue)) { gpointer offset; @@ -1963,7 +1974,7 @@ /* replace 'special' completions */ specials = g_hash_table_lookup(editor_prefs.snippets, "Special"); - if (specials != NULL) + if (G_LIKELY(specials != NULL)) { /* ugly hack using global_pattern */ snippets_global_pattern = pattern; @@ -2075,7 +2086,7 @@ const gchar *word; ScintillaObject *sci; - if (editor == NULL) + if (G_UNLIKELY(editor == NULL)) return FALSE; sci = editor->sci; @@ -2111,10 +2122,12 @@ { GString *words; - if (editor == NULL) return; + if (G_UNLIKELY(editor == NULL)) + return; words = symbols_get_macro_list(); - if (words == NULL) return; + if (G_UNLIKELY(words == NULL)) + return; SSM(editor->sci, SCI_USERLISTSHOW, 1, (sptr_t) words->str); g_string_free(words, TRUE); @@ -2294,8 +2307,7 @@ gchar *str_begin, *str_end, *co, *cc; gint line_len; - if (editor == NULL || editor->document->file_type == NULL) - return; + g_return_if_fail(G_LIKELY(editor != NULL) && G_LIKELY(editor->document->file_type != NULL)); eol = editor_get_eol_char(editor); co = editor->document->file_type->comment_open; @@ -2320,8 +2332,7 @@ gchar *linebuf; GeanyDocument *doc; - if (editor == NULL || editor->document->file_type == NULL) - return; + g_return_if_fail(G_LIKELY(editor != NULL) && G_LIKELY(editor->document->file_type != NULL)); doc = editor->document; /* remove comment open chars */ @@ -2366,8 +2377,8 @@ gboolean break_loop = FALSE, single_line = FALSE; GeanyFiletype *ft; - if (editor == NULL || editor->document->file_type == NULL) - return 0; + g_return_val_if_fail(G_LIKELY(editor != NULL) && + G_LIKELY(editor->document->file_type != NULL), 0); if (line < 0) { /* use selection or current line */ @@ -2398,11 +2409,11 @@ co = ft->comment_open; cc = ft->comment_close; - if (co == NULL) + if (G_UNLIKELY(co == NULL)) return 0; co_len = strlen(co); - if (co_len == 0) + if (G_UNLIKELY(co_len == 0)) return 0; SSM(editor->sci, SCI_BEGINUNDOACTION, 0, 0); @@ -2521,8 +2532,7 @@ gsize tm_len = strlen(editor_prefs.comment_toggle_mark); GeanyFiletype *ft; - if (editor == NULL || editor->document->file_type == NULL) - return; + g_return_if_fail(G_LIKELY(editor != NULL) && G_LIKELY(editor->document->file_type != NULL)); sel_start = sci_get_selection_start(editor->sci); sel_end = sci_get_selection_end(editor->sci); @@ -2546,11 +2556,11 @@ co = ft->comment_open; cc = ft->comment_close; - if (co == NULL) + if (G_UNLIKELY(co == NULL)) return; co_len = strlen(co); - if (co_len == 0) + if (G_UNLIKELY(co_len == 0)) return; SSM(editor->sci, SCI_BEGINUNDOACTION, 0, 0); @@ -2690,8 +2700,7 @@ gboolean break_loop = FALSE, single_line = FALSE; GeanyFiletype *ft; - if (editor == NULL || editor->document->file_type == NULL) - return; + g_return_if_fail(G_LIKELY(editor != NULL) && G_LIKELY(editor->document->file_type != NULL)); if (line < 0) { /* use selection or current line */ @@ -2722,11 +2731,11 @@ co = ft->comment_open; cc = ft->comment_close; - if (co == NULL) + if (G_UNLIKELY(co == NULL)) return; co_len = strlen(co); - if (co_len == 0) + if (G_UNLIKELY(co_len == 0)) return; SSM(editor->sci, SCI_BEGINUNDOACTION, 0, 0); @@ -2939,7 +2948,7 @@ whitespace = " "; } - if (style == SCE_D_COMMENTNESTED) + if (G_UNLIKELY(style == SCE_D_COMMENTNESTED)) continuation = "+"; /* for nested comments in D */ result = g_strconcat(whitespace, continuation, " ", NULL); @@ -3251,11 +3260,10 @@ gboolean have_multiline_comment = FALSE; GeanyDocument *doc; - if (editor == NULL || editor->document->file_type == NULL || - editor->document->file_type->comment_open == NULL) - { - return; - } + g_return_if_fail(G_LIKELY(editor != NULL) && + G_LIKELY(editor->document->file_type != NULL) && + G_LIKELY(editor->document->file_type->comment_open != NULL)); + doc = editor->document; if (doc->file_type->comment_close != NULL && strlen(doc->file_type->comment_close) > 0) @@ -3312,7 +3320,7 @@ gint vis1, los, delta; GtkWidget *wid; - if (editor == NULL) + if (G_UNLIKELY(editor == NULL)) return; wid = GTK_WIDGET(editor->sci); @@ -3341,6 +3349,9 @@ gchar *text; GeanyIndentPrefs iprefs = *editor_get_indent_prefs(editor); + if (G_UNLIKELY(editor == NULL)) + return; + switch (iprefs.type) { case GEANY_INDENT_TYPE_TABS: @@ -3363,7 +3374,7 @@ gint start; gint end; - g_return_if_fail(editor != NULL); + g_return_if_fail(G_LIKELY(editor != NULL)); pos = SSM(editor->sci, SCI_GETCURRENTPOS, 0, 0); start = SSM(editor->sci, SCI_WORDSTARTPOSITION, pos, TRUE); @@ -3389,7 +3400,7 @@ { gint start, end, line; - g_return_if_fail(editor != NULL); + g_return_if_fail(G_LIKELY(editor != NULL)); start = sci_get_selection_start(editor->sci); end = sci_get_selection_end(editor->sci); @@ -3463,7 +3474,7 @@ { gint pos_start, pos_end, line_start, line_found; - g_return_if_fail(editor != NULL); + g_return_if_fail(G_LIKELY(editor != NULL)); line_start = SSM(editor->sci, SCI_LINEFROMPOSITION, SSM(editor->sci, SCI_GETCURRENTPOS, 0, 0), 0); @@ -3522,7 +3533,7 @@ gint first_sel_start, first_sel_end; ScintillaObject *sci; - g_return_if_fail(editor != NULL); + g_return_if_fail(G_LIKELY(editor != NULL)); sci = editor->sci; @@ -3566,7 +3577,7 @@ gint i, first_line, last_line, line_start, indentation_end, count = 0; gint sel_start, sel_end, first_line_offset = 0; - g_return_if_fail(editor != NULL); + g_return_if_fail(G_LIKELY(editor != NULL)); sel_start = sci_get_selection_start(editor->sci); sel_end = sci_get_selection_end(editor->sci); @@ -3640,7 +3651,7 @@ { gchar *s = NULL; - if (editor == NULL) + if (G_UNLIKELY(editor == NULL)) return NULL; if (sci_get_lines_selected(editor->sci) == 1) @@ -3669,7 +3680,7 @@ { gint vis1, los; - if (editor == NULL) + if (G_UNLIKELY(editor == NULL)) return FALSE; /* If line is wrapped the result may occur on another virtual line than the first and may be @@ -3691,7 +3702,7 @@ { gint line; - if (editor == NULL) + if (G_UNLIKELY(editor == NULL)) return; line = sci_get_current_line(editor->sci); @@ -3730,10 +3741,10 @@ { glong last_pos; - g_return_if_fail(editor != NULL); + g_return_if_fail(G_LIKELY(editor != NULL)); last_pos = sci_get_length(editor->sci); - if (last_pos > 0) + if (G_LIKELY(last_pos > 0)) { sci_indicator_set(editor->sci, indic); sci_indicator_clear(editor->sci, 0, last_pos); @@ -3757,7 +3768,7 @@ guint i = 0, len; gchar *linebuf; - if (editor == NULL) + if (G_UNLIKELY(editor == NULL)) return; start = sci_get_position_from_line(editor->sci, line); @@ -3798,7 +3809,7 @@ */ void editor_indicator_set_on_range(GeanyEditor *editor, gint indic, gint start, gint end) { - if (editor == NULL || start >= end) + if (G_UNLIKELY(editor == NULL) || G_UNLIKELY(start >= end)) return; sci_indicator_set(editor->sci, indic); @@ -3810,7 +3821,7 @@ * the replacement will also start with 0x... */ void editor_insert_color(GeanyEditor *editor, const gchar *colour) { - g_return_if_fail(editor != NULL); + g_return_if_fail(G_LIKELY(editor != NULL)); if (sci_has_selection(editor->sci)) { @@ -3839,7 +3850,7 @@ { gint mode = file_prefs.default_eol_character; - if (editor != NULL) + if (G_LIKELY(editor != NULL)) mode = sci_get_eol_mode(editor->sci); switch (mode) @@ -3856,7 +3867,7 @@ { gint mode = file_prefs.default_eol_character; - if (editor != NULL) + if (G_LIKELY(editor != NULL)) mode = sci_get_eol_mode(editor->sci); switch (mode) @@ -3872,7 +3883,7 @@ { gint mode = file_prefs.default_eol_character; - if (editor != NULL) + if (G_LIKELY(editor != NULL)) mode = sci_get_eol_mode(editor->sci); switch (mode) @@ -3888,7 +3899,7 @@ { gint lines, first, i; - if (editor == NULL || ! editor_prefs.folding) + if (G_UNLIKELY(editor == NULL) || ! editor_prefs.folding) return; lines = sci_get_line_count(editor->sci); @@ -3926,7 +3937,7 @@ gchar *tab_str; struct TextToFind ttf; - if (editor == NULL) + if (G_UNLIKELY(editor == NULL)) return; sci_start_undo_action(editor->sci); @@ -3965,10 +3976,10 @@ gint tab_len; struct TextToFind ttf; - if (editor == NULL) + if (G_UNLIKELY(editor == NULL)) return; - if (tab_len_f < 0.0) + if (G_UNLIKELY(tab_len_f < 0.0)) tab_len_f = sci_get_tab_width(editor->sci); if (! dialogs_show_input_numeric( @@ -4045,11 +4056,11 @@ gboolean append_newline = (max_lines == 1); gint end_document = sci_get_position_from_line(editor->sci, max_lines); - if (max_lines > 1) + if (G_LIKELY(max_lines > 1)) { append_newline = end_document > sci_get_position_from_line(editor->sci, max_lines - 1); } - if (append_newline) + if (G_LIKELY(append_newline)) { const gchar *eol = "\n"; switch (sci_get_eol_mode(editor->sci)) @@ -4072,7 +4083,7 @@ gchar *font_name; PangoFontDescription *pfd; - g_return_if_fail(editor); + g_return_if_fail(G_LIKELY(editor)); pfd = pango_font_description_from_string(font); size = pango_font_description_get_size(pfd) / PANGO_SCALE; @@ -4095,7 +4106,7 @@ void editor_set_line_wrapping(GeanyEditor *editor, gboolean wrap) { - g_return_if_fail(editor != NULL); + g_return_if_fail(G_LIKELY(editor != NULL)); editor->line_wrapping = wrap; sci_set_lines_wrapped(editor->sci, wrap); @@ -4133,8 +4144,8 @@ { gint pos; - g_return_val_if_fail(editor, FALSE); - if (line < 0 || line >= sci_get_line_count(editor->sci)) + g_return_val_if_fail(G_LIKELY(editor), FALSE); + if (G_UNLIKELY(line < 0) || G_UNLIKELY(line >= sci_get_line_count(editor->sci))) return FALSE; pos = sci_get_position_from_line(editor->sci, line); @@ -4148,8 +4159,8 @@ { gint page_num; - g_return_val_if_fail(editor, FALSE); - if (pos < 0) + g_return_val_if_fail(G_LIKELY(editor), FALSE); + if (G_UNLIKELY(pos < 0)) return FALSE; if (mark) @@ -4179,12 +4190,12 @@ /* Handle scroll events if Alt is pressed and scroll whole pages instead of a * few lines only, maybe this could/should be done in Scintilla directly */ - if (event->state & GDK_MOD1_MASK) + if (G_UNLIKELY(event->state & GDK_MOD1_MASK)) { sci_send_command(editor->sci, (event->direction == GDK_SCROLL_DOWN) ? SCI_PAGEDOWN : SCI_PAGEUP); return TRUE; } - else if (event->state & GDK_SHIFT_MASK) + else if (G_UNLIKELY(event->state & GDK_SHIFT_MASK)) { gint amount = (event->direction == GDK_SCROLL_DOWN) ? 8 : -8; @@ -4430,7 +4441,7 @@ { ScintillaObject *sci; - g_return_if_fail(editor != NULL); + g_return_if_fail(G_UNLIKELY(editor != NULL)); sci = editor->sci; Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2009-04-05 19:58:30 UTC (rev 3686) +++ trunk/src/encodings.c 2009-04-05 21:07:40 UTC (rev 3687) @@ -150,7 +150,8 @@ { gint i; - if (charset == NULL) return GEANY_ENCODING_UTF_8; + if (G_UNLIKELY(charset == NULL)) + return GEANY_ENCODING_UTF_8; i = 0; while (i < GEANY_ENCODINGS_MAX) @@ -168,7 +169,8 @@ { gint i; - if (charset == NULL) return &encodings[GEANY_ENCODING_UTF_8]; + if (G_UNLIKELY(charset == NULL)) + return &encodings[GEANY_ENCODING_UTF_8]; i = 0; while (i < GEANY_ENCODINGS_MAX) @@ -185,7 +187,7 @@ const GeanyEncoding *encodings_get_from_index(gint idx) { - g_return_val_if_fail(idx >= 0 && idx < GEANY_ENCODINGS_MAX, NULL); + g_return_val_if_fail(G_LIKELY(idx >= 0) && G_LIKELY(idx < GEANY_ENCODINGS_MAX), NULL); return &encodings[idx]; } @@ -204,7 +206,7 @@ **/ const gchar* encodings_get_charset_from_index(gint idx) { - g_return_val_if_fail(idx >= 0 && idx < GEANY_ENCODINGS_MAX, NULL); + g_return_val_if_fail(G_LIKELY(idx >= 0) && G_LIKELY(idx < GEANY_ENCODINGS_MAX), NULL); return encodings[idx].charset; } @@ -212,9 +214,9 @@ gchar *encodings_to_string(const GeanyEncoding* enc) { - g_return_val_if_fail(enc != NULL, NULL); - g_return_val_if_fail(enc->name != NULL, NULL); - g_return_val_if_fail(enc->charset != NULL, NULL); + g_return_val_if_fail(G_LIKELY(enc != NULL), NULL); + g_return_val_if_fail(G_LIKELY(enc->name != NULL), NULL); + g_return_val_if_fail(G_LIKELY(enc->charset != NULL), NULL); return g_strdup_printf("%s (%s)", enc->name, enc->charset); } @@ -222,8 +224,8 @@ const gchar *encodings_get_charset(const GeanyEncoding* enc) { - g_return_val_if_fail(enc != NULL, NULL); - g_return_val_if_fail(enc->charset != NULL, NULL); + g_return_val_if_fail(G_LIKELY(enc != NULL), NULL); + g_return_val_if_fail(G_LIKELY(enc->charset != NULL), NULL); return enc->charset; } @@ -235,7 +237,7 @@ { gint i; - g_return_if_fail(charset != NULL); + g_return_if_fail(G_LIKELY(charset != NULL)); i = 0; while (i < GEANY_ENCODINGS_MAX) @@ -244,7 +246,7 @@ break; i++; } - if (i == GEANY_ENCODINGS_MAX) + if (G_UNLIKELY(i == GEANY_ENCODINGS_MAX)) i = GEANY_ENCODING_UTF_8; /* fallback to UTF-8 */ /* ignore_callback has to be set by the caller */ @@ -261,7 +263,7 @@ static void regex_compile(regex_t *preg, const gchar *pattern) { gint retval = regcomp(preg, pattern, REG_EXTENDED | REG_ICASE); - if (retval != 0) + if (G_UNLIKELY(retval != 0)) { gchar errmsg[512]; regerror(retval, preg, errmsg, 512); @@ -279,7 +281,7 @@ gchar *encoding = NULL; regmatch_t pmatch[10]; - if (! pregs_loaded || buffer == NULL) + if (G_UNLIKELY(! pregs_loaded) || G_UNLIKELY(buffer == NULL)) return NULL; if (size > 512) @@ -302,10 +304,11 @@ void encodings_finalize(void) { #ifdef HAVE_REGCOMP - if (pregs_loaded) + if (G_LIKELY(pregs_loaded)) { - guint i; - for (i = 0; i < G_N_ELEMENTS(pregs); i++) + guint i, len; + len = G_N_ELEMENTS(pregs); + for (i = 0; i < len; i++) { regfree(&pregs[i]); } @@ -328,7 +331,7 @@ init_encodings(); #ifdef HAVE_REGCOMP - if (! pregs_loaded) + if (G_UNLIKELY(! pregs_loaded)) { regex_compile(&pregs[0], PATTERN_HTMLMETA); regex_compile(&pregs[1], PATTERN_CODING); @@ -445,8 +448,8 @@ gchar* converted_contents = NULL; gsize bytes_written; - g_return_val_if_fail(buffer != NULL, NULL); - g_return_val_if_fail(charset != NULL, NULL); + g_return_val_if_fail(G_LIKELY(buffer != NULL), NULL); + g_return_val_if_fail(G_LIKELY(charset != NULL), NULL); converted_contents = g_convert(buffer, size, "UTF-8", charset, NULL, &bytes_written, &conv_error); @@ -468,7 +471,8 @@ geany_debug("Couldn't convert from %s to UTF-8.", charset); utf8_content = NULL; - if (converted_contents != NULL) g_free(converted_contents); + if (converted_contents != NULL) + g_free(converted_contents); } else { @@ -499,7 +503,7 @@ gchar *utf8_content; gboolean check_regex = FALSE; gboolean check_locale = FALSE; - gint i; + gint i, len; if ((gint)size == -1) { @@ -508,7 +512,8 @@ #ifdef HAVE_REGCOMP /* first try to read the encoding from the file content */ - for (i = 0; i < (gint) G_N_ELEMENTS(pregs) && ! check_regex; i++) + len = (gint) G_N_ELEMENTS(pregs); + for (i = 0; i < len && ! check_regex; i++) { if ((regex_charset = regex_match(&pregs[i], buffer, size)) != NULL) check_regex = TRUE; @@ -520,7 +525,7 @@ for (i = 0; i < GEANY_ENCODINGS_MAX; i++) { - if (i == encodings[GEANY_ENCODING_NONE].idx || i == -1) + if (G_UNLIKELY(i == encodings[GEANY_ENCODING_NONE].idx) || G_UNLIKELY(i == -1)) continue; if (check_regex) @@ -539,17 +544,17 @@ charset = encodings[i].charset; - if (charset == NULL) + if (G_UNLIKELY(charset == NULL)) continue; geany_debug("Trying to convert %" G_GSIZE_FORMAT " bytes of data from %s into UTF-8.", size, charset); utf8_content = encodings_convert_to_utf8_from_charset(buffer, size, charset, FALSE); - if (utf8_content != NULL) + if (G_LIKELY(utf8_content != NULL)) { if (used_encoding != NULL) { - if (*used_encoding != NULL) + if (G_UNLIKELY(*used_encoding != NULL)) { geany_debug("%s:%d", __FILE__, __LINE__); g_free(*used_encoding); @@ -625,7 +630,8 @@ gboolean encodings_is_unicode_charset(const gchar *string) { - if (string != NULL && (strncmp(string, "UTF", 3) == 0 || strncmp(string, "UCS", 3) == 0)) + if (G_LIKELY(string != NULL) && + (strncmp(string, "UTF", 3) == 0 || strncmp(string, "UCS", 3) == 0)) { return TRUE; } Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2009-04-05 19:58:30 UTC (rev 3686) +++ trunk/src/filetypes.c 2009-04-05 21:07:40 UTC (rev 3687) @@ -598,9 +598,9 @@ { const GeanyFiletype *ft1 = pft1, *ft2 = pft2; - if (ft1->id == GEANY_FILETYPES_NONE) + if (G_UNLIKELY(ft1->id == GEANY_FILETYPES_NONE)) return -1; - if (ft2->id == GEANY_FILETYPES_NONE) + if (G_UNLIKELY(ft2->id == GEANY_FILETYPES_NONE)) return 1; return utils_str_casecmp(ft1->title, ft2->title); @@ -611,8 +611,8 @@ * and set the filetype::id field. */ static void filetype_add(GeanyFiletype *ft) { - g_return_if_fail(ft); - g_return_if_fail(ft->name); + g_return_if_fail(G_LIKELY(ft)); + g_return_if_fail(G_LIKELY(ft->name)); ft->id = filetypes_array->len; /* len will be the index for filetype_array */ g_ptr_array_add(filetypes_array, ft); @@ -627,8 +627,8 @@ { filetype_id ft_id; - g_return_if_fail(filetypes_array == NULL); - g_return_if_fail(filetypes_hash == NULL); + g_return_if_fail(G_LIKELY(filetypes_array == NULL)); + g_return_if_fail(G_LIKELY(filetypes_hash == NULL)); filetypes_array = g_ptr_array_sized_new(GEANY_MAX_BUILT_IN_FILETYPES); filetypes_hash = g_hash_table_new(g_str_hash, g_str_equal); @@ -736,7 +736,7 @@ gint j; gboolean ret = FALSE; - if (ft->id == GEANY_FILETYPES_NONE) + if (G_UNLIKELY(ft->id == GEANY_FILETYPES_NONE)) return FALSE; for (j = 0; ft->pattern[j] != NULL; j++) @@ -902,7 +902,7 @@ if (ft != NULL) return ft; - if (utf8_filename == NULL) + if (G_UNLIKELY(utf8_filename == NULL)) return filetypes[GEANY_FILETYPES_NONE]; return filetypes_detect_from_extension(utf8_filename); @@ -915,7 +915,7 @@ GeanyFiletype *ft; gchar *line; - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return filetypes[GEANY_FILETYPES_NONE]; line = sci_get_line(doc->editor->sci, 0); @@ -943,7 +943,7 @@ f = g_fopen(locale_name, "r"); g_free(locale_name); - if (f != NULL) + if (G_LIKELY(f != NULL)) { if (fgets(line, sizeof(line), f) != NULL) { @@ -962,7 +962,7 @@ /* ignore_callback has to be set by the caller */ g_return_if_fail(ignore_callback); - if (ft == NULL) + if (G_UNLIKELY(ft == NULL)) ft = filetypes[GEANY_FILETYPES_NONE]; gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(ft->priv->menu_item), TRUE); @@ -974,7 +974,7 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); - if (ignore_callback || doc == NULL) + if (G_UNLIKELY(ignore_callback) || G_UNLIKELY(doc == NULL)) return; document_set_filetype(doc, (GeanyFiletype*)user_data); @@ -999,7 +999,7 @@ /* Remove a filetype pointer from the list of available filetypes. */ static void filetype_remove(GeanyFiletype *ft) { - g_return_if_fail(ft); + g_return_if_fail(G_LIKELY(ft)); g_ptr_array_remove(filetypes_array, ft); @@ -1027,7 +1027,7 @@ { GeanyFiletype *ft = data; - g_return_if_fail(ft != NULL); + g_return_if_fail(G_LIKELY(ft != NULL)); g_free(ft->name); g_free(ft->title); @@ -1049,10 +1049,10 @@ /* frees the array and all related pointers */ -void filetypes_free_types() +void filetypes_free_types(void) { - g_return_if_fail(filetypes_array != NULL); - g_return_if_fail(filetypes_hash != NULL); + g_return_if_fail(G_LIKELY(filetypes_array != NULL)); + g_return_if_fail(G_LIKELY(filetypes_hash != NULL)); g_ptr_array_foreach(filetypes_array, filetype_free, NULL); g_ptr_array_free(filetypes_array, TRUE); @@ -1070,7 +1070,7 @@ /* default extension */ result = g_key_file_get_string(configh, "settings", "extension", NULL); if (result == NULL) result = g_key_file_get_string(config, "settings", "extension", NULL); - if (result != NULL) + if (G_LIKELY(result != NULL)) { setptr(filetypes[ft_id]->extension, result); } @@ -1078,7 +1078,7 @@ /* read comment notes */ result = g_key_file_get_string(configh, "settings", "comment_open", NULL); if (result == NULL) result = g_key_file_get_string(config, "settings", "comment_open", NULL); - if (result != NULL) + if (G_LIKELY(result != NULL)) { g_free(filetypes[ft_id]->comment_open); filetypes[ft_id]->comment_open = result; @@ -1086,7 +1086,7 @@ result = g_key_file_get_string(configh, "settings", "comment_close", NULL); if (result == NULL) result = g_key_file_get_string(config, "settings", "comment_close", NULL); - if (result != NULL) + if (G_LIKELY(result != NULL)) { g_free(filetypes[ft_id]->comment_close); filetypes[ft_id]->comment_close = result; @@ -1106,7 +1106,7 @@ /* read context action */ result = g_key_file_get_string(configh, "settings", "context_action_cmd", NULL); if (result == NULL) result = g_key_file_get_string(config, "settings", "context_action_cmd", NULL); - if (result != NULL) + if (G_LIKELY(result != NULL)) { filetypes[ft_id]->context_action_cmd = result; } @@ -1114,7 +1114,7 @@ /* read build settings */ result = g_key_file_get_string(configh, "build_settings", "compiler", NULL); if (result == NULL) result = g_key_file_get_string(config, "build_settings", "compiler", NULL); - if (result != NULL) + if (G_LIKELY(result != NULL)) { filetypes[ft_id]->programs->compiler = result; filetypes[ft_id]->actions->can_compile = TRUE; @@ -1130,7 +1130,7 @@ result = g_key_file_get_string(configh, "build_settings", "run_cmd", NULL); if (result == NULL) result = g_key_file_get_string(config, "build_settings", "run_cmd", NULL); - if (result != NULL) + if (G_LIKELY(result != NULL)) { filetypes[ft_id]->programs->run_cmd = result; filetypes[ft_id]->actions->can_exec = TRUE; @@ -1159,7 +1159,7 @@ { GError *error = NULL; gboolean done = g_key_file_load_from_file(key_file, file, flags, &error); - if (! done && error != NULL) + if (G_UNLIKELY(! done) && G_UNLIKELY(error != NULL)) { geany_debug("Failed to open %s (%s)", file, error->message); g_error_free(error); @@ -1176,16 +1176,16 @@ GKeyFile *config, *config_home; GeanyFiletypePrivate *pft; - g_return_if_fail(ft_id >= 0 && ft_id < (gint) filetypes_array->len); + g_return_if_fail(G_LIKELY(ft_id >= 0) && G_LIKELY(ft_id < (gint) filetypes_array->len)); pft = filetypes[ft_id]->priv; /* when reloading, proceed only if the settings were already loaded */ - if (reload && ! pft->keyfile_loaded) + if (reload && G_UNLIKELY(! pft->keyfile_loaded)) return; /* when not reloading, load the settings only once */ - if (! reload && pft->keyfile_loaded) + if (! reload && G_LIKELY(pft->keyfile_loaded)) return; pft->keyfile_loaded = TRUE; @@ -1233,7 +1233,7 @@ } -void filetypes_save_commands() +void filetypes_save_commands(void) { gchar *conf_prefix = g_strconcat(app->configdir, G_DIR_SEPARATOR_S GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S "filetypes.", NULL); @@ -1245,7 +1245,8 @@ GKeyFile *config_home; gchar *fname, *ext, *data; - if (! bp->modified) continue; + if (G_LIKELY(! bp->modified)) + continue; ext = filetypes_get_conf_extension(i); fname = g_strconcat(conf_prefix, ext, NULL); @@ -1254,13 +1255,13 @@ config_home = g_key_file_new(); g_key_file_load_from_file(config_home, fname, G_KEY_FILE_KEEP_COMMENTS, NULL); - if (bp->compiler && *bp->compiler) + if (NZV(bp->compiler)) g_key_file_set_string(config_home, "build_settings", "compiler", bp->compiler); - if (bp->linker && *bp->linker) + if (NZV(bp->linker)) g_key_file_set_string(config_home, "build_settings", "linker", bp->linker); - if (bp->run_cmd && *bp->run_cmd) + if (NZV(bp->run_cmd)) g_key_file_set_string(config_home, "build_settings", "run_cmd", bp->run_cmd); - if (bp->run_cmd2 && *bp->run_cmd2) + if (NZV(bp->run_cmd2)) g_key_file_set_string(config_home, "build_settings", "run_cmd2", bp->run_cmd2); data = g_key_file_to_data(config_home, NULL, NULL); @@ -1274,7 +1275,7 @@ /* create one file filter which has each file pattern of each filetype */ -GtkFileFilter *filetypes_create_file_filter_all_source() +GtkFileFilter *filetypes_create_file_filter_all_source(void) { GtkFileFilter *new_filter; guint i, j; @@ -1284,7 +1285,7 @@ for (i = 0; i < filetypes_array->len; i++) { - if (i == GEANY_FILETYPES_NONE) + if (G_UNLIKELY(i == GEANY_FILETYPES_NONE)) continue; for (j = 0; filetypes[i]->pattern[j]; j++) @@ -1302,7 +1303,7 @@ gint i; const gchar *title; - g_return_val_if_fail(ft != NULL, NULL); + g_return_val_if_fail(G_LIKELY(ft != NULL), NULL); new_filter = gtk_file_filter_new(); title = ft->id == GEANY_FILETYPES_NONE ? _("All files") : ft->title; @@ -1320,7 +1321,7 @@ /* Indicates whether there is a tag parser for the filetype or not. */ gboolean filetype_has_tags(GeanyFiletype *ft) { - g_return_val_if_fail(ft != NULL, FALSE); + g_return_val_if_fail(G_LIKELY(ft != NULL), FALSE); return ft->lang >= 0; } @@ -1339,7 +1340,7 @@ g_return_val_if_fail(NZV(name), NULL); ft = g_hash_table_lookup(filetypes_hash, name); - if (ft == NULL) + if (G_UNLIKELY(ft == NULL)) geany_debug("Could not find filetype '%s'.", name); return ft; } @@ -1359,7 +1360,7 @@ ft->priv->error_regex_compiled = (retval == 0); /* prevent recompilation */ - if (retval != 0) + if (G_UNLIKELY(retval != 0)) { gchar buf[256]; regerror(retval, regex, buf, sizeof buf); @@ -1388,9 +1389,9 @@ if (!NZV(ft->error_regex_string)) return FALSE; - if (!ft->priv->error_regex_compiled) + if (G_UNLIKELY(!ft->priv->error_regex_compiled)) compile_regex(ft, regex); - if (!ft->priv->error_regex_compiled) /* regex error */ + if (G_UNLIKELY(!ft->priv->error_regex_compiled)) /* regex error */ return FALSE; if (regexec(regex, message, G_N_ELEMENTS(pmatch), pmatch, 0) != 0) @@ -1453,7 +1454,7 @@ g_key_file_has_key(userconfig, "Extensions", filetypes[i]->name, NULL); list = g_key_file_get_string_list( (userset) ? userconfig : sysconfig, "Extensions", filetypes[i]->name, &len, NULL); - if (list && len > 0) + if (G_LIKELY(list) && G_LIKELY(len > 0)) { g_strfreev(filetypes[i]->pattern); filetypes[i]->pattern = list; @@ -1477,7 +1478,8 @@ */ GeanyFiletype *filetypes_index(gint idx) { - return (idx >= 0 && idx < (gint) filetypes_array->len) ? filetypes[idx] : NULL; + return (G_LIKELY(idx >= 0) && G_LIKELY(idx < (gint) filetypes_array->len)) ? + filetypes[idx] : NULL; } @@ -1489,7 +1491,7 @@ foreach_slist(ft, node, filetypes_by_title) { - if (ft->id != GEANY_FILETYPES_NONE) + if (G_LIKELY(ft->id != GEANY_FILETYPES_NONE)) callback(ft, user_data); } } Modified: trunk/src/geanymenubuttonaction.c =================================================================== --- trunk/src/geanymenubuttonaction.c 2009-04-05 19:58:30 UTC (rev 3686) +++ trunk/src/geanymenubuttonaction.c 2009-04-05 21:07:40 UTC (rev 3687) @@ -68,7 +68,7 @@ { GeanyMenubuttonActionPrivate *priv = GEANY_MENU_BUTTON_ACTION_GET_PRIVATE(data); - if (! priv->menu_added) + if (G_UNLIKELY(! priv->menu_added)) { gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(priv->button), priv->menu); priv->menu_added = TRUE; @@ -161,7 +161,7 @@ { GeanyMenubuttonActionPrivate *priv; - g_return_val_if_fail(action != NULL, NULL); + g_return_val_if_fail(G_LIKELY(action != NULL), NULL); priv = GEANY_MENU_BUTTON_ACTION_GET_PRIVATE(action); Modified: trunk/src/geanyobject.c =================================================================== --- trunk/src/geanyobject.c 2009-04-05 19:58:30 UTC (rev 3686) +++ trunk/src/geanyobject.c 2009-04-05 21:07:40 UTC (rev 3687) @@ -66,7 +66,7 @@ register GCClosure* cc = (GCClosure*) closure; register gpointer data1, data2; - g_return_if_fail(n_param_vals == 4); + g_return_if_fail(G_LIKELY(n_param_vals == 4)); if (G_CCLOSURE_SWAP_DATA(closure)) { @@ -112,8 +112,8 @@ register gpointer data1, data2; gboolean v_return; - g_return_if_fail(return_value != NULL); - g_return_if_fail(n_param_values == 3); + g_return_if_fail(G_LIKELY(return_value != NULL)); + g_return_if_fail(G_LIKELY(n_param_values == 3)); if (G_CCLOSURE_SWAP_DATA(closure)) { @@ -260,12 +260,12 @@ static void geany_object_init(GeanyObject *self) { - + /* nothing to do */ } -GObject* geany_object_new(void) +GObject *geany_object_new(void) { - return (GObject*)g_object_new(GEANY_OBJECT_TYPE, NULL); + return g_object_new(GEANY_OBJECT_TYPE, NULL); } Modified: trunk/src/geanywraplabel.c =================================================================== --- trunk/src/geanywraplabel.c 2009-04-05 19:58:30 UTC (rev 3686) +++ trunk/src/geanywraplabel.c 2009-04-05 21:07:40 UTC (rev 3687) @@ -28,6 +28,7 @@ #include <gtk/gtk.h> +#include "utils.h" #include "geanywraplabel.h" @@ -83,7 +84,7 @@ { GeanyWrapLabelPrivate *priv; - if (width == 0) + if (G_UNLIKELY(width == 0)) return; /* @@ -136,7 +137,7 @@ { GtkWidget *l = g_object_new(GEANY_WRAP_LABEL_TYPE, NULL); - if (text != NULL && text[0] != '\0') + if (NZV(text)) gtk_label_set_text(GTK_LABEL(l), text); pango_layout_set_wrap(gtk_label_get_layout(GTK_LABEL(l)), PANGO_WRAP_WORD_CHAR); Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2009-04-05 19:58:30 UTC (rev 3686) +++ trunk/src/highlighting.c 2009-04-05 21:07:40 UTC (rev 3687) @@ -121,16 +121,17 @@ { gchar *result; - if (config == NULL || configh == NULL || section == NULL) + if (G_UNLIKELY(config == NULL) || G_UNLIKELY(configh == NULL) || G_UNLIKELY(section == NULL)) { style_sets[index].keywords[pos] = g_strdup(default_value); return; } result = g_key_file_get_string(configh, section, key, NULL); - if (result == NULL) result = g_key_file_get_string(config, section, key, NULL); + if (result == NULL) + result = g_key_file_get_string(config, section, key, NULL); - if (result == NULL) + if (G_UNLIKELY(result == NULL)) { style_sets[index].keywords[pos] = g_strdup(default_value); } @@ -145,7 +146,7 @@ { gchar *result; - if (config == NULL || configh == NULL) + if (G_UNLIKELY(config == NULL) || G_UNLIKELY(configh == NULL)) { *wordchars = g_strdup(GEANY_WORDCHARS); return; @@ -154,7 +155,7 @@ result = g_key_file_get_string(configh, "settings", "wordchars", NULL); if (result == NULL) result = g_key_file_get_string(config, "settings", "wordchars", NULL); - if (result == NULL) + if (G_UNLIKELY(result == NULL)) { *wordchars = g_strdup(GEANY_WORDCHARS); } @@ -178,26 +179,32 @@ gchar **list; gsize len; - g_return_if_fail(config && configh && key_name && default_style && style); + g_return_if_fail(G_LIKELY(config)); + g_return_if_fail(G_LIKELY(configh)); + g_return_if_fail(G_LIKELY(key_name)); + g_return_if_fail(G_LIKELY(default_style)); + g_return_if_fail(G_LIKELY(style)); list = g_key_file_get_string_list(configh, "styling", key_name, &len, NULL); if (list == NULL) list = g_key_file_get_string_list(config, "styling", key_name, &len, NULL); - if (list != NULL && list[0] != NULL) + if (G_LIKELY(list) != NULL && G_UNLIKELY(list[0] != NULL)) style->foreground = (gint) utils_strtod(list[0], NULL, FALSE); else style->foreground = rotate_rgb(default_style->foreground); - if (list != NULL && list[1] != NULL) + if (G_LIKELY(list != NULL) && G_LIKELY(list[1] != NULL)) style->background = (gint) utils_strtod(list[1], NULL, FALSE); else style->background = rotate_rgb(default_style->background); - if (list != NULL && list[2] != NULL) style->bold = utils_atob(list[2]); + if (G_LIKELY(list) != NULL && G_LIKELY(list[2] != NULL)) + style->bold = utils_atob(list[2]); else style->bold = default_style->bold; - if (list != NULL && list[3] != NULL) style->italic = utils_atob(list[3]); + if (G_LIKELY(list) != NULL && list[3] != NULL) + style->italic = utils_atob(list[3]); else style->italic = default_style->italic; g_strfreev(list); @@ -212,26 +219,34 @@ gchar **list; gsize len; - if (config == NULL || configh == NULL || section == NULL) return; + g_return_if_fail(G_LIKELY(config)); + g_return_if_fail(G_LIKELY(configh)); + g_return_if_fail(G_LIKELY(section)); + g_return_if_fail(G_LIKELY(key)); list = g_key_file_get_string_list(configh, section, key, &len, NULL); - if (list == NULL) list = g_key_file_get_string_list(config, section, key, &len, NULL); + if (list == NULL) + list = g_key_file_get_string_list(config, section, key, &len, NULL); - if (list != NULL && list[0] != NULL) + if (G_LIKELY(list != NULL) && G_LIKELY(list[0] != NULL)) style->foreground = (gint) utils_strtod(list[0], NULL, FALSE); else if (foreground) style->foreground = (gint) utils_strtod(foreground, NULL, FALSE); - if (list != NULL && list[1] != NULL) + if (G_LIKELY(list != NULL) && G_LIKELY(list[1] != NULL)) style->background = (gint) utils_strtod(list[1], NULL, FALSE); else if (background) style->background = (gint) utils_strtod(background, NULL, FALSE); - if (list != NULL && list[2] != NULL) style->bold = utils_atob(list[2]); - else style->bold = utils_atob(bold); + if (G_LIKELY(list != NULL) && G_LIKELY(list[2] != NULL)) + style->bold = utils_atob(list[2]); + else + style->bold = utils_atob(bold); - if (list != NULL && list[3] != NULL) style->italic = utils_atob(list[3]); - else style->italic = FALSE; + if (G_LIKELY(list != NULL) && list[3] != NULL) + style->italic = utils_atob(list[3]); + else + style->italic = FALSE; g_strfreev(list); } @@ -245,19 +260,29 @@ gchar *end1, *end2; gsize len; - if (config == NULL || configh == NULL || section == NULL) return; + g_return_if_fail(G_LIKELY(config)); + g_return_if_fail(G_LIKELY(configh)); + g_return_if_fail(G_LIKELY(section)); + g_return_if_fail(G_LIKELY(key)); list = g_key_file_get_string_list(configh, section, key, &len, NULL); - if (list == NULL) list = g_key_file_get_string_list(config, section, key, &len, NULL); + if (list == NULL) + list = g_key_file_get_string_list(config, section, key, &len, NULL); - if (list != NULL && list[0] != NULL) style->foreground = strtol(list[0], &end1, 10); - else style->foreground = fdefault_val; - if (list != NULL && list[1] != NULL) style->background = strtol(list[1], &end2, 10); - else style->background = sdefault_val; + if (G_LIKELY(list != NULL) && G_LIKELY(list[0] != NULL) ) + style->foreground = strtol(list[0], &end1, 10); + else + style->foreground = fdefault_val; + if (G_LIKELY(list != NULL) && G_LIKELY(list[1] != NULL) ) + style->background = strtol(list[1], &end2, 10); + else + style->background = sdefault_val; /* if there was an error, strtol() returns 0 and end is list[x], so then we use default_val */ - if (list == NULL || list[0] == end1) style->foreground = fdefault_val; - if (list == NULL || list[1] == end2) style->background = sdefault_val; + if (G_UNLIKELY(list == NULL) || G_UNLIKELY(list[0] == end1)) + style->foreground = fdefault_val; + if (G_UNLIKELY(list == NULL) || G_UNLIKELY(list[1] == end2)) + style->background = sdefault_val; g_strfreev(list); } @@ -280,18 +305,18 @@ static GeanyLexerStyle *get_style(guint ft_id, guint styling_index) { - g_assert(ft_id < GEANY_MAX_BUILT_IN_FILETYPES); + g_assert(G_LIKELY(ft_id < GEANY_MAX_BUILT_IN_FILETYPES)); - if (ft_id == GEANY_FILETYPES_NONE) + if (G_UNLIKELY(ft_id == GEANY_FILETYPES_NONE)) { - g_assert(styling_index < GCS_MAX); + g_assert(G_LIKELY(styling_index < GCS_MAX)); return &common_style_set.styling[styling_index]; } else { StyleSet *set = &style_sets[ft_id]; - g_assert(styling_index < set->count); + g_assert(G_LIKELY(styling_index < set->count)); return &set->styling[styling_index]; } } @@ -329,11 +354,11 @@ { GString *s = NULL; - if (app->tm_workspace) + if (G_LIKELY(app->tm_workspace)) { GPtrArray *tags_array = app->tm_workspace->global_tags; - if (tags_array) + if (G_LIKELY(tags_array)) { s = symbols_find_tags_as_string(tags_array, TM_GLOBAL_TYPE_MASK, lang); } @@ -347,7 +372,7 @@ { gchar *result; - if (config == NULL || configh == NULL) + if (G_UNLIKELY(config == NULL) || G_UNLIKELY(configh == NULL)) { result = NULL; } @@ -367,7 +392,7 @@ { static gboolean common_style_set_valid = FALSE; - if (common_style_set_valid) + if (G_LIKELY(common_style_set_valid)) return; common_style_set_valid = TRUE; /* ensure filetypes.common is only loaded once */ @@ -605,7 +630,7 @@ GString *s; s = get_global_typenames(lang); - if (s == NULL) + if (G_UNLIKELY(s == NULL)) s = g_string_sized_new(200); else g_string_append_c(s, ' '); /* append a space as delimiter to the existing list of words */ @@ -621,7 +646,7 @@ static void apply_filetype_properties(ScintillaObject *sci, gint lexer, filetype_id ft_id) { - g_assert(ft_id != GEANY_FILETYPES_NONE); + g_assert(G_LIKELY(ft_id != GEANY_FILETYPES_NONE)); SSM(sci, SCI_SETLEXER, lexer, 0); @@ -3498,7 +3523,7 @@ * @see Scintilla messages @c SCI_STYLEGETFORE, etc, for use with ScintillaFuncs::send_message(). */ const GeanyLexerStyle *highlighting_get_style(gint ft_id, gint style_id) { - if (ft_id < 0 || ft_id > GEANY_MAX_BUILT_IN_FILETYPES) + if (G_UNLIKELY(ft_id < 0) || G_UNLIKELY(ft_id > GEANY_MAX_BUILT_IN_FILETYPES)) return NULL; /* ensure filetype loaded */ Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2009-04-05 19:58:30 UTC (rev 3686) +++ trunk/src/keybindings.c 2009-04-05 21:07:40 UTC (rev 3687) @@ -73,8 +73,8 @@ static gboolean on_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data); static gboolean on_key_release_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data); -static gboolean check_current_word(void); -static gboolean read_current_word(void); +static gboolean check_current_word(GeanyDocument *doc); +static gboolean read_current_word(GeanyDocument *doc); static void cb_func_file_action(guint key_id); static void cb_func_project_action(guint key_id); @@ -126,7 +126,7 @@ { GeanyKeyBinding *kb; - g_assert(key_id < group->count); + g_assert(G_LIKELY(key_id < group->count)); kb = &group->keys[key_id]; @@ -526,7 +526,7 @@ static void on_document_close(GObject *obj, GeanyDocument *doc) { - if (! main_status.quitting) + if (G_LIKELY(! main_status.quitting)) { g_queue_remove_all(mru_docs, doc); g_idle_add(on_idle_close, NULL); @@ -558,7 +558,7 @@ static void apply_kb_accel(GeanyKeyGroup *group, GeanyKeyBinding *kb, gpointer user_data) { - if (kb->key != 0 && kb->menu_item) + if (G_LIKELY(kb->key != 0) && kb->menu_item) { gtk_widget_add_accelerator(kb->menu_item, "activate", kb_accel_group, kb->key, kb->mods, GTK_ACCEL_VISIBLE); @@ -571,14 +571,15 @@ static void keybindings_foreach(KBItemCallback cb, gpointer user_data) { gsize g, i; + GeanyKeyGroup *group; + GeanyKeyBinding *kb; for (g = 0; g < keybinding_groups->len; g++) { - GeanyKeyGroup *group = g_ptr_array_index(keybinding_groups, g); - + group = g_ptr_array_index(keybinding_groups, g); for (i = 0; i < group->count; i++) { - GeanyKeyBinding *kb = &group->keys[i]; + kb = &group->keys[i]; cb(group, kb, user_data); } @@ -594,13 +595,13 @@ GdkModifierType mods; val = g_key_file_get_string(config, group->name, kb->name, NULL); - if (val != NULL) + if (G_LIKELY(val != NULL)) { gtk_accelerator_parse(val, &key, &mods); kb->key = key; kb->mods = mods; + g_free(val); } - g_free(val); } @@ -636,7 +637,7 @@ { GeanyKeyBinding *kb = &group->keys[kb_id]; - if (kb->key != 0) + if (G_LIKELY(kb->key != 0)) gtk_widget_add_accelerator(menuitem, "activate", accel_group, kb->key, kb->mods, GTK_ACCEL_VISIBLE); } @@ -750,7 +751,7 @@ { group = g_ptr_array_index(keybinding_groups, g); - if (g > 0) + if (G_LIKELY(g > 0)) { gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, -1); @@ -823,6 +824,7 @@ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 6); gtk_box_pack_start(GTK_BOX(vbox), swin, TRUE, TRUE, 0); + return dialog; } @@ -854,7 +856,7 @@ void keybindings_show_shortcuts(void) { - if (key_dialog) + if (G_UNLIKELY(key_dialog)) gtk_widget_destroy(key_dialog); /* in case the key_dialog is still visible */ key_dialog = create_dialog(); @@ -900,18 +902,17 @@ /* We have a special case for GEANY_KEYS_EDIT_COMPLETESNIPPET, because we need to * return FALSE if no completion occurs, so the tab or space is handled normally. */ -static gboolean check_snippet_completion(guint keyval, guint state) +static gboolean check_snippet_completion(GeanyDocument *doc, guint keyval, guint state) { GeanyKeyBinding *kb = keybindings_lookup_item(GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_COMPLETESNIPPET); if (kb->key == keyval && kb->mods == state) { - GeanyDocument *doc = document_get_current(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); /* keybinding only valid when scintilla widget has focus */ - if (doc != NULL && focusw == GTK_WIDGET(doc->editor->sci)) + if (G_LIKELY(doc != NULL) && focusw == GTK_WIDGET(doc->editor->sci)) { ScintillaObject *sci = doc->editor->sci; gint pos = sci_get_current_position(sci); @@ -952,18 +953,17 @@ * would be shown. As a very special case, we differentiate between the Menu key and Shift-F10 * if pressed in the editor widget: the Menu key opens the popup menu, Shift-F10 opens the * notebook tab list. */ -static gboolean check_menu_key(guint keyval, guint state, guint32 event_time) +static gboolean check_menu_key(GeanyDocument *doc, guint keyval, guint state, guint32 event_time) { if ((keyval == GDK_Menu && state == 0) || (keyval == GDK_F10 && state == GDK_SHIFT_MASK)) { - GeanyDocument *doc = document_get_current(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); static GtkWidget *scribble = NULL; - if (scribble == NULL) + if (G_UNLIKELY(scribble == NULL)) scribble = ui_lookup_widget(main_widgets.window, "textview_scribble"); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) { if (focusw == doc->priv->tag_tree) { @@ -1062,27 +1062,20 @@ #endif -static void check_disk_status(void) -{ - GeanyDocument *doc = document_get_current(); - - if (doc != NULL) - { - document_check_disk_status(doc, FALSE); - } -} - - /* central keypress event handler, almost all keypress events go to this function */ static gboolean on_key_press_event(GtkWidget *widget, GdkEventKey *ev, gpointer user_data) { guint state, keyval; gsize g, i; + GeanyDocument *doc; + GeanyKeyGroup *group; + GeanyKeyBinding *kb; - if (ev->keyval == 0) + if (G_UNLIKELY(ev->keyval == 0)) return FALSE; - check_disk_status(); + doc = document_get_current(); + document_check_disk_status(doc, FALSE); keyval = ev->keyval; state = ev->state & GEANY_KEYS_MODIFIER_MASK; @@ -1099,23 +1092,22 @@ if (vte_info.have_vte && check_vte(state, keyval)) return FALSE; #endif - if (check_snippet_completion(keyval, state)) + if (check_snippet_completion(doc, keyval, state)) return TRUE; - if (check_menu_key(keyval, state, ev->time)) + if (check_menu_key(doc, keyval, state, ev->time)) return TRUE; ignore_keybinding = FALSE; for (g = 0; g < keybinding_groups->len; g++) { - GeanyKeyGroup *group = g_ptr_array_index(keybinding_groups, g); + group = g_ptr_array_index(keybinding_groups, g); for (i = 0; i < group->count; i++) { - GeanyKeyBinding *kb = &group->keys[i]; - + kb = &group->keys[i]; if (keyval == kb->key && state == kb->mods) { - if (kb->callback == NULL) + if (G_UNLIKELY(kb->callback == NULL)) return FALSE; /* ignore the keybinding */ /* call the corresponding callback function for this shortcut */ @@ -1158,12 +1150,12 @@ { GeanyKeyGroup *group; - g_return_val_if_fail(group_id < keybinding_groups->len, NULL); + g_return_val_if_fail(G_LIKELY(group_id < keybinding_groups->len), NULL); group = g_ptr_array_index(keybinding_groups, group_id); - g_return_val_if_fail(group, NULL); - g_return_val_if_fail(key_id < group->count, NULL); + g_return_val_if_fail(G_LIKELY(group), NULL); + g_return_val_if_fail(G_LIKELY(key_id < group->count), NULL); return &group->keys[key_id]; } @@ -1177,10 +1169,10 @@ { GeanyKeyBinding *kb; - g_return_if_fail(group_id < GEANY_KEY_GROUP_COUNT); /* can't use this for plugin groups */ + g_return_if_fail(G_LIKELY(group_id < GEANY_KEY_GROUP_COUNT)); /* can't use this for plugin groups */ kb = keybindings_lookup_item(group_id, key_id); - if (kb) + if (G_LIKELY(kb)) kb->callback(key_id); } @@ -1251,6 +1243,8 @@ static void cb_func_search_action(guint key_id) { + GeanyDocument *doc; + switch (key_id) { case GEANY_KEYS_SEARCH_FIND: @@ -1272,11 +1266,13 @@ case GEANY_KEYS_SEARCH_PREVIOUSMESSAGE: on_previous_message1_activate(NULL, NULL); break; case GEANY_KEYS_SEARCH_FINDUSAGE: - read_current_word(); + doc = document_get_current(); + read_current_word(doc); on_find_usage1_activate(NULL, NULL); break; case GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE: - read_current_word(); + doc = document_get_current(); + read_current_word(doc); on_find_document_usage1_activate(NULL, NULL); break; } @@ -1334,11 +1330,12 @@ BuildMenuItems *menu_items; GeanyDocument *doc = document_get_current(); - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; ft = doc->file_type; - if (! ft) return; + if (G_UNLIKELY(! ft)) + return; menu_items = build_get_menu_items(ft->id); switch (key_id) @@ -1384,12 +1381,11 @@ } -static gboolean read_current_word(void) +static gboolean read_current_word(GeanyDocument *doc) { gint pos; - GeanyDocument *doc = document_get_current(); - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return FALSE; pos = sci_get_current_position(doc->editor->sci); @@ -1401,9 +1397,9 @@ } -static gboolean check_current_word(void) +static gboolean check_current_word(GeanyDocument *doc) { - if (!read_current_word()) + if (!read_current_word(doc)) { utils_beep(); return FALSE; @@ -1432,7 +1428,7 @@ case GEANY_KEYS_FOCUS_EDITOR: { GeanyDocument *doc = document_get_current(); - if (doc != NULL) + if (G_LIKELY(doc != NULL)) gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); break; } @@ -1557,7 +1553,7 @@ if (switch_dialog_cancelled) return FALSE; - if (!switch_dialog) + if (G_UNLIKELY(! switch_dialog)) switch_dialog = create_switch_dialog(); geany_wrap_label_set_text(GTK_LABEL(switch_dialog_label), @@ -1572,7 +1568,7 @@ /* TODO: MRU switching order */ GeanyDocument *last_doc = g_queue_peek_head(mru_docs); - if (!DOC_VALID(last_doc)) + if (! DOC_VALID(last_doc)) return; gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), @@ -1580,7 +1576,7 @@ /* if there's a modifier key, we can switch back in MRU order each time unless * the key is released */ - if (!switch_dialog_cancelled) + if (! switch_dialog_cancelled) { on_switch_timeout(NULL); /* update filename label */ } @@ -1604,7 +1600,7 @@ gint cur_page = gtk_notebook_get_current_page(nb); GeanyDocument *doc = document_get_current(); - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; sci = GTK_WIDGET(doc->editor->sci); @@ -1638,7 +1634,7 @@ { gint pos, new_pos; - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; pos = sci_get_current_position(doc->editor->sci); @@ -1658,7 +1654,7 @@ { GeanyDocument *doc = document_get_current(); - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; switch (key_id) @@ -1688,7 +1684,7 @@ gint cur_line; GeanyDocument *doc = document_get_current(); - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; cur_line = sci_get_current_line(doc->editor->sci); @@ -1737,11 +1733,11 @@ return; } case GEANY_KEYS_GOTO_TAGDEFINITION: - if (check_current_word()) + if (check_current_word(doc)) symbols_goto_tag(editor_info.current_word, TRUE); return; case GEANY_KEYS_GOTO_TAGDECLARATION: - if (check_current_word()) + if (check_current_word(doc)) symbols_goto_tag(editor_info.current_word, FALSE); return; } @@ -1797,7 +1793,7 @@ GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); /* edit keybindings only valid when scintilla widget has focus */ - if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) + if (G_UNLIKELY(doc == NULL) || focusw != GTK_WIDGET(doc->editor->sci)) return; switch (key_id) @@ -1840,7 +1836,7 @@ editor_show_macro_list(doc->editor); break; case GEANY_KEYS_EDITOR_CONTEXTACTION: - if (check_current_word()) + if (check_current_word(doc)) on_context_action1_activate(GTK_MENU_ITEM(ui_lookup_widget(main_widgets.editor_menu, "context_action1")), NULL); break; @@ -1873,7 +1869,7 @@ GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); /* keybindings only valid when scintilla widget has focus */ - if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) + if (G_UNLIKELY(doc == NULL) || focusw != GTK_WIDGET(doc->editor->sci)) return; switch (key_id) @@ -1927,12 +1923,12 @@ /* common function for select keybindings, only valid when scintilla has focus. */ static void cb_func_select_action(guint key_id) { - GeanyDocument *doc = document_get_current(); + GeanyDocument *doc; GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); static GtkWidget *scribble_widget = NULL; /* special case for Select All in the scribble widget */ - if (scribble_widget == NULL) /* lookup the scribble widget only once */ + if (G_UNLIKELY(scribble_widget == NULL)) /* lookup the scribble widget only once */ scribble_widget = ui_lookup_widget(main_widgets.window, "textview_scribble"); if (key_id == GEANY_KEYS_SELECT_ALL && focusw == scribble_widget) { @@ -1940,8 +1936,9 @@ return; } + doc = document_get_current(); /* keybindings only valid when scintilla widget has focus */ - if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) + if (G_UNLIKELY(doc == NULL) || focusw != GTK_WIDGET(doc->editor->sci)) return; switch (key_id) @@ -1965,7 +1962,7 @@ static void cb_func_document_action(guint key_id) { GeanyDocument *doc = document_get_current(); - if (doc == NULL) + if (G_UNLIKELY(doc == NULL)) return; switch (key_id) @@ -2011,7 +2008,8 @@ GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); /* keybindings only valid when scintilla widget has focus */ - if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) return; + if (G_UNLIKELY(doc == NULL) || focusw != GTK_WIDGET(doc->editor->sci)) + return; switch (key_id) { Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2009-04-05 19:58:30 UTC (rev 3686) +++ trunk/src/keyfile.c 2009-04-05 21:07:40 UTC (rev 3687) @@ -233,7 +233,7 @@ gchar *locale_filename; GeanyFiletype *ft = doc->file_type; - if (ft == NULL) /* can happen when saving a new file when quitting */ + if (G_UNLIKELY(ft == NULL)) /* can happen when saving a new file when quitting */ ft = filetypes[GEANY_FILETYPES_NONE]; locale_filename = utils_get_locale_from_utf8(doc->file_name); @@ -275,7 +275,7 @@ for (i = 0; i < max; i++) { @@ 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:[3686] trunk/po
by frlan＠users.sourceforge.net 06 Apr '09

06 Apr '09

Revision: 3686 http://geany.svn.sourceforge.net/geany/?rev=3686&view=rev Author: frlan Date: 2009-04-05 19:58:30 +0000 (Sun, 05 Apr 2009) Log Message: ----------- Update of Turkish translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/tr.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2009-04-05 15:12:56 UTC (rev 3685) +++ trunk/po/ChangeLog 2009-04-05 19:58:30 UTC (rev 3686) @@ -1,3 +1,8 @@ +2009-04-05 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * tr.po: Update of Turkish translation. Thanks to Gürkan Gür. + + 2009-03-27 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * ru.po: Update of Russian translation. Thanks to John Wehin. Modified: trunk/po/tr.po =================================================================== --- trunk/po/tr.po 2009-04-05 15:12:56 UTC (rev 3685) +++ trunk/po/tr.po 2009-04-05 19:58:30 UTC (rev 3686) @@ -2,13 +2,12 @@ # Copyright (C) 2006-2009 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. # Gürkan Gür <seqizz(a)gmail.com> 2008, 2009 - msgid "" msgstr "" "Project-Id-Version: geany 0.17svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-07 23:08+0100\n" -"PO-Revision-Date: 2009-03-07 23:30+0200\n" +"POT-Creation-Date: 2009-04-05 21:56+0200\n" +"PO-Revision-Date: 2009-04-05 03:28+0200\n" "Last-Translator: Gürkan Gür <seqizz(a)gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -21,7 +20,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "GTK2 kullanan hızlı ve hafif bir IDE" -#: ../geany.desktop.in.h:2 ../src/interface.c:260 ../src/interface.c:1466 +#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 msgid "Geany" msgstr "Geany" @@ -29,67 +28,67 @@ msgid "Integrated Development Environment" msgstr "Tümleşik Geliştirme Ortamı" -#: ../src/about.c:136 +#: ../src/about.c:137 msgid "About Geany" msgstr "Geany Hakkında" -#: ../src/about.c:186 +#: ../src/about.c:187 msgid "A fast and lightweight IDE" msgstr "Hızlı ve Hafif Bir IDE" -#: ../src/about.c:207 +#: ../src/about.c:208 #, c-format msgid "(built on or after %s)" msgstr "(%s veya daha sonrasında derlendi)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:238 +#: ../src/about.c:239 msgid "Info" msgstr "Bilgi" -#: ../src/about.c:254 +#: ../src/about.c:255 msgid "Developers" msgstr "Geliştiriciler" -#: ../src/about.c:263 +#: ../src/about.c:264 msgid "maintainer" msgstr "bakıcı" -#: ../src/about.c:271 +#: ../src/about.c:272 msgid "developer" msgstr "geliştirici" -#: ../src/about.c:279 +#: ../src/about.c:280 msgid "translation maintainer" msgstr "çeviri bakıcısı" -#: ../src/about.c:288 +#: ../src/about.c:289 msgid "Translators" msgstr "Çevirmenler" -#: ../src/about.c:308 +#: ../src/about.c:309 msgid "Previous Translators" msgstr "Önceki Çevirmenler" -#: ../src/about.c:329 +#: ../src/about.c:330 msgid "Contributors" msgstr "Katkıda Bulunanlar" -#: ../src/about.c:339 +#: ../src/about.c:340 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "Bir çok geliştiriciden bazıları (daha detaylı liste için bkz: %s):" -#: ../src/about.c:365 +#: ../src/about.c:366 msgid "Credits" msgstr "Yapımcılar" -#: ../src/about.c:379 +#: ../src/about.c:380 msgid "License" msgstr "Lisans" -#: ../src/about.c:388 +#: ../src/about.c:389 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -97,13 +96,8 @@ "Lisans yazısı bulunamadı. Lütfen çevrimiçi olarak görüntülemek için http://" "www.gnu.org/licenses/gpl-2.0.txt adresini ziyaret edin." -#: ../src/build.c:192 +#: ../src/build.c:215 ../src/build.c:709 #, c-format -msgid "Failed to view %s (make sure it is already compiled)" -msgstr "%s görüntülenemedi (derlenmiş olduğundan emin olun)" - -#: ../src/build.c:225 ../src/build.c:719 -#, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " "Preferences)" @@ -111,132 +105,132 @@ "\"%s\" terminali bulunamadı (Terminal aracının yolunu ayarlamak için " "Seçenekler'e bakınız)" -#: ../src/build.c:240 ../src/build.c:624 +#: ../src/build.c:230 ../src/build.c:614 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "\"%s\" çalıştırılamadı (başlangıç-betiği oluşturulamadı)" -#: ../src/build.c:276 ../src/build.c:508 ../src/build.c:752 +#: ../src/build.c:266 ../src/build.c:498 ../src/build.c:742 #: ../src/search.c:1392 #, c-format msgid "Process failed (%s)" msgstr "İşlem hatalı (%s)" -#: ../src/build.c:495 +#: ../src/build.c:485 #, c-format msgid "%s (in directory: %s)" msgstr "%s (%s dizininde)" -#: ../src/build.c:587 +#: ../src/build.c:577 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "\"%s\" çalışma dizinine geçilemedi." -#: ../src/build.c:681 +#: ../src/build.c:671 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Dosya sanal terminalde çalıştırılamadı, büyük ihtimalle bir komut içeriyor." -#: ../src/build.c:866 +#: ../src/build.c:862 msgid "Compilation failed." msgstr "Derleme hatalı." -#: ../src/build.c:880 +#: ../src/build.c:876 msgid "Compilation finished successfully." msgstr "Derleme başarılı." #. compile the code -#: ../src/build.c:986 +#: ../src/build.c:982 msgid "_Compile" msgstr "_Derle" #. build the code -#: ../src/build.c:994 ../src/build.c:2056 ../src/interface.c:966 +#: ../src/build.c:990 ../src/build.c:2061 ../src/interface.c:976 msgid "_Build" msgstr "İn_şa Et" #. build the code with make all -#: ../src/build.c:1006 ../src/build.c:1112 ../src/build.c:2067 +#: ../src/build.c:1002 ../src/build.c:1108 ../src/build.c:2072 msgid "_Make All" msgstr "Tü_münü inşa et" #. build the code with make custom -#: ../src/build.c:1015 ../src/build.c:1121 ../src/build.c:2075 +#: ../src/build.c:1011 ../src/build.c:1117 ../src/build.c:2080 msgid "Make Custom _Target" msgstr "_Özel Hedef Derle" #. build the code with make object -#: ../src/build.c:1024 ../src/build.c:2083 +#: ../src/build.c:1020 ../src/build.c:2088 msgid "Make _Object" msgstr "Nesne_yi Derle" #. next error -#: ../src/build.c:1037 ../src/build.c:1134 +#: ../src/build.c:1033 ../src/build.c:1130 msgid "_Next Error" msgstr "Sonra_ki Hata" -#: ../src/build.c:1044 ../src/build.c:1141 +#: ../src/build.c:1040 ../src/build.c:1137 msgid "_Previous Error" msgstr "Ön_ceki Hata" #. arguments -#: ../src/build.c:1069 ../src/build.c:2095 +#: ../src/build.c:1065 ../src/build.c:2100 msgid "_Set Includes and Arguments" msgstr "Dahili _Seçenekleri ve Argümanları Ayarla" #. DVI -#: ../src/build.c:1090 +#: ../src/build.c:1086 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1099 +#: ../src/build.c:1095 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1153 +#: ../src/build.c:1149 msgid "_View DVI File" msgstr "D_VI Dosyayı İncele" #. PDF view -#: ../src/build.c:1163 +#: ../src/build.c:1159 msgid "V_iew PDF File" msgstr "PDF Dosyayı _İncele" #. arguments -#: ../src/build.c:1178 +#: ../src/build.c:1174 msgid "_Set Arguments" msgstr "Arg_ümanları Ayarla" -#: ../src/build.c:1253 +#: ../src/build.c:1249 msgid "Set Arguments" msgstr "Argümanları Ayarla" -#: ../src/build.c:1260 +#: ../src/build.c:1256 msgid "Set programs and options for compiling and viewing (La)TeX files." msgstr "" "(La)TeX dosyalarının derlenmesi ve incelenmesi için program ve seçenekleri " "ayarla." -#: ../src/build.c:1271 +#: ../src/build.c:1267 msgid "DVI creation:" msgstr "DVI oluşturma:" -#: ../src/build.c:1291 +#: ../src/build.c:1287 msgid "PDF creation:" msgstr "PDF oluşturma:" -#: ../src/build.c:1311 +#: ../src/build.c:1307 msgid "DVI preview:" msgstr "DVI izleme:" -#: ../src/build.c:1331 +#: ../src/build.c:1327 msgid "PDF preview:" msgstr "PDF izleme:" -#: ../src/build.c:1348 ../src/build.c:1524 +#: ../src/build.c:1344 ../src/build.c:1526 #, c-format msgid "" "%f will be replaced by the current filename, e.g. test_file.c\n" @@ -245,137 +239,137 @@ "%f geçerli dosya adı ile değişecek, örn. test_dosyasi.c\n" "%e geçerli dosya adının uzantısız hali ile değişecek, örn. test_dosyasi" -#: ../src/build.c:1427 +#: ../src/build.c:1429 msgid "Set Includes and Arguments" msgstr "Dahili Seçenekleri ve Argümanları Ayarla" -#: ../src/build.c:1434 +#: ../src/build.c:1436 msgid "Set the commands for building and running programs." msgstr "Dosyaları derlemek ve çalıştırmak için kullanılacak komutları ayarla." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1442 +#: ../src/build.c:1444 #, c-format msgid "%s commands" msgstr "%s komutları" -#: ../src/build.c:1457 +#: ../src/build.c:1459 msgid "Compile:" msgstr "Derle:" -#: ../src/build.c:1479 +#: ../src/build.c:1481 msgid "Build:" msgstr "İnşa Et:" -#: ../src/build.c:1501 ../src/dialogs.c:1224 +#: ../src/build.c:1503 ../src/dialogs.c:1245 msgid "Execute:" msgstr "Çalıştır:" -#: ../src/build.c:1827 ../src/toolbar.c:194 +#: ../src/build.c:1832 ../src/toolbar.c:193 msgid "Build the current file" msgstr "Geçerli dosyayı derle" -#: ../src/build.c:1852 +#: ../src/build.c:1857 msgid "Make Custom Target" msgstr "Özel Hedef Belirle" -#: ../src/build.c:1853 +#: ../src/build.c:1858 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "Buraya özel seçenekleri girin, girilen bütün yazı make komutuna gidecek." -#: ../src/build.c:1902 +#: ../src/build.c:1907 msgid "Build the current file with Make and the default target" msgstr "Geçerli dosyayı make aracı ile ve öntanımlı dizinde inşa et" -#: ../src/build.c:1905 +#: ../src/build.c:1910 msgid "Build the current file with Make and the specified target" msgstr "Geçerli dosyayı make aracı kullanarak belirtilen dizinde inşa et" -#: ../src/build.c:1908 +#: ../src/build.c:1913 msgid "Compile the current file with Make" msgstr "Geçerli dosyayı Make ile derle" -#: ../src/build.c:1970 +#: ../src/build.c:1975 msgid "Failed to execute the view program" msgstr "Görüntüleme programı çalıştırılamadı" -#: ../src/build.c:2008 +#: ../src/build.c:2013 #, c-format msgid "Process could not be stopped (%s)." msgstr "İşlem durdurulamadı (%s)." -#: ../src/build.c:2027 ../src/build.c:2041 +#: ../src/build.c:2032 ../src/build.c:2046 msgid "No more build errors." msgstr "Başka inşa hatası yok." -#: ../src/callbacks.c:150 +#: ../src/callbacks.c:152 msgid "Do you really want to quit?" msgstr "Gerçekten çıkmak istiyor musunuz?" -#: ../src/callbacks.c:459 ../src/document.c:2823 ../src/interface.c:334 -#: ../src/treeviews.c:517 +#: ../src/callbacks.c:461 ../src/document.c:2840 ../src/interface.c:340 +#: ../src/treeviews.c:525 msgid "_Reload" msgstr "Tek_rar Yükle" -#: ../src/callbacks.c:460 +#: ../src/callbacks.c:462 msgid "Any unsaved changes will be lost." msgstr "Kaydedilmemiş bütün içerik kaybolacak." -#: ../src/callbacks.c:461 +#: ../src/callbacks.c:463 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Yeniden yüklemek istediğinize emin misiniz '%s'?" -#: ../src/callbacks.c:1196 ../src/keybindings.c:366 +#: ../src/callbacks.c:1221 ../src/keybindings.c:367 msgid "Go to Line" msgstr "Satıra Git" -#: ../src/callbacks.c:1196 +#: ../src/callbacks.c:1221 msgid "Enter the line you want to go to:" msgstr "Gitmek istediğiniz satırı girin:" -#: ../src/callbacks.c:1294 ../src/callbacks.c:1319 +#: ../src/callbacks.c:1319 ../src/callbacks.c:1344 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Lütfen bı fonksiyonu kullanmadan önce geçerli dosya için dosya türünü " "ayarlayın." -#: ../src/callbacks.c:1427 ../src/ui_utils.c:530 +#: ../src/callbacks.c:1452 ../src/ui_utils.c:541 msgid "dd.mm.yyyy" msgstr "gg.aa.yyyy" -#: ../src/callbacks.c:1429 ../src/ui_utils.c:531 +#: ../src/callbacks.c:1454 ../src/ui_utils.c:542 msgid "mm.dd.yyyy" msgstr "aa.gg.yyyy" -#: ../src/callbacks.c:1431 ../src/ui_utils.c:532 +#: ../src/callbacks.c:1456 ../src/ui_utils.c:543 msgid "yyyy/mm/dd" msgstr "yyyy/aa/gg" -#: ../src/callbacks.c:1433 ../src/ui_utils.c:541 +#: ../src/callbacks.c:1458 ../src/ui_utils.c:552 msgid "dd.mm.yyyy hh:mm:ss" msgstr "gg.aa.yyyy sa:dk:sn" -#: ../src/callbacks.c:1435 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1460 ../src/ui_utils.c:553 msgid "mm.dd.yyyy hh:mm:ss" msgstr "gg.aa.yyyy sa:dk:sn" -#: ../src/callbacks.c:1437 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1462 ../src/ui_utils.c:554 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/aa/gg sa:dk:sn" -#: ../src/callbacks.c:1439 ../src/ui_utils.c:552 +#: ../src/callbacks.c:1464 ../src/ui_utils.c:563 msgid "_Use Custom Date Format" msgstr "Özel Tarih Formatını K_ullan" -#: ../src/callbacks.c:1450 +#: ../src/callbacks.c:1475 msgid "Custom Date Format" msgstr "Özel Tarih Formatı" -#: ../src/callbacks.c:1451 +#: ../src/callbacks.c:1476 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." @@ -383,24 +377,24 @@ "Buraya özel tarih ve zaman biçimini girin. ANSI C uyumlu bütün olasılıkları " "kullanabilirsiniz." -#: ../src/callbacks.c:1469 +#: ../src/callbacks.c:1494 msgid "Date format string could not be converted (possibly too long)." msgstr "Tarih biçimi dönüştürülemedi (muhtemelen çok uzun)." -#: ../src/callbacks.c:1742 ../src/callbacks.c:1752 +#: ../src/callbacks.c:1767 ../src/callbacks.c:1777 msgid "No more message items." msgstr "Başka mesaj yok." #. initialize the dialog -#: ../src/dialogs.c:177 ../src/prefs.c:1547 +#: ../src/dialogs.c:183 ../src/prefs.c:1579 msgid "Open File" msgstr "Dosya Aç" -#: ../src/dialogs.c:181 ../src/interface.c:685 +#: ../src/dialogs.c:187 ../src/interface.c:691 msgid "_View" msgstr "G_örünüm" -#: ../src/dialogs.c:184 +#: ../src/dialogs.c:190 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -408,24 +402,24 @@ "Dosyayı salt okuma modunda açar. Birden fazla dosya açarsanız hepsi salt " "okunur modda açılacaktır." -#: ../src/dialogs.c:221 +#: ../src/dialogs.c:212 msgid "Detect by file extension" msgstr "Dosya uzantısına göre algıla" -#: ../src/dialogs.c:232 ../src/interface.c:3465 ../src/interface.c:5006 +#: ../src/dialogs.c:237 ../src/interface.c:3538 ../src/interface.c:5086 msgid "Detect from file" msgstr "Dosyadan algıla" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:295 +#: ../src/dialogs.c:304 msgid "Show _hidden files" msgstr "_Gizli dosyaları görüntüle" -#: ../src/dialogs.c:306 +#: ../src/dialogs.c:315 msgid "Set encoding:" msgstr "Kodlamayı ayarla:" -#: ../src/dialogs.c:316 +#: ../src/dialogs.c:325 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -437,11 +431,11 @@ "otomatik olarak tanıyamıyorsa kendiniz belirtmek için bunu kullanın.\n" "Birden çok dosya seçerseniz hepsi seçilen kodlama ile açılacaktır." -#: ../src/dialogs.c:337 +#: ../src/dialogs.c:346 msgid "Set filetype:" msgstr "Dosya türünü ayarla:" -#: ../src/dialogs.c:347 +#: ../src/dialogs.c:356 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -453,23 +447,23 @@ "kullanın.\n" "Birden çok dosya seçerseniz hepsi seçilen dosya türünde açılacaktır." -#: ../src/dialogs.c:458 +#: ../src/dialogs.c:467 msgid "Save File" msgstr "Dosyayı Kaydet" -#: ../src/dialogs.c:466 +#: ../src/dialogs.c:475 msgid "R_ename" msgstr "Y_eniden adlandır" -#: ../src/dialogs.c:468 +#: ../src/dialogs.c:477 msgid "Save the file and rename it" msgstr "Dosyayı kaydet ve yeniden isimlendir" -#: ../src/dialogs.c:476 +#: ../src/dialogs.c:485 msgid "_Open file in a new tab" msgstr "D_osyayı yeni sekmede aç" -#: ../src/dialogs.c:478 +#: ../src/dialogs.c:487 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -477,110 +471,110 @@ "Şimdiki kaydedilmemiş dökümanı açık tut ve yeni kaydedilmiş dosyayı yeni " "sekmede aç." -#: ../src/dialogs.c:657 +#: ../src/dialogs.c:678 msgid "_Don't save" msgstr "Kay_detme" -#: ../src/dialogs.c:691 +#: ../src/dialogs.c:712 #, c-format msgid "The file '%s' is not saved." msgstr "'%s' dosyası kaydedilmedi." -#: ../src/dialogs.c:693 +#: ../src/dialogs.c:714 msgid "Do you want to save it before closing?" msgstr "Kapatmadan önce kaydetmek ister misiniz?" -#: ../src/dialogs.c:768 +#: ../src/dialogs.c:789 msgid "Choose font" msgstr "Yazıtipi seç" -#: ../src/dialogs.c:1008 +#: ../src/dialogs.c:1029 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." msgstr "Bir hata oluştu ya da dosya bilgisi getirilemedi." -#: ../src/dialogs.c:1027 ../src/dialogs.c:1028 ../src/dialogs.c:1029 -#: ../src/dialogs.c:1035 ../src/dialogs.c:1036 ../src/dialogs.c:1037 -#: ../src/symbols.c:1627 ../src/symbols.c:1648 ../src/symbols.c:1700 -#: ../src/ui_utils.c:203 +#: ../src/dialogs.c:1048 ../src/dialogs.c:1049 ../src/dialogs.c:1050 +#: ../src/dialogs.c:1056 ../src/dialogs.c:1057 ../src/dialogs.c:1058 +#: ../src/symbols.c:1642 ../src/symbols.c:1663 ../src/symbols.c:1715 +#: ../src/ui_utils.c:214 msgid "unknown" msgstr "bilinmeyen" -#: ../src/dialogs.c:1041 +#: ../src/dialogs.c:1062 ../src/symbols.c:733 msgid "Properties" msgstr "Özellikler" -#: ../src/dialogs.c:1071 +#: ../src/dialogs.c:1092 msgid "Type:" msgstr "Tür:" -#: ../src/dialogs.c:1085 +#: ../src/dialogs.c:1106 msgid "Size:" msgstr "Boyut:" -#: ../src/dialogs.c:1101 +#: ../src/dialogs.c:1122 msgid "Location:" msgstr "Yer:" -#: ../src/dialogs.c:1115 +#: ../src/dialogs.c:1136 msgid "Read-only:" msgstr "Salt okunur:" -#: ../src/dialogs.c:1122 +#: ../src/dialogs.c:1143 msgid "(only inside Geany)" msgstr "(sadece Geany içinde)" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1152 msgid "Encoding:" msgstr "Kodlama:" #. BOM = byte order mark -#: ../src/dialogs.c:1141 ../src/ui_utils.c:206 +#: ../src/dialogs.c:1162 ../src/ui_utils.c:217 msgid "(with BOM)" msgstr "(BOM ile)" -#: ../src/dialogs.c:1141 +#: ../src/dialogs.c:1162 msgid "(without BOM)" msgstr "(BOM olmadan)" -#: ../src/dialogs.c:1152 +#: ../src/dialogs.c:1173 msgid "Modified:" msgstr "Düzenlendi:" -#: ../src/dialogs.c:1166 +#: ../src/dialogs.c:1187 msgid "Changed:" msgstr "Değiştirildi:" -#: ../src/dialogs.c:1180 +#: ../src/dialogs.c:1201 msgid "Accessed:" msgstr "Ulaşıldı:" -#: ../src/dialogs.c:1202 +#: ../src/dialogs.c:1223 msgid "Permissions:" msgstr "İzinler:" #. Header -#: ../src/dialogs.c:1210 +#: ../src/dialogs.c:1231 msgid "Read:" msgstr "Okuma:" -#: ../src/dialogs.c:1217 +#: ../src/dialogs.c:1238 msgid "Write:" msgstr "Yazma:" #. Owner -#: ../src/dialogs.c:1232 +#: ../src/dialogs.c:1253 msgid "Owner:" msgstr "Sahibi:" #. Group -#: ../src/dialogs.c:1268 +#: ../src/dialogs.c:1289 msgid "Group:" msgstr "Grup:" #. Other -#: ../src/dialogs.c:1304 +#: ../src/dialogs.c:1325 msgid "Other:" msgstr "Diğer:" @@ -711,8 +705,8 @@ msgid "Wrap search and find again?" msgstr "Aramayı geç ve tekrar bul?" -#: ../src/document.c:1995 ../src/search.c:1065 ../src/search.c:1663 -#: ../src/search.c:1664 +#: ../src/document.c:1995 ../src/search.c:1065 ../src/search.c:1669 +#: ../src/search.c:1670 #, c-format msgid "No matches found for \"%s\"." msgstr "\"%s\" araması için hiçbir eşleşme bulunamadı." @@ -724,11 +718,11 @@ msgstr[0] "%s: %d tane \"%s\" değeri \"%s\" ile değiştirildi." msgstr[1] "%s: %d tane \"%s\" değeri \"%s\" ile değiştirildi." -#: ../src/document.c:2824 +#: ../src/document.c:2841 msgid "Do you want to reload it?" msgstr "Yeniden yüklemek ister misiniz?" -#: ../src/document.c:2825 +#: ../src/document.c:2842 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -737,11 +731,11 @@ "'%s' dosyasının daha güncel bir hali\n" "diskte bulunmakta." -#: ../src/document.c:2846 +#: ../src/document.c:2863 msgid "Try to resave the file?" msgstr "Dosyayı tekrar kurtarmayı denemek ister misiniz?" -#: ../src/document.c:2847 +#: ../src/document.c:2864 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "\"%s\" dosyası diskte bulunamadı!" @@ -900,92 +894,92 @@ msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:85 ../src/filetypes.c:96 ../src/filetypes.c:108 -#: ../src/filetypes.c:119 ../src/filetypes.c:130 ../src/filetypes.c:141 -#: ../src/filetypes.c:152 ../src/filetypes.c:164 ../src/filetypes.c:175 -#: ../src/filetypes.c:186 ../src/filetypes.c:197 ../src/filetypes.c:208 -#: ../src/filetypes.c:219 ../src/filetypes.c:230 ../src/filetypes.c:242 -#: ../src/filetypes.c:254 ../src/filetypes.c:265 ../src/filetypes.c:276 -#: ../src/filetypes.c:287 ../src/filetypes.c:298 ../src/filetypes.c:309 -#: ../src/filetypes.c:320 ../src/filetypes.c:367 ../src/filetypes.c:378 -#: ../src/filetypes.c:412 ../src/filetypes.c:423 ../src/filetypes.c:468 -#: ../src/filetypes.c:502 ../src/filetypes.c:513 ../src/filetypes.c:524 -#: ../src/filetypes.c:535 ../src/filetypes.c:546 +#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 +#: ../src/interface.c:5005 +msgid "None" +msgstr "Hiçbiri" + +#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 +#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 +#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 +#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 +#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 +#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 +#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 +#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 +#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 +#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 +#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 #, c-format msgid "%s source file" msgstr "%s kaynak dosyası" -#: ../src/filetypes.c:331 +#: ../src/filetypes.c:348 msgid "Shell script file" msgstr "Kabuk betiği dosyası" -#: ../src/filetypes.c:343 +#: ../src/filetypes.c:360 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:355 +#: ../src/filetypes.c:372 msgid "XML document" msgstr "XML dosyası" -#: ../src/filetypes.c:390 +#: ../src/filetypes.c:407 msgid "Cascading StyleSheet" msgstr "CSS dosyası" -#: ../src/filetypes.c:401 +#: ../src/filetypes.c:418 msgid "SQL Dump file" msgstr "SQL Dump dosyası" -#: ../src/filetypes.c:434 +#: ../src/filetypes.c:451 msgid "Diff file" msgstr "Diff dosyası" -#: ../src/filetypes.c:445 +#: ../src/filetypes.c:462 msgid "Config file" msgstr "Ayar dosyası" -#: ../src/filetypes.c:457 +#: ../src/filetypes.c:474 msgid "Gettext translation file" msgstr "Gettext çeviri dosyası" -#: ../src/filetypes.c:479 +#: ../src/filetypes.c:507 #, c-format msgid "%s script file" msgstr "%s betik dosyası" -#: ../src/filetypes.c:490 +#: ../src/filetypes.c:518 msgid "reStructuredText file" msgstr "reStructuredText dosyası" -#: ../src/filetypes.c:557 ../src/project.c:284 -msgid "All files" -msgstr "Tüm dosyalar" - -#: ../src/filetypes.c:654 +#: ../src/filetypes.c:697 msgid "_Programming Languages" msgstr "_Programlama Dilleri" -#: ../src/filetypes.c:655 +#: ../src/filetypes.c:698 msgid "_Scripting Languages" msgstr "_Betik Dilleri" -#: ../src/filetypes.c:656 +#: ../src/filetypes.c:699 msgid "_Markup Languages" msgstr "İşaretle_me Dilleri" -#: ../src/filetypes.c:657 +#: ../src/filetypes.c:700 msgid "M_iscellaneous Languages" msgstr "D_iğer Diller" -#: ../src/filetypes.c:686 ../src/interface.c:3384 ../src/interface.c:4925 -#: ../src/templates.c:376 ../src/ui_utils.c:156 -msgid "None" -msgstr "Hiçbiri" - -#: ../src/filetypes.c:1273 ../src/win32.c:107 +#: ../src/filetypes.c:1283 ../src/win32.c:107 msgid "All Source" msgstr "Bütün Kaynak" -#: ../src/filetypes.c:1354 +#: ../src/filetypes.c:1308 ../src/project.c:287 +msgid "All files" +msgstr "Tüm dosyalar" + +#: ../src/filetypes.c:1366 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "%s dosya türü için geçersiz düzenli ifade: %s" @@ -994,458 +988,467 @@ msgid "untitled" msgstr "isimsiz" -#: ../src/interface.c:270 +#: ../src/interface.c:276 msgid "_File" msgstr "_Dosya" -#: ../src/interface.c:281 +#: ../src/interface.c:287 msgid "New (with _Template)" msgstr "Yeni (_kalıp ile)" -#: ../src/interface.c:292 ../src/interface.c:353 ../src/interface.c:531 -#: ../src/interface.c:585 ../src/interface.c:599 ../src/interface.c:845 -#: ../src/interface.c:855 ../src/interface.c:1982 ../src/interface.c:2036 -#: ../src/interface.c:2050 +#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 +#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 +#: ../src/interface.c:861 ../src/interface.c:2006 ../src/interface.c:2060 +#: ../src/interface.c:2074 msgid "invisible" msgstr "geçersiz" -#: ../src/interface.c:294 +#: ../src/interface.c:300 msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:305 ../src/interface.c:1904 +#: ../src/interface.c:311 ../src/interface.c:1928 msgid "Open Selected F_ile" msgstr "Seç_ilen Dosyayı Aç" -#: ../src/interface.c:309 +#: ../src/interface.c:315 msgid "Recent _Files" msgstr "_Önceki Dosyalar" -#: ../src/interface.c:326 +#: ../src/interface.c:332 msgid "Save A_ll" msgstr "Hepsini Kayde_t" -#: ../src/interface.c:342 +#: ../src/interface.c:348 msgid "R_eload As" msgstr ".. olarak t_ekrar yükle" -#: ../src/interface.c:370 +#: ../src/interface.c:376 msgid "Page Set_up" msgstr "Sayfa D_üzeni" -#: ../src/interface.c:387 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:233 msgid "Close Ot_her Documents" msgstr "Di_ğer Dosyaları Kapat" -#: ../src/interface.c:395 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:238 msgid "C_lose All" msgstr "Tümü_nü Kapat" -#: ../src/interface.c:412 +#: ../src/interface.c:418 msgid "_Edit" msgstr "Düz_enle" -#: ../src/interface.c:453 ../src/interface.c:1895 +#: ../src/interface.c:459 ../src/interface.c:1919 msgid "Select _All" msgstr "Tümünü Se_ç" -#: ../src/interface.c:462 ../src/interface.c:1913 +#: ../src/interface.c:468 ../src/interface.c:1937 msgid "_Format" msgstr "_Biçim" -#: ../src/interface.c:469 ../src/interface.c:1920 +#: ../src/interface.c:475 ../src/interface.c:1944 msgid "T_oggle Case of Selection" msgstr "Seçimi Büyült/Kü_çült" -#: ../src/interface.c:478 ../src/interface.c:1929 +#: ../src/interface.c:484 ../src/interface.c:1953 msgid "_Comment Line(s)" msgstr "Satırları _Yoruma Çevir" -#: ../src/interface.c:482 ../src/interface.c:1933 +#: ../src/interface.c:488 ../src/interface.c:1957 msgid "U_ncomment Line(s)" msgstr "Satırların Yorumunu _Kaldır" -#: ../src/interface.c:486 ../src/interface.c:1937 +#: ../src/interface.c:492 ../src/interface.c:1961 msgid "_Toggle Line Commentation" msgstr "Sa_tırı Yorum Yap/Yapma" -#: ../src/interface.c:490 ../src/interface.c:1941 +#: ../src/interface.c:496 ../src/interface.c:1965 msgid "Du_plicate Line or Selection" msgstr "Seçimi ya da Satırı Ço_ğalt" -#: ../src/interface.c:499 ../src/interface.c:1950 +#: ../src/interface.c:505 ../src/interface.c:1974 msgid "_Increase Indent" msgstr "Girintiyi _Artır" -#: ../src/interface.c:507 ../src/interface.c:1958 +#: ../src/interface.c:513 ../src/interface.c:1982 msgid "_Decrease Indent" msgstr "Girintiyi A_zalt" -#: ../src/interface.c:520 ../src/interface.c:1971 +#: ../src/interface.c:526 ../src/interface.c:1995 msgid "_Send Selection to Terminal" msgstr "_Seçimi Terminale Gönder" -#: ../src/interface.c:524 ../src/interface.c:1975 +#: ../src/interface.c:530 ../src/interface.c:1999 msgid "_Send Selection to" msgstr "_Seçimi yolla" -#: ../src/interface.c:539 ../src/interface.c:1990 +#: ../src/interface.c:545 ../src/interface.c:2014 msgid "I_nsert Comments" msgstr "Yoru_m Ekle" -#: ../src/interface.c:550 ../src/interface.c:2001 +#: ../src/interface.c:556 ../src/interface.c:2025 msgid "Insert _ChangeLog Entry" msgstr "Değişiklik _Girdisi Ekle" -#: ../src/interface.c:554 ../src/interface.c:2005 +#: ../src/interface.c:560 ../src/interface.c:2029 msgid "Insert File _Header" msgstr "Dosya _Başlığı Ekle" -#: ../src/interface.c:558 ../src/interface.c:2009 +#: ../src/interface.c:564 ../src/interface.c:2033 msgid "Insert _Function Description" msgstr "_Fonksiyon Tanımı Gir" -#: ../src/interface.c:562 ../src/interface.c:2013 +#: ../src/interface.c:568 ../src/interface.c:2037 msgid "Insert _Multiline Comment" msgstr "Çok satırlı yo_rum girer" -#: ../src/interface.c:566 ../src/interface.c:2017 +#: ../src/interface.c:572 ../src/interface.c:2041 msgid "Insert _GPL Notice" msgstr "_GPL Lisans Notu Gir" -#: ../src/interface.c:570 ../src/interface.c:2021 +#: ../src/interface.c:576 ../src/interface.c:2045 msgid "Insert _BSD License Notice" msgstr "_BSD Lisans Notu Gir" -#: ../src/interface.c:574 ../src/interface.c:2025 +#: ../src/interface.c:580 ../src/interface.c:2049 msgid "Insert Dat_e" msgstr "Tari_h Gir" -#: ../src/interface.c:588 ../src/interface.c:2039 +#: ../src/interface.c:594 ../src/interface.c:2063 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" g_ir" -#: ../src/interface.c:607 +#: ../src/interface.c:613 msgid "Preference_s" msgstr "_Seçenekler" -#: ../src/interface.c:615 +#: ../src/interface.c:621 msgid "_Search" msgstr "_Ara" -#: ../src/interface.c:626 +#: ../src/interface.c:632 msgid "Find _Next" msgstr "So_nrakini Bul" -#: ../src/interface.c:630 +#: ../src/interface.c:636 msgid "Find _Previous" msgstr "Ön_cekini Bul" -#: ../src/interface.c:634 +#: ../src/interface.c:640 msgid "Find in F_iles" msgstr "Dosyalar _içinde Bul" -#: ../src/interface.c:638 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:509 msgid "_Replace" msgstr "Değişti_r" -#: ../src/interface.c:651 +#: ../src/interface.c:657 msgid "Find _Selected" msgstr "_Seçileni Bul" -#: ../src/interface.c:655 +#: ../src/interface.c:661 msgid "Find Pre_vious Selected" msgstr "Önceki Seçileni B_ul" -#: ../src/interface.c:664 +#: ../src/interface.c:670 msgid "Next _Message" msgstr "Sonraki _Mesaj" -#: ../src/interface.c:668 +#: ../src/interface.c:674 msgid "Pr_evious Message" msgstr "Önc_eki Mesaj" -#: ../src/interface.c:677 ../src/interface.c:2091 +#: ../src/interface.c:683 ../src/interface.c:2115 msgid "_Go to Line" msgstr "Satıra _Git" -#: ../src/interface.c:692 +#: ../src/interface.c:698 msgid "Change _Font" msgstr "Ya_zıtipini Değiştir" -#: ../src/interface.c:705 +#: ../src/interface.c:711 msgid "To_ggle All Additional Widgets" msgstr "B_ütün Bölgeleri Göster/Gizle" -#: ../src/interface.c:709 +#: ../src/interface.c:715 msgid "Full_screen" msgstr "Tam E_kran" -#: ../src/interface.c:713 +#: ../src/interface.c:719 msgid "Show Message _Window" msgstr "Mesa_j Penceresini Göster" -#: ../src/interface.c:718 +#: ../src/interface.c:724 msgid "Show _Toolbar" msgstr "Araç Ç_ubuğunu Göster" -#: ../src/interface.c:723 +#: ../src/interface.c:729 msgid "Show Side_bar" msgstr "Yan Pane_li Gçster" -#: ../src/interface.c:728 ../src/interface.c:3792 ../src/keybindings.c:226 +#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 msgid "Editor" msgstr "Düzenleyici" -#: ../src/interface.c:735 +#: ../src/interface.c:741 msgid "Show _Markers Margin" msgstr "İşaretçi Bölü_münü Göster" -#: ../src/interface.c:740 +#: ../src/interface.c:746 msgid "Show _Line Numbers" msgstr "Satır Numara_larını Göster" -#: ../src/interface.c:745 +#: ../src/interface.c:751 msgid "Show _White Space" msgstr "Beyaz Bo_ş Bölgeyi Göster" -#: ../src/interface.c:749 +#: ../src/interface.c:755 msgid "Show Line _Endings" msgstr "Satır Sonlarını Göst_er" -#: ../src/interface.c:753 +#: ../src/interface.c:759 msgid "Show _Indentation Guides" msgstr "Girintileme Y_önergelerini Göster" -#: ../src/interface.c:774 +#: ../src/interface.c:780 msgid "_Document" msgstr "_Döküman" -#: ../src/interface.c:781 +#: ../src/interface.c:787 msgid "_Line Wrapping" msgstr "Satır Ka_ydırma" -#: ../src/interface.c:786 +#: ../src/interface.c:792 msgid "Line _Breaking" msgstr "Satır s_onu" -#: ../src/interface.c:790 +#: ../src/interface.c:796 msgid "_Auto-indentation" msgstr "Otom_atik Girintileme" -#: ../src/interface.c:795 +#: ../src/interface.c:801 msgid "In_dent Type" msgstr "Girintileme T_ürü" -#: ../src/interface.c:802 ../src/interface.c:3423 ../src/interface.c:4964 +#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 msgid "_Tabs" msgstr "S_ekmeler" -#: ../src/interface.c:808 ../src/interface.c:3414 ../src/interface.c:4955 +#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 msgid "_Spaces" msgstr "Bo_şluklar" -#: ../src/interface.c:814 ../src/interface.c:3432 ../src/interface.c:4973 +#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 msgid "T_abs and Spaces" msgstr "_Sekmeler ve Boşluklar" -#: ../src/interface.c:825 +#: ../src/interface.c:831 msgid "Read _Only" msgstr "Salt _Okunur" -#: ../src/interface.c:829 +#: ../src/interface.c:835 msgid "_Write Unicode BOM" msgstr "BOM Unicode _Yaz" -#: ../src/interface.c:838 +#: ../src/interface.c:844 msgid "Set File_type" msgstr "Dosya _Türünü Ayarla" -#: ../src/interface.c:848 +#: ../src/interface.c:854 msgid "Set _Encoding" msgstr "Kodlama Aya_rla" -#: ../src/interface.c:858 +#: ../src/interface.c:864 msgid "Set Line E_ndings" msgstr "Satır So_nunu Ayarla" -#: ../src/interface.c:865 +#: ../src/interface.c:871 msgid "Convert and Set to _CR/LF (Win)" msgstr "_CR/LF (Win) türüne dönüştür ve devam et" -#: ../src/interface.c:871 +#: ../src/interface.c:877 msgid "Convert and Set to _LF (Unix)" msgstr "_LF (Unix) türüne dönüştür ve devam et" -#: ../src/interface.c:877 +#: ../src/interface.c:883 msgid "Convert and Set to CR (_Mac)" msgstr "CR (_Mac) türüne dönüştür ve devam et" -#: ../src/interface.c:888 +#: ../src/interface.c:894 msgid "_Strip Trailing Spaces" msgstr "_Sondaki Boşlukları Kes" -#: ../src/interface.c:892 +#: ../src/interface.c:898 msgid "_Replace Tabs by Spaces" msgstr "Sekmele_ri Boşluk Yap" -#: ../src/interface.c:896 +#: ../src/interface.c:902 msgid "Replace Spaces b_y Tabs" msgstr "Boşlukları Sekme _Yap" -#: ../src/interface.c:905 +#: ../src/interface.c:911 msgid "_Fold All" msgstr "Hepsini _Katla" -#: ../src/interface.c:909 +#: ../src/interface.c:915 msgid "_Unfold All" msgstr "Hepsini A_ç" -#: ../src/interface.c:918 +#: ../src/interface.c:924 msgid "Remove _Markers" msgstr "İ_şaretçileri Kaldır" -#: ../src/interface.c:922 +#: ../src/interface.c:928 msgid "Remove Error _Indicators" msgstr "Hata belirteçlerin_i Kaldır" -#: ../src/interface.c:926 +#: ../src/interface.c:932 msgid "_Project" msgstr "_Proje" -#: ../src/interface.c:933 +#: ../src/interface.c:939 msgid "_New" msgstr "Ye_ni" -#: ../src/interface.c:941 +#: ../src/interface.c:947 msgid "_Open" msgstr "A_ç" -#: ../src/interface.c:949 +#: ../src/interface.c:955 +#, fuzzy +msgid "_Recent Projects" +msgstr "Proje Aç" + +#: ../src/interface.c:959 msgid "_Close" msgstr "_Kapat" -#: ../src/interface.c:970 +#: ../src/interface.c:980 msgid "_Tools" msgstr "_Araçlar" -#: ../src/interface.c:977 +#: ../src/interface.c:987 msgid "_Color Chooser" msgstr "_Renk Seçici" -#: ../src/interface.c:985 +#: ../src/interface.c:995 msgid "_Word Count" msgstr "Kelime Saya_cı" -#: ../src/interface.c:989 +#: ../src/interface.c:999 msgid "Load Ta_gs" msgstr "Bi_çim Yükle" -#: ../src/interface.c:993 +#: ../src/interface.c:1003 msgid "_Reload Configuration" msgstr "Aya_rları Tekrar Yükle" -#: ../src/interface.c:1001 ../src/interface.c:1008 +#: ../src/interface.c:1011 ../src/interface.c:1018 msgid "_Help" msgstr "Yardı_m" -#: ../src/interface.c:1016 +#: ../src/interface.c:1026 msgid "_Website" msgstr "_Web Sitesi" -#: ../src/interface.c:1020 +#: ../src/interface.c:1030 msgid "_Keyboard Shortcuts" msgstr "_Klavye Kısayolları" -#: ../src/interface.c:1024 +#: ../src/interface.c:1034 msgid "_Debug Messages" msgstr "Hata Mesa_jları" -#: ../src/interface.c:1063 ../src/treeviews.c:112 +#: ../src/interface.c:1073 ../src/treeviews.c:113 msgid "Symbols" msgstr "Semboller" -#: ../src/interface.c:1077 ../src/treeviews.c:240 +#: ../src/interface.c:1087 msgid "Documents" msgstr "Dökümanlar" -#: ../src/interface.c:1113 +#: ../src/interface.c:1123 msgid "Status" msgstr "Durum" -#: ../src/interface.c:1127 +#: ../src/interface.c:1137 msgid "Compiler" msgstr "Derleyici" -#: ../src/interface.c:1142 +#: ../src/interface.c:1152 msgid "Messages" msgstr "Mesajlar" -#: ../src/interface.c:1155 +#: ../src/interface.c:1165 msgid "Scribble" msgstr "Karalama" -#: ../src/interface.c:1712 ../src/interface.c:3201 +#: ../src/interface.c:1725 ../src/interface.c:3266 msgid "Images _and Text" msgstr "Resimler ve Y_azı" -#: ../src/interface.c:1718 ../src/interface.c:3233 +#: ../src/interface.c:1731 ../src/interface.c:3298 msgid "_Images Only" msgstr "Sadece Res_imler" -#: ../src/interface.c:1724 ../src/interface.c:3225 +#: ../src/interface.c:1737 ../src/interface.c:3290 msgid "_Text Only" msgstr "Sadece Ya_zı" -#: ../src/interface.c:1735 ../src/interface.c:3217 +#: ../src/interface.c:1748 ../src/interface.c:3282 msgid "_Large Icons" msgstr "Geniş Simge_ler" -#: ../src/interface.c:1740 ../src/interface.c:3209 +#: ../src/interface.c:1754 ../src/interface.c:3274 msgid "_Small Icons" msgstr "Küçük _Simgeler" -#: ../src/interface.c:1750 +#: ../src/interface.c:1760 ../src/interface.c:3306 +msgid "_Very Small Icons" +msgstr "_Çok Küçük Simgeler" + +#: ../src/interface.c:1770 msgid "_Hide toolbar" msgstr "Araç çubu_ğunu gizle" -#: ../src/interface.c:2058 +#: ../src/interface.c:2082 msgid "Find _Usage" msgstr "K_ullanım Bul" -#: ../src/interface.c:2066 +#: ../src/interface.c:2090 msgid "Find _Document Usage" msgstr "_Döküman Kullanımı Bul" -#: ../src/interface.c:2074 +#: ../src/interface.c:2098 msgid "Go to _Tag Definition" msgstr "Etiket _Tanımına Git" -#: ../src/interface.c:2078 +#: ../src/interface.c:2102 msgid "Go to T_ag Declaration" msgstr "Etik_et İlanına Git" -#: ../src/interface.c:2082 +#: ../src/interface.c:2106 msgid "Conte_xt Action" msgstr "Ba_ğlam Görevi" -#: ../src/interface.c:2616 ../src/keybindings.c:329 +#: ../src/interface.c:2647 ../src/keybindings.c:330 msgid "Preferences" msgstr "Seçenekler" -#: ../src/interface.c:2652 +#: ../src/interface.c:2683 msgid "Load files from the last session" msgstr "Önceki oturumdan dosyaları yükle" -#: ../src/interface.c:2655 +#: ../src/interface.c:2686 msgid "Opens at startup the files from the last session" msgstr "Açılışta önceki oturumdan kalan dosyaları yükler" -#: ../src/interface.c:2657 +#: ../src/interface.c:2688 msgid "Load virtual terminal support" msgstr "Sanal terminal desteğini yükle" -#: ../src/interface.c:2659 +#: ../src/interface.c:2690 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1453,40 +1456,40 @@ "Sanal terminal desteği (VTE) açılışta yüklenmiş olmalı. İhtiyacınız yoksa " "etkisizleştirin." -#: ../src/interface.c:2661 +#: ../src/interface.c:2692 msgid "Enable plugin support" msgstr "Eklenti desteğini yükle" -#: ../src/interface.c:2665 +#: ../src/interface.c:2696 msgid "Startup" msgstr "Başlangıç" -#: ../src/interface.c:2684 +#: ../src/interface.c:2715 msgid "Save window position and geometry" msgstr "Pencere yeri ve boyutunu kaydet" -#: ../src/interface.c:2687 +#: ../src/interface.c:2718 msgid "Saves the window position and geometry and restores it at the start" msgstr "" "Şu anki pencere pozisyonu ve boyutunu kaydeder, açılışta bu şekilde açar." -#: ../src/interface.c:2689 +#: ../src/interface.c:2720 msgid "Confirm exit" msgstr "Çıkışta Onay İste" -#: ../src/interface.c:2692 +#: ../src/interface.c:2723 msgid "Shows a confirmation dialog on exit" msgstr "Çıkışta bir onay sorusu sorar" -#: ../src/interface.c:2694 +#: ../src/interface.c:2725 msgid "Shutdown" msgstr "Kapatma" -#: ../src/interface.c:2715 +#: ../src/interface.c:2746 msgid "Startup path:" msgstr "Başlangıç yolu:" -#: ../src/interface.c:2727 +#: ../src/interface.c:2758 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1494,37 +1497,51 @@ "Bir dosya açılırken veya kaydedilirken öntanımlı yol. Çalışma dizininde " "kalması için boş bırakın." -#: ../src/interface.c:2740 +#: ../src/interface.c:2771 msgid "Project files:" msgstr "Proje dosyaları:" -#: ../src/interface.c:2752 +#: ../src/interface.c:2783 msgid "Path to start in when opening project files" msgstr "Proje dosyaları açılırken açılacak yol" -#: ../src/interface.c:2765 +#: ../src/interface.c:2796 +msgid "Extra plugin path:" +msgstr "Harici eklenti yolu:" + +#: ../src/interface.c:2808 +msgid "" +"Geany looks by default in the global installation path and in the " +"configuration directory. The path entered here will be searched additionally " +"for plugins. Leave blank to disable." +msgstr "" +"Geany öntanımlı olarak sistemde yüklendiği dizini ve kullanıcı ayar dizinini " +"izler. Buraya girdiğiniz yol da harici eklentilerin aranacağı dizin " +"olacaktır. Kullanmak istemiyorsanız boş bırakın." + +#: ../src/interface.c:2821 msgid "Paths" msgstr "Yollar" -#: ../src/interface.c:2770 +#: ../src/interface.c:2826 msgid "Startup" msgstr "Başlangıç" -#: ../src/interface.c:2792 +#: ../src/interface.c:2848 msgid "Beep on errors or when compilation has finished" msgstr "Hatalarda veya başarılı derleme sonlarında sesle uyar" -#: ../src/interface.c:2795 +#: ../src/interface.c:2851 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "Bir hata oluştuğunda ya da derleme işlemi bittiğinde ses uyarısı ver" -#: ../src/interface.c:2797 +#: ../src/interface.c:2853 msgid "Switch to status message list at new message" msgstr "Yeni mesaj oluştuğunda durum mesajları listesine gönder" -#: ../src/interface.c:2800 +#: ../src/interface.c:2856 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1532,11 +1549,11 @@ "Yeni mesaj oluştuğunda durum mesajları sekmesine (not defteri penceresinin " "en altında) gönder" -#: ../src/interface.c:2802 +#: ../src/interface.c:2858 msgid "Suppress status messages in the status bar" msgstr "Durum çubuğunda mesaj gösterme" -#: ../src/interface.c:2805 +#: ../src/interface.c:2861 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1544,11 +1561,11 @@ "Durum çubuğunda mesaj göstermez. Ancak mesajlar durum penceresinde görünmeye " "devam eder." -#: ../src/interface.c:2807 +#: ../src/interface.c:2863 msgid "Auto focus widgets (focus follows mouse)" msgstr "Bölümleri otomatik odakla (odak fareyi takip eder)" -#: ../src/interface.c:2810 +#: ../src/interface.c:2866 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 " @@ -1557,15 +1574,15 @@ "Odağı farenin olduğu bölgeye taşır. Ana bölgede, karatahtada, arama ve git " "bölgeleri ile Sanal Terminal'de çalışır." -#: ../src/interface.c:2812 ../src/interface.c:3138 ../src/interface.c:4001 +#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 msgid "Miscellaneous" msgstr "Çeşitli" -#: ../src/interface.c:2832 +#: ../src/interface.c:2888 msgid "Always wrap search and hide the Find dialog" msgstr "Arama diyaloğu penceresini her zaman gizle" -#: ../src/interface.c:2835 +#: ../src/interface.c:2891 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1573,11 +1590,11 @@ "Sonraki veya önceki sonuç için tıklama yapıldığında her zaman ilk sonuca " "ulaşıp arama diyaloğunu kapat" -#: ../src/interface.c:2837 +#: ../src/interface.c:2893 msgid "Use the current word under the cursor for Find dialogs" msgstr "Arama kutularında farenin gösterdiği kelimeyi göster" -#: ../src/interface.c:2840 +#: ../src/interface.c:2896 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1585,29 +1602,29 @@ "Seçim durumu olmadığında, arama ve yer değiştirme kutularında farenin " "altındaki kelime öntanımlı olarak yerleştir" -#: ../src/interface.c:2842 +#: ../src/interface.c:2898 msgid "Use the current file's directory for Find in Files" msgstr "Dosyalarda bulmak için geçerli dosyanın dizinini kullan" -#: ../src/interface.c:2846 +#: ../src/interface.c:2902 msgid "Search" msgstr "Arama" -#: ../src/interface.c:2865 +#: ../src/interface.c:2921 msgid "Use project-based session files" msgstr "Proje tabanlı oturum dosyalarını kullan" -#: ../src/interface.c:2868 +#: ../src/interface.c:2924 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" msgstr "Oturum dosyasını projeye göm ve açarken onu kullan" -#: ../src/interface.c:2870 +#: ../src/interface.c:2926 msgid "Store project file inside the project base directory" msgstr "Proje dosyasını projenin temel dizininde sakla" -#: ../src/interface.c:2873 +#: ../src/interface.c:2929 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 " @@ -1618,75 +1635,75 @@ "yerine, proje klasörünün içinde saklanır. İsterseniz proje yolunu Yeni Proje " "penceresinden değiştirebilirsiniz." -#: ../src/interface.c:2875 +#: ../src/interface.c:2931 msgid "Projects" msgstr "Projeler" -#: ../src/interface.c:2880 +#: ../src/interface.c:2936 msgid "Miscellaneous" msgstr "Çeşitli" -#: ../src/interface.c:2884 +#: ../src/interface.c:2940 msgid "General" msgstr "Genel" -#: ../src/interface.c:2907 +#: ../src/interface.c:2963 msgid "Show symbol list" msgstr "Sembol listesini göster" -#: ../src/interface.c:2910 +#: ../src/interface.c:2966 msgid "Toggle the symbol list on and off" msgstr "Sembol listesini aç ya da kapat" -#: ../src/interface.c:2912 +#: ../src/interface.c:2968 msgid "Show documents list" msgstr "Döküman listesini göster" -#: ../src/interface.c:2915 +#: ../src/interface.c:2971 msgid "Toggle the documents list on and off" msgstr "Döküman listesini aç ya da kapat" -#: ../src/interface.c:2917 +#: ../src/interface.c:2973 msgid "Sidebar" msgstr "Yan panel" -#: ../src/interface.c:2938 +#: ../src/interface.c:2994 msgid "Symbol list:" msgstr "Sembol listesi:" -#: ../src/interface.c:2945 ../src/interface.c:3060 +#: ../src/interface.c:3001 ../src/interface.c:3116 msgid "Message window:" msgstr "Mesaj penceresi:" -#: ../src/interface.c:2952 ../src/interface.c:3096 +#: ../src/interface.c:3008 ../src/interface.c:3152 msgid "Editor:" msgstr "Editör:" -#: ../src/interface.c:2964 +#: ../src/interface.c:3020 msgid "Sets the font for the message window" msgstr "Mesaj penceresi için yazıtipini seçin" -#: ../src/interface.c:2972 +#: ../src/interface.c:3028 msgid "Sets the font for the symbol list" msgstr "Sembol listesi için yazıtipini seçin" -#: ../src/interface.c:2980 +#: ../src/interface.c:3036 msgid "Sets the editor font" msgstr "Düzenleyici için yazıtipini seçin" -#: ../src/interface.c:2982 +#: ../src/interface.c:3038 msgid "Fonts" msgstr "Yazıtipi" -#: ../src/interface.c:3001 +#: ../src/interface.c:3057 msgid "Show editor tabs" msgstr "Düzenleyici sekmelerini göster" -#: ../src/interface.c:3005 +#: ../src/interface.c:3061 msgid "Show close buttons" msgstr "Kapat tuşlarını göster" -#: ../src/interface.c:3008 +#: ../src/interface.c:3064 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1694,97 +1711,105 @@ "Kapatmayı kolaylaştırmak için sekmelerin kenarında ufak bir çarpı işareti " "gösterir. (Geany'i yeniden başlatmanız gerekir)" -#: ../src/interface.c:3014 +#: ../src/interface.c:3070 msgid "Placement of new file tabs:" msgstr "Yeni dosya sekmelerinin yerleşimi:" -#: ../src/interface.c:3019 ../src/interface.c:3073 ../src/interface.c:3091 -#: ../src/interface.c:3109 +#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 +#: ../src/interface.c:3165 msgid "Left" msgstr "Sol" -#: ../src/interface.c:3022 +#: ../src/interface.c:3078 msgid "File tabs will be placed on the left of the notebook" msgstr "Yeni dosyalar not defterinde sola yerleşir" -#: ../src/interface.c:3027 ../src/interface.c:3074 ../src/interface.c:3092 -#: ../src/interface.c:3110 +#: ../src/interface.c:3083 ../src/interface.c:3130 ../src/interface.c:3148 +#: ../src/interface.c:3166 msgid "Right" msgstr "Sağ" -#: ../src/interface.c:3030 +#: ../src/interface.c:3086 msgid "File tabs will be placed on the right of the notebook" msgstr "Yeni dosyalar not defterinde sağa yerleşir" -#: ../src/interface.c:3034 +#: ../src/interface.c:3090 msgid "Double-clicking hides all additional widgets" msgstr "Çift tıklama bütün bölgeleri gizler" -#: ../src/interface.c:3037 +#: ../src/interface.c:3093 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Görünüm->Tüm Bölümleri Göster/Gizle komutunu çağırır" -#: ../src/interface.c:3039 +#: ../src/interface.c:3095 msgid "Editor tabs" msgstr "Düzenleyici sekmeleri" -#: ../src/interface.c:3075 ../src/interface.c:3093 ../src/interface.c:3111 +#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 msgid "Top" msgstr "Üst" -#: ../src/interface.c:3076 ../src/interface.c:3094 ../src/interface.c:3112 +#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 msgid "Bottom" msgstr "Taban" -#: ../src/interface.c:3078 +#: ../src/interface.c:3134 msgid "Sidebar:" msgstr "Yan panel:" -#: ../src/interface.c:3114 +#: ../src/interface.c:3170 msgid "Tab positions" msgstr "Sekme pozisyonları" -#: ../src/interface.c:3133 +#: ../src/interface.c:3189 msgid "Show status bar" msgstr "Durum çubuğunu göster" -#: ../src/interface.c:3136 +#: ../src/interface.c:3192 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Ana pencerenin altında durum çubuğu görüntüle" -#: ../src/interface.c:3143 +#: ../src/interface.c:3199 msgid "Interface" msgstr "Arayüz" -#: ../src/interface.c:3162 -msgid "Show Toolbar" -msgstr "Araç çubuğunu göster" +#: ../src/interface.c:3222 +msgid "Show T_oolbar" +msgstr "Araç Çubu_ğunu Göster" -#: ../src/interface.c:3166 +#: ../src/interface.c:3226 +msgid "_Append Toolbar to the Menu" +msgstr "_Araç Çubuğunu Menüye Tuttur" + +#: ../src/interface.c:3229 +msgid "Pack the toolbar to the main menu to save vertical space" +msgstr "Dikey alanda yer kazanmak için araç çubuğunu menüyle birleştirir" + +#: ../src/interface.c:3231 msgid "Toolbar" msgstr "Araç çubuğu" -#: ../src/interface.c:3187 +#: ../src/interface.c:3252 msgid "Icon style:" msgstr "Simge tüyü:" -#: ../src/interface.c:3194 +#: ../src/interface.c:3259 msgid "Icon size:" msgstr "Simge boyutu:" -#: ../src/interface.c:3241 +#: ../src/interface.c:3314 msgid "Appearance" msgstr "Görünüm" -#: ../src/interface.c:3246 +#: ../src/interface.c:3319 msgid "Toolbar" msgstr "Araç Çubuğu" -#: ../src/interface.c:3273 +#: ../src/interface.c:3346 msgid "Line wrapping" msgstr "Satır kaydırma" -#: ../src/interface.c:3276 +#: ../src/interface.c:3349 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 " @@ -1794,11 +1819,11 @@ "özellik performans kaybına sebep olur ve bu yüzden yavaş makinalarda pasif " "olmalıdır." -#: ../src/interface.c:3278 +#: ../src/interface.c:3351 msgid "Enable \"smart\" home key" msgstr "\"Akıllı\" home tuşunu etkinleştir" -#: ../src/interface.c:3281 +#: ../src/interface.c:3354 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 " @@ -1811,11 +1836,11 @@ "götürür. Bu özellik pasif ise işaretçi nerede olursa olsun HOME tuşu ile " "boşlukları önemsemeden satırın en başına gider." -#: ../src/interface.c:3283 +#: ../src/interface.c:3356 msgid "Disable Drag and Drop" msgstr "Sürükle ve bırak desteğini kapat" -#: ../src/interface.c:3286 +#: ../src/interface.c:3359 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" @@ -1823,19 +1848,19 @@ "Sürükle ve bırak özelliğini kapatır. Bu sayede düzenleyici içinde veya " "dışarıyla sürükle bırak yöntemi ile taşıma yapılamaz." -#: ../src/interface.c:3288 +#: ../src/interface.c:3361 msgid "Enable folding" msgstr "Katlamayı etkinleştır" -#: ../src/interface.c:3291 +#: ../src/interface.c:3364 msgid "Whether to enable folding the code" msgstr "Kod için katlama özelliğini aç ya da kapat" -#: ../src/interface.c:3293 +#: ../src/interface.c:3366 msgid "Fold/unfold all children of a fold point" msgstr "Bir katlama noktasında tüm alt katlamaları aç/kapat" -#: ../src/interface.c:3296 +#: ../src/interface.c:3369 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." @@ -1843,34 +1868,34 @@ "Bir katlama noktasında tüm alt katlamaları açar/katlar. Tersi davranış için " "tıklarken Shift tuşunu kullanın." -#: ../src/interface.c:3298 +#: ../src/interface.c:3371 msgid "Use indicators to show compile errors" msgstr "Derleme hataları için gösterge kullan" -#: ../src/interface.c:3301 +#: ../src/interface.c:3374 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" msgstr "" "Derleyici hata ve uyarıları için bir gösterge (dalgalı alt çizgi) kullan" -#: ../src/interface.c:3303 +#: ../src/interface.c:3376 msgid "Newline strips trailing spaces" msgstr "Yeni satır alttaki boşlukları keser" -#: ../src/interface.c:3306 +#: ../src/interface.c:3379 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Alttaki boşlukları yok etmesi için yeni satırı etkinleştir" -#: ../src/interface.c:3312 +#: ../src/interface.c:3385 msgid "Line breaking column:" msgstr "Satır sonlandırıcı sütun:" -#: ../src/interface.c:3326 +#: ../src/interface.c:3399 msgid "Comment toggle marker:" msgstr "Yorum aç/kapa işaretçisi:" -#: ../src/interface.c:3333 +#: ../src/interface.c:3406 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1878,95 +1903,95 @@ "Kaynak dosyasında yorum satırlarını belirtmek için bir değer. Yorum " "satırları arasında geçişlerde kullanılacak." -#: ../src/interface.c:3335 +#: ../src/interface.c:3408 msgid "Features" msgstr "Özellikler" -#: ../src/interface.c:3340 +#: ../src/interface.c:3413 msgid "Features" msgstr "Özellikler" -#: ../src/interface.c:3372 ../src/interface.c:4913 +#: ../src/interface.c:3445 ../src/interface.c:4993 msgid "Auto-indent mode:" msgstr "Oto-Girinti modu:" -#: ../src/interface.c:3385 ../src/interface.c:4926 +#: ../src/interface.c:3458 ../src/interface.c:5006 msgid "Basic" msgstr "Temel" -#: ../src/interface.c:3386 ../src/interface.c:4927 +#: ../src/interface.c:3459 ../src/interface.c:5007 msgid "Current chars" msgstr "Geçerli karakterler" -#: ../src/interface.c:3387 ../src/interface.c:4928 +#: ../src/interface.c:3460 ../src/interface.c:5008 msgid "Match braces" msgstr "Eşleme ayraçları" -#: ../src/interface.c:3389 ../src/interface.c:3732 ../src/interface.c:4930 +#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 msgid "Type:" msgstr "Tür:" -#: ../src/interface.c:3396 ../src/interface.c:4937 +#: ../src/interface.c:3469 ../src/interface.c:5017 msgid "Width:" msgstr "Genişlik" -#: ../src/interface.c:3409 ../src/interface.c:4950 +#: ../src/interface.c:3482 ../src/interface.c:5030 msgid "The width in chars of a single indent" msgstr "Tek girdi için karakterin genişliği" -#: ../src/interface.c:3419 ../src/interface.c:4960 +#: ../src/interface.c:3492 ../src/interface.c:5040 msgid "Use spaces when inserting indentation" msgstr "Girinti koyarken boşluk kullan" -#: ../src/interface.c:3428 ../src/interface.c:4969 +#: ../src/interface.c:3501 ../src/interface.c:5049 msgid "Use one tab per indent" msgstr "Her girinti için bir sekme kullan" -#: ../src/interface.c:3437 ../src/interface.c:4978 +#: ../src/interface.c:3510 ../src/interface.c:5058 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Girinti boyutu tek sekmeden küçükse boşluk, diğer türlü her ikisini de kullan" -#: ../src/interface.c:3452 ../src/interface.c:4993 +#: ../src/interface.c:3525 ../src/interface.c:5073 msgid "Hard tab width:" msgstr "Sekme genişliği:" -#: ../src/interface.c:3460 ../src/interface.c:5001 +#: ../src/interface.c:3533 ../src/interface.c:5081 msgid "The width of a tab when Tabs & Spaces is set for a document" msgstr "" "Sekmeler ve Boşluklar ayarlı olan bir dökümanda kullanılacak sekme genişliği" -#: ../src/interface.c:3470 ../src/interface.c:5011 +#: ../src/interface.c:3543 ../src/interface.c:5091 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "Girintileme türünün açılan dosyanın içeriğinden tespit edilmesi" -#: ../src/interface.c:3472 +#: ../src/interface.c:3545 msgid "Tab key indents" msgstr "Tab tuşu aralığı" -#: ../src/interface.c:3475 +#: ../src/interface.c:3548 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Tab/Shift-Tab tuşları sekme karakteri eklemek yerine seçilen bölgedeki " "girintiyi ayarlar" -#: ../src/interface.c:3477 +#: ../src/interface.c:3550 msgid "Indentation" msgstr "Girintileme" -#: ../src/interface.c:3482 ../src/interface.c:5013 +#: ../src/interface.c:3555 ../src/interface.c:5093 msgid "Indentation" msgstr "Girinti" -#: ../src/interface.c:3505 +#: ../src/interface.c:3578 msgid "Snippet completion" msgstr "Parça tamamlama" -#: ../src/interface.c:3508 +#: ../src/interface.c:3581 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -1974,19 +1999,19 @@ "Önceden belirlenmiş bir değişkenin bir kısmı yazıldığında tek tuşla " "tamamlamak için seçenek çıksın" -#: ../src/interface.c:3510 +#: ../src/interface.c:3583 msgid "XML tag auto completion" msgstr "XML için otomatik tamamlama" -#: ../src/interface.c:3513 +#: ../src/interface.c:3586 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "XML ve HTML etiketleri için otomatik tamamlama ve etiket kapatma." -#: ../src/interface.c:3515 +#: ../src/interface.c:3588 msgid "Automatic continuation of multi-line comments" msgstr "Çok satırlı yorumlara otomatik devam etme" -#: ../src/interface.c:3518 +#: ../src/interface.c:3591 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -1994,11 +2019,11 @@ "C, C++ ve Java gibi dillerde çoklu yorum satırlarında alt satıra geçince " "yorum olarak işaretlemeye devam et" -#: ../src/interface.c:3520 +#: ../src/interface.c:3593 msgid "Automatic symbol completion" msgstr "Otomatik sembol tamamlama" -#: ../src/interface.c:3523 +#: ../src/interface.c:3596 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2006,89 +2031,89 @@ "Bilinen sembolleri otomatik tamamlama (fonksiyon isimleri, global " "değişkenler vs.)" -#: ../src/interface.c:3531 +#: ../src/interface.c:3604 msgid "Max. symbol name suggestions:" msgstr "En fazla verilecek sembol ismi teklifi:" -#: ../src/interface.c:3538 +#: ../src/interface.c:3611 msgid "Completion list height:" msgstr "Tamamlama listesi uzunluğu:" -#: ../src/interface.c:3545 +#: ../src/interface.c:3618 msgid "Characters to type for completion:" msgstr "Tamamlama için girilecek karakter sayısı:" -#: ../src/interface.c:3558 +#: ../src/interface.c:3631 msgid "" "The amount of characters which are necessary to show the symbol auto " "completion list" msgstr "Tamamlamanın devreye girmesi için yazılması gereken karakter sayısı" -#: ../src/interface.c:3567 +#: ../src/interface.c:3640 msgid "Display height in rows for the auto completion list" msgstr "Otomatik tamamlama listesindeki sıralarda uzunluğu gösterir" -#: ../src/interface.c:3576 +#: ../src/interface.c:3649 msgid "Maximum number of entries to display in the auto completion list" msgstr "Otomatik tamamlama listesinde gösterilecek en fazla sayıda öğe" -#: ../src/interface.c:3579 +#: ../src/interface.c:3652 msgid "Completions" msgstr "Tamamlamalar" -#: ../src/interface.c:3599 +#: ../src/interface.c:3672 msgid "Parenthesis ( )" msgstr "Parantez ( )" -#: ../src/interface.c:3604 +#: ../src/interface.c:3677 msgid "Auto-close parenthesis when typing an opening one" msgstr "Yeni parantez kullanımında parantezi otomatik olarak kapat" -#: ../src/interface.c:3606 +#: ../src/interface.c:3679 msgid "Single quotes ' '" msgstr "Tek tırnak ' '" -#: ../src/interface.c:3611 +#: ../src/interface.c:3684 msgid "Auto-close simple quote when typing an opening one" msgstr "Yeni tek tırnak kullanımında tırnağı otomatik olarak kapat" -#: ../src/interface.c:3613 +#: ../src/interface.c:3686 msgid "Curly brackets { }" msgstr "Küme işareti { }" -#: ../src/interface.c:3618 +#: ../src/interface.c:3691 msgid "Auto-close curly bracket when typing an opening one" msgstr "Yeni küme işareti kullanımında kümeyi otomatik olarak kapat" -#: ../src/interface.c:3620 +#: ../src/interface.c:3693 msgid "Square brackets [ ]" msgstr "Köşeli Parantez [ ]" -#: ../src/interface.c:3625 +#: ../src/interface.c:3698 msgid "Auto-close squre-bracket when typing an opening one" msgstr "Yeni köşeli parantez kullanımında parantezi otomatik olarak kapat" -#: ../src/interface.c:3627 +#: ../src/interface.c:3700 msgid "Double quotes \" \"" msgstr "Çift tırnak \" \"" -#: ../src/interface.c:3632 +#: ../src/interface.c:3705 msgid "Auto-close double quote when typing an opening one" msgstr "Yeni çift tırnak kullanımında tırnağı otomatik olarak kapat" -#: ../src/interface.c:3634 +#: ../src/interface.c:3707 msgid "Auto-close quotes and brackets" msgstr "Tırnak ve kümeleri otomatik kapat" -#: ../src/interface.c:3639 +#: ../src/interface.c:3712 msgid "Completions" msgstr "Tamamlamalar" -#: ../src/interface.c:3662 +#: ../src/interface.c:3735 msgid "Invert syntax highlighting colors" msgstr "Sözdizimi renklendirmesinde renkleri tersine çevir" -#: ../src/interface.c:3665 +#: ../src/interface.c:3738 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" @@ -2096,45 +2121,45 @@ "Siyah arkaplan üzerine beyaz yazı kullan ve bütün renkleri zıttına çevir. Bu " "seçeneği aktifleştirdikten sonra Geany'i yeniden başlatmanız gerekir" -#: ../src/interface.c:3667 +#: ../src/interface.c:3740 msgid "Show indentation guides" msgstr "Girintileme yönergelerini göster" -#: ../src/interface.c:3670 +#: ../src/interface.c:3743 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Doğru girintileme kullandığınızda ufak noktalı satırlar kullanarak size " "yardımcı olur" -#: ../src/interface.c:3672 +#: ../src/interface.c:3745 msgid "Show white space" msgstr "Beyaz boş bölgeyi göster" -#: ../src/interface.c:3675 +#: ../src/interface.c:3748 msgid "Marks spaces with dots and tabs with arrows" msgstr "Boşluk ve sekmelerle oluşturulmuş beyaz bölgeyi oklarla işaretler" -#: ../src/interface.c:3677 +#: ../src/interface.c:3750 msgid "Show line endings" msgstr "Satır sonlarını göster" -#: ../src/interface.c:3680 +#: ../src/interface.c:3753 msgid "Show the line ending character" msgstr "Satır sonu karakterini göster" -#: ../src/interface.c:3682 +#: ../src/interface.c:3755 msgid "Show line numbers" msgstr "Satır numaralarını göster" -#: ../src/interface.c:3685 +#: ../src/interface.c:3758 msgid "Shows or hides the Line Number margin" msgstr "Satır numarası bölgesini gösterir ya da gizler" -#: ../src/interface.c:3687 +#: ../src/interface.c:3760 msgid "Show markers margin" msgstr "İşaretçi bölümünü göster" -#: ../src/interface.c:3690 +#: ../src/interface.c:3763 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2142,36 +2167,36 @@ "Satırları işaretleyebilmek için satır numaralarının sağında ufak bir bölge " "açar" -#: ../src/interface.c:3692 +#: ../src/interface.c:3765 msgid "Stop scrolling at last line" msgstr "Son satırda kaydırmayı durdur" -#: ../src/interface.c:3695 +#: ../src/interface.c:3768 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "Son satıra gelindiğinde kaydırmayı durdurur" -#: ../src/interface.c:3697 +#: ../src/interface.c:3770 msgid "Display" msgstr "Görünüm" -#: ../src/interface.c:3718 +#: ../src/interface.c:3791 msgid "Long line marker:" msgstr "Uzun satır işareti:" -#: ../src/interface.c:3725 +#: ../src/interface.c:3798 msgid "Long line marker color:" msgstr "Uzun satır işareti rengi:" -#: ../src/interface.c:3744 +#: ../src/interface.c:3817 msgid "Sets the color of the long line marker" msgstr "Uzun satır işaretinin rengini belirler" -#: ../src/interface.c:3745 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Renk Seçici" -#: ../src/interface.c:3753 +#: ../src/interface.c:3826 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 " @@ -2181,11 +2206,11 @@ "satırları veya satır arası ipuçlarını belirtir. Bu değeri 0 (sıfır)dan " "farklı belirterek görünmesi gereken sütunu ayarlayabilirsiniz." -#: ../src/interface.c:3763 +#: ../src/interface.c:3836 msgid "Line" msgstr "Satır" -#: ../src/interface.c:3766 +#: ../src/interface.c:3839 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2193,11 +2218,11 @@ "Düzenleyicide işaretci pozisyonunda düşey bir satır belirtir (ayrıntılar " "için aşağı bkz)" -#: ../src/interface.c:3770 +#: ../src/interface.c:3843 msgid "Background" msgstr "Arkaplan" -#: ../src/interface.c:3773 +#: ../src/interface.c:3846 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 " @@ -2207,55 +2232,55 @@ "karakterlerin arkaplan rengini ayarlayın. (Orantılı fontlar kullanıyorsanız " "tavsiye edilir)" -#: ../src/interface.c:3777 +#: ../src/interface.c:3850 msgid "Disabled" msgstr "Pasifleştirildi" -#: ../src/interface.c:3783 +#: ../src/interface.c:3856 msgid "Long line marker" msgstr "Uzun satır işareti" -#: ../src/interface.c:3788 +#: ../src/interface.c:3861 msgid "Display" msgstr "Gösterim" -#: ../src/interface.c:3819 +#: ../src/interface.c:3892 msgid "Open new documents from the command-line" msgstr "Yeni dökümanları komut satırında aç" -#: ../src/interface.c:3822 +#: ../src/interface.c:3895 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "Komut satırında adı geçip de gerçekte olmayan dosyaları oluştur" -#: ../src/interface.c:3836 +#: ../src/interface.c:3909 msgid "Default end of line characters:" msgstr "Öntanımlı satır sonu karakterleri:" -#: ../src/interface.c:3843 +#: ../src/interface.c:3916 msgid "New files" msgstr "Yeni dosyalar" -#: ../src/interface.c:3869 +#: ../src/interface.c:3942 msgid "Sets the default encoding for newly created files" msgstr "Yeni oluşturulmuş dosyalar için öntanımlı kodlamayı ayarlar" -#: ../src/interface.c:3875 +#: ../src/interface.c:3948 msgid "Default encoding (new files):" msgstr "Öntanımlı kodlama (yeni dosyalar için):" -#: ../src/interface.c:3882 +#: ../src/interface.c:3955 msgid "Default encoding (existing files):" msgstr "Öntanımlı kodlama (varolan dosyalar için):" -#: ../src/interface.c:3894 +#: ../src/interface.c:3967 msgid "Sets the default encoding for opening existing files" msgstr "Açılan eski dosyalar için öntanımlı kodlamayı ayarlar" -#: ../src/interface.c:3900 +#: ../src/interface.c:3973 msgid "Use fixed encoding when opening files" msgstr "Dosyaları açarken sabit kodlama kullan" -#: ../src/interface.c:3905 +#: ../src/interface.c:3978 msgid "" "This option disables the automatic detection of the file encoding when " "opening files and opens the file with the specified encoding (usually not " @@ -2265,53 +2290,53 @@ "kılar. Dosya sizin seçtiğiniz kodlamaya göre açılır (ki genellikle bu " "tavsiye edilmez)" -#: ../src/interface.c:3907 +#: ../src/interface.c:3980 msgid "Encodings" msgstr "Kodlamalar" -#: ../src/interface.c:3926 +#: ../src/interface.c:3999 msgid "Ensure new line at file end" msgstr "Dosya sonunda bir satır boş bırak" -#: ../src/interface.c:3929 +#: ../src/interface.c:4002 msgid "Ensures that at the end of the file is a new line" msgstr "Dosyanın son satırının altına boş bir satır bırakır" -#: ../src/interface.c:3931 +#: ../src/interface.c:4004 msgid "Strip trailing spaces and tabs" msgstr "Sondaki boşluğu temizle" -#: ../src/interface.c:3934 +#: ../src/interface.c:4007 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "" "Dosyaların sonundaki boşluk, sekme ve diğer satır sonu karakterlerini " "temizler" -#: ../src/interface.c:3936 ../src/keybindings.c:448 +#: ../src/interface.c:4009 ../src/keybindings.c:449 msgid "Replace tabs by space" msgstr "Sekmeleri boşluklara dönüştür" -#: ../src/interface.c:3939 +#: ../src/interface.c:4012 msgid "Replaces all tabs in document by spaces" msgstr "Dökümandaki bütün sekme karakterlerini boşluklara dönüştürür" -#: ../src/interface.c:3941 +#: ../src/interface.c:4014 msgid "Saving files" msgstr "Dosya kaydı" -#: ../src/interface.c:3966 +#: ../src/interface.c:4039 msgid "Recent files list length:" msgstr "Son açılanlar listesinin uzunluğu:" -#: ../src/interface.c:3980 +#: ../src/interface.c:4053 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Son açılan dosyalar bölümünde kaç dosyanın gösterileceğini ayarlar" -#: ../src/interface.c:3984 +#: ../src/interface.c:4057 msgid "Disk check timeout:" msgstr "Disk kontrolü zaman aşımı:" -#: ../src/interface.c:3997 +#: ../src/interface.c:4070 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2319,27 +2344,27 @@ "Dosyanın değişir değişmediğini diskten kontrol etme zaman aralığı, saniye " "olarak. Sıfır değeri kontrolü iptal eder." -#: ../src/interface.c:4006 ../src/symbols.c:560 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4079 ../src/symbols.c:560 ../plugins/filebrowser.c:1016 msgid "Files" msgstr "Dosyalar" -#: ../src/interface.c:4039 +#: ../src/interface.c:4112 msgid "Make:" msgstr "Derleme:" -#: ../src/interface.c:4046 +#: ../src/interface.c:4119 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4126 msgid "Browser:" msgstr "Tarayıcı:" -#: ../src/interface.c:4065 +#: ../src/interface.c:4138 msgid "Path and options for the make tool" msgstr "Derleme aracı için yol ve deçenekler" -#: ../src/interface.c:4072 +#: ../src/interface.c:4145 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2347,23 +2372,23 @@ "xterm, gnome-terminal veya konsole gibi bir terminal emülatörü ( -e " "seçeneğini kabul etmeli)" -#: ../src/interface.c:4079 +#: ../src/interface.c:4152 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Kullanacağınız tarayıcının yolu ve diğer argümanları" -#: ../src/interface.c:4111 +#: ../src/interface.c:4184 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4134 +#: ../src/interface.c:4207 msgid "Tool paths" msgstr "Araç yolları" -#: ../src/interface.c:4155 +#: ../src/interface.c:4228 msgid "Context action:" msgstr "Bağlam eylemi:" -#: ../src/interface.c:4166 +#: ../src/interface.c:4239 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2374,67 +2399,67 @@ "Girilecek komutun verildiği her yerde görülür ve çalıştırılmadan önce " "gerçeği ile yer değiştirecektir." -#: ../src/interface.c:4179 +#: ../src/interface.c:4252 msgid "Commands" msgstr "Komutlar" -#: ../src/interface.c:4184 ../src/keybindings.c:484 +#: ../src/interface.c:4257 ../src/keybindings.c:485 msgid "Tools" msgstr "Araçlar" -#: ../src/interface.c:4218 +#: ../src/interface.c:4291 msgid "email address of the developer" msgstr "geliştiricinin e-posta adresi" -#: ../src/interface.c:4225 +#: ../src/interface.c:4298 msgid "Initials of the developer name" msgstr "geliştirici isminin baş harfleri" -#: ../src/interface.c:4227 +#: ../src/interface.c:4300 msgid "Initial version:" msgstr "Başlangıç sürümü:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4312 msgid "Version number, which a new file initially has" msgstr "Yeni dosyaya verilecek sürüm numarası" -#: ../src/interface.c:4246 +#: ../src/interface.c:4319 msgid "Company name" msgstr "Şirket adı" -#: ../src/interface.c:4248 +#: ../src/interface.c:4321 msgid "Developer:" msgstr "Geliştirici" -#: ../src/interface.c:4255 +#: ../src/interface.c:4328 msgid "Company:" msgstr "Şirket:" -#: ../src/interface.c:4262 +#: ../src/interface.c:4335 msgid "Mail address:" msgstr "E-posta adresi:" -#: ../src/interface.c:4269 +#: ../src/interface.c:4342 msgid "Initials:" msgstr "Başlangıçlar:" -#: ../src/interface.c:4281 +#: ../src/interface.c:4354 msgid "The name of the developer" msgstr "Geliştiricinin adı" -#: ../src/interface.c:4283 +#: ../src/interface.c:4356 msgid "Year:" msgstr "Yıl:" -#: ../src/interface.c:4290 +#: ../src/interface.c:4363 msgid "Date:" msgstr "Tarih:" -#: ../src/interface.c:4297 +#: ../src/interface.c:4370 msgid "Date & Time:" msgstr "Tarih ve Zaman:" -#: ../src/interface.c:4309 +#: ../src/interface.c:4382 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." @@ -2442,7 +2467,7 @@ "{tarihzaman} değişkeni için bir biçim belirtin. ANSI C uyumlu karakterleri " "kullanabilirsiniz." -#: ../src/interface.c:4316 +#: ../src/interface.c:4389 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." @@ -2450,7 +2475,7 @@ "{yıl} değişkeni için bir biçim belirtin. ANSI C uyumlu karakterleri " "kullanabilirsiniz." -#: ../src/interface.c:4323 +#: ../src/interface.c:4396 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." @@ -2458,63 +2483,63 @@ "{tarih} değişkeni için bir biçim belirtin. ANSI C uyumlu karakterleri " "kullanabilirsiniz." -#: ../src/interface.c:4325 +#: ../src/interface.c:4398 msgid "Template data" msgstr "Şema bilgisi" -#: ../src/interface.c:4330 +#: ../src/interface.c:4403 msgid "Templates" msgstr "Şemalar" -#: ../src/interface.c:4368 +#: ../src/interface.c:4441 msgid "C_hange" msgstr "De_ğiştir" -#: ../src/interface.c:4372 +#: ../src/interface.c:4445 msgid "Keyboard shortcuts" msgstr "Klavye kısayolları" -#: ../src/interface.c:4377 +#: ../src/interface.c:4450 msgid "Keybindings" msgstr "Tuş kombinasyonları" -#: ../src/interface.c:4400 +#: ../src/interface.c:4473 msgid "Command:" msgstr "Komut:" -#: ../src/interface.c:4407 +#: ../src/interface.c:4480 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Dosyaları yazdırırken kullanılacak komut (dosya adı için %f kullanın)" -#: ../src/interface.c:4417 +#: ../src/interface.c:4490 msgid "Use an external command for printing" msgstr "Yazdırma için harici bir komut kullan" -#: ../src/interface.c:4437 ../src/printing.c:345 +#: ../src/interface.c:4510 ../src/printing.c:345 msgid "Print line numbers" msgstr "Satır numaralarını yazdır" -#: ../src/interface.c:4440 ../src/printing.c:347 +#: ../src/interface.c:4513 ../src/printing.c:347 msgid "Add line numbers to the printed page" msgstr "Yazdırılacak sayfaya satır numaralarını da ekle" -#: ../src/interface.c:4442 ../src/printing.c:350 +#: ../src/interface.c:4515 ../src/printing.c:350 msgid "Print page numbers" msgstr "Sayfa numaralarını yazdır" -#: ../src/interface.c:4445 +#: ../src/interface.c:4518 msgid "" "Add page numbers at the bottom of each page, it takes 2 lines of the page" msgstr "" "Yazdırılmış sayfanın en altında sayfa numaralarını da gösterir. Bu işlem " "sayfadan 2 satır alır." -#: ../src/interface.c:4447 ../src/printing.c:355 +#: ../src/interface.c:4520 ../src/printing.c:355 msgid "Print page header" msgstr "Sayfa başlığını yazdır" -#: ../src/interface.c:4450 ../src/printing.c:357 +#: ../src/interface.c:4523 ../src/printing.c:357 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." @@ -2522,19 +2547,19 @@ "Her sayfanın başına sayfa numarası, dosya adı ve geçerli (detay için aşağı " "bakın) tarihi gösteren bir bilgi ekler. Bu işlem sayfadan 3 satır alır." -#: ../src/interface.c:4467 ../src/printing.c:373 +#: ../src/interface.c:4540 ../src/printing.c:373 msgid "Use the basename of the printed file" msgstr "Dosyanın sadece adını kullan" -#: ../src/interface.c:4470 ../src/printing.c:375 +#: ../src/interface.c:4543 ../src/printing.c:375 msgid "Print only the basename(without the path) of the printed file" msgstr "Yazdırırken dosyanın sadece (yolu olmadan) adını kullan" -#: ../src/interface.c:4476 ../src/printing.c:381 +#: ../src/interface.c:4549 ../src/printing.c:381 msgid "Date format:" msgstr "Tarih biçimi:" -#: ../src/interface.c:4483 ../src/printing.c:387 +#: ../src/interface.c:4556 ../src/printing.c:387 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 " @@ -2543,533 +2568,533 @@ "Her sayfanın başına eklenecek tarih ve zaman için bir biçim girin. ANSI C " "uyumlu karakterleri kullanabilirsiniz." -#: ../src/interface.c:4486 +#: ../src/interface.c:4559 msgid "Use native GTK printing" msgstr "Doğal GTK yazdırma kullan" -#: ../src/interface.c:4492 +#: ../src/interface.c:4565 msgid "Printing" msgstr "Yazdırma" -#: ../src/interface.c:4896 +#: ../src/interface.c:4976 msgid "Project Properties" msgstr "Proje Özellikleri" -#: ../src/keybindings.c:195 ../src/plugins.c:1099 +#: ../src/keybindings.c:196 ../src/plugins.c:1112 msgid "File" msgstr "Dosya" -#: ../src/keybindings.c:198 +#: ../src/keybindings.c:199 msgid "New" msgstr "Yeni" -#: ../src/keybindings.c:200 +#: ../src/keybindings.c:201 msgid "Open" msgstr "Aç" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:204 msgid "Open selected file" msgstr "Seçilen dosyayı aç" -#: ../src/keybindings.c:205 +#: ../src/keybindings.c:206 msgid "Save" msgstr "Kaydet" -#: ../src/keybindings.c:207 +#: ../src/keybindings.c:208 msgid "Save as" msgstr "Farklı kaydet" -#: ../src/keybindings.c:209 +#: ../src/keybindings.c:210 msgid "Save all" msgstr "Tümünü kaydet" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:213 msgid "Print" msgstr "Yazdır" -#: ../src/keybindings.c:214 +#: ../src/keybindings.c:215 msgid "Close" msgstr "Kapat" -#: ../src/keybindings.c:216 +#: ../src/keybindings.c:217 msgid "Close all" msgstr "Hepsini kapat" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:220 msgid "Reload file" msgstr "Yeniden yükle" -#: ../src/keybindings.c:221 ../src/project.c:486 +#: ../src/keybindings.c:222 ../src/project.c:489 msgid "Project" msgstr "Proje" -#: ../src/keybindings.c:224 +#: ../src/keybindings.c:225 msgid "Project properties" msgstr "Proje özellikleri" -#: ../src/keybindings.c:229 +#: ../src/keybindings.c:230 msgid "Undo" msgstr "Geri al" -#: ../src/keybindings.c:231 +#: ../src/keybindings.c:232 msgid "Redo" msgstr "Tekrarla" -#: ../src/keybindings.c:233 +#: ../src/keybindings.c:234 msgid "Duplicate line or selection" msgstr "Seçimi veya satırı çoğalt" -#: ../src/keybindings.c:236 +#: ../src/keybindings.c:237 msgid "Delete current line(s)" msgstr "Geçerli satır(lar)ı sil" -#: ../src/keybindings.c:238 +#: ../src/keybindings.c:239 msgid "Transpose current line" msgstr "Geçerli satırı taşı" -#: ../src/keybindings.c:240 +#: ../src/keybindings.c:241 msgid "Scroll to current line" msgstr "Geçerli satıra git" -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:243 msgid "Scroll up the view by one line" msgstr "Görünümü bir satır yukarı kaydır" -#: ../src/keybindings.c:244 +#: ../src/keybindings.c:245 msgid "Scroll down the view by one line" msgstr "Görünümü bir satır aşağı kaydır" -#: ../src/keybindings.c:247 +#: ../src/keybindings.c:248 msgid "Complete snippet" msgstr "Parçayı tamamla" -#: ../src/keybindings.c:249 +#: ../src/keybindings.c:250 msgid "Move cursor in snippet" msgstr "İşaretçiyi parça içinde hareket ettir" -#: ../src/keybindings.c:251 +#: ../src/keybindings.c:252 msgid "Suppress snippet completion" msgstr "Parça tamamlamayı engelle" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:254 msgid "Context Action" msgstr "Bağlam eylemi" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:256 msgid "Complete word" msgstr "Kelimeyi tamamla" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:258 msgid "Show calltip" msgstr "İpucunu göster" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:260 msgid "Show macro list" msgstr "Makro listesini göster" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:262 msgid "Clipboard" msgstr "Pano" -#: ../src/keybindings.c:264 +#: ../src/keybindings.c:265 msgid "Cut" msgstr "Kes" -#: ../src/keybindings.c:266 +#: ../src/keybindings.c:267 msgid "Copy" msgstr "Kopyala" -#: ../src/keybindings.c:268 +#: ../src/keybindings.c:269 msgid "Paste" msgstr "Yapıştır" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:271 msgid "Copy current line(s)" msgstr "Geçerli satır(lar)ı kopyala" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:273 msgid "Cut current line(s)" msgstr "Geçerli satır(lar)ı kes" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:275 msgid "Select" msgstr "Seç" -#: ../src/keybindings.c:277 +#: ../src/keybindings.c:278 msgid "Select All" msgstr "Tümünü Seç" -#: ../src/keybindings.c:279 +#: ../src/keybindings.c:280 msgid "Select current word" msgstr "Geçerli kelimeyi seç" -#: ../src/keybindings.c:281 +#: ../src/keybindings.c:282 msgid "Select current line(s)" msgstr "Geçerli satır(lar)ı seç" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:284 msgid "Select current paragraph" msgstr "Geçerli paragrafı seç" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:286 msgid "Format" msgstr "Biçim" -#: ../src/keybindings.c:289 +#: ../src/keybindings.c:290 msgid "Toggle Case of Selection" msgstr "Seçimi büyült/küçült" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:292 msgid "Toggle line commentation" msgstr "Seçimi Yorum yap/yapma" -#: ../src/keybindings.c:294 +#: ../src/keybindings.c:295 msgid "Comment line(s)" msgstr "Satır(lar)ı yoruma çevir" -#: ../src/keybindings.c:296 +#: ../src/keybindings.c:297 msgid "Uncomment line(s)" msgstr "Yorumdan satır(lar)a çevir" -#: ../src/keybindings.c:298 +#: ../src/keybindings.c:299 msgid "Increase indent" msgstr "Girdiyi artır" -#: ../src/keybindings.c:301 +#: ../src/keybindings.c:302 msgid "Decrease indent" msgstr "Girdiyi azalt" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:305 msgid "Increase indent by one space" msgstr "Tek boşluk ile girdiyi artır" -#: ../src/keybindings.c:306 +#: ../src/keybindings.c:307 msgid "Decrease indent by one space" msgstr "Tek boşluk ile girdiyi azalt" -#: ../src/keybindings.c:308 +#: ../src/keybindings.c:309 msgid "Smart line indent" msgstr "Akıllı girintilendirme" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:311 msgid "Send to Custom Command 1" msgstr "Özel Komut 1'e gönder" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:313 msgid "Send to Custom Command 2" msgstr "Özel Komut 2'ye gönder" -#: ../src/keybindings.c:314 +#: ../src/keybindings.c:315 msgid "Send to Custom Command 3" msgstr "Özel Komut 3'e gönder" -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:317 msgid "Send Selection to Terminal" msgstr "Seçimi Terminale Gönder" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:319 msgid "Insert" msgstr "Araya ekle" -#: ../src/keybindings.c:321 +#: ../src/keybindings.c:322 msgid "Insert date" msgstr "Araya tarih ekle" -#: ../src/keybindings.c:324 +#: ../src/keybindings.c:325 msgid "Insert alternative white space" msgstr "Alternatif beyaz alan ekle" -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:327 msgid "Settings" msgstr "Ayarlar" -#: ../src/keybindings.c:332 ../src/toolbar.c:200 +#: ../src/keybindings.c:333 ../src/toolbar.c:199 msgid "Search" msgstr "Ara" -#: ../src/keybindings.c:335 ../src/search.c:364 +#: ../src/keybindings.c:336 ../src/search.c:364 msgid "Find" msgstr "Bul" -#: ../src/keybindings.c:337 +#: ../src/keybindings.c:338 msgid "Find Next" msgstr "Sonrakini Bul" -#: ../src/keybindings.c:339 +#: ../src/keybindings.c:340 msgid "Find Previous" msgstr "Öncekini Bul" -#: ../src/keybindings.c:342 +#: ../src/keybindings.c:343 msgid "Find Next Selection" msgstr "Sonraki Seçimi Bul" -#: ../src/keybindings.c:344 +#: ../src/keybindings.c:345 msgid "Find Previous Selection" msgstr "Önceki Seçimi Bul" -#: ../src/keybindings.c:346 ../src/search.c:499 +#: ../src/keybindings.c:347 ../src/search.c:499 msgid "Replace" msgstr "Değiştir" -#: ../src/keybindings.c:348 ../src/search.c:671 +#: ../src/keybindings.c:349 ../src/search.c:671 msgid "Find in Files" msgstr "Dosyalarda Bul" -#: ../src/keybindings.c:351 +#: ../src/keybindings.c:352 msgid "Next Message" msgstr "Sonraki Mesaj" -#: ../src/keybindings.c:353 +#: ../src/keybindings.c:354 msgid "Previous Message" msgstr "Önceki Mesaj" -#: ../src/keybindings.c:355 +#: ../src/keybindings.c:356 msgid "Find Usage" msgstr "Kullanım Bul" -#: ../src/keybindings.c:357 +#: ../src/keybindings.c:358 msgid "Find Document Usage" msgstr "Döküman Kullanımı Bul" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:360 msgid "Go to" msgstr "Git" -#: ../src/keybindings.c:362 ../src/toolbar.c:62 +#: ../src/keybindings.c:363 ../src/toolbar.c:62 msgid "Navigate back a location" msgstr "Bir bölüm geri yolculuk yap" -#: ../src/keybindings.c:364 ../src/toolbar.c:63 +#: ../src/keybindings.c:365 ../src/toolbar.c:63 msgid "Navigate forward a location" msgstr "Bir bölüm ileri yolculuk yap" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:370 msgid "Go to matching brace" msgstr "Eşleşen ayraca git" -#: ../src/keybindings.c:372 +#: ../src/keybindings.c:373 msgid "Toggle marker" msgstr "İşaretçi ayarla" -#: ../src/keybindings.c:375 +#: ../src/keybindings.c:376 msgid "Go to next marker" msgstr "Sonraki işaretçiye git" -#: ../src/keybindings.c:378 +#: ../src/keybindings.c:379 msgid "Go to previous marker" msgstr "Önceki işaretçiye git" -#: ../src/keybindings.c:380 +#: ../src/keybindings.c:381 msgid "Go to Tag Definition" msgstr "Etiket Tanımına Git" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:383 msgid "Go to Tag Declaration" msgstr "Etiket İlanına Git" -#: ../src/keybindings.c:384 +#: ../src/keybindings.c:385 msgid "Go to Start of Line" msgstr "Satırın Başına Git" -#: ../src/keybindings.c:386 +#: ../src/keybindings.c:387 msgid "Go to End of Line" msgstr "Satırın Sonuna Git" -#: ../src/keybindings.c:388 +#: ../src/keybindings.c:389 msgid "Go to Previous Word Part" msgstr "Önceki Yazı Parçasına Git" -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:391 msgid "Go to Next Word Part" msgstr "Sonraki Yazı Parçasına Git" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:393 msgid "View" msgstr "Bak" -#: ../src/keybindings.c:395 +#: ../src/keybindings.c:396 msgid "Toggle All Additional Widgets" msgstr "Bütün bölümleri Aç/Kapa" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:399 msgid "Fullscreen" msgstr "Tam ekran" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:401 msgid "Toggle Messages Window" msgstr "Mesaj Penceresini Aç/Kapa" -#: ../src/keybindings.c:403 +#: ../src/keybindings.c:404 msgid "Toggle Sidebar" msgstr "Araç çubuğunu Aç/Kapa" -#: ../src/keybindings.c:405 +#: ../src/keybindings.c:406 msgid "Zoom In" msgstr "Yakınlaştır" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:408 msgid "Zoom Out" msgstr "Uzaklaştır" -#: ../src/keybindings.c:409 +#: ../src/keybindings.c:410 msgid "Focus" msgstr "Odakla" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:413 msgid "Switch to Editor" msgstr "Düzenleyiciye geç" -#: ../src/keybindings.c:414 +#: ../src/keybindings.c:415 msgid "Switch to Scribble" msgstr "Karalama defterine geç" -#: ../src/keybindings.c:416 +#: ../src/keybindings.c:417 msgid "Switch to VTE" msgstr "Terminale geç" -#: ../src/keybindings.c:418 +#: ../src/keybindings.c:419 msgid "Switch to Search Bar" msgstr "Arama çubuğuna geç" -#: ../src/keybindings.c:420 +#: ../src/keybindings.c:421 msgid "Switch to Sidebar" msgstr "Araç çubuğuna geç" -#: ../src/keybindings.c:422 +#: ../src/keybindings.c:423 msgid "Switch to Compiler" msgstr "Derleyiciye geç" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:425 msgid "Notebook tab" msgstr "Not defteri sekmesi" -#: ../src/keybindings.c:427 +#: ../src/keybindings.c:428 msgid "Switch to left document" msgstr "Soldaki dökümana geç" -#: ../src/keybindings.c:429 +#: ../src/keybindings.c:430 msgid "Switch to right document" msgstr "Sağdaki dökümana geç" -#: ../src/keybindings.c:431 +#: ../src/keybindings.c:432 msgid "Switch to last used document" msgstr "Son kullanılan dökümana geç" -#: ../src/keybindings.c:433 +#: ../src/keybindings.c:434 msgid "Move document left" msgstr "Dükümanı sola taşı" -#: ../src/keybindings.c:435 +#: ../src/keybindings.c:436 msgid "Move document right" msgstr "Dükümanı sağa taşı" -#: ../src/keybindings.c:437 +#: ../src/keybindings.c:438 msgid "Move document first" msgstr "Dükümanı başa taşı" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:440 msgid "Move document last" msgstr "Dükümanı sona taşı" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:442 msgid "Document" msgstr "Döküman" -#: ../src/keybindings.c:444 +#: ../src/keybindings.c:445 msgid "Toggle Line wrapping" msgstr "Satır Kaydırmayı aç/kapat" -#: ../src/keybindings.c:446 +#: ../src/keybindings.c:447 msgid "Toggle Line breaking" msgstr "Satır kesmeyi aç/kapat" -#: ../src/keybindings.c:450 +#: ../src/keybindings.c:451 msgid "Replace spaces by tabs" msgstr "Boşlukları sekmeye çevir" -#: ../src/keybindings.c:452 +#: ../src/keybindings.c:453 msgid "Toggle current fold" msgstr "Geçerli katlamayı aç/kapa" -#: ../src/keybindings.c:454 +#: ../src/keybindings.c:455 msgid "Fold all" msgstr "Tümünü katla" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:457 msgid "Unfold all" msgstr "Tmünü aç" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:459 msgid "Reload symbol list" msgstr "Simge listesini tekrar yükle" -#: ../src/keybindings.c:460 ../src/keybindings.c:465 ../src/ui_utils.c:1662 +#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1737 msgid "Build" msgstr "İnşa et" -#: ../src/keybindings.c:463 ../src/toolbar.c:64 +#: ../src/keybindings.c:464 ../src/toolbar.c:64 msgid "Compile" msgstr "Derle" -#: ../src/keybindings.c:467 +#: ../src/keybindings.c:468 msgid "Make all" msgstr "hepsini derle" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:471 msgid "Make custom target" msgstr "Özel hedef yap" -#: ../src/keybindings.c:472 +#: ../src/keybindings.c:473 msgid "Make object" msgstr "Nesneyi derle" -#: ../src/keybindings.c:474 +#: ../src/keybindings.c:475 msgid "Next error" msgstr "Sonraki hata" -#: ../src/keybindings.c:476 +#: ../src/keybindings.c:477 msgid "Previous error" msgstr "Önceki hata" -#: ../src/keybindings.c:478 +#: ../src/keybindings.c:479 msgid "Run" msgstr "Çalıştır" -#: ../src/keybindings.c:480 +#: ../src/keybindings.c:481 msgid "Run (alternative command)" msgstr "Çalıştır (alternatif komut)" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:483 msgid "Build options" msgstr "İnşa seçenekleri" -#: ../src/keybindings.c:487 +#: ../src/keybindings.c:488 msgid "Show Color Chooser" msgstr "Renk Seçiciyi Göster" -#: ../src/keybindings.c:489 ../src/keybindings.c:492 +#: ../src/keybindings.c:490 ../src/keybindings.c:493 msgid "Help" msgstr "Yardım" -#: ../src/keybindings.c:782 +#: ../src/keybindings.c:786 msgid "Keyboard Shortcuts" msgstr "Klavye Kısayolları" -#: ../src/keybindings.c:795 +#: ../src/keybindings.c:799 msgid "The following keyboard shortcuts are configurable:" msgstr "Şu kısayollar düzenlenebilir:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1534 msgid "Switch to Document" msgstr "Dökümana geç" -#: ../src/keyfile.c:783 +#: ../src/keyfile.c:795 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Buraya istediğinizi yazabilirsiniz. Karalama defteri olarak " "kullanabilirsiniz." -#: ../src/keyfile.c:980 +#: ../src/keyfile.c:993 msgid "Failed to load one or more session files." msgstr "Bir ya da daha fazla oturum dosyasının yüklenmesi sırasında hata." @@ -3143,24 +3168,24 @@ msgid "Show version and exit" msgstr "Sürümü görüntüle ve çık" -#: ../src/main.c:494 +#: ../src/main.c:507 msgid "[FILES...]" msgstr "[DOSYALAR...]" -#: ../src/main.c:511 +#: ../src/main.c:524 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(%s üzerinde GTK %d.%d.%d ve GLib %d.%d.%d ile derlendi)" -#: ../src/main.c:616 +#: ../src/main.c:629 msgid "Move it now?" msgstr "Şimdi taşınsın mı?" -#: ../src/main.c:618 +#: ../src/main.c:631 msgid "Geany needs to move your old configuration directory before starting." msgstr "Geany başlamadan önce eski ayar dizininizi taşıması gerek." -#: ../src/main.c:624 +#: ../src/main.c:637 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3169,7 +3194,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:634 +#: ../src/main.c:647 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3178,7 +3203,7 @@ "Eski ayar dizininiz \"%s\" , \"%s\" konumuna taşınamadı (%s). Lütfen dizini " "yeni konuma elle taşıyın." -#: ../src/main.c:715 +#: ../src/main.c:728 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3189,38 +3214,38 @@ "Geany'i ayar dizini olmadan kullanmak bazı sorunlara yol açabilir.\n" "Yine de Geany'i açmak ister misiniz?" -#: ../src/main.c:801 ../src/socket.c:160 +#: ../src/main.c:814 ../src/socket.c:160 #, c-format msgid "Could not find file '%s'." msgstr "'%s' dosyası bulunamadı." -#: ../src/main.c:1020 +#: ../src/main.c:1033 #, c-format msgid "This is Geany %s." msgstr "Bu, Geany %s." -#: ../src/main.c:1022 +#: ../src/main.c:1035 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Ayar dizini oluşturulamadı (%s)." -#: ../src/main.c:1238 +#: ../src/main.c:1272 msgid "Configuration files reloaded." msgstr "Ayar dosyaları tekrar yüklendi." -#: ../src/msgwindow.c:134 +#: ../src/msgwindow.c:135 msgid "Status messages" msgstr "Durum mesajları" -#: ../src/msgwindow.c:512 +#: ../src/msgwindow.c:515 msgid "Copy _All" msgstr "Tümünü Kopy_ala" -#: ../src/msgwindow.c:542 +#: ../src/msgwindow.c:545 msgid "_Hide Message Window" msgstr "Mesaj Penceresini Gi_zle" -#: ../src/plugins.c:435 +#: ../src/plugins.c:440 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3229,11 +3254,11 @@ "\"%s\" eklentisi derlenmiş halde Geany'nin bu sürümü ile uyumlu değil, " "lütfen tekrar derleyin." -#: ../src/plugins.c:870 +#: ../src/plugins.c:881 msgid "_Plugin Manager" msgstr "Eklenti _Yöneticisi" -#: ../src/plugins.c:1016 +#: ../src/plugins.c:1029 #, c-format msgid "" "Plugin: %s %s\n" @@ -3244,23 +3269,23 @@ "Tanım: %s\n" "Sahip(leri): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1100 msgid "Active" msgstr "Aktif" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1106 msgid "Plugin" msgstr "Eklenti" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1130 msgid "No plugins available." msgstr "Erişilebilir eklenti yok." -#: ../src/plugins.c:1229 +#: ../src/plugins.c:1242 msgid "Plugins" msgstr "Eklentiler" -#: ../src/plugins.c:1249 +#: ../src/plugins.c:1262 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3268,57 +3293,57 @@ "Aşağıda erişilebilir eklentilerin listesi bulunmakta. Geany açılırken " "çalıştırılacak eklentiler için seçiniz." -#: ../src/plugins.c:1262 +#: ../src/plugins.c:1275 msgid "Plugin details:" msgstr "Eklenti detayları:" -#: ../src/prefs.c:144 +#: ../src/prefs.c:145 msgid "Action" msgstr "Hareket" -#: ../src/prefs.c:149 +#: ../src/prefs.c:150 msgid "Shortcut" msgstr "Kısayol" -#: ../src/prefs.c:1122 +#: ../src/prefs.c:1138 msgid "Grab Key" msgstr "Tuşu Yakala" -#: ../src/prefs.c:1128 +#: ../src/prefs.c:1144 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "\"%s\" için kullanmak istediğiniz tuş kombinasyonunu girin." -#: ../src/prefs.c:1315 +#: ../src/prefs.c:1331 msgid "_Override" msgstr "Üzerine _yaz" -#: ../src/prefs.c:1316 +#: ../src/prefs.c:1332 msgid "Override that keybinding?" msgstr "Bu kısayolun üzerine yaz?" -#: ../src/prefs.c:1317 +#: ../src/prefs.c:1333 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "'%s' kombinasyonu zaten \"%s\" için kullanılıyor." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1420 +#: ../src/prefs.c:1447 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Aşağıya araçların yollarını girin. İhtiyacınız olmayan araçlar için boş " "bırakabilirsiniz." #. page Templates -#: ../src/prefs.c:1425 +#: ../src/prefs.c:1452 msgid "" "Set the information to be used in templates. See the documentation for " "details." msgstr "" "Şablonlarla kullanılacak bilgiyi ayarlayın. Detaylar için belgelere bakınız." -#: ../src/prefs.c:1429 +#: ../src/prefs.c:1456 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." @@ -3329,7 +3354,7 @@ "ayarları tekrar yüklemeye zorlamalısınız." #. page Keybindings -#: ../src/prefs.c:1435 +#: ../src/prefs.c:1462 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 " @@ -3340,7 +3365,7 @@ "olarak düzenlemek için çift tıklayın." #. page Printing -#: ../src/prefs.c:1440 +#: ../src/prefs.c:1467 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)." @@ -3350,7 +3375,7 @@ "çalışırken kullanılabilir." #. page Toolbar -#: ../src/prefs.c:1446 +#: ../src/prefs.c:1473 msgid "" "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." "xml'. Please see the documentation for details." @@ -3359,7 +3384,7 @@ "düzenleyebilirsiniz. Lütfen deyatlar için belgeleri inceleyin." #. page Editor->Indentation -#: ../src/prefs.c:1452 +#: ../src/prefs.c:1479 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3425,31 +3450,31 @@ #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "projeler" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Yeni Proje" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "Oluştu_r" -#: ../src/project.c:140 ../src/project.c:377 +#: ../src/project.c:139 ../src/project.c:380 msgid "Name:" msgstr "Adı:" -#: ../src/project.c:149 ../src/project.c:390 +#: ../src/project.c:148 ../src/project.c:393 msgid "Filename:" msgstr "Dosya adı:" -#: ../src/project.c:165 ../src/project.c:420 +#: ../src/project.c:164 ../src/project.c:423 msgid "Base path:" msgstr "Temel yol:" -#: ../src/project.c:171 ../src/project.c:429 +#: ../src/project.c:170 ../src/project.c:432 msgid "" "Base directory of all files that make up the project. This can be a new " "path, or an existing directory tree. You can use paths relative to the " @@ -3458,41 +3483,41 @@ "Projenin oluşturulacağı ana dizin. Yeni bir tane oluşturabilir veya olan " @@ 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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2009