Commits January 2011

commits@lists.geany.org

4 participants
33 discussions

SF.net SVN: geany:[5534] trunk/tagmanager/makefile.win32
by eht16＠users.sourceforge.net 30 Jan '11

30 Jan '11

Revision: 5534 http://geany.svn.sourceforge.net/geany/?rev=5534&view=rev Author: eht16 Date: 2011-01-30 16:22:09 +0000 (Sun, 30 Jan 2011) Log Message: ----------- fix build (typo) Modified Paths: -------------- trunk/tagmanager/makefile.win32 Modified: trunk/tagmanager/makefile.win32 =================================================================== --- trunk/tagmanager/makefile.win32 2011-01-30 15:03:51 UTC (rev 5533) +++ trunk/tagmanager/makefile.win32 2011-01-30 16:22:09 UTC (rev 5534) @@ -39,7 +39,7 @@ clean: -$(RM) deps.mak *.o $(COMPLIB) -$(COMPLIB): abc.o args.o c.o cobol.c fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o \ +$(COMPLIB): abc.o args.o c.o cobol.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o \ actionscript.o nsis.o \ haskell.o haxe.o html.o python.o lregex.o rest.o sh.o ctags.o entry.o get.o keyword.o nestlevel.o \ options.o \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5533] trunk
by eht16＠users.sourceforge.net 30 Jan '11

30 Jan '11

Revision: 5533 http://geany.svn.sourceforge.net/geany/?rev=5533&view=rev Author: eht16 Date: 2011-01-30 15:03:51 +0000 (Sun, 30 Jan 2011) Log Message: ----------- Add filetype Cobol (based on a patch by Seth Keiper). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetype_extensions.conf trunk/scintilla/Makefile.am trunk/scintilla/makefile.win32 trunk/scintilla/src/Catalogue.cxx trunk/src/editor.c trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/highlighting.c trunk/src/plugindata.h trunk/src/symbols.c trunk/tagmanager/Makefile.am trunk/tagmanager/makefile.win32 trunk/tagmanager/parsers.h trunk/wscript Added Paths: ----------- trunk/data/filetypes.cobol trunk/scintilla/lexers/LexCOBOL.cxx trunk/tagmanager/cobol.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-01-30 13:48:21 UTC (rev 5532) +++ trunk/ChangeLog 2011-01-30 15:03:51 UTC (rev 5533) @@ -3,6 +3,13 @@ * src/editor.c: Ensure the editor widget has the focus when the editor menu is called. + * scintilla/lexers/LexCOBOL.cxx, scintilla/src/Catalogue.cxx, + scintilla/Makefile.am, scintilla/makefile.win32, src/highlighting.c, + src/plugindata.h, src/filetypes.c, src/filetypes.h, src/editor.c, + src/symbols.c, tagmanager/parsers.h, tagmanager/makefile.win32, + tagmanager/cobol.c, tagmanager/Makefile.am, data/filetypes.cobol, + data/filetype_extensions.conf, wscript: + Add filetype Cobol (based on a patch by Seth Keiper). 2011-01-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/data/filetype_extensions.conf =================================================================== --- trunk/data/filetype_extensions.conf 2011-01-30 13:48:21 UTC (rev 5532) +++ trunk/data/filetype_extensions.conf 2011-01-30 15:03:51 UTC (rev 5533) @@ -11,6 +11,7 @@ C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C;*.H; C#=*.cs; CMake=CMakeLists.txt;*.cmake;*.ctest; +COBOL=*.cob;*.cpy;*.cbl;*.cobol; Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop; CSS=*.css; D=*.d;*.di; Added: trunk/data/filetypes.cobol =================================================================== --- trunk/data/filetypes.cobol (rev 0) +++ trunk/data/filetypes.cobol 2011-01-30 15:03:51 UTC (rev 5533) @@ -0,0 +1,41 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=default +comment=comment +commentline=comment +commentdoc=commentdoc +number=number +word=keyword +word2=keyword2 +string=string +character=string +operator=operator +identifier=default +quotedidentifier=default + +[keywords] +# all items must be in one line +keywords=accept access add address advancing after alphabet alphabetic alphabetic-lower alphabetic-upper alphanumeric alphanumeric-edited als alternate and any are area areas ascending assign at author before binary blank block bottom by cancel cbll cd cf ch character characters class clock-units close cobol code code-set collating column comma common communications computational compute configuration content continue control converting corr corresponding count currency data date date-compiled date-written day day-of-week de debug-contents debug-item debug-line debug-name debug-sub-1 debug-sub-2 debug-sub-3 debugging decimal-point delaratives delete delimited delimiter depending descending destination detail disable display divide division down duplicates dynamic egi else emi enable end-add end-compute end-delete end-divide end-evaluate end-if end-multiply end-of-page end-perform end-read end-receive end-return end-rewrite end-search end-start end-string end-subtract end-unstring end-write environment equal error esi evaluate every exception extend external false fd file file-control filler final first footing for from generate giving global greater group heading high-value high-values i-o i-o-control identification in index indexed indicate initial initialize initiate input input-output inspect installation into is just justified key label last leading left length lock memory merge message mode modules move multiple multiply native negative next no not number numeric numeric-edited object-computer occurs of off omitted on open optional or order organization other output overflow packed-decimal padding page page-counter perform pf ph pic picture plus position positive printing procedure procedures procedd program program-id purge queue quotes random rd read receive record records redefines reel reference references relative release remainder removal replace replacing report reporting reports rerun reserve reset return returning reversed rewind rewrite rf rh right rounded same sd search section security segment segment-limited select send sentence separate sequence sequential set sign size sort sort-merge source source-computer special-names standard standard-1 standard-2 start status string sub-queue-1 sub-queue-2 sub-queue-3 subtract sum suppress symbolic sync synchronized table tallying tape terminal terminate test text than then through thru time times to top trailing true type unit unstring until up upon usage use using value values varying when with words working-storage write + +[settings] +# default extension used when saving files +extension=cob + +# 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= + +# 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 + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=false + +# context action command (please see Geany's main documentation for details) +context_action_cmd= Property changes on: trunk/data/filetypes.cobol ___________________________________________________________________ Added: keywords + Author Date Id Revision Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/scintilla/Makefile.am =================================================================== --- trunk/scintilla/Makefile.am 2011-01-30 13:48:21 UTC (rev 5532) +++ trunk/scintilla/Makefile.am 2011-01-30 15:03:51 UTC (rev 5533) @@ -10,6 +10,7 @@ lexers/LexAsm.cxx \ lexers/LexBash.cxx \ lexers/LexBasic.cxx \ +lexers/LexCOBOL.cxx \ lexers/LexCPP.cxx \ lexers/LexCSS.cxx \ lexers/LexCaml.cxx \ Added: trunk/scintilla/lexers/LexCOBOL.cxx =================================================================== --- trunk/scintilla/lexers/LexCOBOL.cxx (rev 0) +++ trunk/scintilla/lexers/LexCOBOL.cxx 2011-01-30 15:03:51 UTC (rev 5533) @@ -0,0 +1,372 @@ +// Scintilla source code edit control +/** @file LexCOBOL.cxx + ** Lexer for COBOL + ** Based on LexPascal.cxx + ** Written by Laurent le Tynevez + ** Updated by Simon Steele <s.steele(a)pnotepad.org> September 2002 + ** Updated by Mathias Rauen <scite(a)madshi.net> May 2003 (Delphi adjustments) + ** Updated by Rod Falck, Aug 2006 Converted to COBOL + **/ + +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <stdarg.h> +#include <assert.h> +#include <ctype.h> + +#include "ILexer.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#include "PropSetSimple.h" +#include "WordList.h" +#include "LexAccessor.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "CharacterSet.h" +#include "LexerModule.h" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + +#define IN_DIVISION 0x01 +#define IN_DECLARATIVES 0x02 +#define IN_SECTION 0x04 +#define IN_PARAGRAPH 0x08 +#define IN_FLAGS 0xF +#define NOT_HEADER 0x10 + +inline bool isCOBOLoperator(char ch) + { + return isoperator(ch); + } + +inline bool isCOBOLwordchar(char ch) + { + return isascii(ch) && (isalnum(ch) || ch == '-'); + + } + +inline bool isCOBOLwordstart(char ch) + { + return isascii(ch) && isalnum(ch); + } + +static int CountBits(int nBits) + { + int count = 0; + for (int i = 0; i < 32; ++i) + { + count += nBits & 1; + nBits >>= 1; + } + return count; + } + +static void getRange(unsigned int start, + unsigned int end, + Accessor &styler, + char *s, + unsigned int len) { + unsigned int i = 0; + while ((i < end - start + 1) && (i < len-1)) { + s[i] = static_cast<char>(tolower(styler[start + i])); + i++; + } + s[i] = '\0'; +} + +static void ColourTo(Accessor &styler, unsigned int end, unsigned int attr) { + styler.ColourTo(end, attr); +} + + +static int classifyWordCOBOL(unsigned int start, unsigned int end, /*WordList &keywords*/WordList *keywordlists[], Accessor &styler, int nContainment, bool *bAarea) { + int ret = 0; + + WordList& a_keywords = *keywordlists[0]; + WordList& b_keywords = *keywordlists[1]; + WordList& c_keywords = *keywordlists[2]; + + char s[100]; + getRange(start, end, styler, s, sizeof(s)); + + char chAttr = SCE_C_IDENTIFIER; + if (isdigit(s[0]) || (s[0] == '.') || (s[0] == 'v')) { + chAttr = SCE_C_NUMBER; + char *p = s + 1; + while (*p) { + if ((!isdigit(*p) && (*p) != 'v') && isCOBOLwordchar(*p)) { + chAttr = SCE_C_IDENTIFIER; + break; + } + ++p; + } + } + else { + if (a_keywords.InList(s)) { + chAttr = SCE_C_WORD; + } + else if (b_keywords.InList(s)) { + chAttr = SCE_C_WORD2; + } + else if (c_keywords.InList(s)) { + chAttr = SCE_C_UUID; + } + } + if (*bAarea) { + if (strcmp(s, "division") == 0) { + ret = IN_DIVISION; + // we've determined the containment, anything else is just ignored for those purposes + *bAarea = false; + } else if (strcmp(s, "declaratives") == 0) { + ret = IN_DIVISION | IN_DECLARATIVES; + if (nContainment & IN_DECLARATIVES) + ret |= NOT_HEADER | IN_SECTION; + // we've determined the containment, anything else is just ignored for those purposes + *bAarea = false; + } else if (strcmp(s, "section") == 0) { + ret = (nContainment &~ IN_PARAGRAPH) | IN_SECTION; + // we've determined the containment, anything else is just ignored for those purposes + *bAarea = false; + } else if (strcmp(s, "end") == 0 && (nContainment & IN_DECLARATIVES)) { + ret = IN_DIVISION | IN_DECLARATIVES | IN_SECTION | NOT_HEADER; + } else { + ret = nContainment | IN_PARAGRAPH; + } + } + ColourTo(styler, end, chAttr); + return ret; +} + +static void ColouriseCOBOLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], + Accessor &styler) { + + styler.StartAt(startPos); + + int state = initStyle; + if (state == SCE_C_CHARACTER) // Does not leak onto next line + state = SCE_C_DEFAULT; + char chPrev = ' '; + char chNext = styler[startPos]; + unsigned int lengthDoc = startPos + length; + + int nContainment; + + int currentLine = styler.GetLine(startPos); + if (currentLine > 0) { + styler.SetLineState(currentLine, styler.GetLineState(currentLine-1)); + nContainment = styler.GetLineState(currentLine); + nContainment &= ~NOT_HEADER; + } else { + styler.SetLineState(currentLine, 0); + nContainment = 0; + } + + styler.StartSegment(startPos); + bool bNewLine = true; + bool bAarea = !isspacechar(chNext); + int column = 0; + for (unsigned int i = startPos; i < lengthDoc; i++) { + char ch = chNext; + + chNext = styler.SafeGetCharAt(i + 1); + + ++column; + + if (bNewLine) { + column = 0; + } + if (column <= 1 && !bAarea) { + bAarea = !isspacechar(ch); + } + bool bSetNewLine = false; + if ((ch == '\r' && chNext != '\n') || (ch == '\n')) { + // Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win) or on LF alone (Unix) + // Avoid triggering two times on Dos/Win + // End of line + if (state == SCE_C_CHARACTER) { + ColourTo(styler, i, state); + state = SCE_C_DEFAULT; + } + styler.SetLineState(currentLine, nContainment); + currentLine++; + bSetNewLine = true; + if (nContainment & NOT_HEADER) + nContainment &= ~(NOT_HEADER | IN_DECLARATIVES | IN_SECTION); + } + + if (styler.IsLeadByte(ch)) { + chNext = styler.SafeGetCharAt(i + 2); + chPrev = ' '; + i += 1; + continue; + } + + if (state == SCE_C_DEFAULT) { + if (isCOBOLwordstart(ch) || (ch == '$' && isascii(chNext) && isalpha(chNext))) { + ColourTo(styler, i-1, state); + state = SCE_C_IDENTIFIER; + } else if (column == 0 && ch == '*' && chNext != '*') { + ColourTo(styler, i-1, state); + state = SCE_C_COMMENTLINE; + } else if (column == 0 && ch == '/' && chNext != '*') { + ColourTo(styler, i-1, state); + state = SCE_C_COMMENTLINE; + } else if (column == 0 && ch == '*' && chNext == '*') { + ColourTo(styler, i-1, state); + state = SCE_C_COMMENTDOC; + } else if (column == 0 && ch == '/' && chNext == '*') { + ColourTo(styler, i-1, state); + state = SCE_C_COMMENTDOC; + } else if (ch == '"') { + ColourTo(styler, i-1, state); + state = SCE_C_STRING; + } else if (ch == '\'') { + ColourTo(styler, i-1, state); + state = SCE_C_CHARACTER; + } else if (ch == '?' && column == 0) { + ColourTo(styler, i-1, state); + state = SCE_C_PREPROCESSOR; + } else if (isCOBOLoperator(ch)) { + ColourTo(styler, i-1, state); + ColourTo(styler, i, SCE_C_OPERATOR); + } + } else if (state == SCE_C_IDENTIFIER) { + if (!isCOBOLwordchar(ch)) { + int lStateChange = classifyWordCOBOL(styler.GetStartSegment(), i - 1, keywordlists, styler, nContainment, &bAarea); + + if(lStateChange != 0) { + styler.SetLineState(currentLine, lStateChange); + nContainment = lStateChange; + } + + state = SCE_C_DEFAULT; + chNext = styler.SafeGetCharAt(i + 1); + if (ch == '"') { + state = SCE_C_STRING; + } else if (ch == '\'') { + state = SCE_C_CHARACTER; + } else if (isCOBOLoperator(ch)) { + ColourTo(styler, i, SCE_C_OPERATOR); + } + } + } else { + if (state == SCE_C_PREPROCESSOR) { + if ((ch == '\r' || ch == '\n') && !(chPrev == '\\' || chPrev == '\r')) { + ColourTo(styler, i-1, state); + state = SCE_C_DEFAULT; + } + } else if (state == SCE_C_COMMENT) { + if (ch == '\r' || ch == '\n') { + ColourTo(styler, i, state); + state = SCE_C_DEFAULT; + } + } else if (state == SCE_C_COMMENTDOC) { + if (ch == '\r' || ch == '\n') { + if (((i > styler.GetStartSegment() + 2) || ( + (initStyle == SCE_C_COMMENTDOC) && + (styler.GetStartSegment() == static_cast<unsigned int>(startPos))))) { + ColourTo(styler, i, state); + state = SCE_C_DEFAULT; + } + } + } else if (state == SCE_C_COMMENTLINE) { + if (ch == '\r' || ch == '\n') { + ColourTo(styler, i-1, state); + state = SCE_C_DEFAULT; + } + } else if (state == SCE_C_STRING) { + if (ch == '"') { + ColourTo(styler, i, state); + state = SCE_C_DEFAULT; + } + } else if (state == SCE_C_CHARACTER) { + if (ch == '\'') { + ColourTo(styler, i, state); + state = SCE_C_DEFAULT; + } + } + } + chPrev = ch; + bNewLine = bSetNewLine; + if (bNewLine) + { + bAarea = false; + } + } + ColourTo(styler, lengthDoc - 1, state); +} + +static void FoldCOBOLDoc(unsigned int startPos, int length, int, WordList *[], + Accessor &styler) { + bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; + unsigned int endPos = startPos + length; + int visibleChars = 0; + int lineCurrent = styler.GetLine(startPos); + int levelPrev = lineCurrent > 0 ? styler.LevelAt(lineCurrent - 1) & SC_FOLDLEVELNUMBERMASK : 0xFFF; + char chNext = styler[startPos]; + + bool bNewLine = true; + bool bAarea = !isspacechar(chNext); + int column = 0; + bool bComment = false; + for (unsigned int i = startPos; i < endPos; i++) { + char ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + ++column; + + if (bNewLine) { + column = 0; + bComment = (ch == '*' || ch == '/' || ch == '?'); + } + if (column <= 1 && !bAarea) { + bAarea = !isspacechar(ch); + } + bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); + if (atEOL) { + int nContainment = styler.GetLineState(lineCurrent); + int lev = CountBits(nContainment & IN_FLAGS) | SC_FOLDLEVELBASE; + if (bAarea && !bComment) + --lev; + if (visibleChars == 0 && foldCompact) + lev |= SC_FOLDLEVELWHITEFLAG; + if ((bAarea) && (visibleChars > 0) && !(nContainment & NOT_HEADER) && !bComment) + lev |= SC_FOLDLEVELHEADERFLAG; + if (lev != styler.LevelAt(lineCurrent)) { + styler.SetLevel(lineCurrent, lev); + } + if ((lev & SC_FOLDLEVELNUMBERMASK) <= (levelPrev & SC_FOLDLEVELNUMBERMASK)) { + // this level is at the same level or less than the previous line + // therefore these is nothing for the previous header to collapse, so remove the header + styler.SetLevel(lineCurrent - 1, levelPrev & ~SC_FOLDLEVELHEADERFLAG); + } + levelPrev = lev; + visibleChars = 0; + bAarea = false; + bNewLine = true; + lineCurrent++; + } else { + bNewLine = false; + } + + + if (!isspacechar(ch)) + visibleChars++; + } + + // Fill in the real level of the next line, keeping the current flags as they will be filled in later + int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK; + styler.SetLevel(lineCurrent, levelPrev | flagsNext); +} + +static const char * const COBOLWordListDesc[] = { + "A Keywords", + "B Keywords", + "Extended Keywords", + 0 +}; + +LexerModule lmCOBOL(SCLEX_COBOL, ColouriseCOBOLDoc, "COBOL", FoldCOBOLDoc, COBOLWordListDesc); Property changes on: trunk/scintilla/lexers/LexCOBOL.cxx ___________________________________________________________________ Added: svn:mime-type + text/x-c++src Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/scintilla/makefile.win32 =================================================================== --- trunk/scintilla/makefile.win32 2011-01-30 13:48:21 UTC (rev 5532) +++ trunk/scintilla/makefile.win32 2011-01-30 15:03:51 UTC (rev 5533) @@ -62,6 +62,7 @@ LexAda.o \ LexAsm.o \ LexBash.o \ +LexCOBOL.o \ LexCSS.o \ LexCPP.o \ LexHTML.o \ Modified: trunk/scintilla/src/Catalogue.cxx =================================================================== --- trunk/scintilla/src/Catalogue.cxx 2011-01-30 13:48:21 UTC (rev 5532) +++ trunk/scintilla/src/Catalogue.cxx 2011-01-30 15:03:51 UTC (rev 5533) @@ -86,6 +86,7 @@ LINK_LEXER(lmBash); LINK_LEXER(lmCaml); LINK_LEXER(lmCmake); + LINK_LEXER(lmCOBOL); LINK_LEXER(lmCPP); LINK_LEXER(lmCss); LINK_LEXER(lmD); Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2011-01-30 13:48:21 UTC (rev 5532) +++ trunk/src/editor.c 2011-01-30 15:03:51 UTC (rev 5533) @@ -3364,6 +3364,7 @@ { switch (lexer) { + case SCLEX_COBOL: case SCLEX_CPP: return (style == SCE_C_COMMENT || style == SCE_C_COMMENTDOC); @@ -4842,6 +4843,7 @@ case SCLEX_MAKEFILE: case SCLEX_ASM: case SCLEX_SQL: + case SCLEX_COBOL: case SCLEX_PROPERTIES: case SCLEX_FORTRAN: /* Is this the best option for Fortran? */ case SCLEX_CAML: Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2011-01-30 13:48:21 UTC (rev 5532) +++ trunk/src/filetypes.c 2011-01-30 15:03:51 UTC (rev 5533) @@ -347,6 +347,13 @@ ft->mime_type = g_strdup("text/x-sql"); ft->group = GEANY_FILETYPE_GROUP_MISC; +#define COBOL + ft = filetypes[GEANY_FILETYPES_COBOL]; + ft->lang = 41; + ft->name = g_strdup("COBOL"); + filetype_make_title(ft, TITLE_FILE); + ft->group = GEANY_FILETYPE_GROUP_MISC; + #define LATEX ft = filetypes[GEANY_FILETYPES_LATEX]; ft->lang = 8; Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2011-01-30 13:48:21 UTC (rev 5532) +++ trunk/src/filetypes.h 2011-01-30 15:03:51 UTC (rev 5533) @@ -88,6 +88,7 @@ GEANY_FILETYPES_FORTH, GEANY_FILETYPES_LISP, GEANY_FILETYPES_ERLANG, + GEANY_FILETYPES_COBOL, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2011-01-30 13:48:21 UTC (rev 5532) +++ trunk/src/highlighting.c 2011-01-30 15:03:51 UTC (rev 5533) @@ -909,7 +909,7 @@ } -static void styleset_c_like(ScintillaObject *sci, gint ft_id) +static void styleset_c_like(ScintillaObject *sci, gint ft_id, gint lexer) { gint styles[] = { SCE_C_DEFAULT, @@ -935,7 +935,7 @@ SCE_C_GLOBALCLASS }; - apply_filetype_properties(sci, SCLEX_CPP, ft_id); + apply_filetype_properties(sci, lexer, ft_id); apply_style_entries(sci, ft_id, styles, G_N_ELEMENTS(styles)); /* Disable explicit //{ folding as it can seem like a bug */ @@ -957,7 +957,7 @@ static void styleset_c(ScintillaObject *sci, gint ft_id) { - styleset_c_like(sci, ft_id); + styleset_c_like(sci, ft_id, SCLEX_CPP); sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); /* SCI_SETKEYWORDS = 1 - secondary + global tags file types, see below */ @@ -1528,7 +1528,7 @@ static void styleset_java(ScintillaObject *sci, gint ft_id) { - styleset_c_like(sci, ft_id); + styleset_c_like(sci, ft_id, SCLEX_CPP); sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); /* SCI_SETKEYWORDS = 1 - secondary + global tags file types, see below */ @@ -1740,6 +1740,28 @@ } +static void styleset_cobol_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) +{ + styleset_c_like_init(config, config_home, ft_id); + + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "secondary", ft_id, 1); + get_keyfile_keywords(config, config_home, "extended_keywords", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; +} + + +static void styleset_cobol(ScintillaObject *sci, gint ft_id) +{ + styleset_c_like(sci, ft_id, SCLEX_COBOL); + + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); +} + + static void styleset_r_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { new_styleset(ft_id, 12); @@ -2904,7 +2926,7 @@ static void styleset_ferite(ScintillaObject *sci, gint ft_id) { - styleset_c_like(sci, ft_id); + styleset_c_like(sci, ft_id, SCLEX_CPP); sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); @@ -3082,7 +3104,7 @@ static void styleset_js(ScintillaObject *sci, gint ft_id) { - styleset_c_like(sci, ft_id); + styleset_c_like(sci, ft_id, SCLEX_CPP); sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); @@ -3243,7 +3265,7 @@ static void styleset_actionscript(ScintillaObject *sci, gint ft_id) { - styleset_c_like(sci, ft_id); + styleset_c_like(sci, ft_id, SCLEX_CPP); sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); sci_set_keywords(sci, 1, style_sets[ft_id].keywords[2]); @@ -3265,7 +3287,7 @@ static void styleset_haxe(ScintillaObject *sci, gint ft_id) { - styleset_c_like(sci, ft_id); + styleset_c_like(sci, ft_id, SCLEX_CPP); sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); @@ -3405,6 +3427,7 @@ init_styleset_case(GEANY_FILETYPES_C, styleset_c_init); init_styleset_case(GEANY_FILETYPES_CAML, styleset_caml_init); init_styleset_case(GEANY_FILETYPES_CMAKE, styleset_cmake_init); + init_styleset_case(GEANY_FILETYPES_COBOL, styleset_cobol_init); init_styleset_case(GEANY_FILETYPES_CONF, styleset_conf_init); init_styleset_case(GEANY_FILETYPES_CSS, styleset_css_init); init_styleset_case(GEANY_FILETYPES_D, styleset_d_init); @@ -3477,6 +3500,7 @@ styleset_case(GEANY_FILETYPES_C, styleset_c); styleset_case(GEANY_FILETYPES_CAML, styleset_caml); styleset_case(GEANY_FILETYPES_CMAKE, styleset_cmake); + styleset_case(GEANY_FILETYPES_COBOL, styleset_cobol); styleset_case(GEANY_FILETYPES_CONF, styleset_conf); styleset_case(GEANY_FILETYPES_CSS, styleset_css); styleset_case(GEANY_FILETYPES_D, styleset_d); @@ -3832,6 +3856,7 @@ { switch (lexer) { + case SCLEX_COBOL: case SCLEX_CPP: return (style == SCE_C_COMMENT || style == SCE_C_COMMENTLINE || Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2011-01-30 13:48:21 UTC (rev 5532) +++ trunk/src/plugindata.h 2011-01-30 15:03:51 UTC (rev 5533) @@ -54,7 +54,7 @@ * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 201 +#define GEANY_API_VERSION 202 /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2011-01-30 13:48:21 UTC (rev 5532) +++ trunk/src/symbols.c 2011-01-30 15:03:51 UTC (rev 5533) @@ -626,6 +626,16 @@ &tv_iters.tag_function, _("Functions"), "classviewer-method", NULL); break; + case GEANY_FILETYPES_COBOL: + tag_list_add_groups(tag_store, + &tv_iters.tag_class, _("Program"), "classviewer-class", + &tv_iters.tag_function, _("File"), "classviewer-method", + &tv_iters.tag_namespace, _("Sections"), "classviewer-namespace", + &tv_iters.tag_macro, _("Paragraph"), "classviewer-other", + &tv_iters.tag_struct, _("Group"), "classviewer-struct", + &tv_iters.tag_variable, _("Data"), "classviewer-var", + NULL); + break; case GEANY_FILETYPES_CONF: tag_list_add_groups(tag_store, &tv_iters.tag_namespace, _("Sections"), "classviewer-other", Modified: trunk/tagmanager/Makefile.am =================================================================== --- trunk/tagmanager/Makefile.am 2011-01-30 13:48:21 UTC (rev 5532) +++ trunk/tagmanager/Makefile.am 2011-01-30 15:03:51 UTC (rev 5533) @@ -36,6 +36,7 @@ abc.c\ basic.c\ c.c\ + cobol.c\ conf.c\ css.c\ diff.c\ Added: trunk/tagmanager/cobol.c =================================================================== --- trunk/tagmanager/cobol.c (rev 0) +++ trunk/tagmanager/cobol.c 2011-01-30 15:03:51 UTC (rev 5533) @@ -0,0 +1,50 @@ +/* +* $Id$ +* +* Copyright (c) 2000-2003, Darren Hiebert +* +* This source code is released for free distribution under the terms of the +* GNU General Public License. +* +* This module contains functions for generating tags for COBOL language +* files. +*/ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ +#include "parse.h" + +/* +* FUNCTION DEFINITIONS +*/ + +static void installCobolRegex (const langType language) +{ + addTagRegex (language, "^[ \t]*[0-9]+[ \t]+([A-Z0-9][A-Z0-9-]*)[ \t]+(BLANK|OCCURS|IS|JUST|PIC|REDEFINES|RENAMES|SIGN|SYNC|USAGE|VALUE)", + "\\1", "d,variable,data items", "i"); + addTagRegex (language, "^[ \t]*[FSR]D[ \t]+([A-Z0-9][A-Z0-9-]*)\\.", + "\\1", "f,function,file descriptions (FD, SD, RD)", "i"); + addTagRegex (language, "^[ \t]*[0-9]+[ \t]+([A-Z0-9][A-Z0-9-]*)\\.", + "\\1", "g,struct,group items", "i"); + addTagRegex (language, "^[ \t]*([A-Z0-9][A-Z0-9-]*)\\.", + "\\1", "p,macro,paragraphs", "i"); + addTagRegex (language, "^[ \t]*PROGRAM-ID\\.[ \t]+([A-Z0-9][A-Z0-9-]*)\\.", + "\\1", "P,class,program ids", "i"); + addTagRegex (language, "^[ \t]*([A-Z0-9][A-Z0-9-]*)[ \t]+SECTION\\.", + "\\1", "n,namespace,sections", "i"); +} + +extern parserDefinition* CobolParser () +{ + static const char *const extensions [] = { + "cbl", "cob", "cpy", "CBL", "COB", NULL }; + parserDefinition* def = parserNew ("Cobol"); + def->extensions = extensions; + def->initialize = installCobolRegex; + def->regex = TRUE; + return def; +} + +/* vi:set tabstop=4 shiftwidth=4: */ Property changes on: trunk/tagmanager/cobol.c ___________________________________________________________________ Added: svn:mime-type + text/x-csrc Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tagmanager/makefile.win32 =================================================================== --- trunk/tagmanager/makefile.win32 2011-01-30 13:48:21 UTC (rev 5532) +++ trunk/tagmanager/makefile.win32 2011-01-30 15:03:51 UTC (rev 5533) @@ -39,7 +39,7 @@ clean: -$(RM) deps.mak *.o $(COMPLIB) -$(COMPLIB): abc.o args.o c.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o \ +$(COMPLIB): abc.o args.o c.o cobol.c fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o \ actionscript.o nsis.o \ haskell.o haxe.o html.o python.o lregex.o rest.o sh.o ctags.o entry.o get.o keyword.o nestlevel.o \ options.o \ Modified: trunk/tagmanager/parsers.h =================================================================== --- trunk/tagmanager/parsers.h 2011-01-30 13:48:21 UTC (rev 5532) +++ trunk/tagmanager/parsers.h 2011-01-30 15:03:51 UTC (rev 5533) @@ -55,7 +55,8 @@ Txt2tagsParser, \ AbcParser, \ VerilogParser, \ - RParser + RParser, \ + CobolParser /* langType of each parser 0 CParser @@ -99,6 +100,7 @@ 38 AbcParser 39 Verilog 40 RParser +41 CobolParser */ #endif /* _PARSERS_H */ Modified: trunk/wscript =================================================================== --- trunk/wscript 2011-01-30 13:48:21 UTC (rev 5532) +++ trunk/wscript 2011-01-30 15:03:51 UTC (rev 5533) @@ -61,7 +61,7 @@ tagmanager_sources = set([ 'tagmanager/args.c', 'tagmanager/abc.c', 'tagmanager/actionscript.c', 'tagmanager/asm.c', - 'tagmanager/basic.c', 'tagmanager/c.c', + 'tagmanager/basic.c', 'tagmanager/c.c', 'tagmanager/cobol.c', 'tagmanager/conf.c', 'tagmanager/css.c', 'tagmanager/ctags.c', 'tagmanager/diff.c', 'tagmanager/docbook.c', 'tagmanager/entry.c', 'tagmanager/fortran.c', 'tagmanager/get.c', 'tagmanager/haskell.c', 'tagmanager/haxe.c', 'tagmanager/html.c', 'tagmanager/js.c', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5532] trunk
by eht16＠users.sourceforge.net 30 Jan '11

