Commits March 2011

commits@lists.geany.org

4 participants
116 discussions

SF.net SVN: geany:[5617] trunk/po
by frlan＠users.sourceforge.net 22 Mar '11

22 Mar '11

Revision: 5617 http://geany.svn.sourceforge.net/geany/?rev=5617&view=rev Author: frlan Date: 2011-03-22 23:08:43 +0000 (Tue, 22 Mar 2011) Log Message: ----------- Fix a typo inside Slovenian translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/sl.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2011-03-22 17:26:47 UTC (rev 5616) +++ trunk/po/ChangeLog 2011-03-22 23:08:43 UTC (rev 5617) @@ -1,3 +1,8 @@ +2011-03-22 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * sl.po: Fix of a typo inside Slovenian translation. Thanks to Jože Klepec. + + 2011-03-21 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * es.po: Update of Spanish translation. Thanks to Lucas Vieites. Modified: trunk/po/sl.po =================================================================== --- trunk/po/sl.po 2011-03-22 17:26:47 UTC (rev 5616) +++ trunk/po/sl.po 2011-03-22 23:08:43 UTC (rev 5617) @@ -9,7 +9,7 @@ "Project-Id-Version: geany 0.20\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-12-05 15:55+0100\n" -"PO-Revision-Date: 2010-12-09 21:30+0100\n" +"PO-Revision-Date: 2011-03-22 23:57+0100\n" "Last-Translator: Jože Klepec <joze.klepec(a)siol.net>\n" "Language-Team: Slovenian <lugos-slo(a)lugos.si>\n" "Language: sl\n" @@ -868,7 +868,7 @@ #: ../src/document.c:3016 msgid "Close _without saving" -msgstr "Zapri _brez sharnjevanja" +msgstr "Zapri _brez shranjevanja" #: ../src/document.c:3019 msgid "Try to resave the 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:[5616] trunk
by ntrel＠users.sourceforge.net 22 Mar '11

22 Mar '11

Revision: 5616 http://geany.svn.sourceforge.net/geany/?rev=5616&view=rev Author: ntrel Date: 2011-03-22 17:26:47 +0000 (Tue, 22 Mar 2011) Log Message: ----------- Allow multiple file filters to be separated by a space for consistency with Find in Files file patterns. ';' is still allowed also. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/filebrowser.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-22 17:09:48 UTC (rev 5615) +++ trunk/ChangeLog 2011-03-22 17:26:47 UTC (rev 5616) @@ -2,6 +2,10 @@ * src/main.c: Make --ft-names list filetypes alphabetically. + * plugins/filebrowser.c: + Allow multiple file filters to be separated by a space for + consistency with Find in Files file patterns. ';' is still + allowed also. 2011-03-20 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2011-03-22 17:09:48 UTC (rev 5615) +++ trunk/plugins/filebrowser.c 2011-03-22 17:26:47 UTC (rev 5616) @@ -160,10 +160,10 @@ { gchar **filter_item; guint len; - + if (filter == NULL) return FALSE; - + len = g_strv_length(filter); foreach_c_array(filter_item, filter, len) { @@ -795,7 +795,9 @@ static void on_filter_activate(GtkEntry *entry, gpointer user_data) { - filter = g_strsplit(gtk_entry_get_text(entry), ";", -1); + /* We use spaces for consistency with Find in Files file patterns + * ';' also supported like original patch. */ + filter = g_strsplit_set(gtk_entry_get_text(entry), "; ", -1); if (filter == NULL || g_strv_length(filter) == 0) { clear_filter(); @@ -911,7 +913,7 @@ g_signal_connect(filter_entry, "icon-release", G_CALLBACK(on_filter_clear), NULL); } ui_widget_set_tooltip_text(filter_entry, - _("Filter your files with usual wildcards, separate multiple filters with \";\"")); + _("Filter your files with the usual wildcards. Separate multiple patterns with a space.")); g_signal_connect(filter_entry, "activate", G_CALLBACK(on_filter_activate), NULL); gtk_box_pack_start(GTK_BOX(filterbar), label, FALSE, FALSE, 0); @@ -1095,7 +1097,7 @@ GtkWidget *scrollwin, *toolbar, *filterbar; filter = NULL; - + file_view_vbox = gtk_vbox_new(FALSE, 0); toolbar = make_toolbar(); gtk_box_pack_start(GTK_BOX(file_view_vbox), toolbar, FALSE, FALSE, 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5615] trunk
by ntrel＠users.sourceforge.net 22 Mar '11

22 Mar '11

Revision: 5615 http://geany.svn.sourceforge.net/geany/?rev=5615&view=rev Author: ntrel Date: 2011-03-22 17:09:48 +0000 (Tue, 22 Mar 2011) Log Message: ----------- Make --ft-names list filetypes alphabetically. Modified Paths: -------------- trunk/ChangeLog trunk/src/main.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-22 17:03:04 UTC (rev 5614) +++ trunk/ChangeLog 2011-03-22 17:09:48 UTC (rev 5615) @@ -1,3 +1,9 @@ +2011-03-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/main.c: + Make --ft-names list filetypes alphabetically. + + 2011-03-20 Colomban Wendling <colomban(at)geany(dot)org> * data/filetypes.*, doc/geany.txt, doc/geany.html, src/callbacks.c, Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2011-03-22 17:03:04 UTC (rev 5614) +++ trunk/src/main.c 2011-03-22 17:09:48 UTC (rev 5615) @@ -472,14 +472,16 @@ static void print_filetypes(void) { - guint i; + GSList *node; filetypes_init_types(); - printf("Geany's internal filetype names:\n"); + printf("Geany's filetype names:\n"); - for (i = 0; i < filetypes_array->len; i++) + foreach_slist(node, filetypes_by_title) { - printf("%s\n", filetypes[i]->name); + GeanyFiletype *ft = node->data; + + printf("%s\n", ft->name); } filetypes_free_types(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5614] trunk/src/document.c
by ntrel＠users.sourceforge.net 22 Mar '11

22 Mar '11

Revision: 5614 http://geany.svn.sourceforge.net/geany/?rev=5614&view=rev Author: ntrel Date: 2011-03-22 17:03:04 +0000 (Tue, 22 Mar 2011) Log Message: ----------- Fix compiler warnings: document.c: In function ?\226?\128?\152apply_forced_indent_settings?\226?\128?\153: document.c:1008: warning: enumeration value ?\226?\128?\152GEANY_FILETYPES_NONE?\226?\128?\153 not handled in switch ... Modified Paths: -------------- trunk/src/document.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2011-03-21 21:38:20 UTC (rev 5613) +++ trunk/src/document.c 2011-03-22 17:03:04 UTC (rev 5614) @@ -1015,9 +1015,9 @@ /* force using spaces for indentation for Fortran 77 */ editor_set_indent(doc->editor, GEANY_INDENT_TYPE_SPACES, iprefs->width); return TRUE; + default: + return FALSE; } - - return FALSE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5613] trunk/src/filetypes.c
by colombanw＠users.sourceforge.net 21 Mar '11

21 Mar '11

Revision: 5613 http://geany.svn.sourceforge.net/geany/?rev=5613&view=rev Author: colombanw Date: 2011-03-21 21:38:20 +0000 (Mon, 21 Mar 2011) Log Message: ----------- Fix invalid free (oops) Modified Paths: -------------- trunk/src/filetypes.c Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2011-03-21 19:08:44 UTC (rev 5612) +++ trunk/src/filetypes.c 2011-03-21 21:38:20 UTC (rev 5613) @@ -1120,7 +1120,7 @@ else if (! NZV(filetypes[ft_id]->comment_close)) { setptr(filetypes[ft_id]->comment_single, filetypes[ft_id]->comment_open); - setptr(filetypes[ft_id]->comment_open, NULL); + filetypes[ft_id]->comment_open = NULL; } tmp = g_key_file_get_boolean(configh, "settings", "comment_use_indent", &error); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5612] trunk/po
by frlan＠users.sourceforge.net 21 Mar '11

21 Mar '11

