Revision: 5804 http://geany.svn.sourceforge.net/geany/?rev=5804&view=rev Author: statc Date: 2011-05-21 08:50:00 +0000 (Sat, 21 May 2011)
Log Message: ----------- Merge trunk (revisions 5601..5620)
Conflicts: src/filetypes.c
Modified Paths: -------------- branches/sm/ChangeLog branches/sm/data/filetype_extensions.conf branches/sm/data/filetypes.Genie.conf branches/sm/data/filetypes.actionscript branches/sm/data/filetypes.ada branches/sm/data/filetypes.asm branches/sm/data/filetypes.c branches/sm/data/filetypes.caml branches/sm/data/filetypes.cmake branches/sm/data/filetypes.cobol branches/sm/data/filetypes.conf branches/sm/data/filetypes.cpp branches/sm/data/filetypes.cs branches/sm/data/filetypes.css branches/sm/data/filetypes.d branches/sm/data/filetypes.diff branches/sm/data/filetypes.docbook branches/sm/data/filetypes.erlang branches/sm/data/filetypes.f77 branches/sm/data/filetypes.ferite branches/sm/data/filetypes.forth branches/sm/data/filetypes.fortran branches/sm/data/filetypes.freebasic branches/sm/data/filetypes.glsl branches/sm/data/filetypes.haskell branches/sm/data/filetypes.haxe branches/sm/data/filetypes.html branches/sm/data/filetypes.java branches/sm/data/filetypes.javascript branches/sm/data/filetypes.latex branches/sm/data/filetypes.lisp branches/sm/data/filetypes.lua branches/sm/data/filetypes.makefile branches/sm/data/filetypes.matlab branches/sm/data/filetypes.nsis branches/sm/data/filetypes.pascal branches/sm/data/filetypes.perl branches/sm/data/filetypes.php branches/sm/data/filetypes.po branches/sm/data/filetypes.python branches/sm/data/filetypes.r branches/sm/data/filetypes.restructuredtext branches/sm/data/filetypes.ruby branches/sm/data/filetypes.sh branches/sm/data/filetypes.sql branches/sm/data/filetypes.tcl branches/sm/data/filetypes.vala branches/sm/data/filetypes.verilog branches/sm/data/filetypes.vhdl branches/sm/data/filetypes.xml branches/sm/data/filetypes.yaml branches/sm/doc/geany.html branches/sm/doc/geany.txt branches/sm/geany.glade branches/sm/plugins/filebrowser.c branches/sm/po/ChangeLog branches/sm/po/es.po branches/sm/po/sl.po branches/sm/src/callbacks.c branches/sm/src/document.c branches/sm/src/editor.c branches/sm/src/encodings.c branches/sm/src/encodings.h branches/sm/src/filetypes.c branches/sm/src/filetypes.h branches/sm/src/interface.c branches/sm/src/main.c branches/sm/src/search.c branches/sm/src/templates.c branches/sm/tagmanager/diff.c
Added Paths: ----------- branches/sm/data/filetypes.Scala.conf branches/sm/data/templates/files/main.vala
Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/ChangeLog 2011-05-21 08:50:00 UTC (rev 5804) @@ -1,3 +1,64 @@ +2011-03-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * plugins/filebrowser.c: + Add history to filter entry. + + +2011-03-24 Colomban Wendling <colomban(at)geany(dot)org> + + * doc/geany.txt, doc/geany.html: + Update the documentation to talk about real-time tag parsing. + + +2011-03-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * 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> + + * 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. + * 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> + + * 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: + Move document encoding conversion with BOM support to encodings.[ch] as + encodings_convert_to_utf8_auto(). + * src/templates.c: + Properly convert template files to UTF-8 on loading, fixing encoding + issues if templates files are not encoded in UTF-8. + + +2011-03-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/templates/files/main.vala: + Add file template for Vala (patch by Mark Trompell, thanks). + + 2011-03-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/utils.c, src/utils.h, src/filetypes.c: @@ -8,12 +69,24 @@ Improve Class Builder plugin dialog UI using a table (patch by Matthew Brush, thanks). * plugins/classbuilder.c: - Fix GLib warning when creating classes and no documents are open + Fix GLib warning when creating classes and no documents are open (patch by Matthew Brush, thanks). * plugins/classbuilder.c: - Undo patch change to cc_option_label_new() to append a ':' colon to - label text because this unnecessarily causes string translations to + Undo patch change to cc_option_label_new() to append a ':' colon to + label text because this unnecessarily causes string translations to be updated. + * src/interface.c, geany.glade: + Fix wrong label capitalization for Toolbar Preferences dialog tab + and 2 other labels. + * data/filetypes.Scala.conf, data/filetype_extensions.conf: + Add Scala custom filetype, based on file by werg (thanks). + (This uses the newly added [styling=C] syntax). + * src/filetypes.c: + Make special case for filetypes.matlab instead of truncating all + filetype config filenames at slash. + * src/filetypes.c: + Fix generating tag files and --ft-names option by ensuring GTK is + initialized before calling ui_get_mime_icon().
2011-03-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: branches/sm/data/filetype_extensions.conf =================================================================== --- branches/sm/data/filetype_extensions.conf 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetype_extensions.conf 2011-05-21 08:50:00 UTC (rev 5804) @@ -45,6 +45,7 @@ reStructuredText=*.rest;*.reST;*.rst; R=*.R;*.r; Ruby=*.rb;*.rhtml;*.ruby; +Scala=*.scl; Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;*.ash;*.bash;*.m4; SQL=*.sql; Tcl=*.tcl;*.tk;*.wish;
Modified: branches/sm/data/filetypes.Genie.conf =================================================================== --- branches/sm/data/filetypes.Genie.conf 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.Genie.conf 2011-05-21 08:50:00 UTC (rev 5804) @@ -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=*/
Added: branches/sm/data/filetypes.Scala.conf =================================================================== --- branches/sm/data/filetypes.Scala.conf (rev 0) +++ branches/sm/data/filetypes.Scala.conf 2011-05-21 08:50:00 UTC (rev 5804) @@ -0,0 +1,36 @@ +# Based on file by werg +# For complete documentation of this file, please see Geany's main documentation +[styling=C] + +[keywords] +# all items must be in one line +primary=abstract case catch class def do else extends false final finally for forSome if implicit import lazy match new object override package private protected requires return sealed throw trait true try type val var with while yield @ => + +secondary=null super this AllRef Any AnyRef Array Attribute Elem Iterable List Option Some Stack String Unit Console Nil None Predef +# these are some doxygen keywords (incomplete) +docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union + +[settings] +lexer_filetype=C + +# default extension used when saving files +extension=scl + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ + +comment_use_indent=true + +#[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +#compiler=g++ -Wall -c "%f" +#linker=g++ -Wall -o "%e" "%f" +#run_cmd="./%e"
Modified: branches/sm/data/filetypes.actionscript =================================================================== --- branches/sm/data/filetypes.actionscript 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.actionscript 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.ada =================================================================== --- branches/sm/data/filetypes.ada 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.ada 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.asm =================================================================== --- branches/sm/data/filetypes.asm 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.asm 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.c =================================================================== --- branches/sm/data/filetypes.c 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.c 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.caml =================================================================== --- branches/sm/data/filetypes.caml 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.caml 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.cmake =================================================================== --- branches/sm/data/filetypes.cmake 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.cmake 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.cobol =================================================================== --- branches/sm/data/filetypes.cobol 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.cobol 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.conf =================================================================== --- branches/sm/data/filetypes.conf 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.conf 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.cpp =================================================================== --- branches/sm/data/filetypes.cpp 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.cpp 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.cs =================================================================== --- branches/sm/data/filetypes.cs 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.cs 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.css =================================================================== --- branches/sm/data/filetypes.css 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.css 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.d =================================================================== --- branches/sm/data/filetypes.d 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.d 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.diff =================================================================== --- branches/sm/data/filetypes.diff 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.diff 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.docbook =================================================================== --- branches/sm/data/filetypes.docbook 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.docbook 2011-05-21 08:50:00 UTC (rev 5804) @@ -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=<!-- comment_close=-->
Modified: branches/sm/data/filetypes.erlang =================================================================== --- branches/sm/data/filetypes.erlang 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.erlang 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.f77 =================================================================== --- branches/sm/data/filetypes.f77 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.f77 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.ferite =================================================================== --- branches/sm/data/filetypes.ferite 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.ferite 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.forth =================================================================== --- branches/sm/data/filetypes.forth 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.forth 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.fortran =================================================================== --- branches/sm/data/filetypes.fortran 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.fortran 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.freebasic =================================================================== --- branches/sm/data/filetypes.freebasic 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.freebasic 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.glsl =================================================================== --- branches/sm/data/filetypes.glsl 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.glsl 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.haskell =================================================================== --- branches/sm/data/filetypes.haskell 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.haskell 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.haxe =================================================================== --- branches/sm/data/filetypes.haxe 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.haxe 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.html =================================================================== --- branches/sm/data/filetypes.html 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.html 2011-05-21 08:50:00 UTC (rev 5804) @@ -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=<!-- comment_close=-->
Modified: branches/sm/data/filetypes.java =================================================================== --- branches/sm/data/filetypes.java 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.java 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.javascript =================================================================== --- branches/sm/data/filetypes.javascript 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.javascript 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.latex =================================================================== --- branches/sm/data/filetypes.latex 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.latex 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.lisp =================================================================== --- branches/sm/data/filetypes.lisp 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.lisp 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.lua =================================================================== --- branches/sm/data/filetypes.lua 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.lua 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.makefile =================================================================== --- branches/sm/data/filetypes.makefile 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.makefile 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.matlab =================================================================== --- branches/sm/data/filetypes.matlab 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.matlab 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.nsis =================================================================== --- branches/sm/data/filetypes.nsis 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.nsis 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.pascal =================================================================== --- branches/sm/data/filetypes.pascal 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.pascal 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.perl =================================================================== --- branches/sm/data/filetypes.perl 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.perl 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.php =================================================================== --- branches/sm/data/filetypes.php 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.php 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.po =================================================================== --- branches/sm/data/filetypes.po 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.po 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.python =================================================================== --- branches/sm/data/filetypes.python 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.python 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.r =================================================================== --- branches/sm/data/filetypes.r 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.r 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.restructuredtext =================================================================== --- branches/sm/data/filetypes.restructuredtext 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.restructuredtext 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.ruby =================================================================== --- branches/sm/data/filetypes.ruby 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.ruby 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.sh =================================================================== --- branches/sm/data/filetypes.sh 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.sh 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.sql =================================================================== --- branches/sm/data/filetypes.sql 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.sql 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.tcl =================================================================== --- branches/sm/data/filetypes.tcl 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.tcl 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.vala =================================================================== --- branches/sm/data/filetypes.vala 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.vala 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.verilog =================================================================== --- branches/sm/data/filetypes.verilog 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.verilog 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.vhdl =================================================================== --- branches/sm/data/filetypes.vhdl 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.vhdl 2011-05-21 08:50:00 UTC (rev 5804) @@ -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: branches/sm/data/filetypes.xml =================================================================== --- branches/sm/data/filetypes.xml 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.xml 2011-05-21 08:50:00 UTC (rev 5804) @@ -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=<!-- comment_close=-->
Modified: branches/sm/data/filetypes.yaml =================================================================== --- branches/sm/data/filetypes.yaml 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/data/filetypes.yaml 2011-05-21 08:50:00 UTC (rev 5804) @@ -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
Added: branches/sm/data/templates/files/main.vala =================================================================== --- branches/sm/data/templates/files/main.vala (rev 0) +++ branches/sm/data/templates/files/main.vala 2011-05-21 08:50:00 UTC (rev 5804) @@ -0,0 +1,9 @@ +{fileheader} + +class {untitled} : GLib.Object { + + public static int main(string[] args) { + + return 0; + } +}
Modified: branches/sm/doc/geany.html =================================================================== --- branches/sm/doc/geany.html 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/doc/geany.html 2011-05-21 08:50:00 UTC (rev 5804) @@ -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 @@ <br />Nick Treleaven <br />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> @@ -1909,10 +1909,11 @@ tags files, as described below.</p> <div class="section" id="workspace-tags"> <h3><a class="toc-backref" href="#id78">Workspace tags</a></h3> -<p>Tags for each document are parsed whenever a file is loaded or -saved. These are shown in the Symbol list in the Sidebar. These tags -are also used for autocompletion of symbols and calltips for all documents -open in the current session that have the same filetype.</p> +<p>Tags for each document are parsed whenever a file is loaded, saved or +modified (see <em>Symbol list update frequency</em> preference in the <a class="reference internal" href="#editor-completions-preferences">Editor +Completions preferences</a>). These are shown in the Symbol list in the +Sidebar. These tags are also used for autocompletion of symbols and calltips +for all documents open in the current session that have the same filetype.</p> <p>The <em>Go to Tag</em> commands can be used with all workspace tags. See <a class="reference internal" href="#go-to-tag-definition">Go to tag definition</a>.</p> </div> @@ -2428,6 +2429,17 @@ <dd>The number of rows to display for the autocompletion window.</dd> <dt>Max. symbol name suggestions</dt> <dd>The maximum number of items in the autocompletion list.</dd> +<dt>Symbol list update frequency</dt> +<dd><p class="first">The minimum delay (in milliseconds) between two symbol list updates.</p> +<p>This option determines how frequently the tag list is updated for the +current document. The smaller the delay, the more up-to-date the symbol +list (and then the completions); but rebuilding the symbol list has a +cost in performance, especially with large files.</p> +<p>The default value is 250ms, which means the symbol list will be updated +at most four times per second, even if the document changes continuously.</p> +<p class="last">A value of 0 disables automatic updates, so the symbol list will only be +updated upon document saving.</p> +</dd> </dl> </div> <div class="section" id="auto-close-quotes-and-brackets"> @@ -4463,10 +4475,20 @@ filetypes.common setting.</p> </div> </dd> +<dt>comment_single</dt> +<dd><p class="first">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.</p> +<p>Single-line comments are used in priority over multiline comments to +comment a line, e.g. with the <cite>Comment/Uncomment line</cite> command.</p> +<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">comment_single=//</span></tt></p> +</dd> <dt>comment_open</dt> -<dd><p class="first">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.</p> +<dd><p class="first">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.</p> +<p>Multiline comments are used in priority over single-line comments to +comment a block, e.g. template comments.</p> <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">comment_open=/*</span></tt></p> </dd> <dt>comment_close</dt> @@ -6461,7 +6483,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-24 02:06 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: branches/sm/doc/geany.txt =================================================================== --- branches/sm/doc/geany.txt 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/doc/geany.txt 2011-05-21 08:50:00 UTC (rev 5804) @@ -1505,10 +1505,11 @@ Workspace tags ^^^^^^^^^^^^^^
-Tags for each document are parsed whenever a file is loaded or -saved. These are shown in the Symbol list in the Sidebar. These tags -are also used for autocompletion of symbols and calltips for all documents -open in the current session that have the same filetype. +Tags for each document are parsed whenever a file is loaded, saved or +modified (see *Symbol list update frequency* preference in the `Editor +Completions preferences`_). These are shown in the Symbol list in the +Sidebar. These tags are also used for autocompletion of symbols and calltips +for all documents open in the current session that have the same filetype.
The *Go to Tag* commands can be used with all workspace tags. See `Go to tag definition`_. @@ -2090,7 +2091,21 @@ Max. symbol name suggestions The maximum number of items in the autocompletion list.
+Symbol list update frequency + The minimum delay (in milliseconds) between two symbol list updates.
+ This option determines how frequently the tag list is updated for the + current document. The smaller the delay, the more up-to-date the symbol + list (and then the completions); but rebuilding the symbol list has a + cost in performance, especially with large files. + + The default value is 250ms, which means the symbol list will be updated + at most four times per second, even if the document changes continuously. + + A value of 0 disables automatic updates, so the symbol list will only be + updated upon document saving. + + Auto-close quotes and brackets ``````````````````````````````
@@ -3749,11 +3764,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: branches/sm/geany.glade =================================================================== --- branches/sm/geany.glade 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/geany.glade 2011-05-21 08:50:00 UTC (rev 5804) @@ -5221,7 +5221,7 @@ <widget class="GtkCheckButton" id="check_toolbar_show"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Show T_oolbar</property> + <property name="label" translatable="yes">Show t_oolbar</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5241,7 +5241,7 @@ <property name="visible">True</property> <property name="tooltip" translatable="yes">Pack the toolbar to the main menu to save vertical space</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Append Toolbar to the Menu</property> + <property name="label" translatable="yes">_Append toolbar to the menu</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5398,7 +5398,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_style_default"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">System _Default</property> + <property name="label" translatable="yes">System _default</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5420,7 +5420,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_imagetext"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Images _and Text</property> + <property name="label" translatable="yes">Images _and text</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5443,7 +5443,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_image"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Images Only</property> + <property name="label" translatable="yes">_Images only</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5466,7 +5466,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_text"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Text Only</property> + <property name="label" translatable="yes">_Text only</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5492,7 +5492,7 @@ <child> <widget class="GtkLabel" id="label244"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Icon Style</b></property> + <property name="label" translatable="yes"><b>Icon style</b></property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -5551,7 +5551,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_icon_default"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">S_ystem Default</property> + <property name="label" translatable="yes">S_ystem default</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5573,7 +5573,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_small"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Small Icons</property> + <property name="label" translatable="yes">_Small icons</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5596,7 +5596,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_verysmall"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Very Small Icons</property> + <property name="label" translatable="yes">_Very small icons</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5619,7 +5619,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_large"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Large Icons</property> + <property name="label" translatable="yes">_Large icons</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5645,7 +5645,7 @@ <child> <widget class="GtkLabel" id="label245"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Icon Size</b></property> + <property name="label" translatable="yes"><b>Icon size</b></property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -6355,7 +6355,7 @@ <property name="visible">True</property> <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">T_abs and Spaces</property> + <property name="label" translatable="yes">T_abs and spaces</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -9320,7 +9320,7 @@ <child> <widget class="GtkLabel" id="label218"> <property name="visible">True</property> - <property name="label" translatable="yes">Date & Time:</property> + <property name="label" translatable="yes">Date & time:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -10345,7 +10345,7 @@ <property name="visible">True</property> <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">T_abs and Spaces</property> + <property name="label" translatable="yes">T_abs and spaces</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property>
Modified: branches/sm/plugins/filebrowser.c =================================================================== --- branches/sm/plugins/filebrowser.c 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/plugins/filebrowser.c 2011-05-21 08:50:00 UTC (rev 5804) @@ -74,6 +74,7 @@ static GtkTreeIter *last_dir_iter = NULL; static GtkEntryCompletion *entry_completion = NULL;
+static GtkWidget *filter_combo; static GtkWidget *filter_entry; static GtkWidget *path_combo; static GtkWidget *path_entry; @@ -160,10 +161,10 @@ { gchar **filter_item; guint len; - + if (filter == NULL) return FALSE; - + len = g_strv_length(filter); foreach_c_array(filter_item, filter, len) { @@ -785,21 +786,24 @@ }
-static void on_path_combo_changed(GtkComboBox *combo, gpointer user_data) +static void ui_combo_box_changed(GtkComboBox *combo, gpointer user_data) { /* we get this callback on typing as well as choosing an item */ if (gtk_combo_box_get_active(combo) >= 0) - on_path_entry_activate(GTK_ENTRY(path_entry), NULL); + gtk_widget_activate(GTK_BIN(combo)->child); }
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(); } + ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(filter_combo), NULL, 0); refresh(); }
@@ -903,7 +907,8 @@
label = gtk_label_new(_("Filter:"));
- filter_entry = gtk_entry_new(); + filter_combo = gtk_combo_box_entry_new_text(); + filter_entry = GTK_BIN(filter_combo)->child;
if (gtk_check_version(2, 15, 2) == NULL) { @@ -911,11 +916,12 @@ 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); + g_signal_connect(filter_combo, "changed", G_CALLBACK(ui_combo_box_changed), NULL);
gtk_box_pack_start(GTK_BOX(filterbar), label, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(filterbar), filter_entry, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(filterbar), filter_combo, TRUE, TRUE, 0);
return filterbar; } @@ -1095,7 +1101,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); @@ -1105,7 +1111,7 @@
path_combo = gtk_combo_box_entry_new_text(); gtk_box_pack_start(GTK_BOX(file_view_vbox), path_combo, FALSE, FALSE, 2); - g_signal_connect(path_combo, "changed", G_CALLBACK(on_path_combo_changed), NULL); + g_signal_connect(path_combo, "changed", G_CALLBACK(ui_combo_box_changed), NULL); path_entry = GTK_BIN(path_combo)->child; g_signal_connect(path_entry, "activate", G_CALLBACK(on_path_entry_activate), NULL);
Modified: branches/sm/po/ChangeLog =================================================================== --- branches/sm/po/ChangeLog 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/po/ChangeLog 2011-05-21 08:50:00 UTC (rev 5804) @@ -1,3 +1,14 @@ +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. + (closes #3222844) + + 2011-03-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* zh_TW.po: Update of traditional Chinese translation.
Modified: branches/sm/po/es.po =================================================================== --- branches/sm/po/es.po 2011-05-21 08:47:02 UTC (rev 5803) +++ branches/sm/po/es.po 2011-05-21 08:50:00 UTC (rev 5804) @@ -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@damianv.com.ar, 2006, 2007. # Antonio Jiménez González ajimenez@linuxmail.org, 2009 - 2010. -# Lucas Vieites lucasvieites@gmail.com, 2010. - +# Lucas Vieites lucas.vieites@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@gmail.com\n" -"Language-Team: es@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@gmail.com\n" +"Language-Team: Español es@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"
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.