30 Jan '11

Revision: 5532 http://geany.svn.sourceforge.net/geany/?rev=5532&view=rev Author: eht16 Date: 2011-01-30 13:48:21 +0000 (Sun, 30 Jan 2011) Log Message: ----------- Ensure the editor widget has the focus when the editor menu is called. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-01-27 16:30:19 UTC (rev 5531) +++ trunk/ChangeLog 2011-01-30 13:48:21 UTC (rev 5532) @@ -1,3 +1,10 @@ +2011-01-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/editor.c: + Ensure the editor widget has the focus when the editor menu is + called. + + 2011-01-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * plugins/filebrowser.c: Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2011-01-27 16:30:19 UTC (rev 5531) +++ trunk/src/editor.c 2011-01-30 13:48:21 UTC (rev 5532) @@ -341,6 +341,9 @@ { gboolean can_goto; + /* ensure the editor widget has the focus after this operation */ + gtk_widget_grab_focus(widget); + editor_find_current_word(editor, editor_info.click_pos, current_word, sizeof current_word, NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5531] trunk/po
by frlan＠users.sourceforge.net 27 Jan '11

27 Jan '11

Revision: 5531 http://geany.svn.sourceforge.net/geany/?rev=5531&view=rev Author: frlan Date: 2011-01-27 16:30:19 +0000 (Thu, 27 Jan 2011) Log Message: ----------- Update of Vietnamese translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/vi.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2011-01-20 19:51:31 UTC (rev 5530) +++ trunk/po/ChangeLog 2011-01-27 16:30:19 UTC (rev 5531) @@ -1,3 +1,8 @@ +2011-01-27 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * vi.po: Update of Vietnamese translation. Thanks to Nguyễn Hồng Quân. + + 2011-01-11 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * pt_BR.po: Update of Brasilian Portuguese translation. Modified: trunk/po/vi.po =================================================================== --- trunk/po/vi.po 2011-01-20 19:51:31 UTC (rev 5530) +++ trunk/po/vi.po 2011-01-27 16:30:19 UTC (rev 5531) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-05 15:55+0100\n" +"POT-Creation-Date: 2011-01-27 10:57+0700\n" "PO-Revision-Date: 2009-09-29 21:16+0930\n" "Last-Translator: Clytie Siddall <clytie(a)riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN(a)googlegroups.com>\n" @@ -22,7 +22,7 @@ msgstr "Một IDE nhanh và nhẹ nhàng dùng GTK2" # Name: don't translate/Tên: đừng dịch -#: ../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" @@ -114,27 +114,27 @@ msgid "%s (in directory: %s)" msgstr "%s (trong thư mục: %s)" -#: ../src/build.c:739 ../src/build.c:964 ../src/search.c:1486 +#: ../src/build.c:739 ../src/build.c:961 ../src/search.c:1486 #, c-format msgid "Process failed (%s)" msgstr "Tiến trình bị lỗi (%s)" -#: ../src/build.c:810 +#: ../src/build.c:807 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Lỗi chuyển đổi thư mục hoạt động sang « %s »" -#: ../src/build.c:839 +#: ../src/build.c:836 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "Lỗi thực hiện « %s » (không thể tạo văn lệnh khởi chạy)" -#: ../src/build.c:893 +#: ../src/build.c:890 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "Không thể thực hiện tập tin trong VTE vì nó rất có thể chứa lệnh." -#: ../src/build.c:931 +#: ../src/build.c:928 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -143,87 +143,83 @@ "Không tìm thấy thiết bị cuối « %s » (kiểm tra đường dẫn đến công cụ Thiết bị " "cuối trong Tùy thích)" -#: ../src/build.c:1104 +#: ../src/build.c:1101 msgid "Compilation failed." msgstr "Lỗi biên dịch." -#: ../src/build.c:1118 +#: ../src/build.c:1115 msgid "Compilation finished successfully." msgstr "Mới biên dịch xong." -#: ../src/build.c:1277 +#: ../src/build.c:1274 #, fuzzy msgid "Custom Text" msgstr "Make đích riêng" -#: ../src/build.c:1278 +#: ../src/build.c:1275 #, fuzzy msgid "Enter custom text here, all entered text is appended to the command." msgstr "" "Ở đây hãy nhập các tùy chọn riêng, toàn bộ đoạn đã nhập được gởi qua cho " "lệnh « make »." -#: ../src/build.c:1356 +#: ../src/build.c:1353 msgid "_Next Error" msgstr "Lỗi tiế_p" -#: ../src/build.c:1358 +#: ../src/build.c:1355 msgid "_Previous Error" msgstr "Lỗi t_rước" -#: ../src/build.c:1368 +#: ../src/build.c:1365 #, fuzzy msgid "_Set Build Commands" msgstr "Đặt lệnh riêng" -#: ../src/build.c:1652 ../src/toolbar.c:373 +#: ../src/build.c:1649 ../src/toolbar.c:373 msgid "Build the current file" msgstr "Xây dựng tập tin hiện thời" -#: ../src/build.c:1666 +#: ../src/build.c:1663 msgid "Build the current file with Make and the default target" msgstr "Xây dựng tập tin hiện thời, dùng công cụ Make và đích đến mặc định" -#: ../src/build.c:1668 +#: ../src/build.c:1665 msgid "Build the current file with Make and the specified target" msgstr "Xây dựng tập tin hiện thời, dùng công cụ Make và đích đến đã xác định" -#: ../src/build.c:1670 +#: ../src/build.c:1667 msgid "Compile the current file with Make" msgstr "Biên dịch tập tin hiện thời dùng Make" -#: ../src/build.c:1697 +#: ../src/build.c:1694 #, c-format msgid "Process could not be stopped (%s)." msgstr "Tiến trình không dừng chạy được (%s)." -#: ../src/build.c:1714 ../src/build.c:1726 +#: ../src/build.c:1711 ../src/build.c:1723 msgid "No more build errors." msgstr "Không có lỗi xây dựng nào nữa." #. 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 "" -#: ../src/build.c:1847 -msgid "Item" -msgstr "" - -#: ../src/build.c:1848 ../src/symbols.c:650 +#: ../src/build.c:1845 ../src/symbols.c:650 msgid "Label" msgstr "Nhãn" -#: ../src/build.c:1849 ../src/symbols.c:645 +#: ../src/build.c:1846 ../src/symbols.c:645 msgid "Command" msgstr "Lệnh" -#: ../src/build.c:1850 +#: ../src/build.c:1847 #, fuzzy msgid "Working directory" msgstr "%s (trong thư mục: %s)" -#: ../src/build.c:1851 +#: ../src/build.c:1848 #, fuzzy msgid "Clear" msgstr "Bộ biên dịch" @@ -252,65 +248,65 @@ msgid "Independent Commands" msgstr "Đặt lệnh riêng" -#: ../src/build.c:2043 +#: ../src/build.c:2045 msgid "Note: Item 2 opens a dialog and appends the response to the command." msgstr "" -#: ../src/build.c:2052 +#: ../src/build.c:2054 #, fuzzy msgid "Execute Commands" msgstr "Đặt lệnh riêng" -#: ../src/build.c:2063 +#: ../src/build.c:2066 #, c-format msgid "" "%d, %e, %f, %p are substituted in command and directory fields, see manual " "for details." msgstr "" -#: ../src/build.c:2223 +#: ../src/build.c:2226 #, fuzzy msgid "Set Build Commands" msgstr "Đặt lệnh riêng" -#: ../src/build.c:2434 +#: ../src/build.c:2437 msgid "_Compile" msgstr "Biên dị_ch" #. 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 "_Xây dựng" -#: ../src/build.c:2448 ../src/build.c:2478 ../src/build.c:2671 +#: ../src/build.c:2451 ../src/build.c:2481 ../src/build.c:2674 #, fuzzy msgid "_Execute" msgstr "Thực hiện:" #. 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 "Make đích _riêng" #. 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 "Make đố_i tượng" # Name: don't translate/Tên: đừng dịch -#: ../src/build.c:2497 ../src/build.c:2668 +#: ../src/build.c:2500 ../src/build.c:2671 #, fuzzy msgid "_Make" msgstr "Make:" # Literal: don't translate/Nghĩa chữ : đừng dịch #. build the code with make all -#: ../src/build.c:2715 +#: ../src/build.c:2718 msgid "_Make All" msgstr "_Make All" #. arguments -#: ../src/build.c:2743 +#: ../src/build.c:2746 #, fuzzy msgid "_Set Build Menu Commands" msgstr "Đặt lệnh riêng" @@ -325,7 +321,7 @@ msgid_plural "%d files saved." msgstr[0] "Tập tin %s đã được lưu." -#: ../src/callbacks.c:490 ../src/document.c:2996 ../src/interface.c:380 +#: ../src/callbacks.c:490 ../src/document.c:2999 ../src/interface.c:381 #: ../src/sidebar.c:683 msgid "_Reload" msgstr "Tải _lại" @@ -339,7 +335,7 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Bạn có chắc muốn tải lại « %s » không?" -#: ../src/callbacks.c:1196 ../src/keybindings.c:424 +#: ../src/callbacks.c:1196 ../src/keybindings.c:425 msgid "Go to Line" msgstr "Tới dòng" @@ -401,7 +397,7 @@ msgid "No more message items." msgstr "Không có mục thông điệp nào nữa." -#: ../src/dialogs.c:178 ../src/interface.c:3873 ../src/interface.c:5492 +#: ../src/dialogs.c:178 ../src/interface.c:3909 ../src/interface.c:5532 msgid "Detect from file" msgstr "Phát hiện từ tập tin" @@ -441,7 +437,7 @@ msgid "Open File" msgstr "Mở tập tin" -#: ../src/dialogs.c:243 ../src/interface.c:868 +#: ../src/dialogs.c:243 ../src/interface.c:873 msgid "_View" msgstr "_Xem" @@ -723,7 +719,7 @@ msgid "Setting %s indentation mode for %s." msgstr "Đang đặt chế độ thụt lề %s cho %s." -#: ../src/document.c:1248 +#: ../src/document.c:1248 ../src/document.c:1858 msgid "Invalid filename" msgstr "Tên tập tin không hợp lệ" @@ -786,16 +782,12 @@ msgid "Failed to close file '%s': fclose() failed: %s" msgstr "" -#: ../src/document.c:1855 ../src/document.c:1927 -msgid "Error saving file." -msgstr "Gặp lỗi khi lưu tập tin." - -#: ../src/document.c:1920 +#: ../src/document.c:1858 ../src/document.c:1923 #, c-format msgid "Error saving file (%s)." msgstr "Gặp lỗi khi lưu tập tin (%s)." -#: ../src/document.c:1925 +#: ../src/document.c:1928 #, c-format msgid "" "%s\n" @@ -803,37 +795,41 @@ "The file on disk may now be truncated!" msgstr "" -#: ../src/document.c:1951 +#: ../src/document.c:1930 +msgid "Error saving file." +msgstr "Gặp lỗi khi lưu tập tin." + +#: ../src/document.c:1954 #, c-format msgid "File %s saved." msgstr "Tập tin %s đã được lưu." -#: ../src/document.c:2019 ../src/document.c:2076 ../src/document.c:2084 +#: ../src/document.c:2022 ../src/document.c:2079 ../src/document.c:2087 #, c-format msgid "\"%s\" was not found." msgstr "Không tìm thấy « %s »." -#: ../src/document.c:2084 +#: ../src/document.c:2087 msgid "Wrap search and find again?" msgstr "Cuộn qua việc tìm và tìm lại không?" -#: ../src/document.c:2163 ../src/search.c:1146 ../src/search.c:1190 +#: ../src/document.c:2166 ../src/search.c:1146 ../src/search.c:1190 #: ../src/search.c:1882 ../src/search.c:1883 #, c-format msgid "No matches found for \"%s\"." msgstr "Không tìm thấy cái nào tương ứng với « %s »." -#: ../src/document.c:2174 ../src/document.c:2183 +#: ../src/document.c:2177 ../src/document.c:2186 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: mới thay thế %d lần gặp « %s » bằng « %s »." -#: ../src/document.c:2997 +#: ../src/document.c:3000 msgid "Do you want to reload it?" msgstr "Bạn có muốn tải lại nó không?" -#: ../src/document.c:2998 +#: ../src/document.c:3001 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -842,15 +838,15 @@ "Tập tin « %s » nằm trên đĩa là mới hơn\n" "bộ đệm hiện thời." -#: ../src/document.c:3016 +#: ../src/document.c:3019 msgid "Close _without saving" msgstr "" -#: ../src/document.c:3019 +#: ../src/document.c:3022 msgid "Try to resave the file?" msgstr "Thử lưu lại tập tin ?" -#: ../src/document.c:3020 +#: ../src/document.c:3023 #, fuzzy, c-format msgid "File \"%s\" was not found on disk!" msgstr "Không tìm thấy tập tin « %s » trên đĩa." @@ -1008,8 +1004,8 @@ msgid "%s file" msgstr "Tập tin %s" -#: ../src/filetypes.c:99 ../src/filetypes.c:1553 ../src/interface.c:3816 -#: ../src/interface.c:5435 +#: ../src/filetypes.c:99 ../src/filetypes.c:1553 ../src/interface.c:3852 +#: ../src/interface.c:5475 msgid "None" msgstr "Không có" @@ -1086,7 +1082,7 @@ msgid "untitled" msgstr "không tên" -#: ../src/highlighting.c:3595 ../src/main.c:814 ../src/socket.c:165 +#: ../src/highlighting.c:3595 ../src/main.c:815 ../src/socket.c:165 #: ../src/templates.c:315 #, c-format msgid "Could not find file '%s'." @@ -1101,571 +1097,571 @@ msgid "_Color Schemes" msgstr "Bảng _chọn màu" -#: ../src/interface.c:323 +#: ../src/interface.c:324 msgid "_File" msgstr "_Tập tin" -#: ../src/interface.c:334 +#: ../src/interface.c:335 msgid "New (with _Template)" msgstr "Mới (dùng Mẫ_u)" -#: ../src/interface.c:351 ../src/interface.c:2332 +#: ../src/interface.c:352 ../src/interface.c:2346 msgid "Open Selected F_ile" msgstr "Mở tập t_in đã chọn" -#: ../src/interface.c:355 +#: ../src/interface.c:356 msgid "Recent _Files" msgstr "Tập tin _gần đây" -#: ../src/interface.c:372 +#: ../src/interface.c:373 msgid "Save A_ll" msgstr "Lưu tất _cả" -#: ../src/interface.c:388 +#: ../src/interface.c:389 msgid "R_eload As" msgstr "Tải lại _dạng" -#: ../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 "vô hình" -#: ../src/interface.c:416 +#: ../src/interface.c:417 msgid "Page Set_up" msgstr "Thiết lập tr_ang" -#: ../src/interface.c:433 ../src/notebook.c:214 +#: ../src/interface.c:434 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Đóng các tập tin k_hác" -#: ../src/interface.c:441 ../src/notebook.c:219 +#: ../src/interface.c:442 ../src/notebook.c:219 msgid "C_lose All" msgstr "Đóng tất _cả" -#: ../src/interface.c:458 ../src/interface.c:2231 +#: ../src/interface.c:459 ../src/interface.c:2241 msgid "_Edit" msgstr "_Sửa" -#: ../src/interface.c:508 +#: ../src/interface.c:509 #, fuzzy msgid "_Commands" msgstr "Lệnh" -#: ../src/interface.c:515 ../src/keybindings.c:311 +#: ../src/interface.c:516 ../src/keybindings.c:311 #, fuzzy msgid "_Cut Current Line(s)" msgstr "Cắt các dòng hiện tại" -#: ../src/interface.c:523 ../src/keybindings.c:308 +#: ../src/interface.c:524 ../src/keybindings.c:308 #, fuzzy msgid "_Copy Current Line(s)" msgstr "Chép các dòng hiện tại" -#: ../src/interface.c:531 ../src/keybindings.c:263 +#: ../src/interface.c:532 ../src/keybindings.c:263 #, fuzzy msgid "_Delete Current Line(s)" msgstr "Xoá các dòng hiện tại" -#: ../src/interface.c:535 ../src/keybindings.c:260 +#: ../src/interface.c:536 ../src/keybindings.c:260 #, fuzzy msgid "_Duplicate Line or Selection" msgstr "_Nhân đôi dòng hay vùng chọn" -#: ../src/interface.c:544 ../src/keybindings.c:321 +#: ../src/interface.c:545 ../src/keybindings.c:321 #, fuzzy msgid "_Select Current Line(s)" msgstr "Chọn các dòng hiện tại" -#: ../src/interface.c:548 ../src/keybindings.c:324 +#: ../src/interface.c:549 ../src/keybindings.c:324 #, fuzzy msgid "_Select Current Paragraph" msgstr "Chọn đoạn văn hiện tại" -#: ../src/interface.c:557 ../src/keybindings.c:363 +#: ../src/interface.c:558 ../src/keybindings.c:363 msgid "_Send Selection to Terminal" msgstr "_Gửi vùng chọn cho Thiết bị cuối" -#: ../src/interface.c:561 ../src/interface.c:2235 +#: ../src/interface.c:562 ../src/interface.c:2245 msgid "_Format" msgstr "Định _dạng" -#: ../src/interface.c:568 ../src/keybindings.c:365 +#: ../src/interface.c:569 ../src/keybindings.c:365 #, fuzzy msgid "_Reflow Lines/Block" msgstr "Cuộn lại dòng/khối" -#: ../src/interface.c:572 ../src/keybindings.c:335 +#: ../src/interface.c:573 ../src/keybindings.c:335 msgid "T_oggle Case of Selection" msgstr "Chuyển đổi chữ h_oa/thường của vùng chọn" -#: ../src/interface.c:576 ../src/keybindings.c:270 +#: ../src/interface.c:577 ../src/keybindings.c:270 #, fuzzy msgid "_Transpose Current Line" msgstr "Chuyển vị dòng hiện tại" -#: ../src/interface.c:585 +#: ../src/interface.c:586 msgid "_Comment Line(s)" msgstr "Ghi _chú dòng" -#: ../src/interface.c:589 +#: ../src/interface.c:590 msgid "U_ncomment Line(s)" msgstr "Hủy ghi chú dò_ng" -#: ../src/interface.c:593 +#: ../src/interface.c:594 msgid "_Toggle Line Commentation" msgstr "Bật/_tắt ghi chú dòng" -#: ../src/interface.c:602 +#: ../src/interface.c:603 msgid "_Increase Indent" msgstr "_Thụt lề thêm" -#: ../src/interface.c:610 +#: ../src/interface.c:611 msgid "_Decrease Indent" msgstr "Thụt lề _kém" -#: ../src/interface.c:618 ../src/keybindings.c:354 +#: ../src/interface.c:619 ../src/keybindings.c:354 #, fuzzy msgid "_Smart Line Indent" msgstr "Thụt lề dòng khéo" -#: ../src/interface.c:627 +#: ../src/interface.c:628 msgid "_Send Selection to" msgstr "_Gửi vùng chọn cho" -#: ../src/interface.c:642 +#: ../src/interface.c:643 msgid "I_nsert Comments" msgstr "Chè_n chú thích" -#: ../src/interface.c:653 ../src/interface.c:2246 +#: ../src/interface.c:654 ../src/interface.c:2260 msgid "Insert _ChangeLog Entry" msgstr "_Chèn mục nhập ChangeLog" -#: ../src/interface.c:657 ../src/interface.c:2250 +#: ../src/interface.c:658 ../src/interface.c:2264 msgid "Insert _Function Description" msgstr "Chèn _mô tả hàm" -#: ../src/interface.c:661 ../src/interface.c:2254 +#: ../src/interface.c:662 ../src/interface.c:2268 msgid "Insert _Multiline Comment" msgstr "Chèn _ghi chú đa dòng" -#: ../src/interface.c:670 ../src/interface.c:2269 +#: ../src/interface.c:671 ../src/interface.c:2283 msgid "Insert File _Header" msgstr "Chèn p_hần đầu tập tin" -#: ../src/interface.c:674 ../src/interface.c:2273 +#: ../src/interface.c:675 ../src/interface.c:2287 msgid "Insert _GPL Notice" msgstr "Chèn thông báo _GPL" -#: ../src/interface.c:678 ../src/interface.c:2277 +#: ../src/interface.c:679 ../src/interface.c:2291 msgid "Insert _BSD License Notice" msgstr "Chèn thông báo giấy phép _BSD" -#: ../src/interface.c:682 ../src/interface.c:2286 +#: ../src/interface.c:683 ../src/interface.c:2300 msgid "Insert Dat_e" msgstr "Chèn ngà_y" -#: ../src/interface.c:696 ../src/interface.c:2300 +#: ../src/interface.c:697 ../src/interface.c:2314 msgid "_Insert \"include <...>\"" msgstr "Chèn \"_include <...>\"" -#: ../src/interface.c:715 +#: ../src/interface.c:711 ../src/interface.c:2333 ../src/keybindings.c:374 +#, fuzzy +msgid "_Insert Alternative White Space" +msgstr "Chèn khoảng trắng xen kẽ" + +#: ../src/interface.c:720 msgid "Preference_s" msgstr "Tù_y thích" -#: ../src/interface.c:723 ../src/keybindings.c:386 +#: ../src/interface.c:728 ../src/keybindings.c:387 #, fuzzy msgid "P_lugin Preferences" msgstr "Tùy thích" -#: ../src/interface.c:731 ../src/interface.c:2323 +#: ../src/interface.c:736 ../src/interface.c:2337 msgid "_Search" msgstr "_Tìm" -#: ../src/interface.c:742 +#: ../src/interface.c:747 msgid "Find _Next" msgstr "Tìm tiế_p" -#: ../src/interface.c:746 +#: ../src/interface.c:751 msgid "Find _Previous" msgstr "Tìm t_rước" -#: ../src/interface.c:755 +#: ../src/interface.c:760 msgid "Find in F_iles" msgstr "Tìm trong tập t_in" -#: ../src/interface.c:763 ../src/search.c:562 +#: ../src/interface.c:768 ../src/search.c:562 msgid "_Replace" msgstr "Tha_y thế" -#: ../src/interface.c:776 +#: ../src/interface.c:781 msgid "Next _Message" msgstr "Thông điệp tiế_p" -#: ../src/interface.c:784 +#: ../src/interface.c:789 msgid "Pr_evious Message" msgstr "Thông điệp t_rước" -#: ../src/interface.c:797 ../src/keybindings.c:433 +#: ../src/interface.c:802 ../src/keybindings.c:434 #, fuzzy msgid "_Go to Next Marker" msgstr "Tới dấu tiếp" -#: ../src/interface.c:801 ../src/keybindings.c:436 +#: ../src/interface.c:806 ../src/keybindings.c:437 #, fuzzy msgid "_Go to Previous Marker" msgstr "Về dấu trước" -#: ../src/interface.c:810 +#: ../src/interface.c:815 msgid "_Go to Line" msgstr "Tới dòn_g" -#: ../src/interface.c:818 ../src/interface.c:2258 +#: ../src/interface.c:823 ../src/interface.c:2272 ../src/interface.c:3528 msgid "_More" msgstr "" -#: ../src/interface.c:825 ../src/keybindings.c:398 +#: ../src/interface.c:830 ../src/keybindings.c:399 #, fuzzy msgid "Find Next _Selection" -msgstr "Tìm vùng chọn tiếp" +msgstr "Tìm vùng _chọn tiếp" -#: ../src/interface.c:829 ../src/keybindings.c:400 +#: ../src/interface.c:834 ../src/keybindings.c:401 #, fuzzy msgid "Find Pre_vious Selection" -msgstr "Tìm vùng chọn trước" +msgstr "Tìm vùng _chọn trước" -#: ../src/interface.c:838 ../src/interface.c:2340 +#: ../src/interface.c:843 ../src/interface.c:2354 msgid "Find _Usage" -msgstr "Tìm cách _sử dụng" +msgstr "Tìm chỗ _sử dụng" -#: ../src/interface.c:842 ../src/interface.c:2348 +#: ../src/interface.c:847 ../src/interface.c:2362 msgid "Find _Document Usage" -msgstr "Tìm cách sử _dụng tài liệu" +msgstr "Tìm chỗ sử _dụng trong tài liệu" # Literal: don't translate/Nghĩa chữ : đừng dịch -#: ../src/interface.c:851 ../src/keybindings.c:415 +#: ../src/interface.c:856 ../src/keybindings.c:416 #, fuzzy msgid "_Mark All" msgstr "Đánh dấu tất cả" -#: ../src/interface.c:860 ../src/interface.c:2356 +#: ../src/interface.c:865 ../src/interface.c:2370 msgid "Go to _Tag Definition" -msgstr "_Tới lời xác định thẻ" +msgstr "Tới định _nghĩa thẻ" -#: ../src/interface.c:864 +#: ../src/interface.c:869 msgid "Go to T_ag Declaration" -msgstr "Tớ_i lời tuyên bố thẻ" +msgstr "Tới _khai báo thẻ" -#: ../src/interface.c:875 +#: ../src/interface.c:880 msgid "Change _Font" msgstr "Đổi _phông" -#: ../src/interface.c:888 +#: ../src/interface.c:893 msgid "To_ggle All Additional Widgets" msgstr "Bật/tắt mọi ô điều khiển bổ sun_g" -#: ../src/interface.c:892 +#: ../src/interface.c:897 msgid "Full_screen" msgstr "T_oàn màn hình" -#: ../src/interface.c:896 +#: ../src/interface.c:901 msgid "Show Message _Window" msgstr "Hiện cửa _sổ thông điệp" -#: ../src/interface.c:901 +#: ../src/interface.c:906 msgid "Show _Toolbar" msgstr "Hiện _thanh công cụ" -#: ../src/interface.c:906 +#: ../src/interface.c:911 msgid "Show Side_bar" msgstr "Hiện khung _lề" -#: ../src/interface.c:911 ../src/interface.c:4247 ../src/interface.c:5576 +#: ../src/interface.c:916 ../src/interface.c:4283 ../src/interface.c:5616 #: ../src/keybindings.c:253 ../src/prefs.c:1557 msgid "Editor" msgstr "Trình soạn thảo" -#: ../src/interface.c:918 +#: ../src/interface.c:923 msgid "Show _Markers Margin" msgstr "Hiện lề đánh _dấu" -#: ../src/interface.c:923 +#: ../src/interface.c:928 msgid "Show _Line Numbers" msgstr "Hiện _số hiệu dòng" -#: ../src/interface.c:928 +#: ../src/interface.c:933 msgid "Show _White Space" msgstr "Hiện kh_oảng trắng" -#: ../src/interface.c:932 +#: ../src/interface.c:937 msgid "Show Line _Endings" msgstr "Hiện _kết thúc dòng" -#: ../src/interface.c:936 +#: ../src/interface.c:941 msgid "Show _Indentation Guides" msgstr "H_iện nét dẫn thụt lề" -#: ../src/interface.c:957 +#: ../src/interface.c:962 msgid "_Document" msgstr "_Tài liệu" -#: ../src/interface.c:964 +#: ../src/interface.c:969 msgid "_Line Wrapping" msgstr "N_gắt dòng" -#: ../src/interface.c:969 +#: ../src/interface.c:974 msgid "Line _Breaking" msgstr "N_gắt dòng" -#: ../src/interface.c:973 +#: ../src/interface.c:978 msgid "_Auto-indentation" msgstr "_Tự động thụt lề" -#: ../src/interface.c:978 +#: ../src/interface.c:983 msgid "In_dent Type" msgstr "_Kiểu thụt lề" -#: ../src/interface.c:985 ../src/interface.c:3855 ../src/interface.c:5474 +#: ../src/interface.c:990 ../src/interface.c:3891 ../src/interface.c:5514 msgid "_Tabs" msgstr "_Tab" -#: ../src/interface.c:991 ../src/interface.c:3846 ../src/interface.c:5465 +#: ../src/interface.c:996 ../src/interface.c:3882 ../src/interface.c:5505 msgid "_Spaces" msgstr "_Dấu cách" -#: ../src/interface.c:997 ../src/interface.c:3864 ../src/interface.c:5483 +#: ../src/interface.c:1002 ../src/interface.c:3900 ../src/interface.c:5523 msgid "T_abs and Spaces" msgstr "T_ab và Dấu cách" -#: ../src/interface.c:1003 +#: ../src/interface.c:1008 msgid "Indent Widt_h" -msgstr "" +msgstr "Độ _rộng thụt lề" -#: ../src/interface.c:1010 +#: ../src/interface.c:1015 msgid "_1" msgstr "" -#: ../src/interface.c:1016 +#: ../src/interface.c:1021 msgid "_2" msgstr "" -#: ../src/interface.c:1022 +#: ../src/interface.c:1027 msgid "_3" msgstr "" -#: ../src/interface.c:1028 +#: ../src/interface.c:1033 msgid "_4" msgstr "" -#: ../src/interface.c:1034 +#: ../src/interface.c:1039 msgid "_5" msgstr "" -#: ../src/interface.c:1040 +#: ../src/interface.c:1045 msgid "_6" msgstr "" -#: ../src/interface.c:1046 +#: ../src/interface.c:1051 msgid "_7" msgstr "" -#: ../src/interface.c:1052 +#: ../src/interface.c:1057 msgid "_8" msgstr "" -#: ../src/interface.c:1063 +#: ../src/interface.c:1068 msgid "Read _Only" msgstr "_Chỉ đọc" -#: ../src/interface.c:1067 +#: ../src/interface.c:1072 msgid "_Write Unicode BOM" msgstr "Ghi _BOM Unicode" -#: ../src/interface.c:1076 +#: ../src/interface.c:1081 msgid "Set File_type" msgstr "Đặt kiểu _tập tin" -#: ../src/interface.c:1086 +#: ../src/interface.c:1091 msgid "Set _Encoding" msgstr "Đặt _bảng mã" -#: ../src/interface.c:1096 +#: ../src/interface.c:1101 msgid "Set Line E_ndings" msgstr "Đặt kết thúc dò_ng" -#: ../src/interface.c:1103 +#: ../src/interface.c:1108 msgid "Convert and Set to _CR/LF (Win)" msgstr "Chuyển đổi và đặt thành _CR/LF (Win)" -#: ../src/interface.c:1109 +#: ../src/interface.c:1114 msgid "Convert and Set to _LF (Unix)" msgstr "Chuyển đổi và đặt thành _LF (UNIX)" -#: ../src/interface.c:1115 +#: ../src/interface.c:1120 msgid "Convert and Set to CR (_Mac)" msgstr "Chuyển đổi và đặt thành CR (_Mac)" -#: ../src/interface.c:1126 +#: ../src/interface.c:1131 msgid "_Strip Trailing Spaces" msgstr "Bỏ dấu cách theo _sau" -#: ../src/interface.c:1130 +#: ../src/interface.c:1135 msgid "_Replace Tabs by Spaces" msgstr "Tha_y thế các tab bằng dấu cách" -#: ../src/interface.c:1134 +#: ../src/interface.c:1139 msgid "Replace Spaces b_y Tabs" msgstr "Tha_y thế các dấu cách bằng Tab" -#: ../src/interface.c:1143 +#: ../src/interface.c:1148 msgid "_Fold All" msgstr "_Gấp tất cả" -#: ../src/interface.c:1147 +#: ../src/interface.c:1152 msgid "_Unfold All" msgstr "_Mở lại tất cả" -#: ../src/interface.c:1156 +#: ../src/interface.c:1161 msgid "Remove _Markers" msgstr "Bỏ _dấu" -#: ../src/interface.c:1160 +#: ../src/interface.c:1165 msgid "Remove Error _Indicators" msgstr "Bỏ mọi cá_i chỉ lỗi" -#: ../src/interface.c:1164 +#: ../src/interface.c:1169 msgid "_Project" msgstr "_Dự án" -#: ../src/interface.c:1171 +#: ../src/interface.c:1176 msgid "_New" msgstr "Mớ_i" -#: ../src/interface.c:1179 +#: ../src/interface.c:1184 msgid "_Open" msgstr "_Mở" -#: ../src/interface.c:1187 +#: ../src/interface.c:1192 msgid "_Recent Projects" msgstr "Dự án _vừa mở" -#: ../src/interface.c:1191 +#: ../src/interface.c:1196 msgid "_Close" msgstr "Đón_g" -#: ../src/interface.c:1213 +#: ../src/interface.c:1218 #, fuzzy msgid "_Apply Default Indentation" msgstr "_Tự động thụt lề" -#: ../src/interface.c:1216 +#: ../src/interface.c:1221 msgid "Apply the default indentation settings to all documents" -msgstr "" +msgstr "Áp dụng thiết lập mặc định cho _mọi tài liệu" -#: ../src/interface.c:1222 +#: ../src/interface.c:1227 msgid "_Tools" msgstr "_Công cụ" -#: ../src/interface.c:1229 +#: ../src/interface.c:1234 msgid "_Reload Configuration" msgstr "Nạp _lại cấu hình" -#: ../src/interface.c:1237 +#: ../src/interface.c:1242 msgid "C_onfiguration Files" msgstr "Tập tin Cấ_u hình" -#: ../src/interface.c:1250 +#: ../src/interface.c:1255 msgid "_Color Chooser" msgstr "Bảng _chọn màu" -#: ../src/interface.c:1258 +#: ../src/interface.c:1263 msgid "_Word Count" msgstr "_Tổng từ" -#: ../src/interface.c:1262 +#: ../src/interface.c:1267 msgid "Load Ta_gs" msgstr "Nạ_p thẻ" -#: ../src/interface.c:1266 ../src/interface.c:1273 +#: ../src/interface.c:1271 ../src/interface.c:1278 msgid "_Help" msgstr "Trợ _giúp" -#: ../src/interface.c:1281 +#: ../src/interface.c:1286 msgid "_Website" msgstr "Chỗ _Mạng" -#: ../src/interface.c:1285 +#: ../src/interface.c:1290 msgid "_Keyboard Shortcuts" msgstr "_Phím tắt" -#: ../src/interface.c:1289 +#: ../src/interface.c:1294 msgid "_Debug Messages" msgstr "Thông điệp _Gỡ lỗi" -#: ../src/interface.c:1328 ../src/sidebar.c:132 +#: ../src/interface.c:1333 ../src/sidebar.c:132 msgid "Symbols" msgstr "Ký hiệu" -#: ../src/interface.c:1342 +#: ../src/interface.c:1347 msgid "Documents" msgstr "Tài liệu" -#: ../src/interface.c:1378 +#: ../src/interface.c:1383 msgid "Status" msgstr "Trạng thái" -#: ../src/interface.c:1392 +#: ../src/interface.c:1397 msgid "Compiler" msgstr "Bộ biên dịch" -#: ../src/interface.c:1407 +#: ../src/interface.c:1412 msgid "Messages" msgstr "Thông điệp" -#: ../src/interface.c:1420 +#: ../src/interface.c:1425 msgid "Scribble" msgstr "Viết tháu" -#: ../src/interface.c:2094 +#: ../src/interface.c:2103 #, fuzzy msgid "_Toolbar Preferences" msgstr "Tùy thích" -#: ../src/interface.c:2107 +#: ../src/interface.c:2116 msgid "_Hide Toolbar" msgstr "Ẩn t_hanh công cụ" -#: ../src/interface.c:2239 +#: ../src/interface.c:2249 #, fuzzy msgid "I_nsert" msgstr "Chèn" -#: ../src/interface.c:2319 ../src/keybindings.c:374 -#, fuzzy -msgid "_Insert Alternative White Space" -msgstr "Chèn khoảng trắng xen kẽ" - -#: ../src/interface.c:2364 +#: ../src/interface.c:2378 msgid "Conte_xt Action" -msgstr "Hành _vị Ngữ cảnh" +msgstr "Hành động N_gữ cảnh" -#: ../src/interface.c:2885 ../src/keybindings.c:383 +#: ../src/interface.c:2904 ../src/keybindings.c:384 msgid "Preferences" msgstr "Tùy thích" -#: ../src/interface.c:2921 +#: ../src/interface.c:2940 msgid "Load files from the last session" msgstr "Tải các tập tin từ phiên chạy trước" -#: ../src/interface.c:2924 +#: ../src/interface.c:2943 msgid "Opens at startup the files from the last session" msgstr "Khi khởi chạy, mở những tập tin từ phiên chạy cuối cùng" -#: ../src/interface.c:2926 +#: ../src/interface.c:2945 msgid "Load virtual terminal support" msgstr "Nạp hỗ trợ thiết bị cuối ảo" -#: ../src/interface.c:2928 +#: ../src/interface.c:2947 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1673,39 +1669,39 @@ "Mô phỏng thiết bị cuối ảo (VTE) có nên được nạp khi khởi chạy chương trình " "hay không. Không cần thì tắt tùy chọn này." -#: ../src/interface.c:2930 +#: ../src/interface.c:2949 msgid "Enable plugin support" msgstr "Bật hỗ trợ phần bổ sung" -#: ../src/interface.c:2934 +#: ../src/interface.c:2953 msgid "Startup" msgstr "Khởi chạy" -#: ../src/interface.c:2953 +#: ../src/interface.c:2972 msgid "Save window position and geometry" msgstr "Lưu vị trí và dạng hình cửa sổ" -#: ../src/interface.c:2956 +#: ../src/interface.c:2975 msgid "Saves the window position and geometry and restores it at the start" msgstr "Lư vị trí và dạng hình của cửa sổ, và phục hồi lại khi khởi chạy" -#: ../src/interface.c:2958 +#: ../src/interface.c:2977 msgid "Confirm exit" msgstr "Xác nhận thoát" -#: ../src/interface.c:2961 +#: ../src/interface.c:2980 msgid "Shows a confirmation dialog on exit" msgstr "Hiển thị hộp thoại xác nhận khi thoát" -#: ../src/interface.c:2963 +#: ../src/interface.c:2982 msgid "Shutdown" msgstr "Tắt máy" -#: ../src/interface.c:2984 +#: ../src/interface.c:3003 msgid "Startup path:" msgstr "Đường dẫn khởi chạy:" -#: ../src/interface.c:2996 +#: ../src/interface.c:3015 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1713,19 +1709,19 @@ "Đường dẫn đầu tiên khi mở/lưu tập tin. Phải là đường dẫn tuyệt đối. Bỏ rỗng " "để sử dụng thư mục làm việc hiện thời." -#: ../src/interface.c:3009 +#: ../src/interface.c:3028 msgid "Project files:" msgstr "Tập tin dự án:" -#: ../src/interface.c:3021 +#: ../src/interface.c:3040 msgid "Path to start in when opening project files" msgstr "Đường dẫn trong đó cần bắt đầu khi mở tập tin dự án" -#: ../src/interface.c:3034 +#: ../src/interface.c:3053 msgid "Extra plugin path:" msgstr "Đường dẫn phần bổ sung khác:" -#: ../src/interface.c:3046 +#: ../src/interface.c:3065 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1735,30 +1731,30 @@ "hình. Gõ thêm đường dẫn vào đây thì cũng tìm phần bổ sung qua nó. Bỏ trống " "để tắt." -#: ../src/interface.c:3059 +#: ../src/interface.c:3078 msgid "Paths" msgstr "Đường dẫn" -#: ../src/interface.c:3064 +#: ../src/interface.c:3083 msgid "Startup" msgstr "Khởi chạy" -#: ../src/interface.c:3087 +#: ../src/interface.c:3106 msgid "Beep on errors or when compilation has finished" msgstr "Bíp khi gặp lỗi, hay khi biên dịch xong" -#: ../src/interface.c:3090 +#: ../src/interface.c:3109 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "Có nên kêu bíp nếu gặp lỗi, hoặc khi tiến trình biên dịch mới hoàn tất" -#: ../src/interface.c:3092 +#: ../src/interface.c:3111 msgid "Switch to status message list at new message" msgstr "" "Chuyển đổi sang danh sách thông điệp trạng thái khi nhận thông điệp mới" -#: ../src/interface.c:3095 +#: ../src/interface.c:3114 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1766,11 +1762,11 @@ "Chuyển đổi sang thanh thông điệp trạng thái (trong cửa sổ cuốn vở bên dưới) " "khi nhận thông điệp trạng thái mới." -#: ../src/interface.c:3097 +#: ../src/interface.c:3116 msgid "Suppress status messages in the status bar" msgstr "Đừng hiển thị thông điệp trạng thái trên thanh trạng thái" -#: ../src/interface.c:3100 +#: ../src/interface.c:3119 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1778,11 +1774,11 @@ "Gỡ bỏ mọi thông điệp khỏi thanh trạng thái. Các thông điệp này vẫn còn được " "hiển thị trong cửa sổ thông điệp trạng thái." -#: ../src/interface.c:3102 +#: ../src/interface.c:3121 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Tự động đặt tiêu điểm trên ô điều khiển (tiêu điểm theo con chuột)" -#: ../src/interface.c:3105 +#: ../src/interface.c:3124 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1792,25 +1788,25 @@ "được cho ô điều khiển trình soạn thảo chính, vùng viết tháu, ô tìm kiếm trên " "thanh công cụ, các trường đi tới dòng riêng, và VTE." -#: ../src/interface.c:3107 +#: ../src/interface.c:3126 msgid "Use Windows File Open/Save dialogs" msgstr "" -#: ../src/interface.c:3110 +#: ../src/interface.c:3129 msgid "" "Defines whether to use the native Windows File Open/Save dialogs or whether " "to use the GTK default dialogs" msgstr "" -#: ../src/interface.c:3112 ../src/interface.c:3491 ../src/interface.c:4457 +#: ../src/interface.c:3131 ../src/interface.c:3367 ../src/interface.c:4493 msgid "Miscellaneous" msgstr "Lặt vặt" -#: ../src/interface.c:3131 +#: ../src/interface.c:3150 msgid "Always wrap search and hide the Find dialog" msgstr "Luôn luôn cuộn việc tìm và ẩn hộp thoại Tìm" -#: ../src/interface.c:3134 +#: ../src/interface.c:3153 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1818,11 +1814,11 @@ "Lúc nào cũng cuộn vòng việc tìm qua tài liệu và ẩn hộp thoại Tìm sau khi " "nhấn vào mục Tìm tiếp/trước" -#: ../src/interface.c:3136 +#: ../src/interface.c:3155 msgid "Use the current word under the cursor for Find dialogs" msgstr "Dùng từ hiện thời nằm dưới con trỏ cho các hộp thoại Tìm" -#: ../src/interface.c:3139 +#: ../src/interface.c:3158 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1830,19 +1826,19 @@ "Dùng từ hiện thời nằm dưới con trỏ khi mở hộp thoại kiểu Tìm, Tìm trong Tập " "tin, hay Thay thế mà không có chuỗi đã chọn" -#: ../src/interface.c:3141 +#: ../src/interface.c:3160 msgid "Use the current file's directory for Find in Files" msgstr "Dùng thư mục của tập tin hiện thời khi Tìm trong Tập tin" -#: ../src/interface.c:3145 +#: ../src/interface.c:3164 msgid "Search" msgstr "Tìm kiếm" -#: ../src/interface.c:3164 +#: ../src/interface.c:3183 msgid "Use project-based session files" msgstr "Dùng tập tin phiên chạy dựa vào dự án" -#: ../src/interface.c:3167 +#: ../src/interface.c:3186 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1850,11 +1846,11 @@ "Có nên cất giữ các tập tin phiên chạy của dự án, và mở lại chúng khi lại mở " "dự án đó, hay không" -#: ../src/interface.c:3169 +#: ../src/interface.c:3188 msgid "Store project file inside the project base directory" msgstr "Lưu tập tin dự án vào thư mục cơ bản của dự án" -#: ../src/interface.c:3172 +#: ../src/interface.c:3191 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1866,11 +1862,11 @@ "vẫn còn có khả năng thay đổi đường dẫn của tập tin dự án trong hộp thoại Dự " "án Mới." -#: ../src/interface.c:3174 +#: ../src/interface.c:3193 msgid "Projects" msgstr "Dự án" -#: ../src/interface.c:3179 +#: ../src/interface.c:3198 msgid "Miscellaneous" msgstr "Linh tinh" @@ -1878,87 +1874,99 @@ #. * corresponding chapter in the documentation, comparing translatable #. * strings is easy to break. Maybe attach an identifying string to the #. * tab label object. -#: ../src/interface.c:3183 ../src/prefs.c:1551 +#: ../src/interface.c:3202 ../src/prefs.c:1551 msgid "General" msgstr "Chung" -#: ../src/interface.c:3220 +#: ../src/interface.c:3243 msgid "Show symbol list" msgstr "Hiện danh sách ký hiệu" -#: ../src/interface.c:3223 +#: ../src/interface.c:3246 msgid "Toggle the symbol list on and off" msgstr "Hiện/ẩn danh sách ký hiệu" -#: ../src/interface.c:3225 +#: ../src/interface.c:3248 msgid "Show documents list" msgstr "Hiện danh sách tài liệu" -#: ../src/interface.c:3228 +#: ../src/interface.c:3251 msgid "Toggle the documents list on and off" msgstr "Hiện/ẩn danh sách tài liệu" -#: ../src/interface.c:3230 +#: ../src/interface.c:3253 #, fuzzy msgid "Show sidebar" msgstr "Hiện khung _lề" -#: ../src/interface.c:3238 +#: ../src/interface.c:3261 #, fuzzy msgid "Position:" msgstr "Mô tả:" -#: ../src/interface.c:3242 ../src/interface.c:3365 ../src/interface.c:3426 -#: ../src/interface.c:3444 ../src/interface.c:3462 +#: ../src/interface.c:3265 ../src/interface.c:3421 ../src/interface.c:3482 +#: ../src/interface.c:3500 ../src/interface.c:3518 msgid "Left" msgstr "Trái" -#: ../src/interface.c:3249 ../src/interface.c:3373 ../src/interface.c:3427 -#: ../src/interface.c:3445 ../src/interface.c:3463 +#: ../src/interface.c:3272 ../src/interface.c:3429 ../src/interface.c:3483 +#: ../src/interface.c:3501 ../src/interface.c:3519 msgid "Right" msgstr "Phải" -#: ../src/interface.c:3255 +#: ../src/interface.c:3278 msgid "Sidebar" msgstr "Khung lề" -#: ../src/interface.c:3276 +#: ../src/interface.c:3299 msgid "Symbol list:" msgstr "Danh sách ký hiệu :" -#: ../src/interface.c:3283 ../src/interface.c:3413 +#: ../src/interface.c:3306 ../src/interface.c:3469 msgid "Message window:" msgstr "Cửa sổ thông điệp:" -#: ../src/interface.c:3290 ../src/interface.c:3449 +#: ../src/interface.c:3313 ../src/interface.c:3505 msgid "Editor:" msgstr "Bộ soạn thảo :" -#: ../src/interface.c:3302 +#: ../src/interface.c:3325 msgid "Sets the font for the message window" msgstr "Đặt phông chữ cho cửa sổ thông điệp" -#: ../src/interface.c:3310 +#: ../src/interface.c:3333 msgid "Sets the font for the symbol list" msgstr "Đặt phông chữ cho danh sách các ký hiệu" -#: ../src/interface.c:3318 +#: ../src/interface.c:3341 msgid "Sets the editor font" msgstr "Đặt phông soạn thảo" -#: ../src/interface.c:3320 +#: ../src/interface.c:3343 msgid "Fonts" msgstr "Phông" -#: ../src/interface.c:3339 +#: ../src/interface.c:3362 +msgid "Show status bar" +msgstr "Hiện thanh trạng thái" + +#: ../src/interface.c:3365 +msgid "Whether to show the status bar at the bottom of the main window" +msgstr "Có nên hiển thị thanh trạng thái ở dưới cửa sổ chính hay không" + +#: ../src/interface.c:3372 ../src/interface.c:3532 ../src/prefs.c:1553 +msgid "Interface" +msgstr "Giao diện" + +#: ../src/interface.c:3395 msgid "Show editor tabs" msgstr "Hiện các thanh soạn thảo" -#: ../src/interface.c:3343 +#: ../src/interface.c:3399 msgid "Show close buttons" msgstr "Hiện nút Đóng" -#: ../src/interface.c:3346 +#: ../src/interface.c:3402 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1966,141 +1974,129 @@ "Hiển thị một cái nút chữ thập nhỏ trên mỗi thẻ tập tin: nhấn vào thì dễ đóng " "tập tin (tùy chọn này yêu cầu khởi chạy lại Geany)" -#: ../src/interface.c:3352 +#: ../src/interface.c:3408 msgid "Placement of new file tabs:" msgstr "Vị trí thanh tập tin mới:" -#: ../src/interface.c:3368 +#: ../src/interface.c:3424 msgid "File tabs will be placed on the left of the notebook" msgstr "Các thanh tập tin mới sẽ nằm bên trái cuốn vở" -#: ../src/interface.c:3376 +#: ../src/interface.c:3432 msgid "File tabs will be placed on the right of the notebook" msgstr "Các thanh tập tin mới sẽ nằm bên phải cuốn vở" -#: ../src/interface.c:3380 +#: ../src/interface.c:3436 #, fuzzy msgid "Next to current" msgstr "Lưu tập tin hiện thời" -#: ../src/interface.c:3385 +#: ../src/interface.c:3441 msgid "" "Whether to place file tabs next to the current tab rather than at the edges " "of the notebook" msgstr "" -#: ../src/interface.c:3387 +#: ../src/interface.c:3443 msgid "Double-clicking hides all additional widgets" msgstr "Nhấn đôi thì ẩn mọi ô điều khiển bổ sung" -#: ../src/interface.c:3390 +#: ../src/interface.c:3446 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Gọi chức năng Xem > Bật/tắt mọi ô điều khiển bổ sung" -#: ../src/interface.c:3392 +#: ../src/interface.c:3448 msgid "Editor tabs" msgstr "Thẻ trình soạn thảo" -#: ../src/interface.c:3428 ../src/interface.c:3446 ../src/interface.c:3464 +#: ../src/interface.c:3484 ../src/interface.c:3502 ../src/interface.c:3520 msgid "Top" msgstr "Trên" -#: ../src/interface.c:3429 ../src/interface.c:3447 ../src/interface.c:3465 +#: ../src/interface.c:3485 ../src/interface.c:3503 ../src/interface.c:3521 msgid "Bottom" msgstr "Dưới" -#: ../src/interface.c:3431 +#: ../src/interface.c:3487 msgid "Sidebar:" msgstr "Khung lề:" -#: ../src/interface.c:3467 +#: ../src/interface.c:3523 msgid "Tab positions" msgstr "Vị trí thẻ" -#: ../src/interface.c:3486 -msgid "Show status bar" -msgstr "Hiện thanh trạng thái" - -#: ../src/interface.c:3489 -msgid "Whether to show the status bar at the bottom of the main window" -msgstr "Có nên hiển thị thanh trạng thái ở dưới cửa sổ chính hay không" - -#: ../src/interface.c:3496 ../src/prefs.c:1553 -msgid "Interface" -msgstr "Giao diện" - -#: ../src/interface.c:3527 +#: ../src/interface.c:3563 msgid "Show T_oolbar" msgstr "Hiện Th_anh công cụ" -#: ../src/interface.c:3531 +#: ../src/interface.c:3567 msgid "_Append Toolbar to the Menu" msgstr "_Phụ thêm Thanh công cụ vào Trình đơn" -#: ../src/interface.c:3534 +#: ../src/interface.c:3570 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Gắn thanh công cụ với trình đơn chính để tiết kiệm sức chứa theo chiều dọc" -#: ../src/interface.c:3556 ../src/toolbar.c:930 +#: ../src/interface.c:3592 ../src/toolbar.c:930 msgid "Customize Toolbar" msgstr "Tùy chỉnh thanh công cụ" -#: ../src/interface.c:3576 +#: ../src/interface.c:3612 msgid "System _Default" msgstr "" -#: ../src/interface.c:3584 +#: ../src/interface.c:3620 msgid "Images _and Text" msgstr "Ảnh _và Nhãn" -#: ../src/interface.c:3592 +#: ../src/interface.c:3628 msgid "_Images Only" msgstr "_Chỉ ảnh" -#: ../src/interface.c:3600 +#: ../src/interface.c:3636 msgid "_Text Only" msgstr "Chỉ _nhãn" -#: ../src/interface.c:3608 +#: ../src/interface.c:3644 #, fuzzy msgid "Icon Style" msgstr "Phông" -#: ../src/interface.c:3629 +#: ../src/interface.c:3665 msgid "S_ystem Default" msgstr "" -#: ../src/interface.c:3637 +#: ../src/interface.c:3673 msgid "_Small Icons" msgstr "Biểu tượng _nhỏ" -#: ../src/interface.c:3645 +#: ../src/interface.c:3681 msgid "_Very Small Icons" msgstr "Biểu tượng _rất nhỏ" -#: ../src/interface.c:3653 +#: ../src/interface.c:3689 msgid "_Large Icons" msgstr "Biểu tượng _lớn" -#: ../src/interface.c:3661 +#: ../src/interface.c:3697 #, fuzzy msgid "Icon Size" msgstr "Cỡ :" -#: ../src/interface.c:3666 +#: ../src/interface.c:3702 msgid "Toolbar" msgstr "Thanh công cụ" -#: ../src/interface.c:3671 ../src/prefs.c:1555 +#: ../src/interface.c:3707 ../src/prefs.c:1555 msgid "Toolbar" msgstr "Thanh công cụ" -#: ../src/interface.c:3698 +#: ../src/interface.c:3734 msgid "Line wrapping" msgstr "Ngắt dòng" -#: ../src/interface.c:3701 +#: ../src/interface.c:3737 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -2110,12 +2106,12 @@ "năng ngắt dòng trong tài liệu lớn chiếm hiệu suất nhiều, vì vậy nó nên bị " "tắt trên máy chạy chậm." -#: ../src/interface.c:3703 +#: ../src/interface.c:3739 #, fuzzy msgid "\"Smart\" home key" msgstr "Bật phím Home khéo" -#: ../src/interface.c:3706 +#: ../src/interface.c:3742 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -2128,11 +2124,11 @@ "này thì phím HOME lúc nào cũng di chuyển về đầu của dòng hiện tại, bất chấp " "vị trí hiện thời." -#: ../src/interface.c:3708 +#: ../src/interface.c:3744 msgid "Disable Drag and Drop" msgstr "Tắt Kéo và Thả" -#: ../src/interface.c:3711 +#: ../src/interface.c:3747 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -2140,16 +2136,16 @@ "Tắt hoàn toàn khả năng Kéo và Thả trong cửa sổ soạn thảo nên không thể kéo " "và thả vùng chọn nào bên trong hay bên ngoài cửa sổ đó" -#: ../src/interface.c:3713 +#: ../src/interface.c:3749 #, fuzzy msgid "Code folding" msgstr "Bật gấp lại" -#: ../src/interface.c:3717 +#: ../src/interface.c:3753 msgid "Fold/unfold all children of a fold point" msgstr "Gấp lại/Mở ra mọi điểm con của một điểm gấp" -#: ../src/interface.c:3720 +#: ../src/interface.c:3756 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -2157,11 +2153,11 @@ "Gấp lại hay mở ra tất cả các điểm con của một điểm gấp. Ấn giữ phím Shift " "trong khi nhấn vào ký hiệu gấp để đảo ngược ứng xử này" -#: ../src/interface.c:3722 +#: ../src/interface.c:3758 msgid "Use indicators to show compile errors" msgstr "Dùng cái chỉ để hiển thị lỗi biên dịch" -#: ../src/interface.c:3725 +#: ../src/interface.c:3761 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -2169,23 +2165,23 @@ "Có nên dùng cái chỉ (dấu gạch dưới vặn vẹo) hay không để tô sáng mỗi dòng " "trên đó bộ biên dịch tìm cảnh báo hay lỗi" -#: ../src/interface.c:3727 +#: ../src/interface.c:3763 msgid "Newline strips trailing spaces" msgstr "Dòng mới bỏ dấu cách theo sau" -#: ../src/interface.c:3730 +#: ../src/interface.c:3766 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Hiệu lực dòng mới để bỏ các dấu cách theo sau trên dòng trước" -#: ../src/interface.c:3736 +#: ../src/interface.c:3772 msgid "Line breaking column:" msgstr "Cột ngắt dòng:" -#: ../src/interface.c:3750 +#: ../src/interface.c:3786 msgid "Comment toggle marker:" msgstr "Dấu bật/tắt ghi chú :" -#: ../src/interface.c:3757 +#: ../src/interface.c:3793 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -2193,64 +2189,64 @@ "Một chuỗi được thêm khi bật/tắt một ghi chú dòng trong một tập tin nguồn; nó " "dùng để đánh dấu ghi chú đã được bật/tắt." -#: ../src/interface.c:3759 +#: ../src/interface.c:3795 msgid "Features" msgstr "Tính năng" -#: ../src/interface.c:3764 +#: ../src/interface.c:3800 msgid "Features" msgstr "Tính năng" -#: ../src/interface.c:3777 +#: ../src/interface.c:3813 msgid "" "Note: To apply these settings to all currently open documents, use " "Project->Apply Default Indentation." msgstr "" -#: ../src/interface.c:3804 ../src/interface.c:5423 +#: ../src/interface.c:3840 ../src/interface.c:5463 msgid "Auto-indent mode:" msgstr "Chế độ tự động thụt lề:" -#: ../src/interface.c:3817 ../src/interface.c:5436 +#: ../src/interface.c:3853 ../src/interface.c:5476 msgid "Basic" msgstr "Cơ bản" -#: ../src/interface.c:3818 ../src/interface.c:5437 +#: ../src/interface.c:3854 ../src/interface.c:5477 msgid "Current chars" msgstr "Ký tự hiện thời" -#: ../src/interface.c:3819 ../src/interface.c:5438 +#: ../src/interface.c:3855 ../src/interface.c:5478 msgid "Match braces" msgstr "Khớp dấu ngoặc móc" -#: ../src/interface.c:3821 ../src/interface.c:4147 ../src/interface.c:5440 +#: ../src/interface.c:3857 ../src/interface.c:4183 ../src/interface.c:5480 msgid "Type:" msgstr "Kiểu :" -#: ../src/interface.c:3828 ../src/interface.c:5447 +#: ../src/interface.c:3864 ../src/interface.c:5487 msgid "Width:" msgstr "Rộng:" -#: ../src/interface.c:3841 ../src/interface.c:5460 +#: ../src/interface.c:3877 ../src/interface.c:5500 msgid "The width in chars of a single indent" msgstr "Chiều rộng theo ký tự của một khoảng thụt lề riêng lẻ" -#: ../src/interface.c:3851 ../src/interface.c:5470 +#: ../src/interface.c:3887 ../src/interface.c:5510 msgid "Use spaces when inserting indentation" msgstr "Dùng dấu cách khi chèn khoảng thụt lề" -#: ../src/interface.c:3860 ../src/interface.c:5479 +#: ../src/interface.c:3896 ../src/interface.c:5519 msgid "Use one tab per indent" msgstr "Thụt lề theo một khoảng tab" -#: ../src/interface.c:3869 ../src/interface.c:5488 +#: ../src/interface.c:3905 ../src/interface.c:5528 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Dùng các dấu cách nếu khoảng thụt lề vẫn nhỏ hơn chiều rộng của khoảng tab, " "không thì dùng cả hai" -#: ../src/interface.c:3878 ../src/interface.c:5497 +#: ../src/interface.c:3914 ../src/interface.c:5537 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -2258,30 +2254,30 @@ "Có nên phát hiện cách thụt lề dựa vào nội dung tập tin khi mở tập tin, hay " "không" -#: ../src/interface.c:3880 +#: ../src/interface.c:3916 msgid "Tab key indents" msgstr "Thụt lề phím Tab" -#: ../src/interface.c:3883 +#: ../src/interface.c:3919 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Bấm phím Tab hay Shift+Tab thì thụt lề hay bỏ thụt lề thay vào chèn một ký " "tự tab" -#: ../src/interface.c:3885 +#: ../src/interface.c:3921 msgid "Indentation" msgstr "Thụt lề" -#: ../src/interface.c:3890 ../src/interface.c:5499 +#: ../src/interface.c:3926 ../src/interface.c:5539 msgid "Indentation" msgstr "Thụt lề" -#: ../src/interface.c:3913 +#: ../src/interface.c:3949 msgid "Snippet completion" msgstr "Làm xong đoạn" -#: ../src/interface.c:3916 +#: ../src/interface.c:3952 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2289,20 +2285,20 @@ "Gõ một dãy ký tự ngắn đã định sẵn và bấm một phím nào đó để điền nốt chuỗi " "phức tạp hơn" -#: ../src/interface.c:3918 +#: ../src/interface.c:3954 #, fuzzy msgid "XML/HTML tag auto-closing" msgstr "Tự động điền nốt thẻ XML" -#: ../src/interface.c:3921 +#: ../src/interface.c:3957 msgid "Insert matching closing tag for XML/HTML" msgstr "" -#: ../src/interface.c:3923 +#: ../src/interface.c:3959 msgid "Automatic continuation of multi-line comments" msgstr "Tự động tiếp tục ghi chú đa dòng" -#: ../src/interface.c:3926 +#: ../src/interface.c:3962 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2310,11 +2306,11 @@ "Tự động tiếp tục ghi chú đa dòng bằng ngôn ngữ như C, C++ và Java khi xuống " "dòng bên trong một ghi chú như vậy" -#: ../src/interface.c:3928 +#: ../src/interface.c:3964 msgid "Autocomplete symbols" msgstr "Tự động điền nốt ký hiệu" -#: ../src/interface.c:3931 +#: ../src/interface.c:3967 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2322,174 +2318,174 @@ "Tự động gõ xong các ký hiệu đã biết trong tập tin được mở (tên hàm, biến " "toàn cục v.v.)" -#: ../src/interface.c:3933 +#: ../src/interface.c:3969 msgid "Autocomplete all words in document" msgstr "Tự động điền nốt mọi từ trong tài liệu" -#: ../src/interface.c:3937 +#: ../src/interface.c:3973 msgid "Drop rest of word on completion" msgstr "Bỏ phần từ còn lại một khi điền nốt" -#: ../src/interface.c:3947 +#: ../src/interface.c:3983 msgid "Max. symbol name suggestions:" msgstr "Số tối đa các góp ý tên ký hiệu :" -#: ../src/interface.c:3954 +#: ../src/interface.c:3990 msgid "Completion list height:" msgstr "Bề cao danh sách điền nốt:" -#: ../src/interface.c:3961 +#: ../src/interface.c:3997 msgid "Characters to type for autocompletion:" msgstr "Ký tự cần gõ để tự động điền nốt:" -#: ../src/interface.c:3974 +#: ../src/interface.c:4010 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "Số các ký tự cần thiết để hiển thị danh sách tự động điền nốt ký hiệu" -#: ../src/interface.c:3983 +#: ../src/interface.c:4019 msgid "Display height in rows for the autocompletion list" msgstr "Chiều cao hiển thị theo hàng cho danh sách tự động điền nốt" -#: ../src/interface.c:3992 +#: ../src/interface.c:4028 msgid "Maximum number of entries to display in the autocompletion list" msgstr "Số tối đa các mục nhập cần hiển thị trong danh sách tự động điền nốt" -#: ../src/interface.c:3995 +#: ../src/interface.c:4031 msgid "Completions" msgstr "Làm xong" -#: ../src/interface.c:4014 +#: ../src/interface.c:4050 msgid "Parenthesis ( )" msgstr "Ngoặc đơn ( )" -#: ../src/interface.c:4019 +#: ../src/interface.c:4055 msgid "Auto-close parenthesis when typing an opening one" msgstr "Tự động điền nốt một cặp dấu ngoặc đơn khi nhập một dấu ngoặc đơn mở" -#: ../src/interface.c:4021 +#: ../src/interface.c:4057 msgid "Single quotes ' '" msgstr "Nháy đơn ' '" -#: ../src/interface.c:4026 +#: ../src/interface.c:4062 #, fuzzy msgid "Auto-close single quote when typing an opening one" msgstr "Tự động điền nốt một cặp dấu nháy đơn khi nhập một dấu nháy đơn mở" -#: ../src/interface.c:4028 +#: ../src/interface.c:4064 msgid "Curly brackets { }" msgstr "Ngoặc móc { }" -#: ../src/interface.c:4033 +#: ../src/interface.c:4069 msgid "Auto-close curly bracket when typing an opening one" msgstr "Tự động điền nốt một cặp dấu ngoặc móc khi nhập một dấu ngoặc móc mở" -#: ../src/interface.c:4035 +#: ../src/interface.c:4071 msgid "Square brackets [ ]" msgstr "Ngoặc vuông [ ]" -#: ../src/interface.c:4040 +#: ../src/interface.c:4076 msgid "Auto-close square-bracket when typing an opening one" msgstr "Tự động điền nốt một cặp dấu ngoặc vuông khi gõ một dấu ngoặc vuông mở" -#: ../src/interface.c:4042 +#: ../src/interface.c:4078 msgid "Double quotes \" \"" msgstr "Nháy kép \" \"" -#: ../src/interface.c:4047 +#: ../src/interface.c:4083 msgid "Auto-close double quote when typing an opening one" msgstr "Tự động điền nốt một cặp dấu nháy kép khi nhập một dấu nháy kép mở" -#: ../src/interface.c:4049 +#: ../src/interface.c:4085 msgid "Auto-close quotes and brackets" msgstr "Tự động điền nốt Nháy và Ngoặc" -#: ../src/interface.c:4054 +#: ../src/interface.c:4090 msgid "Completions" msgstr "Mục điền nốt" -#: ../src/interface.c:4077 +#: ../src/interface.c:4113 msgid "Invert syntax highlighting colors" msgstr "Đảo ngược màu sắc tô sáng cú pháp" -#: ../src/interface.c:4080 +#: ../src/interface.c:4116 msgid "Invert all colors, by default using white text on a black background" msgstr "" -#: ../src/interface.c:4082 +#: ../src/interface.c:4118 msgid "Show indentation guides" msgstr "Hiện nét dẫn thụt lề" -#: ../src/interface.c:4085 +#: ../src/interface.c:4121 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "Hiển thị đường chấm chấm nhỏ để giúp bạn thụt lề đúng" -#: ../src/interface.c:4087 +#: ../src/interface.c:4123 msgid "Show white space" msgstr "Hiện khoảng trắng" -#: ../src/interface.c:4090 +#: ../src/interface.c:4126 msgid "Marks spaces with dots and tabs with arrows" msgstr "Nhãn dấu cách bằng chấm và tab bằng mũi tên" -#: ../src/interface.c:4092 +#: ../src/interface.c:4128 msgid "Show line endings" msgstr "Hiện kết thúc dòng" -#: ../src/interface.c:4095 +#: ../src/interface.c:4131 msgid "Shows the line ending character" msgstr "Hiện ký tự kết thúc dòng" -#: ../src/interface.c:4097 +#: ../src/interface.c:4133 msgid "Show line numbers" msgstr "Hiện số thứ tự dòng" -#: ../src/interface.c:4100 +#: ../src/interface.c:4136 msgid "Shows or hides the Line Number margin" msgstr "Hiện/ẩn lề số thứ tự dòng" -#: ../src/interface.c:4102 +#: ../src/interface.c:4138 msgid "Show markers margin" msgstr "Hiện lề đánh dấu" -#: ../src/interface.c:4105 +#: ../src/interface.c:4141 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" msgstr "Hiện/ẩn lề nhỏ bên phải các số thứ tự dòng, được dùng để đánh dấu dòng" -#: ../src/interface.c:4107 +#: ../src/interface.c:4143 msgid "Stop scrolling at last line" msgstr "Dừng cuộn ở dòng cuối" -#: ../src/interface.c:4110 +#: ../src/interface.c:4146 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "Có nên dừng cuộn lại một trang đằng sau dòng cuối cùng của tài liệu" -#: ../src/interface.c:4112 +#: ../src/interface.c:4148 msgid "Display" msgstr "Hiển thị" -#: ../src/interface.c:4133 ../src/interface.c:5531 +#: ../src/interface.c:4169 ../src/interface.c:5571 #, fuzzy msgid "Column:" msgstr "Công ty:" -#: ../src/interface.c:4140 +#: ../src/interface.c:4176 msgid "Color:" msgstr "" -#: ../src/interface.c:4159 +#: ../src/interface.c:4195 msgid "Sets the color of the long line marker" msgstr "Đặt màu của dấu dòng dài" -#: ../src/interface.c:4160 ../src/toolbar.c:71 ../src/tools.c:722 +#: ../src/interface.c:4196 ../src/toolbar.c:71 ../src/tools.c:722 #: ../src/vte.c:785 ../src/vte.c:792 msgid "Color Chooser" msgstr "Bộ chọn màu" -#: ../src/interface.c:4168 +#: ../src/interface.c:4204 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2499,11 +2495,11 @@ "dấu dòng dài, hoặc nhắc nhở bạn ngắt dòng đó. Đặt giá trị này thành một giá " "trị hơn 0 để xác định vị trí của cột này." -#: ../src/interface.c:4178 +#: ../src/interface.c:4214 msgid "Line" msgstr "Dòng" -#: ../src/interface.c:4181 +#: ../src/interface.c:4217 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2511,11 +2507,11 @@ "In ra một đường nằm dọc trong cửa sổ trình soạn thảo tại vị trí con trỏ đã " "cho (xem dưới)." -#: ../src/interface.c:4185 +#: ../src/interface.c:4221 msgid "Background" msgstr "Nền" -#: ../src/interface.c:4188 +#: ../src/interface.c:4224 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2524,81 +2520,81 @@ "Màu nền của các ký tự nằm sau vị trí con trỏ đã cho (xem dưới) được thay đổi " "thành màu được đặt bên dưới. (Khuyến khích nếu bạn sử dụng phông tỷ lệ.)" -#: ../src/interface.c:4192 +#: ../src/interface.c:4228 #, fuzzy msgid "Enabled" msgstr "_Bật" -#: ../src/interface.c:4198 ../src/interface.c:5571 +#: ../src/interface.c:4234 ../src/interface.c:5611 msgid "Long line marker" msgstr "Dấu dòng dài" -#: ../src/interface.c:4217 ../src/interface.c:5538 +#: ../src/interface.c:4253 ../src/interface.c:5578 msgid "Disabled" msgstr "Bị tắt" -#: ../src/interface.c:4220 +#: ../src/interface.c:4256 msgid "Do not show virtual spaces" msgstr "" -#: ../src/interface.c:4224 +#: ../src/interface.c:4260 msgid "Only for rectangular selections" msgstr "" -#: ../src/interface.c:4227 +#: ../src/interface.c:4263 msgid "" "Only show virtual spaces beyond the end of lines when drawing a rectangular " "selection" msgstr "" -#: ../src/interface.c:4231 +#: ../src/interface.c:4267 msgid "Always" msgstr "" -#: ../src/interface.c:4234 +#: ../src/interface.c:4270 #, fuzzy msgid "Always show virtual spaces beyond the end of lines" msgstr "Gỡ bỏ các dấu cách theo sau, tab, và kết thúc dòng" -#: ../src/interface.c:4238 +#: ../src/interface.c:4274 #, fuzzy msgid "Virtual spaces" msgstr "Đường dẫn công cụ" -#: ../src/interface.c:4243 +#: ../src/interface.c:4279 msgid "Display" msgstr "Hiển thị" -#: ../src/interface.c:4274 +#: ../src/interface.c:4310 msgid "Open new documents from the command-line" msgstr "Mở tài liệu mới từ dòng lệnh" -#: ../src/interface.c:4277 +#: ../src/interface.c:4313 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "Tạo một tập tin mới cho mỗi tên tập tin dòng lệnh không tồn tại" -#: ../src/interface.c:4291 +#: ../src/interface.c:4327 msgid "Default end of line characters:" msgstr "Ký tự kết thúc dòng mặc định:" -#: ../src/interface.c:4298 +#: ../src/interface.c:4334 msgid "New files" msgstr "Tập tin mới" -#: ../src/interface.c:4321 +#: ../src/interface.c:4357 msgid "Default encoding (new files):" msgstr "Bảng mã mặc định (tập tin mới):" -#: ../src/interface.c:4329 +#: ../src/interface.c:4365 msgid "Sets the default encoding for newly created files" msgstr "Đặt bảng mã mặc định cho tập tin mới tạo" -#: ../src/interface.c:4335 +#: ../src/interface.c:4371 #, fuzzy msgid "Use fixed encoding when opening non-Unicode files" msgstr "Dùng bảng mã cố định khi mở tập tin" -#: ../src/interface.c:4338 +#: ../src/interface.c:4374 #, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " @@ -2608,73 +2604,73 @@ "Tùy chọn này tắt chức năng tự động phát hiện bảng mã tập tin khi mở tập tin, " "và mở tập tin bằng bảng mã đã ghi rõ (thường không cần)" -#: ../src/interface.c:4344 +#: ../src/interface.c:4380 #, fuzzy msgid "Default encoding (existing non-Unicode files):" msgstr "Bảng mã mặc định (tập tin đã có):" -#: ../src/interface.c:4352 +#: ../src/interface.c:4388 #, fuzzy msgid "Sets the default encoding for opening existing non-Unicode files" msgstr "Đặt bảng mã mặc định để mở tập tin đã có" -#: ../src/interface.c:4358 +#: ../src/interface.c:4394 msgid "Encodings" msgstr "Bảng mã" -#: ../src/interface.c:4377 +#: ../src/interface.c:4413 msgid "Ensure new line at file end" msgstr "Đảm bảo có ký tự dòng mới tại kết thúc tập tin" -#: ../src/interface.c:4380 +#: ../src/interface.c:4416 msgid "Ensures that at the end of the file is a new line" msgstr "Đảm bảo có ký tự dòng mới tại kết thúc tập tin" -#: ../src/interface.c:4382 +#: ../src/interface.c:4418 #, fuzzy msgid "Ensure consistent line endings" msgstr "Đảm bảo có ký tự dòng mới tại kết thúc tập tin" -#: ../src/interface.c:4385 +#: ../src/interface.c:4421 msgid "" "Ensures that newline characters always get converted before saving, avoiding " "mixed line endings in the same file" msgstr "" -#: ../src/interface.c:4387 +#: ../src/interface.c:4423 msgid "Strip trailing spaces and tabs" msgstr "Bỏ dấu cách và Tab theo sau" -#: ../src/interface.c:4390 +#: ../src/interface.c:4426 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Gỡ bỏ các dấu cách theo sau, tab, và kết thúc dòng" -#: ../src/interface.c:4392 ../src/keybindings.c:518 +#: ../src/interface.c:4428 ../src/keybindings.c:519 msgid "Replace tabs by space" msgstr "Thay thế các tab bằng dấu cách" -#: ../src/interface.c:4395 +#: ../src/interface.c:4431 msgid "Replaces all tabs in document by spaces" msgstr "Thay thế bằng dấu cách mọi tab trong tài liệu" -#: ../src/interface.c:4397 +#: ../src/interface.c:4433 msgid "Saving files" msgstr "Lưu tập tin" -#: ../src/interface.c:4422 +#: ../src/interface.c:4458 msgid "Recent files list length:" msgstr "Độ dài danh sách tập tin gần đây:" -#: ../src/interface.c:4436 +#: ../src/interface.c:4472 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Xác định số tối đa các tập tin được giữ lại trong danh sách Tập tin gần đây" -#: ../src/interface.c:4440 +#: ../src/interface.c:4476 msgid "Disk check timeout:" msgstr "Thời hạn kiểm tra đĩa:" -#: ../src/interface.c:4453 +#: ../src/interface.c:4489 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2682,20 +2678,20 @@ "Có nên kiểm tra có thay đổi trong tập tin tài liệu trên đĩa thường xuyên cỡ " "nào, theo giây. Số không tắt chức năng kiểm tra." -#: ../src/interface.c:4462 ../src/prefs.c:1559 ../src/symbols.c:605 +#: ../src/interface.c:4498 ../src/prefs.c:1559 ../src/symbols.c:605 #: ../plugins/filebrowser.c:1112 msgid "Files" msgstr "Tập tin" -#: ../src/interface.c:4495 +#: ../src/interface.c:4531 msgid "Terminal:" msgstr "Thiết bị cuối:" -#: ../src/interface.c:4502 +#: ../src/interface.c:4538 msgid "Browser:" msgstr "Bộ duyệt:" -#: ../src/interface.c:4514 +#: ../src/interface.c:4550 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2703,24 +2699,24 @@ "Mô phỏng thiết bị cuối như xterm, gnome-terminal hay konsole (nên chấp nhận " "đối số « -e »)" -#: ../src/interface.c:4521 +#: ../src/interface.c:4557 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Đường dẫn (có thể thêm đối số) đến bộ duyệt ưa thích của bạn" # Name: don't translate/Tên: đừng dịch -#: ../src/interface.c:4543 +#: ../src/interface.c:4579 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4566 +#: ../src/interface.c:4602 msgid "Tool paths" msgstr "Đường dẫn công cụ" -#: ../src/interface.c:4587 +#: ../src/interface.c:4623 msgid "Context action:" msgstr "Hành động ngữ cảnh:" -#: ../src/interface.c:4598 +#: ../src/interface.c:4634 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2731,67 +2727,67 @@ "%s. Nó có thể nằm ở mọi vị trí trong lệnh đã cho, cũng sẽ được thay thế " "trước khi thực hiện." -#: ../src/interface.c:4611 +#: ../src/interface.c:4647 msgid "Commands" msgstr "Lệnh" -#: ../src/interface.c:4616 ../src/keybindings.c:556 ../src/prefs.c:1561 +#: ../src/interface.c:4652 ../src/keybindings.c:557 ../src/prefs.c:1561 msgid "Tools" msgstr "Công cụ" -#: ../src/interface.c:4654 +#: ../src/interface.c:4690 msgid "email address of the developer" msgstr "địa chỉ thư của nhà phát triển" -#: ../src/interface.c:4661 +#: ../src/interface.c:4697 msgid "Initials of the developer name" msgstr "Tên tắt của nhà phát triển" -#: ../src/interface.c:4663 +#: ../src/interface.c:4699 msgid "Initial version:" msgstr "Phiên bản đầu tiên:" -#: ../src/interface.c:4675 +#: ../src/interface.c:4711 msgid "Version number, which a new file initially has" msgstr "Số hiệu phiên bản đầu tiên của tập tin mới" -#: ../src/interface.c:4682 +#: ../src/interface.c:4718 msgid "Company name" msgstr "Tên công ty" -#: ../src/interface.c:4684 +#: ../src/interface.c:4720 msgid "Developer:" msgstr "Nhà phát triển:" -#: ../src/interface.c:4691 +#: ../src/interface.c:4727 msgid "Company:" msgstr "Công ty:" -#: ../src/interface.c:4698 +#: ../src/interface.c:4734 msgid "Mail address:" msgstr "Địa chỉ bưu điện:" -#: ../src/interface.c:4705 +#: ../src/interface.c:4741 msgid "Initials:" msgstr "Tên tắt:" -#: ../src/interface.c:4717 +#: ../src/interface.c:4753 msgid "The name of the developer" msgstr "Tên của nhà phát triển" -#: ../src/interface.c:4719 +#: ../src/interface.c:4755 msgid "Year:" msgstr "Năm:" -#: ../src/interface.c:4726 +#: ../src/interface.c:4762 msgid "Date:" msgstr "Ngày:" -#: ../src/interface.c:4733 +#: ../src/interface.c:4769 msgid "Date & Time:" msgstr "Ngày Giờ :" -#: ../src/interface.c:4745 +#: ../src/interface.c:4781 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2799,7 +2795,7 @@ "Ghi rõ định dạng cho ký hiệu đại diện ngày/giờ {datetime}. Có thể sử dụng " "bất cứ đặc tả chuyển đổi nào tương thích với hàm strftime C ANSI." -#: ../src/interface.c:4752 +#: ../src/interface.c:4788 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2807,7 +2803,7 @@ "Ghi rõ định dạng cho ký hiệu đại diện năm {year}. Có thể sử dụng bất cứ đặc " "tả chuyển đổi nào tương thích với hàm strftime C ANSI." -#: ../src/interface.c:4759 +#: ../src/interface.c:4795 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2815,61 +2811,61 @@ "Ghi rõ định dạng cho ký hiệu đại diện ngày tháng {date}. Có thể sử dụng bất " "cứ đặc tả chuyển đổi nào tương thích với hàm strftime C ANSI." -#: ../src/interface.c:4761 +#: ../src/interface.c:4797 msgid "Template data" msgstr "Dữ liệu mẫu" -#: ../src/interface.c:4766 ../src/prefs.c:1563 +#: ../src/interface.c:4802 ../src/prefs.c:1563 msgid "Templates" msgstr "Biểu mẫu" -#: ../src/interface.c:4804 +#: ../src/interface.c:4840 msgid "C_hange" msgstr "Đổ_i" -#: ../src/interface.c:4808 +#: ../src/interface.c:4844 msgid "Keyboard shortcuts" msgstr "Phím tắt" -#: ../src/interface.c:4813 ../src/prefs.c:1565 +#: ../src/interface.c:4849 ../src/prefs.c:1565 msgid "Keybindings" msgstr "Tổ hợp phím" -#: ../src/interface.c:4847 +#: ../src/interface.c:4883 msgid "Command:" msgstr "Lệnh:" -#: ../src/interface.c:4854 +#: ../src/interface.c:4890 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Đường dẫn tới lệnh để in tập tin (dùng %f thay cho tên tập tin)." -#: ../src/interface.c:4864 +#: ../src/interface.c:4900 msgid "Use an external command for printing" msgstr "Dùng lệnh bên ngoài để in" -#: ../src/interface.c:4884 ../src/printing.c:381 +#: ../src/interface.c:4920 ../src/printing.c:381 msgid "Print line numbers" msgstr "In số thứ tự dòng" -#: ../src/interface.c:4887 ../src/printing.c:383 +#: ../src/interface.c:4923 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Thêm vào trang in các số thứ tự dòng" -#: ../src/interface.c:4889 ../src/printing.c:386 +#: ../src/interface.c:4925 ../src/printing.c:386 msgid "Print page numbers" msgstr "In số thứ tự trang" -#: ../src/interface.c:4892 ../src/printing.c:388 +#: ../src/interface.c:4928 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "Thêm số thứ tự dòng vào đáy từng trang (chiếm 2 dòng của trang)." -#: ../src/interface.c:4894 ../src/printing.c:391 +#: ../src/interface.c:4930 ../src/printing.c:391 msgid "Print page header" msgstr "In phần đầu trang" -#: ../src/interface.c:4897 ../src/printing.c:393 +#: ../src/interface.c:4933 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2877,19 +2873,19 @@ "Thêm vào mỗi trang một phần đầu trang nhỏ chứa số thứ tự trang, tên tập tin " "và ngày tháng hiện thời (xem bên dưới). Phần này chiếm 3 dòng của trang." -#: ../src/interface.c:4914 ../src/printing.c:409 +#: ../src/interface.c:4950 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Dùng tên cơ bản của tập tin đã in" -#: ../src/interface.c:4917 +#: ../src/interface.c:4953 msgid "Print only the basename (without the path) of the printed file" msgstr "In chỉ tên cơ bản (không có phần đường dẫn) của tập tin in ra." -#: ../src/interface.c:4923 ../src/printing.c:417 +#: ../src/interface.c:4959 ../src/printing.c:417 msgid "Date format:" msgstr "Định dạng ngày tháng:" -#: ../src/interface.c:4930 ../src/printing.c:423 +#: ../src/interface.c:4966 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2899,38 +2895,38 @@ "trang. Bạn có khả năng sử dụng bất cứ ký hiệu chuyển đổi nào dùng được với " "hàm strftime kiểu C ANSI. Xem « man strftime » để tìm thêm thông tin." -#: ../src/interface.c:4933 +#: ../src/interface.c:4969 msgid "Use native GTK printing" msgstr "Dùng chức năng in GTK sở hữu" -#: ../src/interface.c:4939 +#: ../src/interface.c:4975 #, fuzzy msgid "Printing" msgstr "Bảng mã:" -#: ../src/interface.c:4944 ../src/prefs.c:1567 +#: ../src/interface.c:4980 ../src/prefs.c:1567 msgid "Printing" msgstr "In" -#: ../src/interface.c:5406 +#: ../src/interface.c:5446 msgid "Project Properties" msgstr "Thuộc tính dự án" -#: ../src/interface.c:5524 +#: ../src/interface.c:5564 #, fuzzy msgid "Display:" msgstr "Hiển thị" -#: ../src/interface.c:5546 +#: ../src/interface.c:5586 #, fuzzy msgid "Custom" msgstr "Cắt" -#: ../src/interface.c:5554 +#: ../src/interface.c:5594 msgid "Use global settings" msgstr "" -#: ../src/keybindings.c:220 ../src/plugins.c:1187 +#: ../src/keybindings.c:220 ../src/plugins.c:1193 msgid "File" msgstr "Tập tin" @@ -3143,315 +3139,315 @@ msgid "Insert date" msgstr "Chèn ngày" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:377 msgid "Insert New Line Before Current" msgstr "" -#: ../src/keybindings.c:378 +#: ../src/keybindings.c:379 msgid "Insert New Line After Current" msgstr "" -#: ../src/keybindings.c:380 +#: ../src/keybindings.c:381 msgid "Settings" msgstr "Thiết lập" -#: ../src/keybindings.c:388 ../src/toolbar.c:381 +#: ../src/keybindings.c:389 ../src/toolbar.c:381 msgid "Search" msgstr "Tìm kiếm" -#: ../src/keybindings.c:391 ../src/search.c:398 +#: ../src/keybindings.c:392 ../src/search.c:398 msgid "Find" msgstr "Tìm" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:394 msgid "Find Next" msgstr "Tìm tiếp" -#: ../src/keybindings.c:395 +#: ../src/keybindings.c:396 msgid "Find Previous" msgstr "Tìm trước" -#: ../src/keybindings.c:402 ../src/search.c:552 +#: ../src/keybindings.c:403 ../src/search.c:552 msgid "Replace" msgstr "Thay thế" -#: ../src/keybindings.c:404 ../src/search.c:724 +#: ../src/keybindings.c:405 ../src/search.c:724 msgid "Find in Files" msgstr "Tìm trong tập tin" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:408 msgid "Next Message" -msgstr "Thông điệp tiếp" +msgstr "Thông điệp kế" -#: ../src/keybindings.c:409 +#: ../src/keybindings.c:410 msgid "Previous Message" msgstr "Thông điệp trước" -#: ../src/keybindings.c:411 +#: ../src/keybindings.c:412 msgid "Find Usage" -msgstr "Tìm cách sử dụng" +msgstr "Tìm chỗ được dùng" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:414 msgid "Find Document Usage" -msgstr "Tìm cách sử dụng tài liệu" +msgstr "Tìm chỗ dùng trong tài liệu" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:418 msgid "Go to" msgstr "Đi tới" -#: ../src/keybindings.c:420 ../src/toolbar.c:67 +#: ../src/keybindings.c:421 ../src/toolbar.c:67 msgid "Navigate back a location" -msgstr "Duyệt ngược một vị trí" +msgstr "Lần ngược một vị trí" -#: ../src/keybindings.c:422 ../src/toolbar.c:68 +#: ../src/keybindings.c:423 ../src/toolbar.c:68 msgid "Navigate forward a location" -msgstr "Duyệt tới một vị trí" +msgstr "Lần tới một vị trí" -#: ../src/keybindings.c:427 +#: ../src/keybindings.c:428 msgid "Go to matching brace" msgstr "Tới dấu ngoặc móc khớp" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:431 msgid "Toggle marker" msgstr "Dấu bật/tắt" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:439 msgid "Go to Tag Definition" -msgstr "Tới lời xác định thẻ" +msgstr "Tới chỗ định nghĩa thẻ" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:441 msgid "Go to Tag Declaration" -msgstr "Tới lời tuyên bố thẻ" +msgstr "Tới chỗ khai báo thẻ" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:443 msgid "Go to Start of Line" msgstr "Tới đầu dòng" -#: ../src/keybindings.c:444 +#: ../src/keybindings.c:445 msgid "Go to End of Line" msgstr "Tới cuối dòng" -#: ../src/keybindings.c:446 +#: ../src/keybindings.c:447 msgid "Go to End of Display Line" msgstr "Tới cuối dòng hiển thị" -#: ../src/keybindings.c:448 +#: ../src/keybindings.c:449 msgid "Go to Previous Word Part" msgstr "Về phần từ trước" -#: ../src/keybindings.c:450 +#: ../src/keybindings.c:451 msgid "Go to Next Word Part" msgstr "Tới phần từ tiếp" -#: ../src/keybindings.c:452 +#: ../src/keybindings.c:453 msgid "View" msgstr "Xem" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:456 msgid "Toggle All Additional Widgets" msgstr "Bật/tắt mọi ô điều khiển bổ sung" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:459 msgid "Fullscreen" msgstr "Toàn màn hình" -#: ../src/keybindings.c:460 +#: ../src/keybindings.c:461 msgid "Toggle Messages Window" msgstr "Hiện/ẩn cửa sổ thông điệp" -#: ../src/keybindings.c:463 +#: ../src/keybindings.c:464 msgid "Toggle Sidebar" msgstr "Hiện/ẩn khung lề" -#: ../src/keybindings.c:465 +#: ../src/keybindings.c:466 msgid "Zoom In" msgstr "Phóng to" -#: ../src/keybindings.c:467 +#: ../src/keybindings.c:468 msgid "Zoom Out" msgstr "Thu nhỏ" -#: ../src/keybindings.c:469 +#: ../src/keybindings.c:470 #, fuzzy msgid "Zoom Reset" msgstr "Thu nhỏ" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:472 msgid "Focus" msgstr "Tập trung" -#: ../src/keybindings.c:474 +#: ../src/keybindings.c:475 msgid "Switch to Editor" msgstr "Chuyển sang bộ soạn thảo" -#: ../src/keybindings.c:476 +#: ../src/keybindings.c:477 msgid "Switch to Search Bar" msgstr "Chuyển sang Thanh tìm" -#: ../src/keybindings.c:478 +#: ../src/keybindings.c:479 #, fuzzy msgid "Switch to Message Window" msgstr "Hiện cửa _sổ thông điệp" -#: ../src/keybindings.c:480 +#: ../src/keybindings.c:481 msgid "Switch to Compiler" msgstr "Chuyển sang Bộ biên dịch" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:483 #, fuzzy msgid "Switch to Messages" msgstr "Chuyển sang Khung lề" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:485 msgid "Switch to Scribble" msgstr "Chuyển sang Viết tháu" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:487 msgid "Switch to VTE" msgstr "Chuyển sang VTE" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:489 msgid "Switch to Sidebar" msgstr "Chuyển sang Khung lề" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:491 #, fuzzy msgid "Switch to Sidebar Symbol List" msgstr "Chuyển sang Khung lề" -#: ../src/keybindings.c:492 +#: ../src/keybindings.c:493 #, fuzzy msgid "Switch to Sidebar Document List" msgstr "Chuyển sang Tài liệu" -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:495 msgid "Notebook tab" -msgstr "Thẻ cuốn vở" +msgstr "Thẻ vở" -#: ../src/keybindings.c:497 +#: ../src/keybindings.c:498 msgid "Switch to left document" msgstr "Chuyển dang tài liệu bên trái" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:500 msgid "Switch to right document" msgstr "Chuyển dang tài liệu bên phải" -#: ../src/keybindings.c:501 +#: ../src/keybindings.c:502 msgid "Switch to last used document" msgstr "Chuyển sang tài liệu dùng cuối" -#: ../src/keybindings.c:503 +#: ../src/keybindings.c:504 msgid "Move document left" msgstr "Dời tài liệu qua bên trái" -#: ../src/keybindings.c:505 +#: ../src/keybindings.c:506 msgid "Move document right" msgstr "Dời tài liệu qua bên phải" -#: ../src/keybindings.c:507 +#: ../src/keybindings.c:508 msgid "Move document first" msgstr "Dời tài liệu trên đầu" -#: ../src/keybindings.c:509 +#: ../src/keybindings.c:510 msgid "Move document last" msgstr "Dời tài liệu xuống cuối" -#: ../src/keybindings.c:511 +#: ../src/keybindings.c:512 msgid "Document" msgstr "Tài liệu" -#: ../src/keybindings.c:514 +#: ../src/keybindings.c:515 msgid "Toggle Line wrapping" msgstr "Bật/tắt cuộn dòng" -#: ../src/keybindings.c:516 +#: ../src/keybindings.c:517 msgid "Toggle Line breaking" msgstr "Bật/tắt ngắt dòng" -#: ../src/keybindings.c:520 +#: ../src/keybindings.c:521 msgid "Replace spaces by tabs" msgstr "Thay thế bằng tab các dấu cách" -#: ../src/keybindings.c:522 +#: ../src/keybindings.c:523 msgid "Toggle current fold" msgstr "Bật/tắt phần gấp hiện thời" -#: ../src/keybindings.c:524 +#: ../src/keybindings.c:525 msgid "Fold all" msgstr "Gấp tất cả" -#: ../src/keybindings.c:526 +#: ../src/keybindings.c:527 msgid "Unfold all" msgstr "Mở lại tất cả" -#: ../src/keybindings.c:528 +#: ../src/keybindings.c:529 msgid "Reload symbol list" msgstr "Tải lại danh sách ký hiệu" -#: ../src/keybindings.c:530 +#: ../src/keybindings.c:531 #, fuzzy msgid "Remove Markers" msgstr "Bỏ _dấu" -#: ../src/keybindings.c:532 +#: ../src/keybindings.c:533 #, fuzzy msgid "Remove Error Indicators" msgstr "Bỏ mọi cá_i chỉ lỗi" -#: ../src/keybindings.c:534 ../src/keybindings.c:539 ../src/project.c:476 +#: ../src/keybindings.c:535 ../src/keybindings.c:540 ../src/project.c:476 #: ../src/ui_utils.c:1912 msgid "Build" msgstr "Xây dựng" -#: ../src/keybindings.c:537 ../src/toolbar.c:69 +#: ../src/keybindings.c:538 ../src/toolbar.c:69 msgid "Compile" msgstr "Biên dịch" -#: ../src/keybindings.c:541 +#: ../src/keybindings.c:542 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:544 +#: ../src/keybindings.c:545 msgid "Make custom target" msgstr "Make đích riêng" -#: ../src/keybindings.c:546 +#: ../src/keybindings.c:547 msgid "Make object" msgstr "Make đối tượng" -#: ../src/keybindings.c:548 +#: ../src/keybindings.c:549 msgid "Next error" msgstr "Lỗi tiếp" -#: ../src/keybindings.c:550 +#: ../src/keybindings.c:551 msgid "Previous error" msgstr "Lỗi trước" -#: ../src/keybindings.c:552 +#: ../src/keybindings.c:553 msgid "Run" msgstr "Chạy" -#: ../src/keybindings.c:554 +#: ../src/keybindings.c:555 msgid "Build options" msgstr "Tùy chọn xây dựng" -#: ../src/keybindings.c:559 +#: ../src/keybindings.c:560 msgid "Show Color Chooser" msgstr "Hiện bảng chọn màu" -#: ../src/keybindings.c:561 ../src/keybindings.c:564 +#: ../src/keybindings.c:562 ../src/keybindings.c:565 msgid "Help" msgstr "Trợ giúp" -#: ../src/keybindings.c:846 +#: ../src/keybindings.c:847 msgid "Keyboard Shortcuts" msgstr "Phím tắt" -#: ../src/keybindings.c:858 +#: ../src/keybindings.c:859 msgid "The following keyboard shortcuts are configurable:" msgstr "Có thể cấu hình những phím tắt này:" -#: ../src/keybindings.c:1756 +#: ../src/keybindings.c:1757 msgid "Switch to Document" msgstr "Chuyển sang Tài liệu" @@ -3549,25 +3545,25 @@ msgid "Show version and exit" msgstr "Hiện phiên bản rồi thoát" -#: ../src/main.c:508 +#: ../src/main.c:509 msgid "[FILES...]" msgstr "[TẬP_TIN...]" #. note for translators: library versions are printed after this -#: ../src/main.c:526 +#: ../src/main.c:527 #, fuzzy, c-format msgid "built on %s with " msgstr "(xây dựng vào hay sau %s)" -#: ../src/main.c:619 +#: ../src/main.c:620 msgid "Move it now?" msgstr "Chuyển nó ngay ?" -#: ../src/main.c:621 +#: ../src/main.c:622 msgid "Geany needs to move your old configuration directory before starting." msgstr "Geany cần phải di chuyển thư mục cấu hình cũ trước khi khởi chạy." -#: ../src/main.c:630 +#: ../src/main.c:631 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3576,7 +3572,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:640 +#: ../src/main.c:641 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3585,7 +3581,7 @@ "Thư mục cấu hình cũ « %s » không thể di chuyển được sang « %s » (%s). Hãy di " "chuyển nó bằng tay sang vị trí mới." -#: ../src/main.c:721 +#: ../src/main.c:722 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3596,17 +3592,17 @@ "Có thể gặp lỗi khi sử dụng Geany mà không có thư mục cấu hình.\n" "Vẫn khởi chạy Geany không?" -#: ../src/main.c:1060 +#: ../src/main.c:1061 #, c-format msgid "This is Geany %s." msgstr "Đây là Geany %s." -#: ../src/main.c:1062 +#: ../src/main.c:1063 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Không thể tạo thư mục cấu hình (%s)." -#: ../src/main.c:1276 +#: ../src/main.c:1277 msgid "Configuration files reloaded." msgstr "Các tập tin cấu hình đã được nạp lại." @@ -3632,7 +3628,7 @@ msgid "Could not find file '%s' - trying the current document path." msgstr "" -#: ../src/plugins.c:477 +#: ../src/plugins.c:478 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3641,11 +3637,11 @@ "Phần bổ sung « %s » không tương thích nhị phân với bản phát hành Geany này: " "hãy biên dịch lại nó." -#: ../src/plugins.c:922 +#: ../src/plugins.c:928 msgid "_Plugin Manager" msgstr "Quản lý _Phần bổ sung" -#: ../src/plugins.c:1099 +#: ../src/plugins.c:1105 #, c-format msgid "" "Plugin: %s %s\n" @@ -3656,27 +3652,27 @@ "Mô tả: %s\n" "Tác giả: %s" -#: ../src/plugins.c:1175 +#: ../src/plugins.c:1181 msgid "Active" msgstr "Hoạt động" -#: ../src/plugins.c:1181 +#: ../src/plugins.c:1187 msgid "Plugin" msgstr "Phần bổ sung" -#: ../src/plugins.c:1205 +#: ../src/plugins.c:1211 msgid "No plugins available." msgstr "Không có phần bổ sung sẵn sàng." -#: ../src/plugins.c:1285 +#: ../src/plugins.c:1291 msgid "Plugins" msgstr "Phần bổ sung" -#: ../src/plugins.c:1305 +#: ../src/plugins.c:1311 msgid "Choose which plugins should be loaded at startup:" msgstr "" -#: ../src/plugins.c:1317 +#: ../src/plugins.c:1323 msgid "Plugin details:" msgstr "Chi tiết về Phần bổ sung" @@ -4075,7 +4071,7 @@ #: ../src/search.c:642 msgid "In Se_lection" -msgstr "Trong _vùng chọn" +msgstr "Trong vùng _chọn" #: ../src/search.c:644 msgid "Replace all matches found in the currently selected text" @@ -4475,7 +4471,7 @@ #: ../src/symbols.c:1915 msgid "Sort by _Appearance" -msgstr "Sắp xếp theo _Diện mạo" +msgstr "Sắp xếp theo sự _Xuất hiện" #: ../src/templates.c:206 msgid "Old" @@ -4684,7 +4680,7 @@ #: ../src/tools.c:616 msgid "Range:" -msgstr "Phạm vị:" +msgstr "Phạm vi:" #: ../src/tools.c:628 msgid "Lines:" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5530] trunk
by eht16＠users.sourceforge.net 20 Jan '11