Revision: 5612 http://geany.svn.sourceforge.net/geany/?rev=5612&view=rev Author: frlan Date: 2011-03-21 19:08:44 +0000 (Mon, 21 Mar 2011) Log Message: ----------- Update of Spanish translation. Thanks to Lucas Vieites for update. (closes #3222844) Modified Paths: -------------- trunk/po/ChangeLog trunk/po/es.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2011-03-20 17:50:59 UTC (rev 5611) +++ trunk/po/ChangeLog 2011-03-21 19:08:44 UTC (rev 5612) @@ -1,3 +1,9 @@ +2011-03-21 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * es.po: Update of Spanish translation. Thanks to Lucas Vieites. + (closes #3222844) + + 2011-03-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * zh_TW.po: Update of traditional Chinese translation. Modified: trunk/po/es.po =================================================================== --- trunk/po/es.po 2011-03-20 17:50:59 UTC (rev 5611) +++ trunk/po/es.po 2011-03-21 19:08:44 UTC (rev 5612) @@ -1,18 +1,17 @@ # translation of es.po to -# Spanish translation file for Geany 0.19 +# Spanish translation file for Geany 0.20 # This file is distributed under the same license as the geany package. # Damián Viano <des(a)damianv.com.ar>, 2006, 2007. # Antonio Jiménez González <ajimenez(a)linuxmail.org>, 2009 - 2010. -# Lucas Vieites <lucasvieites(a)gmail.com>, 2010. - +# Lucas Vieites <lucas.vieites(a)gmail.com>, 2010 - 2011. msgid "" msgstr "" "Project-Id-Version: Geany 0.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-05 15:55+0100\n" -"PO-Revision-Date: 2010-12-07 18:38+0100\n" -"Last-Translator: lucasvieites(a)gmail.com\n" -"Language-Team: <es(a)li.org>\n" +"POT-Creation-Date: 2011-03-21 20:00+0100\n" +"PO-Revision-Date: 2011-03-18 15:33+0100\n" +"Last-Translator: Lucas Vieites <lucas.vieites(a)gmail.com>\n" +"Language-Team: Español <es(a)li.org>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +23,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Un IDE rápido y ligero para GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:309 ../src/interface.c:1806 +#: ../geany.desktop.in.h:2 ../src/interface.c:310 ../src/interface.c:1814 msgid "Geany" msgstr "Geany" @@ -32,53 +31,53 @@ msgid "Integrated Development Environment" msgstr "Entorno de desarrollo integrado" -#: ../src/about.c:152 +#: ../src/about.c:154 msgid "About Geany" msgstr "Acerca de Geany" -#: ../src/about.c:202 +#: ../src/about.c:204 msgid "A fast and lightweight IDE" msgstr "Un IDE rápido y ligero" -#: ../src/about.c:223 +#: ../src/about.c:225 #, c-format msgid "(built on or after %s)" msgstr "(compilado el día %s o después)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:254 +#: ../src/about.c:256 msgid "Info" msgstr "Información" -#: ../src/about.c:270 +#: ../src/about.c:272 msgid "Developers" msgstr "Desarrolladores" -#: ../src/about.c:279 +#: ../src/about.c:281 msgid "maintainer" msgstr "mantenedor" -#: ../src/about.c:287 +#: ../src/about.c:289 ../src/about.c:297 msgid "developer" msgstr "desarrollador" -#: ../src/about.c:295 +#: ../src/about.c:305 msgid "translation maintainer" msgstr "mantenedor de traducción" -#: ../src/about.c:304 +#: ../src/about.c:314 msgid "Translators" msgstr "Traductores" -#: ../src/about.c:324 +#: ../src/about.c:334 msgid "Previous Translators" msgstr "Traductores anteriores" -#: ../src/about.c:345 +#: ../src/about.c:355 msgid "Contributors" msgstr "Colaboradores" -#: ../src/about.c:355 +#: ../src/about.c:365 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" @@ -86,15 +85,15 @@ "Algunos de los muchos colaboradores (vea el archivo %s para una lista más " "detallada):" -#: ../src/about.c:381 +#: ../src/about.c:391 msgid "Credits" msgstr "Créditos" -#: ../src/about.c:395 +#: ../src/about.c:405 msgid "License" msgstr "Licencia" -#: ../src/about.c:404 +#: ../src/about.c:414 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -117,29 +116,29 @@ msgid "%s (in directory: %s)" msgstr "%s (en el directorio: %s)" -#: ../src/build.c:739 ../src/build.c:964 ../src/search.c:1486 +#: ../src/build.c:739 ../src/build.c:961 ../src/search.c:1524 #, c-format msgid "Process failed (%s)" msgstr "El proceso ha fallado (%s)" -#: ../src/build.c:810 +#: ../src/build.c:807 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Error al cambiar el directorio de trabajo a «%s»" -#: ../src/build.c:839 +#: ../src/build.c:836 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "Error al ejecutar «%s» (no se ha podido crear el script de inicio)" -#: ../src/build.c:893 +#: ../src/build.c:890 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "No se ha podido ejecutar el archivo en la terminal virtual (VTE) " "probablemente porque contiene un comando." -#: ../src/build.c:931 +#: ../src/build.c:928 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -148,81 +147,77 @@ "No se ha podido encontrar la terminal «%s» (verifique la ruta de la " "herramienta de terminal en «Preferencias»)" -#: ../src/build.c:1104 +#: ../src/build.c:1101 msgid "Compilation failed." msgstr "Ha fallado la compilación." -#: ../src/build.c:1118 +#: ../src/build.c:1115 msgid "Compilation finished successfully." msgstr "La compilación ha terminado con éxito." -#: ../src/build.c:1277 +#: ../src/build.c:1274 msgid "Custom Text" msgstr "Texto personalizado" -#: ../src/build.c:1278 +#: ../src/build.c:1275 msgid "Enter custom text here, all entered text is appended to the command." msgstr "Introduzca su texto personalizado, éste se añadirá al comando." -#: ../src/build.c:1356 +#: ../src/build.c:1353 msgid "_Next Error" msgstr "Siguie_nte error" -#: ../src/build.c:1358 +#: ../src/build.c:1355 msgid "_Previous Error" msgstr "Error _anterior" -#: ../src/build.c:1368 +#: ../src/build.c:1365 msgid "_Set Build Commands" msgstr "Establecer comando_s de construcción" -#: ../src/build.c:1652 ../src/toolbar.c:373 +#: ../src/build.c:1649 ../src/toolbar.c:374 msgid "Build the current file" msgstr "Construir el archivo actual" -#: ../src/build.c:1666 +#: ../src/build.c:1663 msgid "Build the current file with Make and the default target" msgstr "Construir el archivo actual con «make» y el objetivo predeterminado" -#: ../src/build.c:1668 +#: ../src/build.c:1665 msgid "Build the current file with Make and the specified target" msgstr "Construir el archivo actual con «make» y el objetivo indicado" -#: ../src/build.c:1670 +#: ../src/build.c:1667 msgid "Compile the current file with Make" msgstr "Compilar el archivo actual con «make»" -#: ../src/build.c:1697 +#: ../src/build.c:1694 #, c-format msgid "Process could not be stopped (%s)." msgstr "No se ha podido detener el proceso (%s)." -#: ../src/build.c:1714 ../src/build.c:1726 +#: ../src/build.c:1711 ../src/build.c:1723 msgid "No more build errors." msgstr "No hay más errores de construcción." #. FIXME: we should pass either build dialog or project dialog instead of NULL for parent -#: ../src/build.c:1822 +#: ../src/build.c:1819 msgid "Set menu item label" msgstr "Establecer etiqueta del elemento de menú" -#: ../src/build.c:1847 -msgid "Item" -msgstr "Elem." - -#: ../src/build.c:1848 ../src/symbols.c:650 +#: ../src/build.c:1845 ../src/symbols.c:737 msgid "Label" msgstr "Etiqueta" -#: ../src/build.c:1849 ../src/symbols.c:645 +#: ../src/build.c:1846 ../src/symbols.c:732 msgid "Command" msgstr "Comando" -#: ../src/build.c:1850 +#: ../src/build.c:1847 msgid "Working directory" msgstr "Directorio de trabajo" -#: ../src/build.c:1851 +#: ../src/build.c:1848 msgid "Clear" msgstr "Limpiar" @@ -247,15 +242,15 @@ msgid "Independent Commands" msgstr "Comandos independientes" -#: ../src/build.c:2043 +#: ../src/build.c:2045 msgid "Note: Item 2 opens a dialog and appends the response to the command." msgstr "Nota: El elemento 2 abre un diálogo y añade la respuesta al comando." -#: ../src/build.c:2052 +#: ../src/build.c:2054 msgid "Execute Commands" msgstr "Ejecutar comandos" -#: ../src/build.c:2063 +#: ../src/build.c:2066 #, c-format msgid "" "%d, %e, %f, %p are substituted in command and directory fields, see manual " @@ -264,44 +259,44 @@ "Los comodines %d, %e, %f y %p se sustituirán en los campos de comandos y " "directorios. Consulte el manual para más información." -#: ../src/build.c:2223 +#: ../src/build.c:2226 msgid "Set Build Commands" msgstr "Establecer los comandos de construcción" -#: ../src/build.c:2434 +#: ../src/build.c:2437 msgid "_Compile" msgstr "_Compilar" #. build the code -#: ../src/build.c:2441 ../src/build.c:2703 ../src/interface.c:1218 +#: ../src/build.c:2444 ../src/build.c:2706 ../src/interface.c:1223 msgid "_Build" msgstr "Con_struir" -#: ../src/build.c:2448 ../src/build.c:2478 ../src/build.c:2671 +#: ../src/build.c:2451 ../src/build.c:2481 ../src/build.c:2674 msgid "_Execute" msgstr "_Ejecutar" #. build the code with make custom -#: ../src/build.c:2493 ../src/build.c:2669 ../src/build.c:2723 +#: ../src/build.c:2496 ../src/build.c:2672 ../src/build.c:2726 msgid "Make Custom _Target" msgstr "Compilar obje_tivo personalizado" #. build the code with make object -#: ../src/build.c:2495 ../src/build.c:2670 ../src/build.c:2731 +#: ../src/build.c:2498 ../src/build.c:2673 ../src/build.c:2734 msgid "Make _Object" msgstr "Compilar _objeto" -#: ../src/build.c:2497 ../src/build.c:2668 +#: ../src/build.c:2500 ../src/build.c:2671 msgid "_Make" msgstr "_Compilar" #. build the code with make all -#: ../src/build.c:2715 +#: ../src/build.c:2718 msgid "_Make All" msgstr "_Compilar todo" #. arguments -#: ../src/build.c:2743 +#: ../src/build.c:2746 msgid "_Set Build Menu Commands" msgstr "Establecer comando_s del menú «Construir»" @@ -316,8 +311,8 @@ msgstr[0] "%d archivo guardado." msgstr[1] "%d archivos guardados." -#: ../src/callbacks.c:490 ../src/document.c:2996 ../src/interface.c:380 -#: ../src/sidebar.c:683 +#: ../src/callbacks.c:490 ../src/document.c:2859 ../src/interface.c:381 +#: ../src/sidebar.c:695 msgid "_Reload" msgstr "_Recargar" @@ -330,7 +325,7 @@ msgid "Are you sure you want to reload '%s'?" msgstr "¿Está seguro que quiere recargar «%s»?" -#: ../src/callbacks.c:1196 ../src/keybindings.c:424 +#: ../src/callbacks.c:1196 ../src/keybindings.c:425 msgid "Go to Line" msgstr "Ir a línea" @@ -338,46 +333,46 @@ msgid "Enter the line you want to go to:" msgstr "Introduzca un número de línea:" -#: ../src/callbacks.c:1291 ../src/callbacks.c:1316 +#: ../src/callbacks.c:1291 ../src/callbacks.c:1318 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Seleccione el tipo de archivo para el archivo actual antes de utilizar esta " "función." -#: ../src/callbacks.c:1424 ../src/ui_utils.c:619 +#: ../src/callbacks.c:1434 ../src/ui_utils.c:619 msgid "dd.mm.yyyy" msgstr "dd.mm.aaaa" -#: ../src/callbacks.c:1426 ../src/ui_utils.c:620 +#: ../src/callbacks.c:1436 ../src/ui_utils.c:620 msgid "mm.dd.yyyy" msgstr "mm.dd.aaaa" -#: ../src/callbacks.c:1428 ../src/ui_utils.c:621 +#: ../src/callbacks.c:1438 ../src/ui_utils.c:621 msgid "yyyy/mm/dd" msgstr "aaaa/mm/dd" -#: ../src/callbacks.c:1430 ../src/ui_utils.c:630 +#: ../src/callbacks.c:1440 ../src/ui_utils.c:630 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.aaaa hh:mm:ss" -#: ../src/callbacks.c:1432 ../src/ui_utils.c:631 +#: ../src/callbacks.c:1442 ../src/ui_utils.c:631 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.aaaa hh:mm:ss" -#: ../src/callbacks.c:1434 ../src/ui_utils.c:632 +#: ../src/callbacks.c:1444 ../src/ui_utils.c:632 msgid "yyyy/mm/dd hh:mm:ss" msgstr "aaaa/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1436 ../src/ui_utils.c:641 +#: ../src/callbacks.c:1446 ../src/ui_utils.c:641 msgid "_Use Custom Date Format" msgstr "_Usar formato de fecha personalizado" -#: ../src/callbacks.c:1440 +#: ../src/callbacks.c:1450 msgid "Custom Date Format" msgstr "Formato de fecha personalizado" -#: ../src/callbacks.c:1441 +#: ../src/callbacks.c:1451 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." @@ -386,17 +381,17 @@ "cualquier especificador de conversión que pueda ser usado con la función " "strftime de ANSI C." -#: ../src/callbacks.c:1462 +#: ../src/callbacks.c:1474 msgid "Date format string could not be converted (possibly too long)." msgstr "" "No se ha podido convertir el formato de fecha (probablemente sea demasiado " "largo)." -#: ../src/callbacks.c:1688 ../src/callbacks.c:1698 +#: ../src/callbacks.c:1702 ../src/callbacks.c:1712 msgid "No more message items." msgstr "No hay más elementos de mensajes." -#: ../src/dialogs.c:178 ../src/interface.c:3873 ../src/interface.c:5492 +#: ../src/dialogs.c:178 ../src/interface.c:3912 ../src/interface.c:5553 msgid "Detect from file" msgstr "Detectar desde archivo" @@ -430,7 +425,7 @@ msgid "Open File" msgstr "Abrir archivo" -#: ../src/dialogs.c:243 ../src/interface.c:868 +#: ../src/dialogs.c:243 ../src/interface.c:873 msgid "_View" msgstr "_Ver" @@ -566,12 +561,12 @@ #: ../src/dialogs.c:1176 ../src/dialogs.c:1177 ../src/dialogs.c:1178 #: ../src/dialogs.c:1184 ../src/dialogs.c:1185 ../src/dialogs.c:1186 -#: ../src/symbols.c:1751 ../src/symbols.c:1772 ../src/symbols.c:1824 +#: ../src/symbols.c:1980 ../src/symbols.c:2001 ../src/symbols.c:2053 #: ../src/ui_utils.c:244 msgid "unknown" msgstr "desconocido" -#: ../src/dialogs.c:1191 ../src/symbols.c:800 +#: ../src/dialogs.c:1191 ../src/symbols.c:887 msgid "Properties" msgstr "Propiedades" @@ -661,14 +656,27 @@ msgid "New file \"%s\" opened." msgstr "Se ha abierto un archivo nuevo: «%s»." -#: ../src/document.c:967 ../src/document.c:1485 +#: ../src/document.c:845 ../src/document.c:1343 #, c-format msgid "Could not open file %s (%s)" msgstr "No se ha podido abrir el archivo %s (%s)" -#: ../src/document.c:997 +#: ../src/document.c:865 #, c-format +msgid "The file \"%s\" is not valid %s." +msgstr "El archivo «%s» no es %s válido." + +#: ../src/document.c:871 +#, c-format msgid "" +"The file \"%s\" does not look like a text file or the file encoding is not " +"supported." +msgstr "" +"El archivo «%s» no parece ser de texto o la codificación no es conocida." + +#: ../src/document.c:881 +#, c-format +msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " "can occur if the file contains a NULL byte. Be aware that saving it can " "cause data loss.\n" @@ -679,45 +687,30 @@ "puede provocar la pérdida de datos.\n" "El archivo se ha abierto como sólo lectura." -#. For translators: the second wildcard is an encoding name, e.g. -#. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1023 -#, c-format -msgid "The file \"%s\" is not valid %s." -msgstr "El archivo «%s» no es %s válido." - -#: ../src/document.c:1033 -#, c-format -msgid "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"El archivo «%s» no parece ser de texto o la codificación no es conocida." - -#: ../src/document.c:1184 +#: ../src/document.c:1042 msgid "Spaces" msgstr "Espacios" -#: ../src/document.c:1187 +#: ../src/document.c:1045 msgid "Tabs" msgstr "Tabulaciones" -#: ../src/document.c:1190 +#: ../src/document.c:1048 msgid "Tabs and Spaces" msgstr "Tabulaciones y espacios" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1195 +#: ../src/document.c:1053 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Estableciendo modo de sangría %s para %s." -#: ../src/document.c:1248 +#: ../src/document.c:1106 ../src/document.c:1716 msgid "Invalid filename" msgstr "Nombre de archivo inválido" -#: ../src/document.c:1363 +#: ../src/document.c:1221 #, c-format msgid "File %s reloaded." msgstr "Archivo %s recargado." @@ -725,20 +718,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1368 +#: ../src/document.c:1226 #, c-format msgid "File %s opened(%d%s)." msgstr "Archivo %s abierto(%d%s)" -#: ../src/document.c:1370 +#: ../src/document.c:1228 msgid ", read-only" msgstr ", sólo lectura" -#: ../src/document.c:1579 +#: ../src/document.c:1437 msgid "Error renaming file." msgstr "Error al renombrar el archivo." -#: ../src/document.c:1666 +#: ../src/document.c:1524 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -747,7 +740,7 @@ "Ocurrió un error mientras se convertía el archivo desde UTF-8 en «%s». El " "archivo no fue guardado." -#: ../src/document.c:1688 +#: ../src/document.c:1546 #, c-format msgid "" "Error message: %s\n" @@ -756,39 +749,36 @@ "Mensaje de error: %s\n" "El error ocurrió en «%s»(línea: %d, columna: %d)." -#: ../src/document.c:1693 +#: ../src/document.c:1551 #, c-format msgid "Error message: %s." msgstr "Mensaje de error: %s." -#: ../src/document.c:1743 +#: ../src/document.c:1601 #, c-format msgid "Failed to open file '%s' for writing: fopen() failed: %s" msgstr "" -"Ha ocurrido un error al abrir el archivo «%s» para escritura: ha fallado fopen" -"(): %s" +"Ha ocurrido un error al abrir el archivo «%s» para escritura: ha fallado " +"fopen(): %s" -#: ../src/document.c:1761 +#: ../src/document.c:1619 #, c-format msgid "Failed to write file '%s': fwrite() failed: %s" msgstr "" "Ha ocurrido un error al escribir el archivo «%s»: ha fallado fwrite(): %s" -#: ../src/document.c:1775 +#: ../src/document.c:1633 #, c-format msgid "Failed to close file '%s': fclose() failed: %s" -msgstr "Ha ocurrido un error al cerrar el archivo «%s»: ha fallado fclose(): %s" +msgstr "" +"Ha ocurrido un error al cerrar el archivo «%s»: ha fallado fclose(): %s" -#: ../src/document.c:1855 ../src/document.c:1927 -msgid "Error saving file." -msgstr "Error guardando archivo." - -#: ../src/document.c:1920 +#: ../src/document.c:1716 ../src/document.c:1781 #, c-format msgid "Error saving file (%s)." msgstr "Error al guardar archivo (%s)." -#: ../src/document.c:1925 +#: ../src/document.c:1786 #, c-format msgid "" "%s\n" @@ -799,38 +789,42 @@ "\n" "El archivo en el disco podría estar truncado." -#: ../src/document.c:1951 +#: ../src/document.c:1788 +msgid "Error saving file." +msgstr "Error guardando archivo." + +#: ../src/document.c:1812 #, c-format msgid "File %s saved." msgstr "Archivo %s guardado." -#: ../src/document.c:2019 ../src/document.c:2076 ../src/document.c:2084 +#: ../src/document.c:1880 ../src/document.c:1937 ../src/document.c:1945 #, c-format msgid "\"%s\" was not found." msgstr "no se ha encontrado «%s»." -#: ../src/document.c:2084 +#: ../src/document.c:1945 msgid "Wrap search and find again?" msgstr "¿Volver al principio y buscar de nuevo?" -#: ../src/document.c:2163 ../src/search.c:1146 ../src/search.c:1190 -#: ../src/search.c:1882 ../src/search.c:1883 +#: ../src/document.c:2024 ../src/search.c:1185 ../src/search.c:1229 +#: ../src/search.c:1920 ../src/search.c:1921 #, c-format msgid "No matches found for \"%s\"." msgstr "No se encontraron coincidencias para «%s»." -#: ../src/document.c:2174 ../src/document.c:2183 +#: ../src/document.c:2035 ../src/document.c:2044 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: se reemplazó %d ocurrencia de «%s» con «%s»." msgstr[1] "%s: se reemplazaron %d ocurrencias de «%s» con «%s»." -#: ../src/document.c:2997 +#: ../src/document.c:2860 msgid "Do you want to reload it?" msgstr "¿Quiere recargarlo?" -#: ../src/document.c:2998 +#: ../src/document.c:2861 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -839,30 +833,30 @@ "El archivo «%s» del disco es más reciente\n" "que la vista actual." -#: ../src/document.c:3016 +#: ../src/document.c:2879 msgid "Close _without saving" msgstr "Cerrar _sin guardar" -#: ../src/document.c:3019 +#: ../src/document.c:2882 msgid "Try to resave the file?" msgstr "¿Desea intentar volver a guardar el archivo?" -#: ../src/document.c:3020 +#: ../src/document.c:2883 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "No se ha encontrado el archivo «%s» en el disco." -#: ../src/editor.c:4326 +#: ../src/editor.c:4382 msgid "Enter Tab Width" msgstr "Introduzca el ancho de tabulación:" -#: ../src/editor.c:4327 +#: ../src/editor.c:4383 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" "Introduzca la cantidad de espacios que deberían ser reemplazados por una " "tabulación." -#: ../src/editor.c:4477 +#: ../src/editor.c:4533 #, c-format msgid "Warning: non-standard hard tab width: %d != 8!" msgstr "Advertencia: ancho de tabulación dura no estándar: %d != 8" @@ -1006,8 +1000,8 @@ msgid "%s file" msgstr "Archivo %s" -#: ../src/filetypes.c:99 ../src/filetypes.c:1553 ../src/interface.c:3816 -#: ../src/interface.c:5435 +#: ../src/filetypes.c:99 ../src/filetypes.c:1645 ../src/interface.c:3855 +#: ../src/interface.c:5496 msgid "None" msgstr "Ninguno" @@ -1031,50 +1025,50 @@ msgid "SQL Dump file" msgstr "Archivo de volcado SQL" -#: ../src/filetypes.c:398 +#: ../src/filetypes.c:405 msgid "Config file" msgstr "Archivo de configuración" -#: ../src/filetypes.c:404 +#: ../src/filetypes.c:411 msgid "Gettext translation file" msgstr "Archivo de traducción gettext" -#: ../src/filetypes.c:427 +#: ../src/filetypes.c:434 #, c-format msgid "%s script file" msgstr "Archivo de script %s" -#: ../src/filetypes.c:661 +#: ../src/filetypes.c:667 msgid "_Programming Languages" msgstr "Lenguajes de _programación" -#: ../src/filetypes.c:662 +#: ../src/filetypes.c:668 msgid "_Scripting Languages" msgstr "Lenguajes de _script" -#: ../src/filetypes.c:663 +#: ../src/filetypes.c:669 msgid "_Markup Languages" msgstr "Lenguajes de _etiquetas" -#: ../src/filetypes.c:664 +#: ../src/filetypes.c:670 msgid "M_iscellaneous Languages" msgstr "Lenguajes var_ios" -#: ../src/filetypes.c:665 +#: ../src/filetypes.c:671 msgid "_Custom Filetypes" msgstr "_Tipos de archivo personalizados" -#: ../src/filetypes.c:1281 ../src/win32.c:105 +#: ../src/filetypes.c:1373 ../src/win32.c:105 msgid "All Source" msgstr "Todo código fuente" #. create meta file filter "All files" -#: ../src/filetypes.c:1306 ../src/project.c:288 ../src/win32.c:95 +#: ../src/filetypes.c:1398 ../src/project.c:293 ../src/win32.c:95 #: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Todos los archivos" -#: ../src/filetypes.c:1364 +#: ../src/filetypes.c:1456 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Expresión regular incorrecta para el tipo de archivo %s: %s" @@ -1083,565 +1077,565 @@ msgid "untitled" msgstr "sin título" -#: ../src/highlighting.c:3595 ../src/main.c:814 ../src/socket.c:165 -#: ../src/templates.c:315 +#: ../src/highlighting.c:3621 ../src/main.c:815 ../src/socket.c:165 +#: ../src/templates.c:327 #, c-format msgid "Could not find file '%s'." msgstr "No se ha podido encontrar el archivo «%s»." -#: ../src/highlighting.c:3615 +#: ../src/highlighting.c:3641 msgid "_Default" msgstr "Pre_determinado" -#: ../src/highlighting.c:3656 +#: ../src/highlighting.c:3682 msgid "_Color Schemes" msgstr "Esquemas de _color" -#: ../src/interface.c:323 +#: ../src/interface.c:324 msgid "_File" msgstr "_Archivo" -#: ../src/interface.c:334 +#: ../src/interface.c:335 msgid "New (with _Template)" msgstr "Nuevo (desde _plantilla)" -#: ../src/interface.c:351 ../src/interface.c:2332 +#: ../src/interface.c:352 ../src/interface.c:2346 msgid "Open Selected F_ile" msgstr "Abrir archivo selecc_ionado" -#: ../src/interface.c:355 +#: ../src/interface.c:356 msgid "Recent _Files" msgstr "Arc_hivos recientes" -#: ../src/interface.c:372 +#: ../src/interface.c:373 msgid "Save A_ll" msgstr "Guardar _todos" -#: ../src/interface.c:388 +#: ../src/interface.c:389 msgid "R_eload As" msgstr "R_ecargar como" -#: ../src/interface.c:399 ../src/interface.c:634 ../src/interface.c:693 -#: ../src/interface.c:707 ../src/interface.c:1083 ../src/interface.c:1093 -#: ../src/interface.c:2297 ../src/interface.c:2311 +#: ../src/interface.c:400 ../src/interface.c:635 ../src/interface.c:694 +#: ../src/interface.c:708 ../src/interface.c:1088 ../src/interface.c:1098 +#: ../src/interface.c:2311 ../src/interface.c:2325 msgid "invisible" msgstr "invisible" -#: ../src/interface.c:416 +#: ../src/interface.c:417 msgid "Page Set_up" msgstr "C_onfiguración de página" -#: ../src/interface.c:433 ../src/notebook.c:214 +#: ../src/interface.c:434 ../src/notebook.c:257 msgid "Close Ot_her Documents" msgstr "Cerrar los _demás" -#: ../src/interface.c:441 ../src/notebook.c:219 +#: ../src/interface.c:442 ../src/notebook.c:262 msgid "C_lose All" msgstr "Cerrar _todos" -#: ../src/interface.c:458 ../src/interface.c:2231 +#: ../src/interface.c:459 ../src/interface.c:2241 msgid "_Edit" msgstr "_Editar" -#: ../src/interface.c:508 +#: ../src/interface.c:509 msgid "_Commands" msgstr "_Comandos" -#: ../src/interface.c:515 ../src/keybindings.c:311 +#: ../src/interface.c:516 ../src/keybindings.c:311 msgid "_Cut Current Line(s)" msgstr "_Cortar líneas actuales" -#: ../src/interface.c:523 ../src/keybindings.c:308 +#: ../src/interface.c:524 ../src/keybindings.c:308 msgid "_Copy Current Line(s)" msgstr "_Copiar líneas actuales" -#: ../src/interface.c:531 ../src/keybindings.c:263 +#: ../src/interface.c:532 ../src/keybindings.c:263 msgid "_Delete Current Line(s)" msgstr "_Borrar líneas actuales" -#: ../src/interface.c:535 ../src/keybindings.c:260 +#: ../src/interface.c:536 ../src/keybindings.c:260 msgid "_Duplicate Line or Selection" msgstr "_Duplicar línea o selección" -#: ../src/interface.c:544 ../src/keybindings.c:321 +#: ../src/interface.c:545 ../src/keybindings.c:321 msgid "_Select Current Line(s)" msgstr "_Seleccionar líneas actuales" -#: ../src/interface.c:548 ../src/keybindings.c:324 +#: ../src/interface.c:549 ../src/keybindings.c:324 msgid "_Select Current Paragraph" msgstr "_Seleccionar párrafo actual" -#: ../src/interface.c:557 ../src/keybindings.c:363 +#: ../src/interface.c:558 ../src/keybindings.c:363 msgid "_Send Selection to Terminal" msgstr "Enviar texto _seleccionado al terminal" -#: ../src/interface.c:561 ../src/interface.c:2235 +#: ../src/interface.c:562 ../src/interface.c:2245 msgid "_Format" msgstr "_Formato" -#: ../src/interface.c:568 ../src/keybindings.c:365 +#: ../src/interface.c:569 ../src/keybindings.c:365 msgid "_Reflow Lines/Block" msgstr "_Reestructurar líneas/bloque" -#: ../src/interface.c:572 ../src/keybindings.c:335 +#: ../src/interface.c:573 ../src/keybindings.c:335 msgid "T_oggle Case of Selection" msgstr "C_onvertir selección a mayús./minús." -#: ../src/interface.c:576 ../src/keybindings.c:270 +#: ../src/interface.c:577 ../src/keybindings.c:270 msgid "_Transpose Current Line" msgstr "_Transponer línea actual" -#: ../src/interface.c:585 +#: ../src/interface.c:586 msgid "_Comment Line(s)" msgstr "_Comentar línea(s)" -#: ../src/interface.c:589 +#: ../src/interface.c:590 msgid "U_ncomment Line(s)" msgstr "_Descomentar línea(s)" -#: ../src/interface.c:593 +#: ../src/interface.c:594 msgid "_Toggle Line Commentation" msgstr "Comen_tar/descomentar línea" -#: ../src/interface.c:602 +#: ../src/interface.c:603 msgid "_Increase Indent" msgstr "_Incrementar sangría" -#: ../src/interface.c:610 +#: ../src/interface.c:611 msgid "_Decrease Indent" msgstr "_Disminuir sangría" -#: ../src/interface.c:618 ../src/keybindings.c:354 +#: ../src/interface.c:619 ../src/keybindings.c:354 msgid "_Smart Line Indent" msgstr "_Sangría inteligente" -#: ../src/interface.c:627 +#: ../src/interface.c:628 msgid "_Send Selection to" msgstr "_Enviar texto seleccionado a" -#: ../src/interface.c:642 +#: ../src/interface.c:643 msgid "I_nsert Comments" msgstr "I_nsertar comentarios" -#: ../src/interface.c:653 ../src/interface.c:2246 +#: ../src/interface.c:654 ../src/interface.c:2260 msgid "Insert _ChangeLog Entry" msgstr "Insertar entrada de _ChangeLog" -#: ../src/interface.c:657 ../src/interface.c:2250 +#: ../src/interface.c:658 ../src/interface.c:2264 msgid "Insert _Function Description" msgstr "Insertar descripción de _función" -#: ../src/interface.c:661 ../src/interface.c:2254 +#: ../src/interface.c:662 ../src/interface.c:2268 msgid "Insert _Multiline Comment" msgstr "Insertar comentario _multilínea" -#: ../src/interface.c:670 ../src/interface.c:2269 +#: ../src/interface.c:671 ../src/interface.c:2283 msgid "Insert File _Header" msgstr "Insertar _Cabecera de archivo" -#: ../src/interface.c:674 ../src/interface.c:2273 +#: ../src/interface.c:675 ../src/interface.c:2287 msgid "Insert _GPL Notice" msgstr "Insertar nota de licencia _GPL" -#: ../src/interface.c:678 ../src/interface.c:2277 +#: ../src/interface.c:679 ../src/interface.c:2291 msgid "Insert _BSD License Notice" msgstr "Insertar nota de licencia _BSD" -#: ../src/interface.c:682 ../src/interface.c:2286 +#: ../src/interface.c:683 ../src/interface.c:2300 msgid "Insert Dat_e" msgstr "Insertar f_echa" -#: ../src/interface.c:696 ../src/interface.c:2300 +#: ../src/interface.c:697 ../src/interface.c:2314 msgid "_Insert \"include <...>\"" msgstr "_Insertar \"include <...>\"" -#: ../src/interface.c:715 +#: ../src/interface.c:711 ../src/interface.c:2333 ../src/keybindings.c:374 +msgid "_Insert Alternative White Space" +msgstr "_Insertar espacio en blanco alternativo" + +#: ../src/interface.c:720 msgid "Preference_s" msgstr "Preferencia_s" -#: ../src/interface.c:723 ../src/keybindings.c:386 +#: ../src/interface.c:728 ../src/keybindings.c:387 msgid "P_lugin Preferences" msgstr "Preferencias de comp_lementos" -#: ../src/interface.c:731 ../src/interface.c:2323 +#: ../src/interface.c:736 ../src/interface.c:2337 msgid "_Search" msgstr "_Buscar" -#: ../src/interface.c:742 +#: ../src/interface.c:747 msgid "Find _Next" msgstr "Buscar _siguiente" -#: ../src/interface.c:746 +#: ../src/interface.c:751 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../src/interface.c:755 +#: ../src/interface.c:760 msgid "Find in F_iles" msgstr "Buscar en arch_ivos" -#: ../src/interface.c:763 ../src/search.c:562 +#: ../src/interface.c:768 ../src/search.c:614 msgid "_Replace" msgstr "_Reemplazar" -#: ../src/interface.c:776 +#: ../src/interface.c:781 msgid "Next _Message" msgstr "Siguiente _mensaje" -#: ../src/interface.c:784 +#: ../src/interface.c:789 msgid "Pr_evious Message" msgstr "Mensaje ant_erior" -#: ../src/interface.c:797 ../src/keybindings.c:433 +#: ../src/interface.c:802 ../src/keybindings.c:434 msgid "_Go to Next Marker" msgstr "_Ir a la siguiente marca" -#: ../src/interface.c:801 ../src/keybindings.c:436 +#: ../src/interface.c:806 ../src/keybindings.c:437 msgid "_Go to Previous Marker" msgstr "_Ir a la marca anterior" -#: ../src/interface.c:810 +#: ../src/interface.c:815 msgid "_Go to Line" msgstr "_Ir a la línea" -#: ../src/interface.c:818 ../src/interface.c:2258 +#: ../src/interface.c:823 ../src/interface.c:2272 ../src/interface.c:3531 msgid "_More" msgstr "_Más" -#: ../src/interface.c:825 ../src/keybindings.c:398 +#: ../src/interface.c:830 ../src/keybindings.c:399 msgid "Find Next _Selection" msgstr "Buscar siguiente _selección" -#: ../src/interface.c:829 ../src/keybindings.c:400 +#: ../src/interface.c:834 ../src/keybindings.c:401 msgid "Find Pre_vious Selection" msgstr "Buscar selección _anterior" -#: ../src/interface.c:838 ../src/interface.c:2340 +#: ../src/interface.c:843 ../src/interface.c:2354 msgid "Find _Usage" msgstr "Encontrar _uso" -#: ../src/interface.c:842 ../src/interface.c:2348 +#: ../src/interface.c:847 ../src/interface.c:2362 msgid "Find _Document Usage" msgstr "Encontrar _uso del documento" -#: ../src/interface.c:851 ../src/keybindings.c:415 +#: ../src/interface.c:856 ../src/keybindings.c:416 msgid "_Mark All" msgstr "_Marcar todo" -#: ../src/interface.c:860 ../src/interface.c:2356 +#: ../src/interface.c:865 ../src/interface.c:2370 msgid "Go to _Tag Definition" msgstr "Ir a la definición de la eti_queta" -#: ../src/interface.c:864 +#: ../src/interface.c:869 msgid "Go to T_ag Declaration" msgstr "Ir a la declaración de la eti_queta" -#: ../src/interface.c:875 +#: ../src/interface.c:880 msgid "Change _Font" msgstr "Cambiar _fuente" -#: ../src/interface.c:888 +#: ../src/interface.c:893 msgid "To_ggle All Additional Widgets" msgstr "M_ostrar/ocultar todos los componentes adicionales" -#: ../src/interface.c:892 +#: ../src/interface.c:897 msgid "Full_screen" msgstr "Pantalla _completa" -#: ../src/interface.c:896 +#: ../src/interface.c:901 msgid "Show Message _Window" msgstr "Mostrar _ventana de mensajes" -#: ../src/interface.c:901 +#: ../src/interface.c:906 msgid "Show _Toolbar" msgstr "Mostrar barra de _herramientas" -#: ../src/interface.c:906 +#: ../src/interface.c:911 msgid "Show Side_bar" msgstr "Mostrar _barra lateral" -#: ../src/interface.c:911 ../src/interface.c:4247 ../src/interface.c:5576 +#: ../src/interface.c:916 ../src/interface.c:4302 ../src/interface.c:5637 #: ../src/keybindings.c:253 ../src/prefs.c:1557 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:918 +#: ../src/interface.c:923 msgid "Show _Markers Margin" msgstr "Mostrar margen de _marcas" -#: ../src/interface.c:923 +#: ../src/interface.c:928 msgid "Show _Line Numbers" msgstr "Mostrar números de _línea" -#: ../src/interface.c:928 +#: ../src/interface.c:933 msgid "Show _White Space" msgstr "Mostrar espacio en _blanco" -#: ../src/interface.c:932 +#: ../src/interface.c:937 msgid "Show Line _Endings" msgstr "Mostrar _fin de línea" -#: ../src/interface.c:936 +#: ../src/interface.c:941 msgid "Show _Indentation Guides" msgstr "Mostrar _guías de sangría" -#: ../src/interface.c:957 +#: ../src/interface.c:962 msgid "_Document" msgstr "_Documento" -#: ../src/interface.c:964 +#: ../src/interface.c:969 msgid "_Line Wrapping" msgstr "Ajuste de _línea" -#: ../src/interface.c:969 +#: ../src/interface.c:974 msgid "Line _Breaking" msgstr "_Salto de línea" -#: ../src/interface.c:973 +#: ../src/interface.c:978 msgid "_Auto-indentation" msgstr "Sangría _automática" -#: ../src/interface.c:978 +#: ../src/interface.c:983 msgid "In_dent Type" msgstr "Tipo de _sangría" -#: ../src/interface.c:985 ../src/interface.c:3855 ../src/interface.c:5474 +#: ../src/interface.c:990 ../src/interface.c:3894 ../src/interface.c:5535 msgid "_Tabs" msgstr "_Tabulaciones" -#: ../src/interface.c:991 ../src/interface.c:3846 ../src/interface.c:5465 +#: ../src/interface.c:996 ../src/interface.c:3885 ../src/interface.c:5526 msgid "_Spaces" msgstr "E_spacios" -#: ../src/interface.c:997 ../src/interface.c:3864 ../src/interface.c:5483 +#: ../src/interface.c:1002 msgid "T_abs and Spaces" msgstr "T_abulaciones y espacios" -#: ../src/interface.c:1003 +#: ../src/interface.c:1008 msgid "Indent Widt_h" msgstr "Anc_hura de sangría" -#: ../src/interface.c:1010 +#: ../src/interface.c:1015 msgid "_1" msgstr "_1" -#: ../src/interface.c:1016 +#: ../src/interface.c:1021 msgid "_2" msgstr "_2" -#: ../src/interface.c:1022 +#: ../src/interface.c:1027 msgid "_3" msgstr "_3" -#: ../src/interface.c:1028 +#: ../src/interface.c:1033 msgid "_4" msgstr "_4" -#: ../src/interface.c:1034 +#: ../src/interface.c:1039 msgid "_5" msgstr "_5" -#: ../src/interface.c:1040 +#: ../src/interface.c:1045 msgid "_6" msgstr "_6" -#: ../src/interface.c:1046 +#: ../src/interface.c:1051 msgid "_7" msgstr "_7" -#: ../src/interface.c:1052 +#: ../src/interface.c:1057 msgid "_8" msgstr "_8" -#: ../src/interface.c:1063 +#: ../src/interface.c:1068 msgid "Read _Only" msgstr "Sólo _lectura" -#: ../src/interface.c:1067 +#: ../src/interface.c:1072 msgid "_Write Unicode BOM" msgstr "Escribir _BOM Unicode" -#: ../src/interface.c:1076 +#: ../src/interface.c:1081 msgid "Set File_type" msgstr "Establecer _tipo de archivo" -#: ../src/interface.c:1086 +#: ../src/interface.c:1091 msgid "Set _Encoding" msgstr "Establecer _codificación" -#: ../src/interface.c:1096 +#: ../src/interface.c:1101 msgid "Set Line E_ndings" msgstr "Establecer fi_n de línea" -#: ../src/interface.c:1103 +#: ../src/interface.c:1108 msgid "Convert and Set to _CR/LF (Win)" msgstr "Convertir a, y establecer _CR/LF (Win)" -#: ../src/interface.c:1109 +#: ../src/interface.c:1114 msgid "Convert and Set to _LF (Unix)" msgstr "Convertir a, y establecer _LF (Unix)" -#: ../src/interface.c:1115 +#: ../src/interface.c:1120 msgid "Convert and Set to CR (_Mac)" msgstr "Convertir a, y establecer CR (_Mac)" -#: ../src/interface.c:1126 +#: ../src/interface.c:1131 msgid "_Strip Trailing Spaces" msgstr "_Borrar espacios finales" -#: ../src/interface.c:1130 +#: ../src/interface.c:1135 msgid "_Replace Tabs by Spaces" msgstr "_Reemplazar tabulaciones por espacios" -#: ../src/interface.c:1134 +#: ../src/interface.c:1139 msgid "Replace Spaces b_y Tabs" msgstr "Reemplazar _espacios por tabulaciones" -#: ../src/interface.c:1143 +#: ../src/interface.c:1148 msgid "_Fold All" msgstr "_Plegar todo" -#: ../src/interface.c:1147 +#: ../src/interface.c:1152 msgid "_Unfold All" msgstr "_Desplegar todo" -#: ../src/interface.c:1156 +#: ../src/interface.c:1161 msgid "Remove _Markers" msgstr "Borrar _marcas" -#: ../src/interface.c:1160 +#: ../src/interface.c:1165 msgid "Remove Error _Indicators" msgstr "Borrar _indicadores de errores" -#: ../src/interface.c:1164 +#: ../src/interface.c:1169 msgid "_Project" msgstr "_Proyecto" -#: ../src/interface.c:1171 +#: ../src/interface.c:1176 msgid "_New" msgstr "_Nuevo" -#: ../src/interface.c:1179 +#: ../src/interface.c:1184 msgid "_Open" msgstr "_Abrir" -#: ../src/interface.c:1187 +#: ../src/interface.c:1192 msgid "_Recent Projects" msgstr "Proyectos _recientes" -#: ../src/interface.c:1191 +#: ../src/interface.c:1196 msgid "_Close" msgstr "_Cerrar" -#: ../src/interface.c:1213 +#: ../src/interface.c:1218 msgid "_Apply Default Indentation" msgstr "_Aplicar sangría predeterminada" -#: ../src/interface.c:1216 +#: ../src/interface.c:1221 msgid "Apply the default indentation settings to all documents" msgstr "" "Aplicar la configuración de sangría predeterminada a todos los documentos" -#: ../src/interface.c:1222 +#: ../src/interface.c:1227 msgid "_Tools" msgstr "_Herramientas" -#: ../src/interface.c:1229 +#: ../src/interface.c:1234 msgid "_Reload Configuration" msgstr "_Recargar configuración" -#: ../src/interface.c:1237 +#: ../src/interface.c:1242 msgid "C_onfiguration Files" msgstr "Archivos de c_onfiguración" -#: ../src/interface.c:1250 +#: ../src/interface.c:1255 msgid "_Color Chooser" msgstr "Selector de _color" -#: ../src/interface.c:1258 +#: ../src/interface.c:1263 msgid "_Word Count" msgstr "C_ontar palabras" -#: ../src/interface.c:1262 +#: ../src/interface.c:1267 msgid "Load Ta_gs" msgstr "Cargar eti_quetas" -#: ../src/interface.c:1266 ../src/interface.c:1273 +#: ../src/interface.c:1271 ../src/interface.c:1278 msgid "_Help" msgstr "Ay_uda" -#: ../src/interface.c:1281 +#: ../src/interface.c:1286 msgid "_Website" msgstr "Sitio _web" -#: ../src/interface.c:1285 +#: ../src/interface.c:1290 msgid "_Keyboard Shortcuts" msgstr "_Combinaciones de tecla" -#: ../src/interface.c:1289 +#: ../src/interface.c:1294 msgid "_Debug Messages" msgstr "Mensajes de _depuración" -#: ../src/interface.c:1328 ../src/sidebar.c:132 +#: ../src/interface.c:1333 ../src/sidebar.c:132 msgid "Symbols" msgstr "Símbolos" -#: ../src/interface.c:1342 +#: ../src/interface.c:1347 msgid "Documents" msgstr "Documentos" -#: ../src/interface.c:1378 +#: ../src/interface.c:1383 msgid "Status" msgstr "Estado" -#: ../src/interface.c:1392 +#: ../src/interface.c:1397 msgid "Compiler" msgstr "Compilador" -#: ../src/interface.c:1407 +#: ../src/interface.c:1412 msgid "Messages" msgstr "Mensajes" -#: ../src/interface.c:1420 +#: ../src/interface.c:1425 msgid "Scribble" msgstr "Borrador" -#: ../src/interface.c:2094 +#: ../src/interface.c:2103 msgid "_Toolbar Preferences" msgstr "Preferencias de barra de herramien_tas" -#: ../src/interface.c:2107 +#: ../src/interface.c:2116 msgid "_Hide Toolbar" msgstr "_Ocultar barra de herramientas" -#: ../src/interface.c:2239 +#: ../src/interface.c:2249 msgid "I_nsert" msgstr "I_nsertar" -#: ../src/interface.c:2319 ../src/keybindings.c:374 -msgid "_Insert Alternative White Space" -msgstr "_Insertar espacio en blanco alternativo" - -#: ../src/interface.c:2364 +#: ../src/interface.c:2378 msgid "Conte_xt Action" msgstr "Acción conte_xtual" -#: ../src/interface.c:2885 ../src/keybindings.c:383 +#: ../src/interface.c:2907 ../src/keybindings.c:384 msgid "Preferences" msgstr "Preferencias" -#: ../src/interface.c:2921 +#: ../src/interface.c:2943 msgid "Load files from the last session" msgstr "Cargar archivos de la última sesión" -#: ../src/interface.c:2924 +#: ../src/interface.c:2946 msgid "Opens at startup the files from the last session" msgstr "Al arrancar abre los archivos de la última sesión" -#: ../src/interface.c:2926 +#: ../src/interface.c:2948 msgid "Load virtual terminal support" msgstr "Cargar emulación de terminal virtual" -#: ../src/interface.c:2928 +#: ../src/interface.c:2950 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1649,40 +1643,40 @@ "Define si se carga o no al inicio la emulación de terminal virtual (VTE). " "Desactive esta opción si no necesita la terminal virtual" -#: ../src/interface.c:2930 +#: ../src/interface.c:2952 msgid "Enable plugin support" msgstr "Activar soporte de complementos" -#: ../src/interface.c:2934 +#: ../src/interface.c:2956 msgid "Startup" msgstr "Inicio" -#: ../src/interface.c:2953 +#: ../src/interface.c:2975 msgid "Save window position and geometry" msgstr "Guardar la posición de la ventana y su geometría" -#: ../src/interface.c:2956 +#: ../src/interface.c:2978 msgid "Saves the window position and geometry and restores it at the start" msgstr "" "Guarda la posición de la ventana y su tamaño y las restablece al inicio" -#: ../src/interface.c:2958 +#: ../src/interface.c:2980 msgid "Confirm exit" msgstr "Confirmar salida" -#: ../src/interface.c:2961 +#: ../src/interface.c:2983 msgid "Shows a confirmation dialog on exit" msgstr "Muestra un diálogo de confirmación al salir" -#: ../src/interface.c:2963 +#: ../src/interface.c:2985 msgid "Shutdown" msgstr "Cierre" -#: ../src/interface.c:2984 +#: ../src/interface.c:3006 msgid "Startup path:" msgstr "Ruta de inicio:" -#: ../src/interface.c:2996 +#: ../src/interface.c:3018 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1690,19 +1684,19 @@ "Ruta en la que iniciar cuando se abren o guardan archivos. Debe ser una ruta " "absoluta. Dejar en blanco para usar el directorio de trabajo actual." -#: ../src/interface.c:3009 +#: ../src/interface.c:3031 msgid "Project files:" msgstr "Archivos de proyecto:" -#: ../src/interface.c:3021 +#: ../src/interface.c:3043 msgid "Path to start in when opening project files" msgstr "Ruta a iniciar cuando se abran archivos de proyectos" -#: ../src/interface.c:3034 +#: ../src/interface.c:3056 msgid "Extra plugin path:" msgstr "Ruta para complementos extra:" -#: ../src/interface.c:3046 +#: ../src/interface.c:3068 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1712,19 +1706,19 @@ "de configuración. La ruta introducida aquí se usará para buscar más " "complementos. Para desactivar esta opción deje esta casilla en blanco." -#: ../src/interface.c:3059 +#: ../src/interface.c:3081 msgid "Paths" msgstr "Rutas" -#: ../src/interface.c:3064 +#: ../src/interface.c:3086 msgid "Startup" msgstr "Inicio" -#: ../src/interface.c:3087 +#: ../src/interface.c:3109 msgid "Beep on errors or when compilation has finished" msgstr "Alerta sonora para errores o la finalización de la compilación" -#: ../src/interface.c:3090 +#: ../src/interface.c:3112 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1732,11 +1726,11 @@ "Define si se da una advertencia sonora en los errores o al finalizar el " "proceso de compilación." -#: ../src/interface.c:3092 +#: ../src/interface.c:3114 msgid "Switch to status message list at new message" msgstr "Cambiar a la lista de mensajes de estado cuando haya un nuevo mensaje" -#: ../src/interface.c:3095 +#: ../src/interface.c:3117 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1744,11 +1738,11 @@ "Cambia a la pestaña de mensajes de estado (en la ventana de pestañas de " "abajo) cuando llega un nuevo mensaje de estado." -#: ../src/interface.c:3097 +#: ../src/interface.c:3119 msgid "Suppress status messages in the status bar" msgstr "Suprimir mensajes de estado en la barra de estado" -#: ../src/interface.c:3100 +#: ../src/interface.c:3122 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1756,11 +1750,11 @@ "Elimina todos los mensajes de la barra de estado. Los mensajes se muestran " "de todas formas en la ventana de mensajes de estado." -#: ../src/interface.c:3102 +#: ../src/interface.c:3124 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Foco automático (el foco sigue al ratón)" -#: ../src/interface.c:3105 +#: ../src/interface.c:3127 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 " @@ -1770,11 +1764,11 @@ "para el panel de edición principal, el borrador, la barra de búsquedas, el " "campo «ir a línea» y la VTE." -#: ../src/interface.c:3107 +#: ../src/interface.c:3129 msgid "Use Windows File Open/Save dialogs" msgstr "Utilizar diálogos «Abrir/Guardar archivo» de Windows" -#: ../src/interface.c:3110 +#: ../src/interface.c:3132 msgid "" "Defines whether to use the native Windows File Open/Save dialogs or whether " "to use the GTK default dialogs" @@ -1782,16 +1776,16 @@ "Define si se utilizarán los diálogos de apertura y guardado de archivos " "nativos de Windows o los predeterminados de GTK." -#: ../src/interface.c:3112 ../src/interface.c:3491 ../src/interface.c:4457 +#: ../src/interface.c:3134 ../src/interface.c:3370 ../src/interface.c:4512 msgid "Miscellaneous" msgstr "Varios" -#: ../src/interface.c:3131 +#: ../src/interface.c:3153 msgid "Always wrap search and hide the Find dialog" msgstr "" "Siempre reiniciar la búsqueda por el principio y ocultar el diálogo de Buscar" -#: ../src/interface.c:3134 +#: ../src/interface.c:3156 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1799,11 +1793,11 @@ "Siempre reiniciar la búsqueda por el principio y ocultar el diálogo de " "Buscar después de pulsar en «Buscar siguiente/anterior»" -#: ../src/interface.c:3136 +#: ../src/interface.c:3158 msgid "Use the current word under the cursor for Find dialogs" msgstr "Usar la palabra bajo el cursor para los diálogos de búsqueda" -#: ../src/interface.c:3139 +#: ../src/interface.c:3161 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1811,20 +1805,20 @@ "Usar la palabra bajo el cursor, si no hay ninguna selección, al abrir el " "diálogo de «Buscar», «Buscar en archivos» o «Reemplazar»" -#: ../src/interface.c:3141 +#: ../src/interface.c:3163 msgid "Use the current file's directory for Find in Files" msgstr "" "Usar el directorio del archivo actual para realizar la «Búsqueda en archivos»" -#: ../src/interface.c:3145 +#: ../src/interface.c:3167 msgid "Search" msgstr "Buscar" -#: ../src/interface.c:3164 +#: ../src/interface.c:3186 msgid "Use project-based session files" msgstr "Usar archivos de sesión por proyectos" -#: ../src/interface.c:3167 +#: ../src/interface.c:3189 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1832,12 +1826,12 @@ "Define si se almacenan los archivos de sesión de un proyecto y se vuelven a " "abrir cuando se abra el proyecto" -#: ../src/interface.c:3169 +#: ../src/interface.c:3191 msgid "Store project file inside the project base directory" msgstr "" "Almacenar el archivo de proyecto dentro del directorio base del proyecto" -#: ../src/interface.c:3172 +#: ../src/interface.c:3194 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 " @@ -1849,11 +1843,11 @@ "almacenarse en el directorio superior al directorio base. La ruta del " "proyecto se puede cambiar en el diálogo «Nuevo proyecto»." -#: ../src/interface.c:3174 +#: ../src/interface.c:3196 msgid "Projects" msgstr "Proyectos" -#: ../src/interface.c:3179 +#: ../src/interface.c:3201 msgid "Miscellaneous" msgstr "Varios" @@ -1861,85 +1855,97 @@ #. * corresponding chapter in the documentation, comparing translatable #. * strings is easy to break. Maybe attach an identifying string to the #. * tab label object. -#: ../src/interface.c:3183 ../src/prefs.c:1551 +#: ../src/interface.c:3205 ../src/prefs.c:1551 msgid "General" msgstr "General" -#: ../src/interface.c:3220 +#: ../src/interface.c:3246 msgid "Show symbol list" msgstr "Mostrar la lista de símbolos" -#: ../src/interface.c:3223 +#: ../src/interface.c:3249 msgid "Toggle the symbol list on and off" msgstr "Mostrar/ocultar la lista de símbolos" -#: ../src/interface.c:3225 +#: ../src/interface.c:3251 msgid "Show documents list" msgstr "Mostrar la lista de documentos" -#: ../src/interface.c:3228 +#: ../src/interface.c:3254 msgid "Toggle the documents list on and off" msgstr "Mostrar/ocultar la lista de documentos" -#: ../src/interface.c:3230 +#: ../src/interface.c:3256 msgid "Show sidebar" msgstr "Mostrar barra lateral" -#: ../src/interface.c:3238 +#: ../src/interface.c:3264 msgid "Position:" msgstr "Posición:" -#: ../src/interface.c:3242 ../src/interface.c:3365 ../src/interface.c:3426 -#: ../src/interface.c:3444 ../src/interface.c:3462 +#: ../src/interface.c:3268 ../src/interface.c:3424 ../src/interface.c:3485 +#: ../src/interface.c:3503 ../src/interface.c:3521 msgid "Left" msgstr "Izquierda" -#: ../src/interface.c:3249 ../src/interface.c:3373 ../src/interface.c:3427 -#: ../src/interface.c:3445 ../src/interface.c:3463 +#: ../src/interface.c:3275 ../src/interface.c:3432 ../src/interface.c:3486 +#: ../src/interface.c:3504 ../src/interface.c:3522 msgid "Right" msgstr "Derecha" -#: ../src/interface.c:3255 +#: ../src/interface.c:3281 msgid "Sidebar" msgstr "Barra lateral" -#: ../src/interface.c:3276 +#: ../src/interface.c:3302 msgid "Symbol list:" msgstr "Lista de símbolos:" -#: ../src/interface.c:3283 ../src/interface.c:3413 +#: ../src/interface.c:3309 ../src/interface.c:3472 msgid "Message window:" msgstr "Ventana de mensajes:" -#: ../src/interface.c:3290 ../src/interface.c:3449 +#: ../src/interface.c:3316 ../src/interface.c:3508 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3302 +#: ../src/interface.c:3328 msgid "Sets the font for the message window" msgstr "Selecciona la fuente para la ventana de mensajes" -#: ../src/interface.c:3310 +#: ../src/interface.c:3336 msgid "Sets the font for the symbol list" msgstr "Selecciona la fuente para la lista de símbolos" -#: ../src/interface.c:3318 +#: ../src/interface.c:3344 msgid "Sets the editor font" msgstr "Selecciona la fuente del editor" -#: ../src/interface.c:3320 +#: ../src/interface.c:3346 msgid "Fonts" msgstr "Fuentes" -#: ../src/interface.c:3339 +#: ../src/interface.c:3365 +msgid "Show status bar" +msgstr "Mostrar barra de estado" + +#: ../src/interface.c:3368 +msgid "Whether to show the status bar at the bottom of the main window" +msgstr "Define si se muestra la barra de estado debajo de la ventana principal" + +#: ../src/interface.c:3375 ../src/interface.c:3535 ../src/prefs.c:1553 +msgid "Interface" +msgstr "Interfaz" + +#: ../src/interface.c:3398 msgid "Show editor tabs" msgstr "Mostrar pestañas del editor" -#: ../src/interface.c:3343 +#: ../src/interface.c:3402 msgid "Show close buttons" msgstr "Mostrar botones de cierre" -#: ../src/interface.c:3346 +#: ../src/interface.c:3405 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1947,23 +1953,23 @@ "Muestra un pequeño botón la pestaña de cada archivo, para cerrarlo " "fácilmente pulsando en él (requiere reiniciar Geany)" -#: ../src/interface.c:3352 +#: ../src/interface.c:3411 msgid "Placement of new file tabs:" msgstr "Posición de las pestañas de archivos nuevos:" -#: ../src/interface.c:3368 +#: ../src/interface.c:3427 msgid "File tabs will be placed on the left of the notebook" msgstr "Las pestañas de archivos serán colocadas a la izquierda de la lista" -#: ../src/interface.c:3376 +#: ../src/interface.c:3435 msgid "File tabs will be placed on the right of the notebook" msgstr "Las pestañas de archivos serán colocadas a la derecha de la lista" -#: ../src/interface.c:3380 +#: ../src/interface.c:3439 msgid "Next to current" msgstr "Siguiente a la actual" -#: ../src/interface.c:3385 +#: ../src/interface.c:3444 msgid "" "Whether to place file tabs next to the current tab rather than at the edges " "of the notebook" @@ -1971,118 +1977,106 @@ "Define si se colocan las pestañas de archivos al lado de la pestaña actual " "en vez de en los laterales de la libreta." -#: ../src/interface.c:3387 +#: ../src/interface.c:3446 msgid "Double-clicking hides all additional widgets" msgstr "Doble pulsación oculta todos los componentes adicionales" -#: ../src/interface.c:3390 +#: ../src/interface.c:3449 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "" "Ejecuta el comando «Ver->Mostrar/ocultar todos los componentes adicionales»" -#: ../src/interface.c:3392 +#: ../src/interface.c:3451 msgid "Editor tabs" msgstr "Pestañas del editor" -#: ../src/interface.c:3428 ../src/interface.c:3446 ../src/interface.c:3464 +#: ../src/interface.c:3487 ../src/interface.c:3505 ../src/interface.c:3523 msgid "Top" msgstr "Arriba" -#: ../src/interface.c:3429 ../src/interface.c:3447 ../src/interface.c:3465 +#: ../src/interface.c:3488 ../src/interface.c:3506 ../src/interface.c:3524 msgid "Bottom" msgstr "Abajo" -#: ../src/interface.c:3431 +#: ../src/interface.c:3490 msgid "Sidebar:" msgstr "Barra lateral:" -#: ../src/interface.c:3467 +#: ../src/interface.c:3526 msgid "Tab positions" msgstr "Posición de pestañas:" -#: ../src/interface.c:3486 -msgid "Show status bar" -msgstr "Mostrar barra de estado" - -#: ../src/interface.c:3489 -msgid "Whether to show the status bar at the bottom of the main window" -msgstr "Define si se muestra la barra de estado debajo de la ventana principal" - -#: ../src/interface.c:3496 ../src/prefs.c:1553 -msgid "Interface" -msgstr "Interfaz" - -#: ../src/interface.c:3527 -msgid "Show T_oolbar" +#: ../src/interface.c:3566 +msgid "Show t_oolbar" msgstr "M_ostrar barra de herramientas" -#: ../src/interface.c:3531 -msgid "_Append Toolbar to the Menu" +#: ../src/interface.c:3570 +msgid "_Append toolbar to the menu" msgstr "_Añadir la barra de herramientas al menú" -#: ../src/interface.c:3534 +#: ../src/interface.c:3573 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Añadir la barra de herramientas en el menú principal para ahorrar espacio " "vertical" -#: ../src/interface.c:3556 ../src/toolbar.c:930 +#: ../src/interface.c:3595 ../src/toolbar.c:932 msgid "Customize Toolbar" msgstr "Personalizar barra de _herramientas" -#: ../src/interface.c:3576 -msgid "System _Default" +#: ../src/interface.c:3615 +msgid "System _default" msgstr "Pre_determinado del sistema" -#: ../src/interface.c:3584 -msgid "Images _and Text" -msgstr "Imágenes _y texto" +#: ../src/interface.c:3623 +msgid "Images _and text" +msgstr "Imágenes y _texto" -#: ../src/interface.c:3592 -msgid "_Images Only" +#: ../src/interface.c:3631 +msgid "_Images only" msgstr "Sólo _imágenes" -#: ../src/interface.c:3600 -msgid "_Text Only" +#: ../src/interface.c:3639 +msgid "_Text only" msgstr "Sólo _texto" -#: ../src/interface.c:3608 -msgid "Icon Style" +#: ../src/interface.c:3647 +msgid "Icon style" msgstr "Estilo de iconos" -#: ../src/interface.c:3629 -msgid "S_ystem Default" +#: ../src/interface.c:3668 +msgid "S_ystem default" msgstr "Pre_determinado del sistema" -#: ../src/interface.c:3637 -msgid "_Small Icons" +#: ../src/interface.c:3676 +msgid "_Small icons" msgstr "Iconos _pequeños" -#: ../src/interface.c:3645 -msgid "_Very Small Icons" +#: ../src/interface.c:3684 +msgid "_Very small icons" msgstr "Iconos muy _pequeños" -#: ../src/interface.c:3653 -msgid "_Large Icons" +#: ../src/interface.c:3692 +msgid "_Large icons" msgstr "Iconos _grandes" -#: ../src/interface.c:3661 -msgid "Icon Size" +#: ../src/interface.c:3700 +msgid "Icon size" msgstr "Tamaño de iconos" -#: ../src/interface.c:3666 +#: ../src/interface.c:3705 msgid "Toolbar" msgstr "Barra de herramientas" -#: ../src/interface.c:3671 ../src/prefs.c:1555 +#: ../src/interface.c:3710 ../src/prefs.c:1555 msgid "Toolbar" msgstr "Barra de herramientas" -#: ../src/interface.c:3698 +#: ../src/interface.c:3737 msgid "Line wrapping" msgstr "Ajuste de línea" -#: ../src/interface.c:3701 +#: ../src/interface.c:3740 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 " @@ -2092,11 +2086,11 @@ "siguiente. Nota: esta opción tiene un gran costo en rendimiento para " "documentos grandes así que debería ser desactivada en maquinas lentas." -#: ../src/interface.c:3703 +#: ../src/interface.c:3742 msgid "\"Smart\" home key" msgstr "Tecla Inicio «inteligente»" -#: ../src/interface.c:3706 +#: ../src/interface.c:3745 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 " @@ -2104,18 +2098,18 @@ "key always moves the caret to the start of the current line, regardless of " "its current position." msgstr "" -"Cuando la tecla de inicio «inteligente» está activa, la tecla «Inicio» moverá " -"el cursor al primer carácter no blanco de la línea, a menos que ya se " +"Cuando la tecla de inicio «inteligente» está activa, la tecla «Inicio» " +"moverá el cursor al primer carácter no blanco de la línea, a menos que ya se " "encuentre allí, en cuyo caso lo mueve al principio absoluto de la línea. " "Cuando esta funcionalidad está desactivada, la tecla «Inicio» siempre mueve " "el cursor al principio de la línea actual, independientemente de su posición " "actual." -#: ../src/interface.c:3708 +#: ../src/interface.c:3747 msgid "Disable Drag and Drop" msgstr "Desactivar arrastrar y soltar" -#: ../src/interface.c:3711 +#: ../src/interface.c:3750 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" @@ -2124,15 +2118,15 @@ "forma que no se podrá arrastrar o soltar ninguna selección dentro o hacia " "afuera de la ventana del editor" -#: ../src/interface.c:3713 +#: ../src/interface.c:3752 msgid "Code folding" msgstr "Plegado de código" -#: ../src/interface.c:3717 +#: ../src/interface.c:3756 msgid "Fold/unfold all children of a fold point" msgstr "Plegar/desplegar todos los hijos de un punto de plegado" -#: ../src/interface.c:3720 +#: ../src/interface.c:3759 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." @@ -2141,11 +2135,11 @@ "comportamiento inverso pulsando la tecla «Mayús» mientras se pulsa en un " "símbolo de plegado." -#: ../src/interface.c:3722 +#: ../src/interface.c:3761 msgid "Use indicators to show compile errors" msgstr "Usar indicadores para mostrar los errores de compilación" -#: ../src/interface.c:3725 +#: ../src/interface.c:3764 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -2153,25 +2147,25 @@ "Define si se usarán indicadores (subrayado ondulado) para resaltar las " "líneas donde el compilador encontró un error o una advertencia" -#: ../src/interface.c:3727 +#: ../src/interface.c:3766 msgid "Newline strips trailing spaces" msgstr "Al crear una nueva línea, borrar espacios extra" -#: ../src/interface.c:3730 +#: ../src/interface.c:3769 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" "Habilitar que las nuevas líneas borren los espacios extra al final de la " "línea anterior" -#: ../src/interface.c:3736 +#: ../src/interface.c:3775 msgid "Line breaking column:" msgstr "Columna de salto de línea:" -#: ../src/interface.c:3750 +#: ../src/interface.c:3789 msgid "Comment toggle marker:" msgstr "Marcador para activar/desactivar comentarios" -#: ../src/interface.c:3757 +#: ../src/interface.c:3796 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -2180,15 +2174,15 @@ "de código fuente, y que se utiliza para marcar el comentario como " "establecido." -#: ../src/interface.c:3759 +#: ../src/interface.c:3798 msgid "Features" msgstr "Características" -#: ../src/interface.c:3764 +#: ../src/interface.c:3803 msgid "Features" msgstr "Características" -#: ../src/interface.c:3777 +#: ../src/interface.c:3816 msgid "" "Note: To apply these settings to all currently open documents, use " "Project->Apply Default Indentation." @@ -2196,50 +2190,54 @@ "Nota: utilice Proyecto/Aplicar sangría predeterminada para aplicar " "estos ajustes a todos los documentos abiertos actualmente." -#: ../src/interface.c:3804 ../src/interface.c:5423 +#: ../src/interface.c:3843 ../src/interface.c:5484 msgid "Auto-indent mode:" msgstr "Modo de sangría automática:" -#: ../src/interface.c:3817 ../src/interface.c:5436 +#: ../src/interface.c:3856 ../src/interface.c:5497 msgid "Basic" msgstr "Básico" -#: ../src/interface.c:3818 ../src/interface.c:5437 +#: ../src/interface.c:3857 ../src/interface.c:5498 msgid "Current chars" msgstr "Carácter actual" -#: ../src/interface.c:3819 ../src/interface.c:5438 +#: ../src/interface.c:3858 ../src/interface.c:5499 msgid "Match braces" msgstr "Coincidiendo con las llaves correspondientes" -#: ../src/interface.c:3821 ../src/interface.c:4147 ../src/interface.c:5440 +#: ../src/interface.c:3860 ../src/interface.c:4202 ../src/interface.c:5501 msgid "Type:" msgstr "Tipo:" -#: ../src/interface.c:3828 ../src/interface.c:5447 +#: ../src/interface.c:3867 ../src/interface.c:5508 msgid "Width:" msgstr "Ancho:" -#: ../src/interface.c:3841 ../src/interface.c:5460 +#: ../src/interface.c:3880 ../src/interface.c:5521 msgid "The width in chars of a single indent" msgstr "El ancho en caracteres que ocupará una tabulación" -#: ../src/interface.c:3851 ../src/interface.c:5470 +#: ../src/interface.c:3890 ../src/interface.c:5531 msgid "Use spaces when inserting indentation" msgstr "El ancho en caracteres que ocupará una tabulación" -#: ../src/interface.c:3860 ../src/interface.c:5479 +#: ../src/interface.c:3899 ../src/interface.c:5540 msgid "Use one tab per indent" msgstr "Utilizar una tabulación por sangría" -#: ../src/interface.c:3869 ../src/interface.c:5488 +#: ../src/interface.c:3903 ../src/interface.c:5544 +msgid "T_abs and spaces" +msgstr "T_abulaciones y espacios" + +#: ../src/interface.c:3908 ../src/interface.c:5549 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Usar espacios si la sangría total es menor que el ancho de tabulación, de lo " "contrario usar ambos" -#: ../src/interface.c:3878 ../src/interface.c:5497 +#: ../src/interface.c:3917 ../src/interface.c:5558 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -2247,30 +2245,30 @@ "Define si detectar, cuando se abre un archivo, el tipo de sangría según el " "contenido del archivo." -#: ../src/interface.c:3880 +#: ../src/interface.c:3919 msgid "Tab key indents" msgstr "Usar la tecla Tabulador para realizar la sangría" -#: ../src/interface.c:3883 +#: ../src/interface.c:3922 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Al pulsar «Tab/Mayús-Tab» se incrementa/disminuye la sangría en lugar de " "insertar un carácter de tabulación" -#: ../src/interface.c:3885 +#: ../src/interface.c:3924 msgid "Indentation" msgstr "Sangría" -#: ../src/interface.c:3890 ../src/interface.c:5499 +#: ../src/interface.c:3929 ../src/interface.c:5560 msgid "Indentation" msgstr "Sangría" -#: ../src/interface.c:3913 +#: ../src/interface.c:3952 msgid "Snippet completion" msgstr "Completado de construcciones" -#: ../src/interface.c:3916 +#: ../src/interface.c:3955 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2278,19 +2276,19 @@ "Teclee una secuencia corta definida de caracteres y complétela para formar " "una cadena más compleja con sólo pulsar una tecla" -#: ../src/interface.c:3918 +#: ../src/interface.c:3957 msgid "XML/HTML tag auto-closing" msgstr "Cierre automático de etiquetas XML/HTML" -#: ../src/interface.c:3921 +#: ../src/interface.c:3960 msgid "Insert matching closing tag for XML/HTML" msgstr "Insertar la etiqueta de cierre XML/HTML correspondiente" -#: ../src/interface.c:3923 +#: ../src/interface.c:3962 msgid "Automatic continuation of multi-line comments" msgstr "Continuación automática de comentarios de varias líneas" -#: ../src/interface.c:3926 +#: ../src/interface.c:3965 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2298,11 +2296,11 @@ "Continuar automáticamente comentarios de varias líneas en lenguajes como C, C" "++ y Java cuando se introduce una nueva línea dentro del comentario" -#: ../src/interface.c:3928 +#: ../src/interface.c:3967 msgid "Autocomplete symbols" msgstr "Autocompletar símbolos" -#: ../src/interface.c:3931 +#: ../src/interface.c:3970 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2310,27 +2308,27 @@ "Completado automática de símbolos conocidos en archivos abiertos (nombres de " "funciones, variables globales, ...)" -#: ../src/interface.c:3933 +#: ../src/interface.c:3972 msgid "Autocomplete all words in document" msgstr "Autocompletar todas las palabras en el documento" -#: ../src/interface.c:3937 +#: ../src/interface.c:3976 msgid "Drop rest of word on completion" msgstr "Eliminar caracteres posteriores tras autocompletar" -#: ../src/interface.c:3947 +#: ../src/interface.c:3986 msgid "Max. symbol name suggestions:" msgstr "Número máximo de sugerencias para nombres de símbolos" -#: ../src/interface.c:3954 +#: ../src/interface.c:3993 msgid "Completion list height:" msgstr "Altura de la lista de completado:" -#: ../src/interface.c:3961 +#: ../src/interface.c:4000 msgid "Characters to type for autocompletion:" msgstr "Caracteres a escribir para el autocompletado:" -#: ../src/interface.c:3974 +#: ../src/interface.c:4013 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" @@ -2338,117 +2336,132 @@ "La cantidad de caracteres que son necesarios para mostrar la lista de " "autocompletado de símbolos" -#: ../src/interface.c:3983 +#: ../src/interface.c:4022 msgid "Display height in rows for the autocompletion list" msgstr "Altura en filas de la lista de completado automático." -#: ../src/interface.c:3992 +#: ../src/interface.c:4031 msgid "Maximum number of entries to display in the autocompletion list" msgstr "Número máximo de líneas mostradas en la lista de completado automático" -#: ../src/interface.c:3995 +#: ../src/interface.c:4034 +msgid "Symbol list update frequency:" +msgstr "Frecuencia de actualización de la lista de símbolos:" + +#: ../src/interface.c:4047 +msgid "" +"Minimal delay (in milliseconds) between two automatic updates of the symbol " +"list. Note that a too short delay may have performance impact, especially " +"with large files. A delay of 0 disables real-time updates." +msgstr "" +"Retardo mínimo (en milisegundos) entre dos actualizaciones de la lista de " +"símbolos. Fíjese en que un retardo demasiado corto podría tener impacto en " +"el rendimiento, especialmente con archivos grandes. Un retardo de 0 " +"desactiva la actualización en tiempo real." + +#: ../src/interface.c:4050 msgid "Completions" msgstr "Completados" -#: ../src/interface.c:4014 +#: ../src/interface.c:4069 msgid "Parenthesis ( )" msgstr "Paréntesis ( )" -#: ../src/interface.c:4019 +#: ../src/interface.c:4074 msgid "Auto-close parenthesis when typing an opening one" msgstr "" "Cerrar automáticamente paréntesis al escribir un paréntesis de apertura" -#: ../src/interface.c:4021 +#: ../src/interface.c:4076 msgid "Single quotes ' '" msgstr "Comillas simples ' '" -#: ../src/interface.c:4026 +#: ../src/interface.c:4081 msgid "Auto-close single quote when typing an opening one" msgstr "" "Cerrar automáticamente comillas simples al escribir una comilla de apertura" -#: ../src/interface.c:4028 +#: ../src/interface.c:4083 msgid "Curly brackets { }" msgstr "Llaves { }" -#: ../src/interface.c:4033 +#: ../src/interface.c:4088 msgid "Auto-close curly bracket when typing an opening one" msgstr "Cerrar automáticamente llaves al escribir una llave de apertura" -#: ../src/interface.c:4035 +#: ../src/interface.c:4090 msgid "Square brackets [ ]" msgstr "Corchetes [ ]" -#: ../src/interface.c:4040 +#: ../src/interface.c:4095 msgid "Auto-close square-bracket when typing an opening one" msgstr "Cerrar automáticamente corchetes al escribir un corchete de apertura" -#: ../src/interface.c:4042 +#: ../src/interface.c:4097 msgid "Double quotes \" \"" msgstr "Comillas dobles \" \"" -#: ../src/interface.c:4047 +#: ../src/interface.c:4102 msgid "Auto-close double quote when typing an opening one" msgstr "" "Cerrar automáticamente comillas dobles al escribir una comilla doble de " "apertura" -#: ../src/interface.c:4049 +#: ../src/interface.c:4104 msgid "Auto-close quotes and brackets" msgstr "Cerrar automáticamente comillas y corchetes" -#: ../src/interface.c:4054 +#: ../src/interface.c:4109 msgid "Completions" msgstr "Completados" -#: ../src/interface.c:4077 +#: ../src/interface.c:4132 msgid "Invert syntax highlighting colors" msgstr "Invertir los colores de resaltado de sintaxis" -#: ../src/interface.c:4080 +#: ../src/interface.c:4135 msgid "Invert all colors, by default using white text on a black background" msgstr "" "Invertir todos los colores, usando por defecto texto blanco sobre fondo negro" -#: ../src/interface.c:4082 +#: ../src/interface.c:4137 msgid "Show indentation guides" msgstr "Mostrar guías de sangría" -#: ../src/interface.c:4085 +#: ../src/interface.c:4140 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Muestra líneas con pequeños puntos para ayudar a usar la sangría correcta" -#: ../src/interface.c:4087 +#: ../src/interface.c:4142 msgid "Show white space" msgstr "Mostrar espacio en blanco" -#: ../src/interface.c:4090 +#: ../src/interface.c:4145 msgid "Marks spaces with dots and tabs with arrows" msgstr "Marca los espacios con puntos y las tabulaciones con flechas" -#: ../src/interface.c:4092 +#: ../src/interface.c:4147 msgid "Show line endings" msgstr "Mostrar fin de línea" -#: ../src/interface.c:4095 +#: ../src/interface.c:4150 msgid "Shows the line ending character" msgstr "Muestra el carácter de fin de línea" -#: ../src/interface.c:4097 +#: ../src/interface.c:4152 msgid "Show line numbers" msgstr "Mostrar números de línea" -#: ../src/interface.c:4100 +#: ../src/interface.c:4155 msgid "Shows or hides the Line Number margin" msgstr "Muestra u oculta el margen con números de línea" -#: ../src/interface.c:4102 +#: ../src/interface.c:4157 msgid "Show markers margin" msgstr "Muestra el margen de marcas" -#: ../src/interface.c:4105 +#: ../src/interface.c:4160 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2456,39 +2469,39 @@ "Muestra u oculta el pequeño margen a la derecha de los números de líneas que " "se usa para marcar líneas" -#: ../src/interface.c:4107 +#: ../src/interface.c:4162 msgid "Stop scrolling at last line" msgstr "" "Detiene el desplazamiento hacia abajo cuando se alcanza la última línea" -#: ../src/interface.c:4110 +#: ../src/interface.c:4165 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" "Define si se detiene el desplazamiento de página al sobrepasar la última " "línea del documento" -#: ../src/interface.c:4112 +#: ../src/interface.c:4167 msgid "Display" msgstr "Mostrar" -#: ../src/interface.c:4133 ../src/interface.c:5531 +#: ../src/interface.c:4188 ../src/interface.c:5592 msgid "Column:" msgstr "Columna:" -#: ../src/interface.c:4140 +#: ../src/interface.c:4195 msgid "Color:" msgstr "Color:" -#: ../src/interface.c:4159 +#: ../src/interface.c:4214 msgid "Sets the color of the long line marker" msgstr "Selecciona el color del marcador de líneas largas" -#: ../src/interface.c:4160 ../src/toolbar.c:71 ../src/tools.c:722 +#: ../src/interface.c:4215 ../src/toolbar.c:72 ../src/tools.c:723 #: ../src/vte.c:785 ../src/vte.c:792 msgid "Color Chooser" msgstr "Selector de color" -#: ../src/interface.c:4168 +#: ../src/interface.c:4223 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 " @@ -2498,11 +2511,11 @@ "a marcar las líneas largas, o como sugerencia para cortarlas. Ponga un valor " "mayor a 0 para especificar la columna en la que debe aparecer." -#: ../src/interface.c:4178 +#: ../src/interface.c:4233 msgid "Line" msgstr "Línea" -#: ../src/interface.c:4181 +#: ../src/interface.c:4236 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2510,11 +2523,11 @@ "Imprime una línea vertical en la ventana de edición en la posición dada del " "cursor (ver debajo)" -#: ../src/interface.c:4185 +#: ../src/interface.c:4240 msgid "Background" msgstr "Fondo" -#: ../src/interface.c:4188 +#: ../src/interface.c:4243 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 " @@ -2524,27 +2537,27 @@ "cursor (ver más abajo) cambió al color seleccionado abajo. (Esto es " "recomendable si se usan fuentes proporcionales)" -#: ../src/interface.c:4192 +#: ../src/interface.c:4247 msgid "Enabled" msgstr "Activado" -#: ../src/interface.c:4198 ../src/interface.c:5571 +#: ../src/interface.c:4253 ../src/interface.c:5632 msgid "Long line marker" msgstr "Marcador de líneas largas" -#: ../src/interface.c:4217 ../src/interface.c:5538 +#: ../src/interface.c:4272 ../src/interface.c:5599 msgid "Disabled" msgstr "Deshabilitado" -#: ../src/interface.c:4220 +#: ../src/interface.c:4275 msgid "Do not show virtual spaces" msgstr "No mostrar espacios virtuales" -#: ../src/interface.c:4224 +#: ../src/interface.c:4279 msgid "Only for rectangular selections" msgstr "Solo para selecciones rectangulares" -#: ../src/interface.c:4227 +#: ../src/interface.c:4282 msgid "" "Only show virtual spaces beyond the end of lines when drawing a rectangular " "selection" @@ -2552,53 +2565,53 @@ "Solamente mostrar espacios virtuales más allá del fin de línea al trazar una " "selección rectangular" -#: ../src/interface.c:4231 +#: ../src/interface.c:4286 msgid "Always" msgstr "Siempre" -#: ../src/interface.c:4234 +#: ../src/interface.c:4289 msgid "Always show virtual spaces beyond the end of lines" msgstr "Siempre mostrar espacios virtuales más allá del fin de línea" -#: ../src/interface.c:4238 +#: ../src/interface.c:4293 msgid "Virtual spaces" msgstr "Espacios virtuales" -#: ../src/interface.c:4243 +#: ../src/interface.c:4298 msgid "Display" msgstr "Mostrar" -#: ../src/interface.c:4274 +#: ../src/interface.c:4329 msgid "Open new documents from the command-line" msgstr "Abrir nuevos documentos desde la línea de comandos" -#: ../src/interface.c:4277 +#: ../src/interface.c:4332 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" "Crear un archivo nuevo por cada archivo de los indicados por línea de " "comandos que no exista" -#: ../src/interface.c:4291 +#: ../src/interface.c:4346 msgid "Default end of line characters:" msgstr "Caracteres de fin de línea predeterminados:" -#: ../src/interface.c:4298 +#: ../src/interface.c:4353 msgid "New files" msgstr "Archivos nuevos" -#: ../src/interface.c:4321 +#: ../src/interface.c:4376 msgid "Default encoding (new files):" msgstr "Codificación predeterminada (para archivos nuevos):" -#: ../src/interface.c:4329 +#: ../src/interface.c:4384 msgid "Sets the default encoding for newly created files" msgstr "Selecciona la codificación predeterminada para nuevos archivos creados" -#: ../src/interface.c:4335 +#: ../src/interface.c:4390 msgid "Use fixed encoding when opening non-Unicode files" msgstr "Usar una codificación fija al abrir archivos que no sean Unicode" -#: ../src/interface.c:4338 +#: ../src/interface.c:4393 msgid "" "This option disables the automatic detection of the file encoding when " "opening non-Unicode files and opens the file with the specified encoding " @@ -2608,33 +2621,33 @@ "archivos cuando se está abriendo un archivo que no sea Unicode, y abre el " "archivo con la codificación especificada (normalmente no es necesario)" -#: ../src/interface.c:4344 +#: ../src/interface.c:4399 msgid "Default encoding (existing non-Unicode files):" msgstr "Codificación predeterminada (para archivos que no sean Unicode):" -#: ../src/interface.c:4352 +#: ../src/interface.c:4407 msgid "Sets the default encoding for opening existing non-Unicode files" msgstr "" "Establece la codificación predeterminada para abrir archivos existentes que " "no sean Unicode" -#: ../src/interface.c:4358 +#: ../src/interface.c:4413 msgid "Encodings" msgstr "Codificaciones" -#: ../src/interface.c:4377 +#: ../src/interface.c:4432 msgid "Ensure new line at file end" msgstr "Asegurar terminación de línea al final del archivo" -#: ../src/interface.c:4380 +#: ../src/interface.c:4435 msgid "Ensures that at the end of the file is a new line" msgstr "Asegura que haya una terminación de línea al final del archivo" -#: ../src/interface.c:4382 +#: ../src/interface.c:4437 msgid "Ensure consistent line endings" msgstr "Asegurar terminaciones de línea consistentes" -#: ../src/interface.c:4385 +#: ../src/interface.c:4440 msgid "" "Ensures that newline characters always get converted before saving, avoiding " "mixed line endings in the same file" @@ -2642,41 +2655,41 @@ "Asegura que los caracteres de fin de línea siempre se convierten antes de " "guardar, evitando caracteres mezclados en el mismo archivo" -#: ../src/interface.c:4387 +#: ../src/interface.c:4442 msgid "Strip trailing spaces and tabs" msgstr "Borrar espacios y tabulaciones al final" -#: ../src/interface.c:4390 +#: ../src/interface.c:4445 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Borra los espacios y tabulaciones al final de las líneas" -#: ../src/interface.c:4392 ../src/keybindings.c:518 +#: ../src/interface.c:4447 ../src/keybindings.c:519 msgid "Replace tabs by space" msgstr "Reemplazar tabulaciones por espacios" -#: ../src/interface.c:4395 +#: ../src/interface.c:4450 msgid "Replaces all tabs in document by spaces" msgstr "Reemplaza todas las tabulaciones en el documento por espacios" -#: ../src/interface.c:4397 +#: ../src/interface.c:4452 msgid "Saving files" msgstr "Guardado de archivos" -#: ../src/interface.c:4422 +#: ../src/interface.c:4477 msgid "Recent files list length:" msgstr "Longitud de la lista de archivos recientes:" -#: ../src/interface.c:4436 +#: ../src/interface.c:4491 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Especifica el número de archivos que se guardan en la lista de archivos " "recientes." -#: ../src/interface.c:4440 +#: ../src/interface.c:4495 msgid "Disk check timeout:" msgstr "Tiempo de espera para la comprobación en disco" -#: ../src/interface.c:4453 +#: ../src/interface.c:4508 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2684,20 +2697,20 @@ "Frecuencia en segundos para comprobar en el disco los cambios de los " "archivos abiertos. El valor 0 desactiva la comprobación." -#: ../src/interface.c:4462 ../src/prefs.c:1559 ../src/symbols.c:605 -#: ../plugins/filebrowser.c:1112 +#: ../src/interface.c:4517 ../src/prefs.c:1559 ../src/symbols.c:682 +#: ../plugins/filebrowser.c:1127 msgid "Files" msgstr "Archivos" -#: ../src/interface.c:4495 +#: ../src/interface.c:4550 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4502 +#: ../src/interface.c:4557 msgid "Browser:" msgstr "Navegador:" -#: ../src/interface.c:4514 +#: ../src/interface.c:4569 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2705,23 +2718,23 @@ "Un emulador de terminal como xterm, gnome-terminal o konsole (debe aceptar " "el argumento -e)" -#: ../src/interface.c:4521 +#: ../src/interface.c:4576 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Ruta (y posiblemente argumentos adicionales) a su navegador favorito" -#: ../src/interface.c:4543 +#: ../src/interface.c:4598 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4566 +#: ../src/interface.c:4621 msgid "Tool paths" msgstr "Rutas a las herramientas" -#: ../src/interface.c:4587 +#: ../src/interface.c:4642 msgid "Context action:" msgstr "Acción contextual:" -#: ../src/interface.c:4598 +#: ../src/interface.c:4653 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2732,67 +2745,67 @@ "usada con %s. Puede estar en cualquier lugar del comando dado y será " "remplazada antes de la ejecución." -#: ../src/interface.c:4611 +#: ../src/interface.c:4666 msgid "Commands" msgstr "Comandos" -#: ../src/interface.c:4616 ../src/keybindings.c:556 ../src/prefs.c:1561 +#: ../src/interface.c:4671 ../src/keybindings.c:557 ../src/prefs.c:1561 msgid "Tools" msgstr "Herramientas" -#: ../src/interface.c:4654 +#: ../src/interface.c:4709 msgid "email address of the developer" msgstr "dirección de correo electrónico del desarrollador" -#: ../src/interface.c:4661 +#: ../src/interface.c:4716 msgid "Initials of the developer name" msgstr "Iniciales del nombre del desarrollador" -#: ../src/interface.c:4663 +#: ../src/interface.c:4718 msgid "Initial version:" msgstr "Versión inicial:" -#: ../src/interface.c:4675 +#: ../src/interface.c:4730 msgid "Version number, which a new file initially has" msgstr "Número de versión inicial de un archivo nuevo" -#: ../src/interface.c:4682 +#: ../src/interface.c:4737 msgid "Company name" msgstr "Nombre de la empresa" -#: ../src/interface.c:4684 +#: ../src/interface.c:4739 msgid "Developer:" msgstr "Desarrollador:" -#: ../src/interface.c:4691 +#: ../src/interface.c:4746 msgid "Company:" msgstr "Empresa:" -#: ../src/interface.c:4698 +#: ../src/interface.c:4753 msgid "Mail address:" msgstr "Correo electrónico:" -#: ../src/interface.c:4705 +#: ../src/interface.c:4760 msgid "Initials:" msgstr "Iniciales:" -#: ../src/interface.c:4717 +#: ../src/interface.c:4772 msgid "The name of the developer" msgstr "El nombre del desarrollador" -#: ../src/interface.c:4719 +#: ../src/interface.c:4774 msgid "Year:" msgstr "Año:" -#: ../src/interface.c:4726 +#: ../src/interface.c:4781 msgid "Date:" msgstr "Fecha:" -#: ../src/interface.c:4733 -msgid "Date & Time:" +#: ../src/interface.c:4788 +msgid "Date & time:" msgstr "Fecha y hora:" -#: ../src/interface.c:4745 +#: ../src/interface.c:4800 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." @@ -2801,7 +2814,7 @@ "especificador de conversión que pueda ser usado con la función strftime de " "ANSI C." -#: ../src/interface.c:4752 +#: ../src/interface.c:4807 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." @@ -2809,7 +2822,7 @@ "Introduzca aquí un formato de año. Puede usar cualquier especificador de " "conversión que pueda ser usado con la función strftime de ANSI C." -#: ../src/interface.c:4759 +#: ../src/interface.c:4814 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." @@ -2817,64 +2830,64 @@ "Introduzca aquí un formato de fecha. Puede usar cualquier especificador de " "conversión que pueda ser usado con la función strftime de ANSI C." -#: ../src/interface.c:4761 +#: ../src/interface.c:4816 msgid "Template data" msgstr "Datos de plantillas" -#: ../src/interface.c:4766 ../src/prefs.c:1563 +#: ../src/interface.c:4821 ../src/prefs.c:1563 msgid "Templates" msgstr "Plantillas" -#: ../src/interface.c:4804 +#: ../src/interface.c:4859 msgid "C_hange" msgstr "_Cambiar" -#: ../src/interface.c:4808 +#: ../src/interface.c:4863 msgid "Keyboard shortcuts" msgstr "Combinaciones de tecla" -#: ../src/interface.c:4813 ../src/prefs.c:1565 +#: ../src/interface.c:4868 ../src/prefs.c:1565 msgid "Keybindings" msgstr "Combinaciones" -#: ../src/interface.c:4847 +#: ../src/interface.c:4902 msgid "Command:" msgstr "Comando:" -#: ../src/interface.c:4854 +#: ../src/interface.c:4909 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Ruta al comando para imprimir archivos (usar %f como nombre de archivo)" -#: ../src/interface.c:4864 +#: ../src/interface.c:4919 msgid "Use an external command for printing" msgstr "Usar un comando externo para la impresión" -#: ../src/interface.c:4884 ../src/printing.c:381 +#: ../src/interface.c:4939 ../src/printing.c:381 msgid "Print line numbers" msgstr "Imprimir números de línea" -#: ../src/interface.c:4887 ../src/printing.c:383 +#: ../src/interface.c:4942 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Añadir números de línea a la página impresa" -#: ../src/interface.c:4889 ../src/printing.c:386 +#: ../src/interface.c:4944 ../src/printing.c:386 msgid "Print page numbers" msgstr "Imprimir números de página" -#: ../src/interface.c:4892 ../src/printing.c:388 +#: ../src/interface.c:4947 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" "Añadir números de página al final de cada página. Ocupa 2 líneas de la " "página." -#: ../src/interface.c:4894 ../src/printing.c:391 +#: ../src/interface.c:4949 ../src/printing.c:391 msgid "Print page header" msgstr "Imprimir encabezado de página" -#: ../src/interface.c:4897 ../src/printing.c:393 +#: ../src/interface.c:4952 ../src/printing.c:393 msgid "" "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." @@ -2883,19 +2896,19 @@ "el nombre del archivo y la fecha actual (ver abajo). Ocupa 3 líneas de la " "página." -#: ../src/interface.c:4914 ../src/printing.c:409 +#: ../src/interface.c:4969 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Usar el nombre del archivo impreso" -#: ../src/interface.c:4917 +#: ../src/interface.c:4972 msgid "Print only the basename (without the path) of the printed file" msgstr "Imprimir sólo el nombre (sin la ruta) del archivo impreso" -#: ../src/interface.c:4923 ../src/printing.c:417 +#: ../src/interface.c:4978 ../src/printing.c:417 msgid "Date format:" msgstr "Formato de fecha:" -#: ../src/interface.c:4930 ../src/printing.c:423 +#: ../src/interface.c:4985 ../src/printing.c:423 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 " @@ -2905,35 +2918,35 @@ "cada página. Puede usar cualquier especificador de conversión que pueda ser " "usado con la función strftime de ANSI C." -#: ../src/interface.c:4933 +#: ../src/interface.c:4988 msgid "Use native GTK printing" msgstr "Usar la impresión nativa de GTK" -#: ../src/interface.c:4939 +#: ../src/interface.c:4994 msgid "Printing" msgstr "Impresión:" -#: ../src/interface.c:4944 ../src/prefs.c:1567 +#: ../src/interface.c:4999 ../src/prefs.c:1567 msgid "Printing" msgstr "Impresión" -#: ../src/interface.c:5406 +#: ../src/interface.c:5467 msgid "Project Properties" msgstr "Propiedades del proyecto" -#: ../src/interface.c:5524 +#: ../src/interface.c:5585 msgid "Display:" msgstr "Mostrar:" -#: ../src/interface.c:5546 +#: ../src/interface.c:5607 msgid "Custom" msgstr "Personalizado" -#: ../src/interface.c:5554 +#: ../src/interface.c:5615 msgid "Use global settings" msgstr "Usar ajustes globales" -#: ../src/keybindings.c:220 ../src/plugins.c:1187 +#: ../src/keybindings.c:220 ../src/plugins.c:1191 ../src/symbols.c:709 msgid "File" msgstr "Archivo" @@ -2953,7 +2966,7 @@ msgid "Save" msgstr "Guardar" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:232 ../src/toolbar.c:57 msgid "Save as" msgstr "Guardar como..." @@ -2981,7 +2994,7 @@ msgid "Re-open last closed tab" msgstr "Volver a abrir la última pestaña cerrada" -#: ../src/keybindings.c:248 ../src/project.c:503 +#: ../src/keybindings.c:248 ../src/project.c:509 msgid "Project" msgstr "Proyecto" @@ -3141,312 +3154,312 @@ msgid "Insert date" msgstr "Insertar fecha" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:377 msgid "Insert New Line Before Current" msgstr "Insertar línea nueva antes de la actual" -#: ../src/keybindings.c:378 +#: ../src/keybindings.c:379 msgid "Insert New Line After Current" msgstr "Insertar línea nueva después de la actual" -#: ../src/keybindings.c:380 +#: ../src/keybindings.c:381 msgid "Settings" msgstr "Opciones" -#: ../src/keybindings.c:388 ../src/toolbar.c:381 +#: ../src/keybindings.c:389 ../src/toolbar.c:382 msgid "Search" msgstr "Buscar" -#: ../src/keybindings.c:391 ../src/search.c:398 +#: ../src/keybindings.c:392 ../src/search.c:450 msgid "Find" msgstr "Buscar" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:394 msgid "Find Next" msgstr "Buscar siguiente" -#: ../src/keybindings.c:395 +#: ../src/keybindings.c:396 msgid "Find Previous" msgstr "Buscar anterior" -#: ../src/keybindings.c:402 ../src/search.c:552 +#: ../src/keybindings.c:403 ../src/search.c:604 msgid "Replace" msgstr "Reemplazar" -#: ../src/keybindings.c:404 ../src/search.c:724 +#: ../src/keybindings.c:405 ../src/search.c:777 msgid "Find in Files" msgstr "Buscar en archivos" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:408 msgid "Next Message" msgstr "Mensaje siguiente" -#: ../src/keybindings.c:409 +#: ../src/keybindings.c:410 msgid "Previous Message" msgstr "Mensaje anterior" -#: ../src/keybindings.c:411 +#: ../src/keybindings.c:412 msgid "Find Usage" msgstr "Encontrar uso" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:414 msgid "Find Document Usage" msgstr "Encontrar uso del documento" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:418 msgid "Go to" msgstr "Ir a" -#: ../src/keybindings.c:420 ../src/toolbar.c:67 +#: ../src/keybindings.c:421 ../src/toolbar.c:68 msgid "Navigate back a location" msgstr "Navegar una ubicación hacia atrás" -#: ../src/keybindings.c:422 ../src/toolbar.c:68 +#: ../src/keybindings.c:423 ../src/toolbar.c:69 msgid "Navigate forward a location" msgstr "Navegar una ubicación hacia adelante" -#: ../src/keybindings.c:427 +#: ../src/keybindings.c:428 msgid "Go to matching brace" msgstr "Ir a la llave correspondiente" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:431 msgid "Toggle marker" msgstr "Activar/desactivar marca" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:439 msgid "Go to Tag Definition" msgstr "Ir a la definición de la etiqueta" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:441 msgid "Go to Tag Declaration" msgstr "Ir a la declaración de la etiqueta" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:443 msgid "Go to Start of Line" msgstr "Ir al inicio de la línea" -#: ../src/keybindings.c:444 +#: ../src/keybindings.c:445 msgid "Go to End of Line" msgstr "Ir al final de la línea" -#: ../src/keybindings.c:446 +#: ../src/keybindings.c:447 msgid "Go to End of Display Line" msgstr "Ir al final de la línea mostrada" -#: ../src/keybindings.c:448 +#: ../src/keybindings.c:449 msgid "Go to Previous Word Part" msgstr "Ir al anterior fragmento de palabra" -#: ../src/keybindings.c:450 +#: ../src/keybindings.c:451 msgid "Go to Next Word Part" msgstr "Ir al siguiente fragmento de palabra" -#: ../src/keybindings.c:452 +#: ../src/keybindings.c:453 msgid "View" msgstr "Ver" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:456 msgid "Toggle All Additional Widgets" msgstr "Mostrar/ocultar todos los componentes adicionales" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:459 msgid "Fullscreen" msgstr "Pantalla completa" -#: ../src/keybindings.c:460 +#: ../src/keybindings.c:461 msgid "Toggle Messages Window" msgstr "Mostrar ventana de mensajes" -#: ../src/keybindings.c:463 +#: ../src/keybindings.c:464 msgid "Toggle Sidebar" msgstr "Mostrar/ocultar barra lateral" -#: ../src/keybindings.c:465 +#: ../src/keybindings.c:466 msgid "Zoom In" msgstr "Ampliar texto" -#: ../src/keybindings.c:467 +#: ../src/keybindings.c:468 msgid "Zoom Out" msgstr "Disminuir texto" -#: ../src/keybindings.c:469 +#: ../src/keybindings.c:470 msgid "Zoom Reset" msgstr "Reiniciar zoom" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:472 msgid "Focus" msgstr "Foco" -#: ../src/keybindings.c:474 +#: ../src/keybindings.c:475 msgid "Switch to Editor" msgstr "Ir al editor" -#: ../src/keybindings.c:476 +#: ../src/keybindings.c:477 msgid "Switch to Search Bar" msgstr "Ir a la barra de búsqueda" -#: ../src/keybindings.c:478 +#: ../src/keybindings.c:479 msgid "Switch to Message Window" msgstr "Cambiar a ventana de mensajes" -#: ../src/keybindings.c:480 +#: ../src/keybindings.c:481 msgid "Switch to Compiler" msgstr "Cambiar a compilador" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:483 msgid "Switch to Messages" msgstr "Cambiar a mensajes" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:485 msgid "Switch to Scribble" msgstr "Ir al borrador" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:487 msgid "Switch to VTE" msgstr "Ir a la VTE" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:489 msgid "Switch to Sidebar" msgstr "Ir a la barra lateral " -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:491 msgid "Switch to Sidebar Symbol List" msgstr "Cambiar a la lista de símbolos lateral" -#: ../src/keybindings.c:492 +#: ../src/keybindings.c:493 msgid "Switch to Sidebar Document List" msgstr "Cambiar a lista de documentos lateral" -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:495 msgid "Notebook tab" msgstr "Pestaña de libreta" -#: ../src/keybindings.c:497 +#: ../src/keybindings.c:498 msgid "Switch to left document" msgstr "Ir al documento de la izq." -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:500 msgid "Switch to right document" msgstr "Ir al documento de la der." -#: ../src/keybindings.c:501 +#: ../src/keybindings.c:502 msgid "Switch to last used document" msgstr "Ir al último documento usado" -#: ../src/keybindings.c:503 +#: ../src/keybindings.c:504 msgid "Move document left" msgstr "Mover el documento a la izquierda" -#: ../src/keybindings.c:505 +#: ../src/keybindings.c:506 msgid "Move document right" msgstr "Mover el documento a la derecha" -#: ../src/keybindings.c:507 +#: ../src/keybindings.c:508 msgid "Move document first" msgstr "Mover el documento al principio" -#: ../src/keybindings.c:509 +#: ../src/keybindings.c:510 msgid "Move document last" msgstr "Mover el documento al final" -#: ../src/keybindings.c:511 +#: ../src/keybindings.c:512 msgid "Document" msgstr "Documento" -#: ../src/keybindings.c:514 +#: ../src/keybindings.c:515 msgid "Toggle Line wrapping" msgstr "Activar/desactivar ajuste de línea" -#: ../src/keybindings.c:516 +#: ../src/keybindings.c:517 msgid "Toggle Line breaking" msgstr "Activar/desactivar salto de línea" -#: ../src/keybindings.c:520 +#: ../src/keybindings.c:521 msgid "Replace spaces by tabs" msgstr "Reemplazar espacios por tabulaciones" -#: ../src/keybindings.c:522 +#: ../src/keybindings.c:523 msgid "Toggle current fold" msgstr "Activar/desactivar plegado actual" -#: ../src/keybindings.c:524 +#: ../src/keybindings.c:525 msgid "Fold all" msgstr "Plegar todo" -#: ../src/keybindings.c:526 +#: ../src/keybindings.c:527 msgid "Unfold all" msgstr "Desplegar todo" -#: ../src/keybindings.c:528 +#: ../src/keybindings.c:529 msgid "Reload symbol list" msgstr "Recargar lista de símbolos" -#: ../src/keybindings.c:530 +#: ../src/keybindings.c:531 msgid "Remove Markers" msgstr "Borrar marcas" -#: ../src/keybindings.c:532 +#: ../src/keybindings.c:533 msgid "Remove Error Indicators" msgstr "Borrar indicadores de errores" -#: ../src/keybindings.c:534 ../src/keybindings.c:539 ../src/project.c:476 -#: ../src/ui_utils.c:1912 +#: ../src/keybindings.c:535 ../src/keybindings.c:540 ../src/project.c:482 +#: ../src/ui_utils.c:1913 msgid "Build" msgstr "Construir" -#: ../src/keybindings.c:537 ../src/toolbar.c:69 +#: ../src/keybindings.c:538 ../src/toolbar.c:70 msgid "Compile" msgstr "Compilar" -#: ../src/keybindings.c:541 +#: ../src/keybindings.c:542 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:544 +#: ../src/keybindings.c:545 msgid "Make custom target" msgstr "Construye con make (objetivo personalizado)" -#: ../src/keybindings.c:546 +#: ../src/keybindings.c:547 msgid "Make object" msgstr "Make object" -#: ../src/keybindings.c:548 +#: ../src/keybindings.c:549 msgid "Next error" msgstr "Siguiente error" -#: ../src/keybindings.c:550 +#: ../src/keybindings.c:551 msgid "Previous error" msgstr "Error previo" -#: ../src/keybindings.c:552 +#: ../src/keybindings.c:553 msgid "Run" msgstr "Ejecutar" -#: ../src/keybindings.c:554 +#: ../src/keybindings.c:555 msgid "Build options" msgstr "Opciones de construcción" -#: ../src/keybindings.c:559 +#: ../src/keybindings.c:560 msgid "Show Color Chooser" msgstr "Mostrar selector de colores" -#: ../src/keybindings.c:561 ../src/keybindings.c:564 +#: ../src/keybindings.c:562 ../src/keybindings.c:565 msgid "Help" msgstr "Ayuda" -#: ../src/keybindings.c:846 +#: ../src/keybindings.c:847 msgid "Keyboard Shortcuts" msgstr "Combinaciones de teclas" -#: ../src/keybindings.c:858 +#: ../src/keybindings.c:859 msgid "The following keyboard shortcuts are configurable:" msgstr "Los siguientes atajos de teclado son configurables:" -#: ../src/keybindings.c:1756 +#: ../src/keybindings.c:1757 msgid "Switch to Document" msgstr "Cambiar a documento" -#: ../src/keyfile.c:855 +#: ../src/keyfile.c:858 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Escriba aquí lo que desee, úselo como panel de notas o borrador" @@ -3545,46 +3558,46 @@ msgid "Show version and exit" msgstr "Mostrar versión y salir" -#: ../src/main.c:508 +#: ../src/main.c:509 msgid "[FILES...]" msgstr "[ARCHIVOS...]" #. note for translators: library versions are printed after this -#: ../src/main.c:526 +#: ../src/main.c:527 #, c-format msgid "built on %s with " msgstr "compilado el día %s con" -#: ../src/main.c:619 +#: ../src/main.c:620 msgid "Move it now?" msgstr "¿Moverlo ahora?" -#: ../src/main.c:621 +#: ../src/main.c:622 msgid "Geany needs to move your old configuration directory before starting." msgstr "" "Geany necesita mover su directorio de configuración antiguo antes de empezar." -#: ../src/main.c:630 +#: ../src/main.c:631 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" "\"." msgstr "" -"Su directorio de configuración se ha movido correctamente desde «%s» hacia «%" -"s»." +"Su directorio de configuración se ha movido correctamente desde «%s» hacia " +"«%s»." #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:640 +#: ../src/main.c:641 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." msgstr "" -"Su directorio de configuración antiguo «%s» no se ha podido mover hacia «%s» (%" -"s). Mueva manualmente su antiguo directorio a la nueva ubicación." @@ 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:[5611] trunk
by colombanw＠users.sourceforge.net 20 Mar '11