20 Jan '11

Revision: 5530 http://geany.svn.sourceforge.net/geany/?rev=5530&view=rev Author: eht16 Date: 2011-01-20 19:51:31 +0000 (Thu, 20 Jan 2011) Log Message: ----------- Add '.pyc' to the list of hidden object files (patch by Filip Gruszczy?\197?\132ski, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/plugins/filebrowser.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-01-19 19:47:35 UTC (rev 5529) +++ trunk/ChangeLog 2011-01-20 19:51:31 UTC (rev 5530) @@ -1,3 +1,10 @@ +2011-01-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * plugins/filebrowser.c: + Add '.pyc' to the list of hidden object files + (patch by Filip Gruszczyński, thanks). + + 2011-01-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * *.*: Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2011-01-19 19:47:35 UTC (rev 5529) +++ trunk/plugins/filebrowser.c 2011-01-20 19:51:31 UTC (rev 5530) @@ -139,7 +139,7 @@ if (hide_object_files) { - const gchar *exts[] = {".o", ".obj", ".so", ".dll", ".a", ".lib"}; + const gchar *exts[] = {".o", ".obj", ".so", ".dll", ".a", ".lib", ".pyc"}; guint i, exts_len; exts_len = G_N_ELEMENTS(exts); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Nightly build failed: Geany Windows build
by noreply＠nightly.geany.org 20 Jan '11