20 Mar '11

Revision: 5611 http://geany.svn.sourceforge.net/geany/?rev=5611&view=rev Author: colombanw Date: 2011-03-20 17:50:59 +0000 (Sun, 20 Mar 2011) Log Message: ----------- Update forced indent settings when setting the filetype This makes documents created or set to a filetype with forced indent setting (Makefile, F77) to have the correct setting right away. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-20 16:02:52 UTC (rev 5610) +++ trunk/ChangeLog 2011-03-20 17:50:59 UTC (rev 5611) @@ -8,6 +8,10 @@ * src/editor.c, src/search.c, tagmanager/diff.c: Don't use strlen(..) > 0 or == 0, simply check the first character against 0. + * src/document.c: + Update forced indent settings when setting the filetype. This makes + documents created or set to a filetype with forced indent setting + (Makefile, F77) to have the correct setting right away. 2011-03-19 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2011-03-20 16:02:52 UTC (rev 5610) +++ trunk/src/document.c 2011-03-20 17:50:59 UTC (rev 5611) @@ -1001,24 +1001,33 @@ } -void document_apply_indent_settings(GeanyDocument *doc) +static gboolean apply_forced_indent_settings(GeanyDocument *doc) { const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(NULL); - GeanyIndentType type = iprefs->type; switch (doc->file_type->id) { case GEANY_FILETYPES_MAKE: /* force using tabs for indentation for Makefiles */ editor_set_indent(doc->editor, GEANY_INDENT_TYPE_TABS, iprefs->width); - return; + return TRUE; case GEANY_FILETYPES_F77: /* force using spaces for indentation for Fortran 77 */ editor_set_indent(doc->editor, GEANY_INDENT_TYPE_SPACES, iprefs->width); - return; - default: - break; + return TRUE; } + + return FALSE; +} + + +void document_apply_indent_settings(GeanyDocument *doc) +{ + const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(NULL); + GeanyIndentType type = iprefs->type; + + if (apply_forced_indent_settings(doc)) + return; if (iprefs->detect_type) { type = detect_indent_type(doc->editor); @@ -2434,6 +2443,8 @@ if (ft_changed) { + if (apply_forced_indent_settings(doc)) /* update forced indents, like Makefiles and F77 */ + ui_document_show_hide(doc); sidebar_openfiles_update(doc); /* to update the icon */ g_signal_emit_by_name(geany_object, "document-filetype-set", doc, old_ft); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5610] trunk
by colombanw＠users.sourceforge.net 20 Mar '11

20 Mar '11

Revision: 5610 http://geany.svn.sourceforge.net/geany/?rev=5610&view=rev Author: colombanw Date: 2011-03-20 16:02:52 +0000 (Sun, 20 Mar 2011) Log Message: ----------- Fix a few warnings and style * Don't use strlen(..) > 0 or == 0, simply check the first character against 0; * Fix a return without a value (my bad in last commit); * Fix storing a literal in a non-const string. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c trunk/src/search.c trunk/tagmanager/diff.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-20 15:02:22 UTC (rev 5609) +++ trunk/ChangeLog 2011-03-20 16:02:52 UTC (rev 5610) @@ -5,6 +5,9 @@ Add new filetype setting "comment_single" to provide separated single-line and multiline comment support. Single-line are used in priority to comment code, and multiline to make template comments. + * src/editor.c, src/search.c, tagmanager/diff.c: + Don't use strlen(..) > 0 or == 0, simply check the first character + against 0. 2011-03-19 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2011-03-20 15:02:22 UTC (rev 5609) +++ trunk/src/editor.c 2011-03-20 16:02:52 UTC (rev 5610) @@ -2944,7 +2944,7 @@ co = ft->comment_open; cc = ft->comment_close; if (co == NULL) - return; + return 0; } co_len = strlen(co); @@ -2973,7 +2973,7 @@ if (x < line_len && sel[x] != '\0') { /* use single line comment */ - if (cc == NULL || strlen(cc) == 0) + if (cc == NULL || cc[0] == '\0') { single_line = TRUE; @@ -3281,7 +3281,7 @@ if (allow_empty_lines || (x < line_len && sel[x] != '\0')) { /* use single line comment */ - if (cc == NULL || strlen(cc) == 0) + if (cc == NULL || cc[0] == '\0') { gint start = line_start; single_line = TRUE; @@ -3471,8 +3471,8 @@ { gchar *previous_line = sci_get_line(sci, cur_line - 1); /* the type of comment, '*' (C/C++/Java), '+' and the others (D) */ - gchar *continuation = "*"; - gchar *whitespace = ""; /* to hold whitespace if needed */ + const gchar *continuation = "*"; + const gchar *whitespace = ""; /* to hold whitespace if needed */ gchar *result; gint len = strlen(previous_line); gint i; Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2011-03-20 15:02:22 UTC (rev 5609) +++ trunk/src/search.c 2011-03-20 16:02:52 UTC (rev 5610) @@ -1142,7 +1142,7 @@ search_data.flags = int_search_flags(settings.find_case_sensitive, settings.find_match_whole_word, settings.find_regexp, settings.find_match_word_start); - if (strlen(search_data.text) == 0) + if (search_data.text[0] == '\0') { fail: utils_beep(); Modified: trunk/tagmanager/diff.c =================================================================== --- trunk/tagmanager/diff.c 2011-03-20 15:02:22 UTC (rev 5609) +++ trunk/tagmanager/diff.c 2011-03-20 16:02:52 UTC (rev 5610) @@ -60,7 +60,7 @@ tmp = (const unsigned char*) strrchr((const char*) cp, '\\'); if (tmp == NULL) { /* last fallback, probably the filename doesn't contain a path, so take it */ - if (strlen((const char*) cp) > 0) + if (cp[0] != 0) { tmp = cp; skipSlash = FALSE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5609] trunk
by colombanw＠users.sourceforge.net 20 Mar '11