20 Jan '11

Geany Windows build failed at: applying patches See http://geany.nightlybuilds.org/win32/build_win32_geany_stderr.log for details. Error messages: ... http://geany.nightlybuilds.org/

1 0

SF.net SVN: geany:[5529] trunk
by eht16＠users.sourceforge.net 19 Jan '11

19 Jan '11

Revision: 5529 http://geany.svn.sourceforge.net/geany/?rev=5529&view=rev Author: eht16 Date: 2011-01-19 19:47:35 +0000 (Wed, 19 Jan 2011) Log Message: ----------- Post-release version bump. Modified Paths: -------------- trunk/ChangeLog trunk/configure.ac trunk/doc/geany.txt trunk/geany.nsi trunk/src/geany.h trunk/win32-config.h trunk/wscript Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-01-19 19:39:09 UTC (rev 5528) +++ trunk/ChangeLog 2011-01-19 19:47:35 UTC (rev 5529) @@ -2,6 +2,9 @@ * *.*: Update copyright information. + * configure.ac, doc/geany.html, doc/geany.txt, geany.nsi, + geany_private.rc, win32-config.h, wscript, src/geany.h: + Post-release version bump. 2011-01-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2011-01-19 19:39:09 UTC (rev 5528) +++ trunk/configure.ac 2011-01-19 19:47:35 UTC (rev 5529) @@ -2,7 +2,7 @@ dnl $Id$ AC_INIT(configure.ac) -AM_INIT_AUTOMAKE(geany, 0.20) +AM_INIT_AUTOMAKE(geany, 0.21) AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2011-01-19 19:39:09 UTC (rev 5528) +++ trunk/doc/geany.txt 2011-01-19 19:47:35 UTC (rev 5529) @@ -1,4 +1,4 @@ -.. |(version)| replace:: 0.20 +.. |(version)| replace:: 0.21 ======= Geany Modified: trunk/geany.nsi =================================================================== --- trunk/geany.nsi 2011-01-19 19:39:09 UTC (rev 5528) +++ trunk/geany.nsi 2011-01-19 19:47:35 UTC (rev 5529) @@ -33,8 +33,8 @@ ; helper defines ; ;;;;;;;;;;;;;;;;;;; !define PRODUCT_NAME "Geany" -!define PRODUCT_VERSION "0.20" -!define PRODUCT_VERSION_ID "0.20.0.0" +!define PRODUCT_VERSION "0.21" +!define PRODUCT_VERSION_ID "0.21.0.0" !define PRODUCT_PUBLISHER "The Geany developer team" !define PRODUCT_WEB_SITE "http://www.geany.org/" !define PRODUCT_DIR_REGKEY "Software\Geany" Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2011-01-19 19:39:09 UTC (rev 5528) +++ trunk/src/geany.h 2011-01-19 19:47:35 UTC (rev 5529) @@ -47,7 +47,7 @@ * listed in the documentation should not be changed */ #define GEANY_FILEDEFS_SUBDIR "filedefs" #define GEANY_TEMPLATES_SUBDIR "templates" -#define GEANY_CODENAME "Disra" +#define GEANY_CODENAME "Gromia" #define GEANY_HOMEPAGE "http://www.geany.org/" #define GEANY_STRING_UNTITLED _("untitled") #define GEANY_DEFAULT_DIALOG_HEIGHT 350 Modified: trunk/win32-config.h =================================================================== --- trunk/win32-config.h 2011-01-19 19:39:09 UTC (rev 5528) +++ trunk/win32-config.h 2011-01-19 19:47:35 UTC (rev 5529) @@ -314,7 +314,7 @@ /* #undef volatile */ /* Version number of package */ -#define VERSION "0.20" +#define VERSION "0.21" #define REVISION "-1" Modified: trunk/wscript =================================================================== --- trunk/wscript 2011-01-19 19:39:09 UTC (rev 5528) +++ trunk/wscript 2011-01-19 19:47:35 UTC (rev 5529) @@ -52,7 +52,7 @@ APPNAME = 'geany' -VERSION = '0.20' +VERSION = '0.21' LINGUAS_FILE = 'po/LINGUAS' top = '.' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5528] trunk
by eht16＠users.sourceforge.net 19 Jan '11