20 Mar '11

Revision: 5609 http://geany.svn.sourceforge.net/geany/?rev=5609&view=rev Author: colombanw Date: 2011-03-20 15:02:22 +0000 (Sun, 20 Mar 2011) Log Message: ----------- Add new filetype setting "comment_single" This provides separated single-line and multiline comment support. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.Genie.conf trunk/data/filetypes.Scala.conf trunk/data/filetypes.actionscript trunk/data/filetypes.ada trunk/data/filetypes.asm trunk/data/filetypes.c trunk/data/filetypes.caml trunk/data/filetypes.cmake trunk/data/filetypes.cobol trunk/data/filetypes.conf trunk/data/filetypes.cpp trunk/data/filetypes.cs trunk/data/filetypes.css trunk/data/filetypes.d trunk/data/filetypes.diff trunk/data/filetypes.docbook trunk/data/filetypes.erlang trunk/data/filetypes.f77 trunk/data/filetypes.ferite trunk/data/filetypes.forth trunk/data/filetypes.fortran trunk/data/filetypes.freebasic trunk/data/filetypes.glsl trunk/data/filetypes.haskell trunk/data/filetypes.haxe trunk/data/filetypes.html trunk/data/filetypes.java trunk/data/filetypes.javascript trunk/data/filetypes.latex trunk/data/filetypes.lisp trunk/data/filetypes.lua trunk/data/filetypes.makefile trunk/data/filetypes.matlab trunk/data/filetypes.nsis trunk/data/filetypes.pascal trunk/data/filetypes.perl trunk/data/filetypes.php trunk/data/filetypes.po trunk/data/filetypes.python trunk/data/filetypes.r trunk/data/filetypes.restructuredtext trunk/data/filetypes.ruby trunk/data/filetypes.sh trunk/data/filetypes.sql trunk/data/filetypes.tcl trunk/data/filetypes.vala trunk/data/filetypes.verilog trunk/data/filetypes.vhdl trunk/data/filetypes.xml trunk/data/filetypes.yaml trunk/doc/geany.html trunk/doc/geany.txt trunk/src/callbacks.c trunk/src/editor.c trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/templates.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/ChangeLog 2011-03-20 15:02:22 UTC (rev 5609) @@ -1,3 +1,12 @@ +2011-03-20 Colomban Wendling <colomban(at)geany(dot)org> + + * data/filetypes.*, doc/geany.txt, doc/geany.html, src/callbacks.c, + src/filetypes.c, src/filetypes.h, src/templates.c: + Add new filetype setting "comment_single" to provide separated + single-line and multiline comment support. Single-line are used in + priority to comment code, and multiline to make template comments. + + 2011-03-19 Colomban Wendling <colomban(at)geany(dot)org> * src/callbacks.c: Modified: trunk/data/filetypes.Genie.conf =================================================================== --- trunk/data/filetypes.Genie.conf 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.Genie.conf 2011-03-20 15:02:22 UTC (rev 5609) @@ -42,10 +42,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -#comment_open=// -#comment_close= -# this is an alternative way, so multiline comments are used +# single comments, like # in this file +comment_single=// +# multiline comments comment_open=/* comment_close=*/ Modified: trunk/data/filetypes.Scala.conf =================================================================== --- trunk/data/filetypes.Scala.conf 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.Scala.conf 2011-03-20 15:02:22 UTC (rev 5609) @@ -19,10 +19,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -#comment_open=// -#comment_close= -# this is an alternative way, so multiline comments are used +# single comments, like # in this file +comment_single=// +# multiline comments comment_open=/* comment_close=*/ Modified: trunk/data/filetypes.actionscript =================================================================== --- trunk/data/filetypes.actionscript 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.actionscript 2011-03-20 15:02:22 UTC (rev 5609) @@ -37,9 +37,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.ada =================================================================== --- trunk/data/filetypes.ada 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.ada 2011-03-20 15:02:22 UTC (rev 5609) @@ -26,9 +26,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=-- -comment_close= +# single comments, like # in this file +comment_single=-- +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.asm =================================================================== --- trunk/data/filetypes.asm 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.asm 2011-03-20 15:02:22 UTC (rev 5609) @@ -32,9 +32,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=; -comment_close= +# single comments, like # in this file +comment_single=; +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.c =================================================================== --- trunk/data/filetypes.c 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.c 2011-03-20 15:02:22 UTC (rev 5609) @@ -46,12 +46,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.caml =================================================================== --- trunk/data/filetypes.caml 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.caml 2011-03-20 15:02:22 UTC (rev 5609) @@ -29,7 +29,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +#comment_single= +# multiline comments comment_open=(* comment_close=*) Modified: trunk/data/filetypes.cmake =================================================================== --- trunk/data/filetypes.cmake 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.cmake 2011-03-20 15:02:22 UTC (rev 5609) @@ -31,9 +31,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.cobol =================================================================== --- trunk/data/filetypes.cobol 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.cobol 2011-03-20 15:02:22 UTC (rev 5609) @@ -25,9 +25,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=*> -comment_close= +# single comments, like # in this file +comment_single=*> +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.conf =================================================================== --- trunk/data/filetypes.conf 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.conf 2011-03-20 15:02:22 UTC (rev 5609) @@ -20,9 +20,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.cpp =================================================================== --- trunk/data/filetypes.cpp 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.cpp 2011-03-20 15:02:22 UTC (rev 5609) @@ -48,12 +48,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.cs =================================================================== --- trunk/data/filetypes.cs 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.cs 2011-03-20 15:02:22 UTC (rev 5609) @@ -48,12 +48,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.css =================================================================== --- trunk/data/filetypes.css 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.css 2011-03-20 15:02:22 UTC (rev 5609) @@ -45,7 +45,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +#comment_single= +# multiline comments comment_open=/* comment_close=*/ Modified: trunk/data/filetypes.d =================================================================== --- trunk/data/filetypes.d 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.d 2011-03-20 15:02:22 UTC (rev 5609) @@ -35,13 +35,12 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ -# this is alternative way, so multiline comments are used +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ +# or alternatively #comment_open=/+ #comment_close=+/ Modified: trunk/data/filetypes.diff =================================================================== --- trunk/data/filetypes.diff 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.diff 2011-03-20 15:02:22 UTC (rev 5609) @@ -19,8 +19,9 @@ #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # only the text before the first --- is a comment -comment_open= -comment_close= +#comment_single= +#comment_open= +#comment_close= # context action command (please see Geany's main documentation for details) context_action_cmd= Modified: trunk/data/filetypes.docbook =================================================================== --- trunk/data/filetypes.docbook 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.docbook 2011-03-20 15:02:22 UTC (rev 5609) @@ -47,7 +47,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +#comment_single= +# multiline comments comment_open= Modified: trunk/data/filetypes.erlang =================================================================== --- trunk/data/filetypes.erlang 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.erlang 2011-03-20 15:02:22 UTC (rev 5609) @@ -48,9 +48,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=% -comment_close= +# single comments, like # in this file +comment_single=% +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.f77 =================================================================== --- trunk/data/filetypes.f77 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.f77 2011-03-20 15:02:22 UTC (rev 5609) @@ -33,9 +33,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=c -comment_close= +# single comments, like # in this file +comment_single=c +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.ferite =================================================================== --- trunk/data/filetypes.ferite 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.ferite 2011-03-20 15:02:22 UTC (rev 5609) @@ -37,12 +37,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.forth =================================================================== --- trunk/data/filetypes.forth 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.forth 2011-03-20 15:02:22 UTC (rev 5609) @@ -26,7 +26,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +comment_single=\\ +# multiline comments comment_open=( comment_close= ) Modified: trunk/data/filetypes.fortran =================================================================== --- trunk/data/filetypes.fortran 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.fortran 2011-03-20 15:02:22 UTC (rev 5609) @@ -33,9 +33,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=! -comment_close= +# single comments, like # in this file +comment_single=! +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.freebasic =================================================================== --- trunk/data/filetypes.freebasic 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.freebasic 2011-03-20 15:02:22 UTC (rev 5609) @@ -37,12 +37,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=' -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/' -#comment_close='/ +# single comments, like # in this file +comment_single=' +# multiline comments +comment_open=/' +comment_close='/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.glsl =================================================================== --- trunk/data/filetypes.glsl 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.glsl 2011-03-20 15:02:22 UTC (rev 5609) @@ -51,12 +51,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.haskell =================================================================== --- trunk/data/filetypes.haskell 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.haskell 2011-03-20 15:02:22 UTC (rev 5609) @@ -31,9 +31,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=-- -comment_close= +# single comments, like # in this file +comment_single=-- +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.haxe =================================================================== --- trunk/data/filetypes.haxe 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.haxe 2011-03-20 15:02:22 UTC (rev 5609) @@ -38,9 +38,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= +# single comments, like # in this file +comment_single=// +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.html =================================================================== --- trunk/data/filetypes.html 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.html 2011-03-20 15:02:22 UTC (rev 5609) @@ -16,8 +16,10 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank # these comments are used for PHP, the comments used in HTML are in filetypes.xml +# single comments, like # in this file +#comment_single= +# multiline comments comment_open= Modified: trunk/data/filetypes.java =================================================================== --- trunk/data/filetypes.java 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.java 2011-03-20 15:02:22 UTC (rev 5609) @@ -39,7 +39,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +comment_single=// +# multiline comments comment_open=/* comment_close=*/ Modified: trunk/data/filetypes.javascript =================================================================== --- trunk/data/filetypes.javascript 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.javascript 2011-03-20 15:02:22 UTC (rev 5609) @@ -36,9 +36,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.latex =================================================================== --- trunk/data/filetypes.latex 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.latex 2011-03-20 15:02:22 UTC (rev 5609) @@ -19,9 +19,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=% -comment_close= +# single comments, like # in this file +comment_single=% +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.lisp =================================================================== --- trunk/data/filetypes.lisp 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.lisp 2011-03-20 15:02:22 UTC (rev 5609) @@ -29,12 +29,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=; -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=#| -#comment_close=|# +# single comments, like # in this file +comment_single=; +# multiline comments +comment_open=#| +comment_close=|# # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.lua =================================================================== --- trunk/data/filetypes.lua 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.lua 2011-03-20 15:02:22 UTC (rev 5609) @@ -44,12 +44,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=-- -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=--[[ -#comment_close=]]-- +# single comments, like # in this file +comment_single=-- +# multiline comments +comment_open=--[[ +comment_close=]]-- # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.makefile =================================================================== --- trunk/data/filetypes.makefile 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.makefile 2011-03-20 15:02:22 UTC (rev 5609) @@ -19,9 +19,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.matlab =================================================================== --- trunk/data/filetypes.matlab 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.matlab 2011-03-20 15:02:22 UTC (rev 5609) @@ -22,9 +22,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=% -comment_close= +# single comments, like # in this file +comment_single=% +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.nsis =================================================================== --- trunk/data/filetypes.nsis 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.nsis 2011-03-20 15:02:22 UTC (rev 5609) @@ -40,9 +40,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=; -comment_close= +# single comments, like # in this file +comment_single=; +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.pascal =================================================================== --- trunk/data/filetypes.pascal 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.pascal 2011-03-20 15:02:22 UTC (rev 5609) @@ -33,7 +33,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +#comment_single= +# multiline comments comment_open={ comment_close=} Modified: trunk/data/filetypes.perl =================================================================== --- trunk/data/filetypes.perl 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.perl 2011-03-20 15:02:22 UTC (rev 5609) @@ -52,9 +52,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open==begin +#comment_close==cut # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.php =================================================================== --- trunk/data/filetypes.php 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.php 2011-03-20 15:02:22 UTC (rev 5609) @@ -12,8 +12,10 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank # these comments are used for PHP, the comments used in HTML are in filetypes.xml +# single comments, like # in this file +comment_single=// +# multiline comments comment_open=/* comment_close=*/ Modified: trunk/data/filetypes.po =================================================================== --- trunk/data/filetypes.po 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.po 2011-03-20 15:02:22 UTC (rev 5609) @@ -21,9 +21,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.python =================================================================== --- trunk/data/filetypes.python 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.python 2011-03-20 15:02:22 UTC (rev 5609) @@ -37,9 +37,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comment char, like # in this file +comment_single=# +# multiline comments +#comment_open=""" +#comment_close=""" # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.r =================================================================== --- trunk/data/filetypes.r 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.r 2011-03-20 15:02:22 UTC (rev 5609) @@ -32,12 +32,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.restructuredtext =================================================================== --- trunk/data/filetypes.restructuredtext 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.restructuredtext 2011-03-20 15:02:22 UTC (rev 5609) @@ -9,12 +9,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=.. +# single comments, like # in this file +comment_single=.. +# multiline comments +#comment_open= #comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.ruby =================================================================== --- trunk/data/filetypes.ruby 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.ruby 2011-03-20 15:02:22 UTC (rev 5609) @@ -49,9 +49,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open==begin +#comment_close==end # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.sh =================================================================== --- trunk/data/filetypes.sh 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.sh 2011-03-20 15:02:22 UTC (rev 5609) @@ -27,9 +27,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start a column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.sql =================================================================== --- trunk/data/filetypes.sql 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.sql 2011-03-20 15:02:22 UTC (rev 5609) @@ -29,7 +29,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +comment_single=-- +# multiline comments comment_open=/* comment_close=*/ Modified: trunk/data/filetypes.tcl =================================================================== --- trunk/data/filetypes.tcl 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.tcl 2011-03-20 15:02:22 UTC (rev 5609) @@ -34,9 +34,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.vala =================================================================== --- trunk/data/filetypes.vala 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.vala 2011-03-20 15:02:22 UTC (rev 5609) @@ -48,12 +48,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=// -comment_close= -# this is an alternative way, so multiline comments are used -#comment_open=/* -#comment_close=*/ +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.verilog =================================================================== --- trunk/data/filetypes.verilog 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.verilog 2011-03-20 15:02:22 UTC (rev 5609) @@ -29,7 +29,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +comment_single=// +# multiline comments comment_open=/* comment_close=*/ Modified: trunk/data/filetypes.vhdl =================================================================== --- trunk/data/filetypes.vhdl 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.vhdl 2011-03-20 15:02:22 UTC (rev 5609) @@ -34,9 +34,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=-- -comment_close= +# single comments, like # in this file +comment_single=-- +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/data/filetypes.xml =================================================================== --- trunk/data/filetypes.xml 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.xml 2011-03-20 15:02:22 UTC (rev 5609) @@ -88,7 +88,9 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank +# single comments, like # in this file +#comment_single= +# multiline comments comment_open= Modified: trunk/data/filetypes.yaml =================================================================== --- trunk/data/filetypes.yaml 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/data/filetypes.yaml 2011-03-20 15:02:22 UTC (rev 5609) @@ -25,9 +25,11 @@ # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -# if only single comment char is supported like # in this file, leave comment_close blank -comment_open=# -comment_close= +# single comments, like # in this file +comment_single=# +# multiline comments +#comment_open= +#comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/doc/geany.html 2011-03-20 15:02:22 UTC (rev 5609) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2011-01-19" /> +<meta name="date" content="$Date$" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ Nick Treleaven Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2011-01-19</td></tr> +<td>$Date$</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.21</td></tr> </tbody> @@ -4463,10 +4463,20 @@ filetypes.common setting. </div> </dd> +<dt>comment_single</dt> +<dd>A character or string which is used to comment code. If you want to use +multiline comments only, don't set this but rather comment_open and +comment_close. +Single-line comments are used in priority over multiline comments to +comment a line, e.g. with the <cite>Comment/Uncomment line</cite> command. +Example: <tt class="docutils literal">comment_single=//</tt> +</dd> <dt>comment_open</dt> -<dd>A character or string which is used to comment code. If you want to -use multiline comments, also set comment_close, otherwise leave it -empty. +<dd>A character or string which is used to comment code. You need to also +set comment_close to really use multiline comments. If you want to use +single-line comments, prefer setting comment_single. +Multiline comments are used in priority over single-line comments to +comment a block, e.g. template comments. Example: <tt class="docutils literal">comment_open=/*</tt> </dd> <dt>comment_close</dt> @@ -6461,7 +6471,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2011-02-06 16:10 UTC. +Generated on: 2011-03-20 14:49 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/doc/geany.txt 2011-03-20 15:02:22 UTC (rev 5609) @@ -3749,11 +3749,24 @@ This can be overridden by the *whitespace_chars* filetypes.common setting. +comment_single + A character or string which is used to comment code. If you want to use + multiline comments only, don't set this but rather comment_open and + comment_close. + + Single-line comments are used in priority over multiline comments to + comment a line, e.g. with the `Comment/Uncomment line` command. + + *Example:* ``comment_single=//`` + comment_open - A character or string which is used to comment code. If you want to - use multiline comments, also set comment_close, otherwise leave it - empty. + A character or string which is used to comment code. You need to also + set comment_close to really use multiline comments. If you want to use + single-line comments, prefer setting comment_single. + Multiline comments are used in priority over single-line comments to + comment a block, e.g. template comments. + *Example:* ``comment_open=/*`` comment_close Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/src/callbacks.c 2011-03-20 15:02:22 UTC (rev 5609) @@ -1321,7 +1321,7 @@ verify_click_pos(doc); /* make sure that the click_pos is valid */ - if (doc->file_type->comment_open) + if (doc->file_type->comment_open || doc->file_type->comment_single) editor_insert_multiline_comment(doc->editor); else utils_beep(); Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/src/editor.c 2011-03-20 15:02:22 UTC (rev 5609) @@ -2936,10 +2936,16 @@ ft = filetypes[GEANY_FILETYPES_XML]; } - co = ft->comment_open; - cc = ft->comment_close; - if (co == NULL) - return 0; + co = ft->comment_single; + if (NZV(co)) + cc = NULL; + else + { + co = ft->comment_open; + cc = ft->comment_close; + if (co == NULL) + return; + } co_len = strlen(co); if (co_len == 0) @@ -3068,10 +3074,16 @@ ft = filetypes[GEANY_FILETYPES_XML]; } - co = ft->comment_open; - cc = ft->comment_close; - if (co == NULL) - return; + co = ft->comment_single; + if (NZV(co)) + cc = NULL; + else + { + co = ft->comment_open; + cc = ft->comment_close; + if (co == NULL) + return; + } co_len = strlen(co); if (co_len == 0) @@ -3096,7 +3108,7 @@ while (isspace(sel[x])) x++; /* use single line comment */ - if (cc == NULL || strlen(cc) == 0) + if (cc == NULL || cc[0] == '\0') { gboolean do_continue = FALSE; single_line = TRUE; @@ -3232,10 +3244,16 @@ ft = filetypes[GEANY_FILETYPES_XML]; } - co = ft->comment_open; - cc = ft->comment_close; - if (co == NULL) - return; + co = ft->comment_single; + if (NZV(co)) + cc = NULL; + else + { + co = ft->comment_open; + cc = ft->comment_close; + if (co == NULL) + return; + } co_len = strlen(co); if (co_len == 0) @@ -3540,14 +3558,15 @@ gboolean have_multiline_comment = FALSE; GeanyDocument *doc; - g_return_if_fail(editor != NULL && - editor->document->file_type != NULL && editor->document->file_type->comment_open != NULL); + g_return_if_fail(editor != NULL && editor->document->file_type != NULL && + (editor->document->file_type->comment_open != NULL || + editor->document->file_type->comment_single != NULL)); sci_start_undo_action(editor->sci); doc = editor->document; - if (doc->file_type->comment_close != NULL && strlen(doc->file_type->comment_close) > 0) + if (NZV(doc->file_type->comment_close)) have_multiline_comment = TRUE; /* insert three lines one line above of the current position */ Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/src/filetypes.c 2011-03-20 15:02:22 UTC (rev 5609) @@ -1051,6 +1051,7 @@ g_free(ft->mime_type); g_free(ft->comment_open); g_free(ft->comment_close); + g_free(ft->comment_single); g_free(ft->context_action_cmd); g_free(ft->filecmds); g_free(ft->ftdefcmds); @@ -1095,7 +1096,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 (G_LIKELY(result != NULL)) + if (result != NULL) { g_free(filetypes[ft_id]->comment_open); filetypes[ft_id]->comment_open = result; @@ -1103,12 +1104,25 @@ 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 (G_LIKELY(result != NULL)) + if (result != NULL) { g_free(filetypes[ft_id]->comment_close); filetypes[ft_id]->comment_close = result; } + result = g_key_file_get_string(configh, "settings", "comment_single", NULL); + if (result == NULL) result = g_key_file_get_string(config, "settings", "comment_single", NULL); + if (result != NULL) + { + setptr(filetypes[ft_id]->comment_single, result); + } + /* import correctly filetypes that use old-style single comments */ + else if (! NZV(filetypes[ft_id]->comment_close)) + { + setptr(filetypes[ft_id]->comment_single, filetypes[ft_id]->comment_open); + setptr(filetypes[ft_id]->comment_open, NULL); + } + tmp = g_key_file_get_boolean(configh, "settings", "comment_use_indent", &error); if (error) { Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/src/filetypes.h 2011-03-20 15:02:22 UTC (rev 5609) @@ -136,6 +136,7 @@ GeanyFiletype *lexer_filetype; gchar *mime_type; GdkPixbuf *icon; + gchar *comment_single; /* single-line comment */ struct GeanyFiletypePrivate *priv; /* must be last, append fields before this item */ #ifdef GEANY_PRIVATE Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2011-03-19 22:48:43 UTC (rev 5608) +++ trunk/src/templates.c 2011-03-20 15:02:22 UTC (rev 5609) @@ -475,6 +475,8 @@ gint template_eol_mode; const gchar *template_eol_char; GeanyFiletype *ft = filetypes_index(filetype_idx); + const gchar *co; + const gchar *cc; g_return_if_fail(comment_text != NULL); g_return_if_fail(ft != NULL); @@ -482,19 +484,25 @@ template_eol_mode = utils_get_line_endings(comment_text->str, comment_text->len); template_eol_char = utils_get_eol_char(template_eol_mode); - if (NZV(ft->comment_open)) + co = ft->comment_open; + cc = NULL; + if (NZV(co)) + cc = ft->comment_close; + else + co = ft->comment_single; + if (NZV(co)) { - if (NZV(ft->comment_close)) + if (NZV(cc)) { - frame_start = g_strconcat(ft->comment_open, template_eol_char, NULL); - frame_end = g_strconcat(ft->comment_close, template_eol_char, NULL); + frame_start = g_strconcat(co, template_eol_char, NULL); + frame_end = g_strconcat(cc, template_eol_char, NULL); line_prefix = ""; } else { frame_start = NULL; frame_end = NULL; - line_prefix = ft->comment_open; + line_prefix = co; } } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5608] trunk
by colombanw＠users.sourceforge.net 19 Mar '11