19 Jan '11

Revision: 5528 http://geany.svn.sourceforge.net/geany/?rev=5528&view=rev Author: eht16 Date: 2011-01-19 19:39:09 +0000 (Wed, 19 Jan 2011) Log Message: ----------- Update copyright information. Modified Paths: -------------- trunk/ChangeLog trunk/README trunk/README.Packagers trunk/doc/geany.1.in trunk/doc/geany.txt trunk/doc/plugins.dox trunk/doc/pluginsignals.c trunk/doc/pluginsymbols.c trunk/geany.nsi trunk/geany_private.rc trunk/plugins/classbuilder.c trunk/plugins/demoplugin.c trunk/plugins/export.c trunk/plugins/filebrowser.c trunk/plugins/geanyplugin.h trunk/plugins/genapi.py trunk/plugins/htmlchars.c trunk/plugins/saveactions.c trunk/plugins/splitwindow.c trunk/scripts/changelist.pl trunk/scripts/fix-alignment.pl trunk/scripts/plugin_test.c trunk/src/about.c trunk/src/about.h trunk/src/build.c trunk/src/build.h trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/dialogs.c trunk/src/dialogs.h trunk/src/document.c trunk/src/document.h trunk/src/documentprivate.h trunk/src/editor.c trunk/src/editor.h trunk/src/encodings.c trunk/src/encodings.h trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/filetypesprivate.h trunk/src/gb.c trunk/src/geany.h trunk/src/geanyentryaction.c trunk/src/geanyentryaction.h trunk/src/geanymenubuttonaction.c trunk/src/geanymenubuttonaction.h trunk/src/geanyobject.c trunk/src/geanyobject.h trunk/src/geanywraplabel.c trunk/src/geanywraplabel.h trunk/src/highlighting.c trunk/src/highlighting.h trunk/src/images.c trunk/src/keybindings.c trunk/src/keybindings.h trunk/src/keyfile.c trunk/src/keyfile.h trunk/src/log.c trunk/src/log.h trunk/src/main.c trunk/src/main.h trunk/src/msgwindow.c trunk/src/msgwindow.h trunk/src/navqueue.c trunk/src/navqueue.h trunk/src/notebook.c trunk/src/notebook.h trunk/src/plugindata.h trunk/src/pluginprivate.h trunk/src/plugins.c trunk/src/plugins.h trunk/src/pluginutils.c trunk/src/pluginutils.h trunk/src/prefs.c trunk/src/prefs.h trunk/src/printing.c trunk/src/printing.h trunk/src/project.c trunk/src/project.h trunk/src/projectprivate.h trunk/src/sciwrappers.c trunk/src/sciwrappers.h trunk/src/search.c trunk/src/search.h trunk/src/sidebar.c trunk/src/sidebar.h trunk/src/socket.c trunk/src/socket.h trunk/src/stash.c trunk/src/stash.h trunk/src/support.h trunk/src/symbols.c trunk/src/symbols.h trunk/src/templates.c trunk/src/templates.h trunk/src/toolbar.c trunk/src/toolbar.h trunk/src/tools.c trunk/src/tools.h trunk/src/ui_utils.c trunk/src/ui_utils.h trunk/src/utils.c trunk/src/utils.h trunk/src/vte.c trunk/src/vte.h trunk/src/win32.c trunk/src/win32.h trunk/tagmanager/nestlevel.c trunk/tagmanager/nestlevel.h trunk/tagmanager/nsis.c trunk/tagmanager/rest.c trunk/wscript Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/ChangeLog 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,3 +1,9 @@ +2011-01-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * *.*: + Update copyright information. + + 2011-01-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/highlighting.c, data/filetypes.javascript: @@ -6,7 +12,6 @@ (patch by Jason Oster, thank you). - 2011-01-11 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * THANKS, src/about.c: Modified: trunk/README =================================================================== --- trunk/README 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/README 2011-01-19 19:39:09 UTC (rev 5528) @@ -102,7 +102,7 @@ -- -2005-2010 by Enrico Tröger, Nick Treleaven and Frank Lanitz +2005-2011 by Enrico Tröger, Nick Treleaven and Frank Lanitz enrico(dot)troeger(at)uvena(dot)de nick(dot)treleaven(at)btinternet(dot)com frank(at)frank(dot)uvena(dot)de Modified: trunk/README.Packagers =================================================================== --- trunk/README.Packagers 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/README.Packagers 2011-01-19 19:39:09 UTC (rev 5528) @@ -82,7 +82,7 @@ -- -2008-2010 by Enrico Tröger, Nick Treleaven and Frank Lanitz +2008-2011 by Enrico Tröger, Nick Treleaven and Frank Lanitz enrico(dot)troeger(at)uvena(dot)de nick(dot)treleaven(at)btinternet(dot)com frank(at)frank(dot)uvena(dot)de Modified: trunk/doc/geany.1.in =================================================================== --- trunk/doc/geany.1.in 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/doc/geany.1.in 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,4 +1,4 @@ -.TH "GEANY" "1" "June 12, 2010" "geany @VERSION@" "" +.TH "GEANY" "1" "January 06, 2011" "geany @VERSION@" "" .SH "NAME" Geany \(em a small and lightweight IDE .SH "SYNOPSIS" Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/doc/geany.txt 2011-01-19 19:39:09 UTC (rev 5528) @@ -14,7 +14,7 @@ :Date: $Date$ :Version: |(version)| -Copyright © 2005-2010 +Copyright © 2005-2011 This document is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 Modified: trunk/doc/plugins.dox =================================================================== --- trunk/doc/plugins.dox 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/doc/plugins.dox 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,9 +1,9 @@ /* * plugins.dox - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * Copyright 2009-2010 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/doc/pluginsignals.c =================================================================== --- trunk/doc/pluginsignals.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/doc/pluginsignals.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * pluginsignals.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/doc/pluginsymbols.c =================================================================== --- trunk/doc/pluginsymbols.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/doc/pluginsymbols.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * pluginsymbols.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany.nsi =================================================================== --- trunk/geany.nsi 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/geany.nsi 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; geany.nsi - this file is part of Geany, a fast and lightweight IDE ; -; Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> -; Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> +; Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +; Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> ; ; This program is free software; you can redistribute it and/or modify ; it under the terms of the GNU General Public License as published by @@ -51,7 +51,7 @@ VIAddVersionKey "ProductName" "${PRODUCT_NAME}" VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}" VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}" -VIAddVersionKey "LegalCopyright" "Copyright 2005-2010 by the Geany developer team" +VIAddVersionKey "LegalCopyright" "Copyright 2005-2011 by the Geany developer team" VIAddVersionKey "FileDescription" "${PRODUCT_NAME} Installer" BrandingText "$(^NAME) installer (NSIS 2.46)" Modified: trunk/geany_private.rc =================================================================== --- trunk/geany_private.rc 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/geany_private.rc 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ #include <windows.h> // include for version info constants -#define VER_FILEVERSION 0,20,0,0 -#define VER_FILEVERSION_STR "0.20" +#define VER_FILEVERSION 0,21,0,0 +#define VER_FILEVERSION_STR "0.21" A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico" @@ -21,7 +21,7 @@ VALUE "FileVersion", VER_FILEVERSION_STR VALUE "FileDescription", "Geany" VALUE "InternalName", "Geany" - VALUE "LegalCopyright", "Copyright 2005-2010 by the Geany developers" + VALUE "LegalCopyright", "Copyright 2005-2011 by the Geany developers" VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "Geany.exe" VALUE "ProductName", "Geany" Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/plugins/classbuilder.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -2,8 +2,8 @@ * classbuilder.c - this file is part of Geany, a fast and lightweight IDE * * Copyright 2007 Alexander Rodin <rodin(dot)alexander(at)gmail(dot)com> - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/plugins/demoplugin.c =================================================================== --- trunk/plugins/demoplugin.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/plugins/demoplugin.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * demoplugin.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/plugins/export.c =================================================================== --- trunk/plugins/export.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/plugins/export.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * export.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/plugins/filebrowser.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * filebrowser.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/plugins/geanyplugin.h =================================================================== --- trunk/plugins/geanyplugin.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/plugins/geanyplugin.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * geanyplugin.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2009-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/plugins/genapi.py =================================================================== --- trunk/plugins/genapi.py 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/plugins/genapi.py 2011-01-19 19:39:09 UTC (rev 5528) @@ -3,8 +3,8 @@ # # genapi.py - this file is part of Geany, a fast and lightweight IDE # -# Copyright 2008-2010 Nick Treleaven <nick.treleaven<at>btinternet.com> -# Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# Copyright 2008-2011 Nick Treleaven <nick.treleaven<at>btinternet.com> +# Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by Modified: trunk/plugins/htmlchars.c =================================================================== --- trunk/plugins/htmlchars.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/plugins/htmlchars.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,9 +1,9 @@ /* * htmlchars.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009-2010 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/plugins/saveactions.c =================================================================== --- trunk/plugins/saveactions.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/plugins/saveactions.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * saveactions.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/plugins/splitwindow.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * splitwindow.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/scripts/changelist.pl =================================================================== --- trunk/scripts/changelist.pl 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/scripts/changelist.pl 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# Copyright: 2008-2010, Nick Treleaven +# Copyright: 2008-2011, Nick Treleaven # License: GNU GPL V2 or later, as published by the Free Software Foundation, USA. # Warranty: NONE Modified: trunk/scripts/fix-alignment.pl =================================================================== --- trunk/scripts/fix-alignment.pl 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/scripts/fix-alignment.pl 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# Copyright: 2009-2010, Nick Treleaven +# Copyright: 2009-2011, Nick Treleaven # License: GNU GPL V2 or later, as published by the Free Software Foundation, USA. # Warranty: NONE Modified: trunk/scripts/plugin_test.c =================================================================== --- trunk/scripts/plugin_test.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/scripts/plugin_test.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * plugin_test.c * - * Copyright 2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2010-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2010-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/about.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * about.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,7 +40,7 @@ #define INFO "%s" #define CODENAME "\"" GEANY_CODENAME "\"" #define BUILDDATE "%s" -#define COPYRIGHT "Copyright (c) 2005-2010\nNick Treleaven\nEnrico Tröger\nFrank Lanitz\nAll rights reserved." +#define COPYRIGHT "Copyright (c) 2005-2011\nNick Treleaven\nEnrico Tröger\nFrank Lanitz\nAll rights reserved." const gchar *translators[][2] = { { "ast", "Marcos Costales <marcoscostales(a)gmail.com>"}, Modified: trunk/src/about.h =================================================================== --- trunk/src/about.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/about.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * about.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/build.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * build.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * Copyright 2009 Lex Trotman <elextr(at)gmail(dot)com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/build.h =================================================================== --- trunk/src/build.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/build.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * build.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/callbacks.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * callbacks.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/callbacks.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * callbacks.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/dialogs.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * dialogs.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/dialogs.h =================================================================== --- trunk/src/dialogs.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/dialogs.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * dialogs.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/document.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * document.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/document.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * document.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/documentprivate.h =================================================================== --- trunk/src/documentprivate.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/documentprivate.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * document-private.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/editor.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,9 +1,9 @@ /* * editor.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * Copyright 2009-2010 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/editor.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * editor.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/encodings.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * encodings.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/encodings.h =================================================================== --- trunk/src/encodings.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/encodings.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * encodings.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/filetypes.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * filetypes.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/filetypes.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * filetypes.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/filetypesprivate.h =================================================================== --- trunk/src/filetypesprivate.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/filetypesprivate.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * filetypesprivate.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/gb.c =================================================================== --- trunk/src/gb.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/gb.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * gb.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/geany.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * geany.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/geanyentryaction.c =================================================================== --- trunk/src/geanyentryaction.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/geanyentryaction.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * geanyentryaction.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id$ */ /* GtkAction subclass to provide a GtkEntry in a toolbar. Modified: trunk/src/geanyentryaction.h =================================================================== --- trunk/src/geanyentryaction.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/geanyentryaction.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * geanyentryaction.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/geanymenubuttonaction.c =================================================================== --- trunk/src/geanymenubuttonaction.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/geanymenubuttonaction.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * geanymenubuttonaction.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2009-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id$ */ /* GtkAction subclass to provide a GtkMenuToolButton in a toolbar. Modified: trunk/src/geanymenubuttonaction.h =================================================================== --- trunk/src/geanymenubuttonaction.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/geanymenubuttonaction.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * geanymenubuttonaction.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2009-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id$ */ Modified: trunk/src/geanyobject.c =================================================================== --- trunk/src/geanyobject.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/geanyobject.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * geanyobject.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/geanyobject.h =================================================================== --- trunk/src/geanyobject.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/geanyobject.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * geanyobject.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/geanywraplabel.c =================================================================== --- trunk/src/geanywraplabel.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/geanywraplabel.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * geanywraplabel.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2009-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/geanywraplabel.h =================================================================== --- trunk/src/geanywraplabel.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/geanywraplabel.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * geanywraplabel.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2009-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/highlighting.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * highlighting.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/highlighting.h =================================================================== --- trunk/src/highlighting.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/highlighting.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * highlighting.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/images.c =================================================================== --- trunk/src/images.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/images.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * images.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/keybindings.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * keybindings.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/keybindings.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * keybindings.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/keyfile.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * keyfile.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/keyfile.h =================================================================== --- trunk/src/keyfile.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/keyfile.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * keyfile.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/log.c =================================================================== --- trunk/src/log.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/log.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * log.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/log.h =================================================================== --- trunk/src/log.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/log.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * log.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/main.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * main.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/main.h =================================================================== --- trunk/src/main.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/main.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * main.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/msgwindow.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * msgwindow.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/msgwindow.h =================================================================== --- trunk/src/msgwindow.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/msgwindow.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * msgwindow.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/navqueue.c =================================================================== --- trunk/src/navqueue.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/navqueue.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -2,8 +2,8 @@ * navqueue.c - this file is part of Geany, a fast and lightweight IDE * * Copyright 2007 Dave Moore <wrex006(at)gmail(dot)com> - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/navqueue.h =================================================================== --- trunk/src/navqueue.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/navqueue.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -2,8 +2,8 @@ * navqueue.h - this file is part of Geany, a fast and lightweight IDE * * Copyright 2007 Dave Moore <wrex006(at)gmail(dot)com> - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/notebook.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * notebook.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/notebook.h =================================================================== --- trunk/src/notebook.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/notebook.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * notebook.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/plugindata.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * plugindata.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/pluginprivate.h =================================================================== --- trunk/src/pluginprivate.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/pluginprivate.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * pluginprivate.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * Copyright 2009-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/plugins.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * plugins.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/plugins.h =================================================================== --- trunk/src/plugins.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/plugins.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * plugins.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/pluginutils.c =================================================================== --- trunk/src/pluginutils.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/pluginutils.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * pluginutils.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * Copyright 2009-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/pluginutils.h =================================================================== --- trunk/src/pluginutils.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/pluginutils.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * pluginutils.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * Copyright 2009-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/prefs.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * prefs.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/prefs.h =================================================================== --- trunk/src/prefs.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/prefs.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * prefs.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/printing.c =================================================================== --- trunk/src/printing.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/printing.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * printing.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/printing.h =================================================================== --- trunk/src/printing.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/printing.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * printing.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/project.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * project.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/project.h =================================================================== --- trunk/src/project.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/project.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * project.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/projectprivate.h =================================================================== --- trunk/src/projectprivate.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/projectprivate.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * projectprivate.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/sciwrappers.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * sciwrappers.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/sciwrappers.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * sciwrappers.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/search.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * search.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/search.h =================================================================== --- trunk/src/search.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/search.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * search.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/sidebar.c =================================================================== --- trunk/src/sidebar.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/sidebar.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * sidebar.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/sidebar.h =================================================================== --- trunk/src/sidebar.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/sidebar.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * sidebar.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/socket.c =================================================================== --- trunk/src/socket.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/socket.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * socket.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * Copyright 2006 Hiroyuki Yamamoto (author of Sylpheed) * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/socket.h =================================================================== --- trunk/src/socket.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/socket.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * socket.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/stash.c =================================================================== --- trunk/src/stash.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/stash.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * stash.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/stash.h =================================================================== --- trunk/src/stash.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/stash.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * stash.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/support.h =================================================================== --- trunk/src/support.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/support.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * support.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/symbols.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * symbols.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/symbols.h =================================================================== --- trunk/src/symbols.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/symbols.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * symbols.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/templates.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * templates.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/templates.h =================================================================== --- trunk/src/templates.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/templates.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * templates.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/toolbar.c =================================================================== --- trunk/src/toolbar.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/toolbar.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * toolbar.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2009-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/toolbar.h =================================================================== --- trunk/src/toolbar.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/toolbar.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * toolbar.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2009-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/tools.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * tools.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/tools.h =================================================================== --- trunk/src/tools.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/tools.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * tools.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/ui_utils.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * ui_utils.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/ui_utils.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * ui_utils.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/utils.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * utils.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/utils.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * utils.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/vte.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * vte.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/vte.h =================================================================== --- trunk/src/vte.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/vte.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * vte.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <<nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <<nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/win32.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * win32.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/win32.h =================================================================== --- trunk/src/win32.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/src/win32.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,8 +1,8 @@ /* * win32.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/tagmanager/nestlevel.c =================================================================== --- trunk/tagmanager/nestlevel.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/tagmanager/nestlevel.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -2,7 +2,7 @@ * $Id$ * * Copyright (c) 1999-2002, Darren Hiebert -* Copyright 2009-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> +* Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This source code is released for free distribution under the terms of the * GNU General Public License. Modified: trunk/tagmanager/nestlevel.h =================================================================== --- trunk/tagmanager/nestlevel.h 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/tagmanager/nestlevel.h 2011-01-19 19:39:09 UTC (rev 5528) @@ -2,7 +2,7 @@ * $Id$ * * Copyright (c) 1999-2002, Darren Hiebert -* Copyright 2009-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> +* Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This source code is released for free distribution under the terms of the * GNU General Public License. Modified: trunk/tagmanager/nsis.c =================================================================== --- trunk/tagmanager/nsis.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/tagmanager/nsis.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -2,7 +2,7 @@ * $Id$ * * Copyright (c) 2000-2002, Darren Hiebert -* Copyright (c) 2009-2010, Enrico Tröger +* Copyright (c) 2009-2011, Enrico Tröger * * This source code is released for free distribution under the terms of the * GNU General Public License. Modified: trunk/tagmanager/rest.c =================================================================== --- trunk/tagmanager/rest.c 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/tagmanager/rest.c 2011-01-19 19:39:09 UTC (rev 5528) @@ -1,6 +1,6 @@ /* * -* Copyright (c) 2007-2010, Nick Treleaven +* Copyright (c) 2007-2011, Nick Treleaven * * This source code is released for free distribution under the terms of the * GNU General Public License. Modified: trunk/wscript =================================================================== --- trunk/wscript 2011-01-19 19:19:06 UTC (rev 5527) +++ trunk/wscript 2011-01-19 19:39:09 UTC (rev 5528) @@ -2,8 +2,8 @@ # # WAF build script - this file is part of Geany, a fast and lightweight IDE # -# Copyright 2008-2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> -# Copyright 2008-2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> +# Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5527] trunk/doc/making-a-release
by eht16＠users.sourceforge.net 19 Jan '11