19 Mar '11

Revision: 5608 http://geany.svn.sourceforge.net/geany/?rev=5608&view=rev Author: colombanw Date: 2011-03-19 22:48:43 +0000 (Sat, 19 Mar 2011) Log Message: ----------- Create a new undo action when inserting templates This makes sure the user can undo the template insertion without also undoing a previous action. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-18 15:57:15 UTC (rev 5607) +++ trunk/ChangeLog 2011-03-19 22:48:43 UTC (rev 5608) @@ -1,3 +1,10 @@ +2011-03-19 Colomban Wendling <colomban(at)geany(dot)org> + + * src/callbacks.c: + Create a new undo action when inserting templates, making sure the user + can undo the template insertion without also undoing a previous action. + + 2011-03-18 Colomban Wendling <colomban(at)geany(dot)org> * src/document.c, src/encodings.c, src/encodings.h: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2011-03-18 15:57:15 UTC (rev 5607) +++ trunk/src/callbacks.c 2011-03-19 22:48:43 UTC (rev 5608) @@ -1299,7 +1299,9 @@ text = templates_get_template_function(doc, cur_tag); + sci_start_undo_action(doc->editor->sci); sci_insert_text(doc->editor->sci, pos, text); + sci_end_undo_action(doc->editor->sci); g_free(text); } @@ -1339,7 +1341,9 @@ verify_click_pos(doc); /* make sure that the click_pos is valid */ + sci_start_undo_action(doc->editor->sci); sci_insert_text(doc->editor->sci, editor_info.click_pos, text); + sci_end_undo_action(doc->editor->sci); g_free(text); } @@ -1358,7 +1362,9 @@ verify_click_pos(doc); /* make sure that the click_pos is valid */ + sci_start_undo_action(doc->editor->sci); sci_insert_text(doc->editor->sci, editor_info.click_pos, text); + sci_end_undo_action(doc->editor->sci); g_free(text); } @@ -1374,10 +1380,12 @@ g_return_if_fail(doc != NULL); text = templates_get_template_changelog(doc); + sci_start_undo_action(doc->editor->sci); sci_insert_text(doc->editor->sci, 0, text); /* sets the cursor to the right position to type the changelog text, * the template has 21 chars + length of name and email */ sci_goto_pos(doc->editor->sci, 21 + strlen(template_prefs.developer) + strlen(template_prefs.mail), TRUE); + sci_end_undo_action(doc->editor->sci); g_free(text); } @@ -1398,8 +1406,10 @@ fname = doc->file_name; text = templates_get_template_fileheader(FILETYPE_ID(ft), fname); + sci_start_undo_action(doc->editor->sci); sci_insert_text(doc->editor->sci, 0, text); sci_goto_pos(doc->editor->sci, 0, FALSE); + sci_end_undo_action(doc->editor->sci); g_free(text); } @@ -1451,8 +1461,10 @@ { verify_click_pos(doc); /* make sure that the click_pos is valid */ + sci_start_undo_action(doc->editor->sci); sci_insert_text(doc->editor->sci, editor_info.click_pos, time_str); sci_goto_pos(doc->editor->sci, editor_info.click_pos + strlen(time_str), FALSE); + sci_end_undo_action(doc->editor->sci); g_free(time_str); } else @@ -1487,7 +1499,9 @@ text = g_strconcat("#include <", user_data, ">\n", NULL); } + sci_start_undo_action(doc->editor->sci); sci_insert_text(doc->editor->sci, editor_info.click_pos, text); + sci_end_undo_action(doc->editor->sci); g_free(text); if (pos >= 0) sci_goto_pos(doc->editor->sci, pos, FALSE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2011