19 Jan '11

Revision: 5527 http://geany.svn.sourceforge.net/geany/?rev=5527&view=rev Author: eht16 Date: 2011-01-19 19:19:06 +0000 (Wed, 19 Jan 2011) Log Message: ----------- add note about doc/geany.1.in Modified Paths: -------------- trunk/doc/making-a-release Modified: trunk/doc/making-a-release =================================================================== --- trunk/doc/making-a-release 2011-01-18 19:29:15 UTC (rev 5526) +++ trunk/doc/making-a-release 2011-01-19 19:19:06 UTC (rev 5527) @@ -6,6 +6,8 @@ Ensure version numbers are all updated in: configure.ac geany.nsi geany_private.rc win32-config.h wscript doc/geany.txt +Ensure release date is updated in: + doc/geany.1.in Regenerate doc/geany.html. Check GEANY_CODENAME is set in src/geany.h. Update NEWS & release date. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5526] trunk
by eht16＠users.sourceforge.net 18 Jan '11

18 Jan '11

Revision: 5526 http://geany.svn.sourceforge.net/geany/?rev=5526&view=rev Author: eht16 Date: 2011-01-18 19:29:15 +0000 (Tue, 18 Jan 2011) Log Message: ----------- Add and use secondary keywords for filetype JavaScript, update and sanitize JavaScript keyword lists (patch by Jason Oster, thank you). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.javascript trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-01-11 21:49:43 UTC (rev 5525) +++ trunk/ChangeLog 2011-01-18 19:29:15 UTC (rev 5526) @@ -1,3 +1,12 @@ +2011-01-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/highlighting.c, data/filetypes.javascript: + Add and use secondary keywords for filetype JavaScript, + update and sanitize JavaScript keyword lists + (patch by Jason Oster, thank you). + + + 2011-01-11 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * THANKS, src/about.c: Modified: trunk/data/filetypes.javascript =================================================================== --- trunk/data/filetypes.javascript 2011-01-11 21:49:43 UTC (rev 5525) +++ trunk/data/filetypes.javascript 2011-01-18 19:29:15 UTC (rev 5526) @@ -26,8 +26,8 @@ [keywords] # all items must be in one line -primary=break case catch const continue delete else eval false finally for function if in try instanceof isFinite isNaN NaN new null return switch this throw true typeof undefined var while with default let -secondary=Object Function Array prototype +primary=break case catch const continue default delete do each else false finally for function get if in Infinity instanceof let NaN new null return set switch this throw true try typeof undefined var void while with yield +secondary=Array Boolean Date Function Math Number Object String RegExp EvalError Error RangeError ReferenceError SyntaxError TypeError URIError prototype decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt [settings] # default extension used when saving files Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2011-01-11 21:49:43 UTC (rev 5525) +++ trunk/src/highlighting.c 2011-01-18 19:29:15 UTC (rev 5526) @@ -3073,9 +3073,10 @@ { styleset_c_like_init(config, config_home, ft_id); - style_sets[ft_id].keywords = g_new(gchar*, 2); + style_sets[ft_id].keywords = g_new(gchar*, 3); get_keyfile_keywords(config, config_home, "primary", ft_id, 0); - style_sets[ft_id].keywords[1] = NULL; + get_keyfile_keywords(config, config_home, "secondary", ft_id, 1); + style_sets[ft_id].keywords[2] = NULL; } @@ -3084,6 +3085,7 @@ styleset_c_like(sci, ft_id); sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2011