Commits August 2012

commits@lists.geany.org

1 participants
29 discussions

[geany/geany] 61c521: Fix an off-by-one issue in C macro parsing code
by Colomban Wendling 25 Aug '12

25 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 25 Aug 2012 13:50:09 Commit: 61c5216083a916af46c1150f1b4f4a7102c4a25b https://github.com/geany/geany/commit/61c5216083a916af46c1150f1b4f4a7102c4a… Log Message: ----------- Fix an off-by-one issue in C macro parsing code Closes #3556536. Modified Paths: -------------- tagmanager/ctags/get.c Modified: tagmanager/ctags/get.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -722,10 +722,10 @@ extern char *getArglistFromFilePos(MIOPos startPosition, const char *tokenName) if (pos2 > pos1) { - result = (char *) g_malloc(sizeof(char ) * (pos2 - pos1 + 2)); - if (result != NULL && mio_read(File.mio, result, sizeof(char), pos2 - pos1 + 1) > 0) + result = (char *) g_malloc(sizeof(char ) * (pos2 - pos1 + 1)); + if (result != NULL && mio_read(File.mio, result, sizeof(char), pos2 - pos1) > 0) { - result[pos2-pos1+1] = '\0'; + result[pos2-pos1] = '\0'; arglist = getArglistFromStr(result, tokenName); } g_free(result); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 9817c1: Add a few missing Haxe keywords
by Colomban Wendling 24 Aug '12

24 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 24 Aug 2012 21:26:11 Commit: 9817c1420201554b5c2f9841f5fb192dd7ce00ba https://github.com/geany/geany/commit/9817c1420201554b5c2f9841f5fb192dd7ce0… Log Message: ----------- Add a few missing Haxe keywords Closes #3448664. Modified Paths: -------------- data/filetypes.haxe Modified: data/filetypes.haxe 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -3,8 +3,8 @@ [keywords] # all items must be in one line -primary=abstract break case catch class const continue trace do else enum extends finally for function goto if implements import in instanceof int interface new package private public return static super switch this throw throws transient try typeof var void volatile while with -secondary=Bool Float Int null Void Enum String +primary=abstract break case catch class const continue trace do else enum extends finally for function goto if implements import in inline instanceof int interface new package private public return static super switch this throw throws transient try typeof using var void volatile while with +secondary=Bool Dynamic Float Int null Void Enum String classes=Array ArrayAccess Class Date DateTools EReg Hash IntHash IntIter Iterable Iterator Lambda List Math Null Protected Reflect Std StringBuf StringTools Type UInt ValueType Xml XmlType @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] ce742b: Remove spurious semicolons
by Colomban Wendling 24 Aug '12

24 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 24 Aug 2012 18:20:09 Commit: ce742b45dd103435a77f8ab391bdaec67cde36a0 https://github.com/geany/geany/commit/ce742b45dd103435a77f8ab391bdaec67cde3… Log Message: ----------- Remove spurious semicolons Modified Paths: -------------- src/build.c Modified: src/build.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -479,7 +479,7 @@ static GeanyBuildCommand *get_build_group(const GeanyBuildSource src, const Gean GeanyBuildCommand **g = get_build_group_pointer(src, grp); if (g == NULL) return NULL; return *g; -}; +} /** Remove the specified Build menu item. @@ -587,7 +587,7 @@ const gchar *build_get_current_menu_item(const GeanyBuildGroup grp, const guint break; } return str; -}; +} /** Set the string for the menu item field. * @@ -635,7 +635,7 @@ void build_set_menu_item(const GeanyBuildSource src, const GeanyBuildGroup grp, break; } build_menu_update(NULL); -}; +} /** Set the string for the menu item field. * @@ -649,7 +649,7 @@ void build_set_menu_item(const GeanyBuildSource src, const GeanyBuildGroup grp, void build_activate_menu_item(const GeanyBuildGroup grp, const guint cmd) { on_build_menu_item(NULL, GRP_CMD_TO_POINTER(grp, cmd)); -}; +} /* Clear all error indicators in all documents. */ @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] d80bc7: Update FSF address
by Colomban Wendling 24 Aug '12

24 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 24 Aug 2012 17:25:57 Commit: d80bc7ce56d8f69b1cfe933bc02c4d58dadc2a7e https://github.com/geany/geany/commit/d80bc7ce56d8f69b1cfe933bc02c4d58dadc2… Log Message: ----------- Update FSF address Closes #3557875. Modified Paths: -------------- COPYING doc/geany.html doc/geany.txt doc/plugins.dox doc/pluginsignals.c doc/pluginsymbols.c plugins/classbuilder.c plugins/demoplugin.c plugins/export.c plugins/filebrowser.c plugins/geanyplugin.h plugins/htmlchars.c plugins/saveactions.c plugins/splitwindow.c src/about.c src/about.h src/build.c src/build.h src/callbacks.c src/callbacks.h src/dialogs.c src/dialogs.h src/document.c src/document.h src/documentprivate.h src/editor.c src/editor.h src/encodings.c src/encodings.h src/filetypes.c src/filetypes.h src/filetypesprivate.h src/gb.c src/geany.h src/geanyentryaction.c src/geanyentryaction.h src/geanymenubuttonaction.c src/geanymenubuttonaction.h src/geanyobject.c src/geanyobject.h src/geanywraplabel.c src/geanywraplabel.h src/highlighting.c src/highlighting.h src/highlightingmappings.h src/images.c src/keybindings.c src/keybindings.h src/keyfile.c src/keyfile.h src/log.c src/log.h src/main.c src/main.h src/msgwindow.c src/msgwindow.h src/navqueue.c src/navqueue.h src/notebook.c src/notebook.h src/plugindata.h src/pluginprivate.h src/plugins.c src/plugins.h src/pluginutils.c src/pluginutils.h src/prefs.c src/prefs.h src/printing.c src/printing.h src/project.c src/project.h src/projectprivate.h src/sciwrappers.c src/sciwrappers.h src/search.c src/search.h src/sidebar.c src/sidebar.h src/socket.c src/socket.h src/stash.c src/stash.h src/support.h src/symbols.c src/symbols.h src/templates.c src/templates.h src/toolbar.c src/toolbar.h src/tools.c src/tools.h src/ui_utils.c src/utils.c src/utils.h src/vte.c src/vte.h src/win32.c src/win32.h Modified: COPYING 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -303,9 +303,9 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - 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 St, Fifth Floor, Boston, MA 02110-1301 USA + 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. Also add information on how to contact you by electronic and paper mail. Modified: doc/geany.html 10 files changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -6444,7 +6444,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -6745,9 +6745,9 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - 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 St, Fifth Floor, Boston, MA 02110-1301 USA + 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. Also add information on how to contact you by electronic and paper mail. @@ -6803,7 +6803,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2012-07-26 14:56 UTC. +Generated on: 2012-08-24 17:21 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: doc/geany.txt 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -5285,7 +5285,7 @@ GNU General Public License Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -5586,9 +5586,9 @@ GNU General Public License MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - 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 St, Fifth Floor, Boston, MA 02110-1301 USA + 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. Also add information on how to contact you by electronic and paper mail. Modified: doc/plugins.dox 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -15,10 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. * * This file contains additional plugin documentation like the signal system and a small howto. * It is best viewed when filetype is set to C or C++. Modified: doc/pluginsignals.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Note: this file is for Doxygen only. */ Modified: doc/pluginsymbols.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Note: this file is for Doxygen only. */ Modified: plugins/classbuilder.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -15,10 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Class Builder - creates source files containing a new class interface and definition. */ Modified: plugins/demoplugin.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: plugins/export.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Export plugin. */ Modified: plugins/filebrowser.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Sidebar file browser plugin. */ Modified: plugins/geanyplugin.h 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: plugins/htmlchars.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -15,10 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* HTML Characters plugin (Inserts HTML character entities like '&') */ Modified: plugins/saveactions.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: plugins/splitwindow.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Split Window plugin. */ Modified: src/about.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -15,9 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/about.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/build.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -15,9 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/build.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ /** @file build.h Interface to the Build menu functionality. */ Modified: src/callbacks.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/callbacks.h 28 files changed, 14 insertions(+), 14 deletions(-) =================================================================== @@ -1,22 +1,22 @@ /* - * callbacks.h - this file is part of Geany, a fast and lightweight IDE + * callbacks.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2012 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2005-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2012 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/dialogs.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/dialogs.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: src/document.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/document.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: src/documentprivate.h 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/editor.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -15,9 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ /** Modified: src/editor.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ Modified: src/encodings.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/encodings.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/filetypes.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: src/filetypes.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/filetypesprivate.h 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/gb.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ /* Modified: src/geany.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Main header - should be included first in all source files. Modified: src/geanyentryaction.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* GtkAction subclass to provide a GtkEntry in a toolbar. Modified: src/geanyentryaction.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/geanymenubuttonaction.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* GtkAction subclass to provide a GtkMenuToolButton in a toolbar. Modified: src/geanymenubuttonaction.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/geanyobject.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* A GObject used for connecting and emitting signals when certain events happen, Modified: src/geanyobject.h 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/geanywraplabel.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/geanywraplabel.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ #ifndef GEANY_WRAP_LABEL_H Modified: src/highlighting.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -15,9 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: src/highlighting.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/highlightingmappings.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -15,9 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/images.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * 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. */ /* Modified: src/keybindings.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: src/keybindings.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ #ifndef GEANY_KEYBINDINGS_H Modified: src/keyfile.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/keyfile.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ Modified: src/log.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/log.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/main.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: src/main.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/msgwindow.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ /** Modified: src/msgwindow.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ #ifndef GEANY_MSGWINDOW_H Modified: src/navqueue.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -15,9 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/navqueue.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -15,9 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: src/notebook.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ /* Modified: src/notebook.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ #ifndef GEANY_NOTEBOOK_H Modified: src/plugindata.h 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: src/pluginprivate.h 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/plugins.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Code to manage, load and unload plugins. */ Modified: src/plugins.h 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/pluginutils.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** @file pluginutils.h Modified: src/pluginutils.h 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/prefs.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/prefs.h 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - * + * 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. */ #ifndef GEANY_PREFS_H Modified: src/printing.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/printing.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/project.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** @file project.h Modified: src/project.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/projectprivate.h 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/sciwrappers.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** @file sciwrappers.h Modified: src/sciwrappers.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ #ifndef GEANY_SCIWRAPPERS_H Modified: src/search.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/search.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: src/sidebar.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/sidebar.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ Modified: src/socket.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -15,9 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/socket.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/stash.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: src/stash.h 29 files changed, 14 insertions(+), 15 deletions(-) =================================================================== @@ -1,23 +1,22 @@ /* - * stash.h - this file is part of Geany, a fast and lightweight IDE + * stash.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2012 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * Copyright 2008-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2012 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2012 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * 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. + * 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. */ #ifndef GEANY_STASH_H Modified: src/support.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: src/symbols.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -15,9 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: src/symbols.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ Modified: src/templates.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/templates.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: src/toolbar.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ /** Modified: src/toolbar.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ #ifndef GEANY_TOOLBAR_H Modified: src/tools.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/tools.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ Modified: src/ui_utils.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -15,9 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** @file ui_utils.h Modified: src/utils.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/utils.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /** Modified: src/vte.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/vte.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ Modified: src/win32.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ /* Modified: src/win32.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -14,9 +14,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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. */ @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 2b7715: Update of Russian translation provided by Igor Burmistrov
by Frank Lanitz 20 Aug '12

20 Aug '12

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 20 Aug 2012 07:46:07 Commit: 2b77157e5ee3a897829dce6a61c217b9cdb82378 https://github.com/geany/geany/commit/2b77157e5ee3a897829dce6a61c217b9cdb82… Log Message: ----------- Update of Russian translation provided by Igor Burmistrov Modified Paths: -------------- po/ru.po Modified: po/ru.po 737 files changed, 387 insertions(+), 350 deletions(-) =================================================================== @@ -1,22 +1,21 @@ # Translation Geany to Russian. -# Copyright (C) Geany development team. +# Copyright (C) Geany development team. # This file is distributed under the same license as the Geany package. # John Wehin <john.wehin(a)gmail.com>, 2008-2009. # Denis Koryavov <dkoryavov(a)yandex.ru>, 2010. +# Igor Burmistrov <meyday(a)yandex.ru>, 2012 msgid "" msgstr "" "Project-Id-Version: Geany 1.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-03 17:50+0200\n" -"PO-Revision-Date: 2010-07-28 06:38+0400\n" -"Last-Translator: Denis Koryavov <dkoryavov(a)yandex.ru>\n" +"POT-Creation-Date: 2012-08-20 09:44+0200\n" +"PO-Revision-Date: 2012-08-11 15:21+0300\n" +"Last-Translator: Igor Burmistrov <meyday(a)yandex.ru>\n" "Language-Team: Russian <ru(a)li.org>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Russian\n" -"X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-Basepath: ../\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -59,8 +58,9 @@ msgid "Insert _Multiline Comment" msgstr "Вставить _многострочный комментарий" #: ../data/geany.glade.h:7 +#, fuzzy msgid "_More" -msgstr "" +msgstr "Ещё" #: ../data/geany.glade.h:8 msgid "Insert File _Header" @@ -86,7 +86,7 @@ msgstr "невидимый" msgid "_Insert \"include <...>\"" msgstr "Вставить \"include <...>\"" -#: ../data/geany.glade.h:14 ../src/keybindings.c:408 +#: ../data/geany.glade.h:14 ../src/keybindings.c:411 msgid "_Insert Alternative White Space" msgstr "Вставить переменный _пробел" @@ -130,7 +130,7 @@ msgstr "Текущие символы" msgid "Match braces" msgstr "Совмещать скобки" -#: ../data/geany.glade.h:25 ../src/keybindings.c:418 +#: ../data/geany.glade.h:25 ../src/keybindings.c:421 msgid "Preferences" msgstr "Настройки" @@ -187,9 +187,9 @@ msgid "Startup path:" msgstr "Рабочий каталог при запуске:" #: ../data/geany.glade.h:38 +#, fuzzy msgid "" -"Path to start in when opening or saving files. Must be an absolute path. " -"Leave blank to use the current working directory." +"Path to start in when opening or saving files. Must be an absolute path." msgstr "" "Начальный каталог для открытия и сохранения файлов. Путь должен быть " "абсолютным. Оставьте пустым, чтобы использовать текущий рабочий каталог." @@ -705,10 +705,13 @@ msgid "Features" msgstr "Возможности" #: ../data/geany.glade.h:139 +#, fuzzy msgid "" "Note: To apply these settings to all currently open documents, use " "<i>Project->Apply Default Indentation</i>." msgstr "" +"Замечание: Чтобы применить эти настройки ко всем документам используйте " +"<i>Проект->Использовать ширину отступа по-умолчанию</i>." #: ../data/geany.glade.h:140 msgid "Width:" @@ -814,8 +817,9 @@ msgid "XML/HTML tag auto-closing" msgstr "Автозавершение тегов XML" #: ../data/geany.glade.h:161 +#, fuzzy msgid "Insert matching closing tag for XML/HTML" -msgstr "" +msgstr "Дополнять закрывающие теги для XML/HTML" #: ../data/geany.glade.h:162 msgid "Automatic continuation of multi-line comments" @@ -879,15 +883,21 @@ msgstr "" "Максимальное количество предлагаемых вариантов в списке авто-завершения." #: ../data/geany.glade.h:174 +#, fuzzy msgid "Symbol list update frequency:" -msgstr "" +msgstr "Частота обновления тегов:" #: ../data/geany.glade.h:175 +#, fuzzy msgid "" "Minimal delay (in milliseconds) between two automatic updates of the symbol " "list. Note that a too short delay may have performance impact, especially " "with large files. A delay of 0 disables real-time updates." msgstr "" +"Минимальная задержка (в миллисекундах) между обновлением тегов. Обратите " +"внимание, что слишком маленькая задержка может сказаться на " +"производительности, особенно в больших файлах. Значение 0 устанавливает " +"обновление в реальном времени." #: ../data/geany.glade.h:176 msgid "<b>Completions</b>" @@ -1108,7 +1118,7 @@ msgstr "<b>Виртуальные пробелы</b>" msgid "Display" msgstr "Отображение" -#: ../data/geany.glade.h:223 ../src/keybindings.c:224 ../src/prefs.c:1581 +#: ../data/geany.glade.h:223 ../src/keybindings.c:227 ../src/prefs.c:1581 msgid "Editor" msgstr "Редактор" @@ -1180,10 +1190,13 @@ msgid "Ensure consistent line endings" msgstr "Следить за наличием новой строки в конце файла" #: ../data/geany.glade.h:238 +#, fuzzy msgid "" "Ensures that newline characters always get converted before saving, avoiding " "mixed line endings in the same file" msgstr "" +"Убедиться, что символы новой строки всегда будут преобразовываться перед " +"сохраннием, избегая смешанных символов конца строки в одном файле" #: ../data/geany.glade.h:239 msgid "Strip trailing spaces and tabs" @@ -1193,7 +1206,7 @@ msgstr "Убирать лишние пробелы и табуляции" msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Убирать лишние пробелы, табуляции и окончания строк" -#: ../data/geany.glade.h:241 ../src/keybindings.c:559 +#: ../data/geany.glade.h:241 ../src/keybindings.c:564 msgid "Replace tabs by space" msgstr "Заменить табуляции пробелами" @@ -1225,7 +1238,7 @@ msgstr "" "Периодичность проверки на изменение файлов на диске (в секундах). Нулевое " "значение отключает проверку." -#: ../data/geany.glade.h:248 ../src/prefs.c:1583 ../src/symbols.c:687 +#: ../data/geany.glade.h:248 ../src/prefs.c:1583 ../src/symbols.c:688 #: ../plugins/filebrowser.c:1120 msgid "Files" msgstr "Файлы" @@ -1278,7 +1291,7 @@ msgstr "" msgid "<b>Commands</b>" msgstr "<b>Команды</b>" -#: ../data/geany.glade.h:259 ../src/keybindings.c:236 ../src/prefs.c:1585 +#: ../data/geany.glade.h:259 ../src/keybindings.c:239 ../src/prefs.c:1585 msgid "Tools" msgstr "Инструменты" @@ -1603,8 +1616,10 @@ msgid "Terminal" msgstr "Терминал" #: ../data/geany.glade.h:327 +#, fuzzy msgid "<i>Warning: read the manual before changing these preferences.</i>" msgstr "" +"<i>Внимание: прочтите руководство перед изменением этих параметров.</i>" #: ../data/geany.glade.h:328 #, fuzzy @@ -1620,7 +1635,7 @@ msgstr "_Предыдущее" msgid "Project Properties" msgstr "Свойства проекта" -#: ../data/geany.glade.h:331 ../src/plugins.c:1457 ../src/project.c:150 +#: ../data/geany.glade.h:331 ../src/plugins.c:1459 ../src/project.c:150 msgid "Filename:" msgstr "Имя файла:" @@ -1657,7 +1672,7 @@ msgstr "" "новый каталог, так и уже существующий. Вы можете использовать относительные " "пути (относительно имени проекта)." -#: ../data/geany.glade.h:338 ../src/keybindings.c:234 +#: ../data/geany.glade.h:338 ../src/keybindings.c:237 msgid "Project" msgstr "Проект" @@ -1705,8 +1720,8 @@ msgstr "Недавние _файлы" msgid "Save A_ll" msgstr "Сохранить _все" -#: ../data/geany.glade.h:351 ../src/callbacks.c:430 ../src/document.c:2838 -#: ../src/sidebar.c:696 +#: ../data/geany.glade.h:351 ../src/callbacks.c:433 ../src/document.c:2838 +#: ../src/sidebar.c:697 msgid "_Reload" msgstr "_Обновить" @@ -1730,43 +1745,43 @@ msgstr "_Закрыть все" msgid "_Commands" msgstr "Ко_манды" -#: ../data/geany.glade.h:357 ../src/keybindings.c:343 +#: ../data/geany.glade.h:357 ../src/keybindings.c:346 msgid "_Cut Current Line(s)" msgstr "_Вырезать строку(и)" -#: ../data/geany.glade.h:358 ../src/keybindings.c:340 +#: ../data/geany.glade.h:358 ../src/keybindings.c:343 msgid "_Copy Current Line(s)" msgstr "_Копировать строку(и)" -#: ../data/geany.glade.h:359 ../src/keybindings.c:295 +#: ../data/geany.glade.h:359 ../src/keybindings.c:298 msgid "_Delete Current Line(s)" msgstr "_Удалить строку(и)" -#: ../data/geany.glade.h:360 ../src/keybindings.c:292 +#: ../data/geany.glade.h:360 ../src/keybindings.c:295 msgid "_Duplicate Line or Selection" msgstr "_Дублировать строку" -#: ../data/geany.glade.h:361 ../src/keybindings.c:353 +#: ../data/geany.glade.h:361 ../src/keybindings.c:356 msgid "_Select Current Line(s)" msgstr "Выделить строку(и)" -#: ../data/geany.glade.h:362 ../src/keybindings.c:356 +#: ../data/geany.glade.h:362 ../src/keybindings.c:359 msgid "_Select Current Paragraph" msgstr "Выделить параграф" -#: ../data/geany.glade.h:363 ../src/keybindings.c:395 +#: ../data/geany.glade.h:363 ../src/keybindings.c:398 msgid "_Send Selection to Terminal" msgstr "_Отправить выделенное в терминал" -#: ../data/geany.glade.h:364 ../src/keybindings.c:397 +#: ../data/geany.glade.h:364 ../src/keybindings.c:400 msgid "_Reflow Lines/Block" msgstr "Переформатировать строки/блок" -#: ../data/geany.glade.h:365 ../src/keybindings.c:367 +#: ../data/geany.glade.h:365 ../src/keybindings.c:370 msgid "T_oggle Case of Selection" msgstr "Переключить _регистр выделенного текста" -#: ../data/geany.glade.h:366 ../src/keybindings.c:302 +#: ../data/geany.glade.h:366 ../src/keybindings.c:305 msgid "_Transpose Current Line" msgstr "П_ереставить строку" @@ -1790,7 +1805,7 @@ msgstr "У_величить отступ" msgid "_Decrease Indent" msgstr "У_меньшить отступ" -#: ../data/geany.glade.h:372 ../src/keybindings.c:386 +#: ../data/geany.glade.h:372 ../src/keybindings.c:389 msgid "_Smart Line Indent" msgstr "Использовать \"_умный\" отступ" @@ -1806,7 +1821,7 @@ msgstr "Вставить комм_ентарии" msgid "Preference_s" msgstr "_Настройки" -#: ../data/geany.glade.h:376 ../src/keybindings.c:421 +#: ../data/geany.glade.h:376 ../src/keybindings.c:424 msgid "P_lugin Preferences" msgstr "Настройки _модулей" @@ -1834,11 +1849,11 @@ msgstr "_Следующее сообщение" msgid "Pr_evious Message" msgstr "Предыдущее сообщение" -#: ../data/geany.glade.h:383 ../src/keybindings.c:470 +#: ../data/geany.glade.h:383 ../src/keybindings.c:473 msgid "_Go to Next Marker" msgstr "Перейти к _следующему маркеру" -#: ../data/geany.glade.h:384 ../src/keybindings.c:473 +#: ../data/geany.glade.h:384 ../src/keybindings.c:476 msgid "_Go to Previous Marker" msgstr "Перейти к _предыдущему маркеру" @@ -1846,17 +1861,17 @@ msgstr "Перейти к _предыдущему маркеру" msgid "_Go to Line" msgstr "_Перейти на строку" -#: ../data/geany.glade.h:386 ../src/keybindings.c:433 +#: ../data/geany.glade.h:386 ../src/keybindings.c:436 #, fuzzy msgid "Find Next _Selection" msgstr "Найти следующее выделение" -#: ../data/geany.glade.h:387 ../src/keybindings.c:435 +#: ../data/geany.glade.h:387 ../src/keybindings.c:438 #, fuzzy msgid "Find Pre_vious Selection" msgstr "Найти предыдущее выделенное" -#: ../data/geany.glade.h:388 ../src/keybindings.c:452 +#: ../data/geany.glade.h:388 ../src/keybindings.c:455 #, fuzzy msgid "_Mark All" msgstr "Пометить все" @@ -1947,8 +1962,9 @@ msgid "T_abs and Spaces" msgstr "_Табуляции и пробелы" #: ../data/geany.glade.h:410 +#, fuzzy msgid "Indent Widt_h" -msgstr "" +msgstr "Ширина отступа" #: ../data/geany.glade.h:411 msgid "_1" @@ -2063,8 +2079,9 @@ msgid "_Close" msgstr "_Закрыть" #: ../data/geany.glade.h:439 +#, fuzzy msgid "Apply the default indentation settings to all documents" -msgstr "" +msgstr "Использовать ширину отступа по-умолчанию во всех документах" #: ../data/geany.glade.h:440 #, fuzzy @@ -2122,8 +2139,9 @@ msgid "Wi_ki" msgstr "" #: ../data/geany.glade.h:453 +#, fuzzy msgid "Report a _Bug" -msgstr "" +msgstr "Сообщить об ошибке" #: ../data/geany.glade.h:454 #, fuzzy @@ -2154,7 +2172,7 @@ msgstr "Сообщения" msgid "Scribble" msgstr "Заметки" -#: ../src/about.c:41 +#: ../src/about.c:42 msgid "" "Copyright (c) 2005-2012\n" "Colomban Wendling\n" @@ -2165,68 +2183,68 @@ msgid "" "All rights reserved." msgstr "" -#: ../src/about.c:157 +#: ../src/about.c:158 msgid "About Geany" msgstr "О Geany" -#: ../src/about.c:207 +#: ../src/about.c:208 msgid "A fast and lightweight IDE" msgstr "Быстрая и легковесная среда разработки" -#: ../src/about.c:228 +#: ../src/about.c:229 #, c-format msgid "(built on or after %s)" msgstr "(собрано %s или позднее)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:259 +#: ../src/about.c:260 msgid "Info" msgstr "Информация" -#: ../src/about.c:275 +#: ../src/about.c:276 msgid "Developers" msgstr "Разработчики" -#: ../src/about.c:282 +#: ../src/about.c:283 msgid "maintainer" msgstr "ведущий разработчик" -#: ../src/about.c:290 ../src/about.c:298 ../src/about.c:306 +#: ../src/about.c:291 ../src/about.c:299 ../src/about.c:307 msgid "developer" msgstr "разработчик" -#: ../src/about.c:314 +#: ../src/about.c:315 msgid "translation maintainer" msgstr "ведущий переводчик" -#: ../src/about.c:323 +#: ../src/about.c:324 msgid "Translators" msgstr "переводчики" -#: ../src/about.c:343 +#: ../src/about.c:344 msgid "Previous Translators" msgstr "Предыдущие переводчики" -#: ../src/about.c:364 +#: ../src/about.c:365 msgid "Contributors" msgstr "Участники" -#: ../src/about.c:374 +#: ../src/about.c:375 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" "Некоторые из многих участников проекта (более детальный список в файле %s):" -#: ../src/about.c:400 +#: ../src/about.c:401 msgid "Credits" msgstr "О нас" -#: ../src/about.c:417 +#: ../src/about.c:418 msgid "License" msgstr "Лицензия" -#: ../src/about.c:426 +#: ../src/about.c:427 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -2249,7 +2267,7 @@ msgstr "Не указан рабочий каталог" msgid "%s (in directory: %s)" msgstr "%s (в каталоге: %s)" -#: ../src/build.c:831 ../src/build.c:1055 ../src/search.c:1632 +#: ../src/build.c:831 ../src/build.c:1055 ../src/search.c:1647 #, c-format msgid "Process failed (%s)" msgstr "Процесс дал сбой (%s)" @@ -2336,12 +2354,12 @@ msgstr "Ошибок сборки больше нет." msgid "Set menu item label" msgstr "Метка элемента меню" -#: ../src/build.c:1967 ../src/symbols.c:742 ../src/tools.c:554 +#: ../src/build.c:1967 ../src/symbols.c:743 ../src/tools.c:554 msgid "Label" msgstr "Метка" #. command column, holding status and command display -#: ../src/build.c:1968 ../src/symbols.c:737 ../src/tools.c:539 +#: ../src/build.c:1968 ../src/symbols.c:738 ../src/tools.c:539 msgid "Command" msgstr "Команда" @@ -2441,63 +2459,63 @@ msgstr[0] "Файл %d сохранен." msgstr[1] "%d файла сохранено." msgstr[2] "%d файлов сохранено." -#: ../src/callbacks.c:431 +#: ../src/callbacks.c:434 msgid "Any unsaved changes will be lost." msgstr "Любые несохраненные изменения будут потеряны." -#: ../src/callbacks.c:432 +#: ../src/callbacks.c:435 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Вы уверены, что хотите обновить '%s'?" -#: ../src/callbacks.c:1062 ../src/keybindings.c:461 +#: ../src/callbacks.c:1065 ../src/keybindings.c:464 msgid "Go to Line" msgstr "Перейти на строку" -#: ../src/callbacks.c:1063 +#: ../src/callbacks.c:1066 msgid "Enter the line you want to go to:" msgstr "Введите строку, на которую перейти:" -#: ../src/callbacks.c:1164 ../src/callbacks.c:1189 +#: ../src/callbacks.c:1167 ../src/callbacks.c:1192 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Пожалуйста, установите тип файла для текущего документа перед использованием " "этой функции." -#: ../src/callbacks.c:1294 ../src/ui_utils.c:639 +#: ../src/callbacks.c:1297 ../src/ui_utils.c:639 msgid "dd.mm.yyyy" msgstr "дд.мм.гггг" -#: ../src/callbacks.c:1296 ../src/ui_utils.c:640 +#: ../src/callbacks.c:1299 ../src/ui_utils.c:640 msgid "mm.dd.yyyy" msgstr "мм.дд.гггг" -#: ../src/callbacks.c:1298 ../src/ui_utils.c:641 +#: ../src/callbacks.c:1301 ../src/ui_utils.c:641 msgid "yyyy/mm/dd" msgstr "гггг/мм/дд" -#: ../src/callbacks.c:1300 ../src/ui_utils.c:650 +#: ../src/callbacks.c:1303 ../src/ui_utils.c:650 msgid "dd.mm.yyyy hh:mm:ss" msgstr "дд.мм.гггг час:мин:сек" -#: ../src/callbacks.c:1302 ../src/ui_utils.c:651 +#: ../src/callbacks.c:1305 ../src/ui_utils.c:651 msgid "mm.dd.yyyy hh:mm:ss" msgstr "мм.дд.гггг час:мин:сек" -#: ../src/callbacks.c:1304 ../src/ui_utils.c:652 +#: ../src/callbacks.c:1307 ../src/ui_utils.c:652 msgid "yyyy/mm/dd hh:mm:ss" msgstr "гггг/мм/дддд час:мин:сек" -#: ../src/callbacks.c:1306 ../src/ui_utils.c:661 +#: ../src/callbacks.c:1309 ../src/ui_utils.c:661 msgid "_Use Custom Date Format" msgstr "_Использовать свой формат даты" -#: ../src/callbacks.c:1310 +#: ../src/callbacks.c:1313 msgid "Custom Date Format" msgstr "Свой формат даты" -#: ../src/callbacks.c:1311 +#: ../src/callbacks.c:1314 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2505,16 +2523,16 @@ msgstr "" "Введите свое описание формата даты и времени. Вы можете использовать любые " "параметры конверсии, применимые к функции strftime ANSI C." -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Date format string could not be converted (possibly too long)." msgstr "" "Не удалось конвертировать строку формата даты (возможно, слишком длинная)" -#: ../src/callbacks.c:1527 ../src/callbacks.c:1535 +#: ../src/callbacks.c:1530 ../src/callbacks.c:1538 msgid "No more message items." msgstr "Сообщений больше нет." -#: ../src/callbacks.c:1673 +#: ../src/callbacks.c:1676 #, fuzzy, c-format msgid "Could not open file %s (File not found)" msgstr "Не удалось открыть файл %s (%s)" @@ -2689,12 +2707,12 @@ msgstr "" #: ../src/dialogs.c:1223 ../src/dialogs.c:1224 ../src/dialogs.c:1225 #: ../src/dialogs.c:1231 ../src/dialogs.c:1232 ../src/dialogs.c:1233 -#: ../src/symbols.c:2094 ../src/symbols.c:2115 ../src/symbols.c:2167 +#: ../src/symbols.c:2095 ../src/symbols.c:2116 ../src/symbols.c:2168 #: ../src/ui_utils.c:264 msgid "unknown" msgstr "неизвестно" -#: ../src/dialogs.c:1238 ../src/symbols.c:892 +#: ../src/dialogs.c:1238 ../src/symbols.c:893 msgid "Properties" msgstr "Свойства" @@ -2885,19 +2903,19 @@ msgid "Error message: %s." msgstr "Текст ошибки: %s." #: ../src/document.c:1587 -#, c-format +#, fuzzy, c-format msgid "Failed to open file '%s' for writing: fopen() failed: %s" -msgstr "" +msgstr "Ошибка открытия файла '%s' для записи: ошибка в fopen(): %s" #: ../src/document.c:1605 -#, c-format +#, fuzzy, c-format msgid "Failed to write file '%s': fwrite() failed: %s" -msgstr "" +msgstr "Ошибка записи в файл '%s': ошибка в fwrite(): %s" #: ../src/document.c:1619 -#, c-format +#, fuzzy, c-format msgid "Failed to close file '%s': fclose() failed: %s" -msgstr "" +msgstr "Ошибка закрытия файла '%s': ошибка в fclose(): %s" #: ../src/document.c:1768 #, c-format @@ -2905,12 +2923,15 @@ msgid "Error saving file (%s)." msgstr "Ошибка записи файла (%s)." #: ../src/document.c:1773 -#, c-format +#, fuzzy, c-format msgid "" "%s\n" "\n" "The file on disk may now be truncated!" msgstr "" +"%s\n" +"\n" +"Файл на диске может быть усечён!" #: ../src/document.c:1775 msgid "Error saving file." @@ -2930,8 +2951,8 @@ msgstr "Не удалось найти \"%s\"." msgid "Wrap search and find again?" msgstr "Перейти в начало и возобновить поиск?" -#: ../src/document.c:2034 ../src/search.c:1279 ../src/search.c:1323 -#: ../src/search.c:2087 ../src/search.c:2088 +#: ../src/document.c:2034 ../src/search.c:1294 ../src/search.c:1338 +#: ../src/search.c:2106 ../src/search.c:2107 #, c-format msgid "No matches found for \"%s\"." msgstr "Совпадений для \"%s\" не найдено." @@ -2970,15 +2991,15 @@ msgstr "Попытаться сохранить файл заново?" msgid "File \"%s\" was not found on disk!" msgstr "Файл \"%s\" не найден на диске. Пересохранить?" -#: ../src/editor.c:4310 +#: ../src/editor.c:4315 msgid "Enter Tab Width" msgstr "Ширина табуляции:" -#: ../src/editor.c:4311 +#: ../src/editor.c:4316 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Количество пробелов, которые будут заменены символом табуляции." -#: ../src/editor.c:4469 +#: ../src/editor.c:4474 #, c-format msgid "Warning: non-standard hard tab width: %d != 8!" msgstr "Внимание: не стандартная ширина табуляции: %d != 8" @@ -3164,17 +3185,17 @@ msgstr "Языки _разметки" msgid "M_iscellaneous" msgstr "Прочее" -#: ../src/filetypes.c:1459 ../src/win32.c:104 +#: ../src/filetypes.c:1461 ../src/win32.c:104 msgid "All Source" msgstr "Все исходные" #. create meta file filter "All files" -#: ../src/filetypes.c:1484 ../src/project.c:295 ../src/win32.c:94 +#: ../src/filetypes.c:1486 ../src/project.c:295 ../src/win32.c:94 #: ../src/win32.c:139 ../src/win32.c:160 ../src/win32.c:165 msgid "All files" msgstr "Все типы" -#: ../src/filetypes.c:1532 +#: ../src/filetypes.c:1534 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Плохое регулярное выражение для типа файлов %s: %s" @@ -3183,540 +3204,548 @@ msgstr "Плохое регулярное выражение для типа ф msgid "untitled" msgstr "Без имени" -#: ../src/highlighting.c:1225 ../src/main.c:828 ../src/socket.c:166 +#: ../src/highlighting.c:1233 ../src/main.c:828 ../src/socket.c:166 #: ../src/templates.c:224 #, c-format msgid "Could not find file '%s'." msgstr "Не могу найти файл \"%s\"." -#: ../src/highlighting.c:1297 +#: ../src/highlighting.c:1305 #, fuzzy msgid "Default" msgstr "_По умолчанию" -#: ../src/highlighting.c:1336 +#: ../src/highlighting.c:1344 #, fuzzy msgid "The current filetype overrides the default style." msgstr "Собрать данный файл используя утилиту Make и цель сборки по умолчанию" -#: ../src/highlighting.c:1337 +#: ../src/highlighting.c:1345 +#, fuzzy msgid "This may cause color schemes to display incorrectly." -msgstr "" +msgstr "Это может вызвать неправильное отображение цветовых схем." -#: ../src/highlighting.c:1358 +#: ../src/highlighting.c:1366 #, fuzzy msgid "Color Schemes" msgstr "_Цветовые схемы" #. visual group order -#: ../src/keybindings.c:223 ../src/symbols.c:714 +#: ../src/keybindings.c:226 ../src/symbols.c:715 msgid "File" msgstr "Файл" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:228 msgid "Clipboard" msgstr "Буфер обмена" -#: ../src/keybindings.c:226 +#: ../src/keybindings.c:229 msgid "Select" msgstr "Выбрать" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:230 msgid "Format" msgstr "Формат" -#: ../src/keybindings.c:228 +#: ../src/keybindings.c:231 msgid "Insert" msgstr "Вставить" -#: ../src/keybindings.c:229 +#: ../src/keybindings.c:232 msgid "Settings" msgstr "Настройки" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:233 msgid "Search" msgstr "Поиск" -#: ../src/keybindings.c:231 +#: ../src/keybindings.c:234 msgid "Go to" msgstr "Перейти" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:235 msgid "View" msgstr "Вид" -#: ../src/keybindings.c:233 +#: ../src/keybindings.c:236 msgid "Document" msgstr "Документ" -#: ../src/keybindings.c:235 ../src/keybindings.c:582 ../src/project.c:444 -#: ../src/ui_utils.c:1980 +#: ../src/keybindings.c:238 ../src/keybindings.c:587 ../src/project.c:444 +#: ../src/ui_utils.c:1981 msgid "Build" msgstr "Сборка" -#: ../src/keybindings.c:237 ../src/keybindings.c:607 +#: ../src/keybindings.c:240 ../src/keybindings.c:612 msgid "Help" msgstr "Справка" -#: ../src/keybindings.c:238 +#: ../src/keybindings.c:241 msgid "Focus" msgstr "Фокус" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 msgid "Notebook tab" msgstr "Вкладка блокнота" -#: ../src/keybindings.c:248 ../src/keybindings.c:276 +#: ../src/keybindings.c:251 ../src/keybindings.c:279 msgid "New" msgstr "Новый" -#: ../src/keybindings.c:250 ../src/keybindings.c:278 +#: ../src/keybindings.c:253 ../src/keybindings.c:281 msgid "Open" msgstr "Открыть..." -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:256 msgid "Open selected file" msgstr "Открыть выбранный файл" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:258 msgid "Save" msgstr "Сохранить" -#: ../src/keybindings.c:257 ../src/toolbar.c:55 +#: ../src/keybindings.c:260 ../src/toolbar.c:55 msgid "Save as" msgstr "Сохранить как..." -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:262 msgid "Save all" msgstr "Сохранить все" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:265 msgid "Print" msgstr "Печать..." -#: ../src/keybindings.c:264 ../src/keybindings.c:283 +#: ../src/keybindings.c:267 ../src/keybindings.c:286 msgid "Close" msgstr "Закрыть" -#: ../src/keybindings.c:266 +#: ../src/keybindings.c:269 msgid "Close all" msgstr "Закрыть все" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:272 msgid "Reload file" msgstr "Обновить файл" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:274 msgid "Re-open last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../src/keybindings.c:288 +#: ../src/keybindings.c:291 msgid "Undo" msgstr "Отменить" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:293 msgid "Redo" msgstr "Повторить" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:302 msgid "Delete to line end" msgstr "Удалить до конца строки" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:308 msgid "Scroll to current line" msgstr "Прокрутить до текущей строки" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:310 msgid "Scroll up the view by one line" msgstr "Прокрутить наверх на одну строку" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:312 msgid "Scroll down the view by one line" msgstr "Прокрутить вниз на одну строку" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:314 msgid "Complete snippet" msgstr "Завешить фрагмент кода" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:316 msgid "Move cursor in snippet" msgstr "Перемещать курсор в фрагменте" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:318 msgid "Suppress snippet completion" msgstr "Подавлять автозавершение фрагментов кода" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:320 msgid "Context Action" msgstr "Контекстное действие" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:322 msgid "Complete word" msgstr "Завершить слово" -#: ../src/keybindings.c:321 +#: ../src/keybindings.c:324 msgid "Show calltip" msgstr "Показывать подсказки" -#: ../src/keybindings.c:323 +#: ../src/keybindings.c:326 msgid "Show macro list" msgstr "Показывать список макросов" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:328 msgid "Word part completion" msgstr "Автозавершение фрагментов кода" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:330 msgid "Move line(s) up" msgstr "Переместить строку(и) вверх" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:332 msgid "Move line(s) down" msgstr "Переместить строку(и) вниз" -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:337 msgid "Cut" msgstr "Вырезать" -#: ../src/keybindings.c:336 +#: ../src/keybindings.c:339 msgid "Copy" msgstr "Копировать" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:341 msgid "Paste" msgstr "Вставить" -#: ../src/keybindings.c:349 +#: ../src/keybindings.c:352 msgid "Select All" msgstr "Выбрать все" -#: ../src/keybindings.c:351 +#: ../src/keybindings.c:354 msgid "Select current word" msgstr "Выбрать слово" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:362 msgid "Select to previous word part" msgstr "Выделить до начала слова" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:364 msgid "Select to next word part" msgstr "Выделить до окончания слова" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:372 msgid "Toggle line commentation" msgstr "Переключить комментирование строк" -#: ../src/keybindings.c:372 +#: ../src/keybindings.c:375 msgid "Comment line(s)" msgstr "Комментировать строку (строки)" -#: ../src/keybindings.c:374 +#: ../src/keybindings.c:377 msgid "Uncomment line(s)" msgstr "Разкомментировать строку (строки)" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:379 msgid "Increase indent" msgstr "Увеличить отступ" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:382 msgid "Decrease indent" msgstr "Уменьшить отступ" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:385 msgid "Increase indent by one space" msgstr "Увеличить отступ на один пробел" -#: ../src/keybindings.c:384 +#: ../src/keybindings.c:387 msgid "Decrease indent by one space" msgstr "Уменьшить отступ на один пробел" -#: ../src/keybindings.c:388 +#: ../src/keybindings.c:391 msgid "Send to Custom Command 1" msgstr "Передать пользовательской команде 1" -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:393 msgid "Send to Custom Command 2" msgstr "Передать пользовательской команде 2" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:395 msgid "Send to Custom Command 3" msgstr "Передать пользовательской команде 3" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:403 #, fuzzy msgid "Join lines" msgstr "Комментировать строку (строки)" -#: ../src/keybindings.c:405 +#: ../src/keybindings.c:408 msgid "Insert date" msgstr "Вставить дату" -#: ../src/keybindings.c:411 +#: ../src/keybindings.c:414 +#, fuzzy msgid "Insert New Line Before Current" -msgstr "" +msgstr "Вставить новую строку перед текущей" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:416 +#, fuzzy msgid "Insert New Line After Current" -msgstr "" +msgstr "Вставить новую строку после текущей" -#: ../src/keybindings.c:426 ../src/search.c:463 +#: ../src/keybindings.c:429 ../src/search.c:463 msgid "Find" msgstr "Найти..." -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:431 msgid "Find Next" msgstr "Найти следующее" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:433 msgid "Find Previous" msgstr "Найти предыдущее" -#: ../src/keybindings.c:437 ../src/search.c:619 +#: ../src/keybindings.c:440 ../src/search.c:619 msgid "Replace" msgstr "Заменить..." -#: ../src/keybindings.c:439 ../src/search.c:871 +#: ../src/keybindings.c:442 ../src/search.c:871 msgid "Find in Files" msgstr "Найти в файлах" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:445 msgid "Next Message" msgstr "Следующее сообщение" -#: ../src/keybindings.c:444 +#: ../src/keybindings.c:447 msgid "Previous Message" msgstr "Предыдущее сообщение" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:450 msgid "Find Usage" msgstr "Найти использование" -#: ../src/keybindings.c:450 +#: ../src/keybindings.c:453 msgid "Find Document Usage" msgstr "Статистика документа" -#: ../src/keybindings.c:457 ../src/toolbar.c:66 +#: ../src/keybindings.c:460 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Вернуться на шаг назад" -#: ../src/keybindings.c:459 ../src/toolbar.c:67 +#: ../src/keybindings.c:462 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Перейти на шаг вперёд" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:467 msgid "Go to matching brace" msgstr "Перейти к парной скобке" -#: ../src/keybindings.c:467 +#: ../src/keybindings.c:470 msgid "Toggle marker" msgstr "Переключить маркер" -#: ../src/keybindings.c:476 +#: ../src/keybindings.c:479 msgid "Go to Tag Definition" msgstr "Перейти к определению тега" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:482 msgid "Go to Tag Declaration" msgstr "Перейти к объявлению тега" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:484 msgid "Go to Start of Line" msgstr "Перейти к началу строки" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:486 msgid "Go to End of Line" msgstr "Перейти к концу строки" -#: ../src/keybindings.c:485 +#: ../src/keybindings.c:488 +#, fuzzy +msgid "Go to Start of Display Line" +msgstr "К концу текущей строки" + +#: ../src/keybindings.c:490 msgid "Go to End of Display Line" msgstr "К концу текущей строки" -#: ../src/keybindings.c:487 +#: ../src/keybindings.c:492 msgid "Go to Previous Word Part" msgstr "Перейти к началу слова" -#: ../src/keybindings.c:489 +#: ../src/keybindings.c:494 msgid "Go to Next Word Part" msgstr "Перейти к концу слова" -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:499 msgid "Toggle All Additional Widgets" msgstr "Показать/скрыть все дополнительные виджеты" -#: ../src/keybindings.c:497 +#: ../src/keybindings.c:502 msgid "Fullscreen" msgstr "На весь экран" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:504 msgid "Toggle Messages Window" msgstr "Показать/скрыть окно сообщений" -#: ../src/keybindings.c:502 +#: ../src/keybindings.c:507 msgid "Toggle Sidebar" msgstr "Показать/скрыть боковую панель" -#: ../src/keybindings.c:504 +#: ../src/keybindings.c:509 msgid "Zoom In" msgstr "Увеличить" -#: ../src/keybindings.c:506 +#: ../src/keybindings.c:511 msgid "Zoom Out" msgstr "Уменьшить" -#: ../src/keybindings.c:508 +#: ../src/keybindings.c:513 msgid "Zoom Reset" msgstr "Обычный размер" -#: ../src/keybindings.c:513 +#: ../src/keybindings.c:518 msgid "Switch to Editor" msgstr "Перейти к редактору" -#: ../src/keybindings.c:515 +#: ../src/keybindings.c:520 msgid "Switch to Search Bar" msgstr "Перейти к поиску" -#: ../src/keybindings.c:517 +#: ../src/keybindings.c:522 msgid "Switch to Message Window" msgstr "Показывать окно сообщений" -#: ../src/keybindings.c:519 +#: ../src/keybindings.c:524 msgid "Switch to Compiler" msgstr "Переключиться на компилятор" -#: ../src/keybindings.c:521 +#: ../src/keybindings.c:526 msgid "Switch to Messages" msgstr "Перейти к сообщениям" -#: ../src/keybindings.c:523 +#: ../src/keybindings.c:528 msgid "Switch to Scribble" msgstr "Перейти к заметкам" -#: ../src/keybindings.c:525 +#: ../src/keybindings.c:530 msgid "Switch to VTE" msgstr "Переключиться в терминал" -#: ../src/keybindings.c:527 +#: ../src/keybindings.c:532 msgid "Switch to Sidebar" msgstr "Перейти к боковой панели" -#: ../src/keybindings.c:529 +#: ../src/keybindings.c:534 msgid "Switch to Sidebar Symbol List" msgstr "Перейти к списку тегов" -#: ../src/keybindings.c:531 +#: ../src/keybindings.c:536 msgid "Switch to Sidebar Document List" msgstr "Перейти к списку документов" -#: ../src/keybindings.c:536 +#: ../src/keybindings.c:541 msgid "Switch to left document" msgstr "Перейти на документ слева" -#: ../src/keybindings.c:538 +#: ../src/keybindings.c:543 msgid "Switch to right document" msgstr "Перейти на документ справа" -#: ../src/keybindings.c:540 +#: ../src/keybindings.c:545 msgid "Switch to last used document" msgstr "Перейти на последний документ" -#: ../src/keybindings.c:543 +#: ../src/keybindings.c:548 msgid "Move document left" msgstr "Переместить документ влево" -#: ../src/keybindings.c:546 +#: ../src/keybindings.c:551 msgid "Move document right" msgstr "Переместить документ вправо" -#: ../src/keybindings.c:548 +#: ../src/keybindings.c:553 msgid "Move document first" msgstr "Переместить документ в начало" -#: ../src/keybindings.c:550 +#: ../src/keybindings.c:555 msgid "Move document last" msgstr "Переместить документ в конец" -#: ../src/keybindings.c:555 +#: ../src/keybindings.c:560 msgid "Toggle Line wrapping" msgstr "Переключить режим переноса строк" -#: ../src/keybindings.c:557 +#: ../src/keybindings.c:562 msgid "Toggle Line breaking" msgstr "Переключить перенос строк" -#: ../src/keybindings.c:561 +#: ../src/keybindings.c:566 msgid "Replace spaces by tabs" msgstr "Заменить пробелы табуляциями" -#: ../src/keybindings.c:563 +#: ../src/keybindings.c:568 msgid "Toggle current fold" msgstr "Свернуть/развернуть текущий блок" -#: ../src/keybindings.c:565 +#: ../src/keybindings.c:570 msgid "Fold all" msgstr "Свернуть все" -#: ../src/keybindings.c:567 +#: ../src/keybindings.c:572 msgid "Unfold all" msgstr "Развернуть все" -#: ../src/keybindings.c:569 +#: ../src/keybindings.c:574 msgid "Reload symbol list" msgstr "Обновить список тегов" -#: ../src/keybindings.c:571 +#: ../src/keybindings.c:576 msgid "Remove Markers" msgstr "Удалить маркеры" -#: ../src/keybindings.c:573 +#: ../src/keybindings.c:578 msgid "Remove Error Indicators" msgstr "Убрать индикаторы ошибок" -#: ../src/keybindings.c:575 +#: ../src/keybindings.c:580 #, fuzzy msgid "Remove Markers and Error Indicators" msgstr "Убрать индикаторы ошибок" -#: ../src/keybindings.c:580 ../src/toolbar.c:68 +#: ../src/keybindings.c:585 ../src/toolbar.c:68 msgid "Compile" msgstr "Скомпилировать" -#: ../src/keybindings.c:584 +#: ../src/keybindings.c:589 msgid "Make all" msgstr "Собрать все" -#: ../src/keybindings.c:587 +#: ../src/keybindings.c:592 msgid "Make custom target" msgstr "Сделать указанную цель" -#: ../src/keybindings.c:589 +#: ../src/keybindings.c:594 msgid "Make object" msgstr "Сделать объект" -#: ../src/keybindings.c:591 +#: ../src/keybindings.c:596 msgid "Next error" msgstr "Следующая ошибка" -#: ../src/keybindings.c:593 +#: ../src/keybindings.c:598 msgid "Previous error" msgstr "Предыдущая ошибка" -#: ../src/keybindings.c:595 +#: ../src/keybindings.c:600 msgid "Run" msgstr "Запустить" -#: ../src/keybindings.c:597 +#: ../src/keybindings.c:602 msgid "Build options" msgstr "Опции сборки" -#: ../src/keybindings.c:602 +#: ../src/keybindings.c:607 msgid "Show Color Chooser" msgstr "Показать выбор цвета" -#: ../src/keybindings.c:849 +#: ../src/keybindings.c:854 msgid "Keyboard Shortcuts" msgstr "Сочетания клавиш" -#: ../src/keybindings.c:861 +#: ../src/keybindings.c:866 msgid "The following keyboard shortcuts are configurable:" msgstr "Следующие сочетания клавиш можно настроить:" @@ -3798,8 +3827,9 @@ msgid "Print Geany's installation prefix" msgstr "Вывести инсталляционный префикс Geany" #: ../src/main.c:138 +#, fuzzy msgid "Open all FILES in read-only mode (see documention)" -msgstr "" +msgstr "Открыть все файлы в режиме только чтение (см. документацию)" #: ../src/main.c:139 msgid "Don't load the previous session's files" @@ -3946,26 +3976,27 @@ msgstr "Описание:" msgid "No plugins available." msgstr "Нет доступных модулей" -#: ../src/plugins.c:1414 +#: ../src/plugins.c:1416 msgid "Plugins" msgstr "Модули" -#: ../src/plugins.c:1434 +#: ../src/plugins.c:1436 msgid "Choose which plugins should be loaded at startup:" msgstr "Использовать следующие модули:" -#: ../src/plugins.c:1446 +#: ../src/plugins.c:1448 msgid "<b>Plugin details:</b>" msgstr "<b>Подробнее о модуле:</b>" -#: ../src/plugins.c:1455 +#: ../src/plugins.c:1457 #, fuzzy msgid "Plugin:" msgstr "Модуль" -#: ../src/plugins.c:1456 +#: ../src/plugins.c:1458 +#, fuzzy msgid "Author(s):" -msgstr "" +msgstr "Автор(ы):" #: ../src/pluginutils.c:332 msgid "Configure Plugins" @@ -3980,11 +4011,11 @@ msgstr "Захватить клавишу" msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Укажите сочетание клавиш для \"%s\"" -#: ../src/prefs.c:226 ../src/symbols.c:2236 ../src/sidebar.c:730 +#: ../src/prefs.c:226 ../src/symbols.c:2237 ../src/sidebar.c:731 msgid "_Expand All" msgstr "_Развернуть все" -#: ../src/prefs.c:231 ../src/symbols.c:2241 ../src/sidebar.c:736 +#: ../src/prefs.c:231 ../src/symbols.c:2242 ../src/sidebar.c:737 msgid "_Collapse All" msgstr "_Свернуть все" @@ -4344,8 +4375,9 @@ msgid "" msgstr "" #: ../src/search.c:900 +#, fuzzy msgid "Fi_les:" -msgstr "" +msgstr "Файлы:" #: ../src/search.c:912 #, fuzzy @@ -4385,7 +4417,7 @@ msgstr "Дополнительные _опции:" msgid "Other options to pass to Grep" msgstr "Прочие параметры для передачи утилите grep" -#: ../src/search.c:1282 ../src/search.c:2093 ../src/search.c:2096 +#: ../src/search.c:1297 ../src/search.c:2112 ../src/search.c:2115 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." @@ -4393,49 +4425,49 @@ msgstr[0] "Найдено %d совпадение для \"%s\"." msgstr[1] "Найдено %d совпадения для \"%s\"." msgstr[2] "Найдено %d совпадений для \"%s\"." -#: ../src/search.c:1329 +#: ../src/search.c:1344 #, c-format msgid "Replaced %u matches in %u documents." msgstr "Произведено %u замен(ы) в %u документе(ах)." -#: ../src/search.c:1519 +#: ../src/search.c:1534 msgid "Invalid directory for find in files." msgstr "Для поиска в файлах указан недопустимый каталог." -#: ../src/search.c:1540 +#: ../src/search.c:1555 msgid "No text to find." msgstr "Нет текста для поиска." -#: ../src/search.c:1567 +#: ../src/search.c:1582 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Не могу выполнить утилиту grep \"%s\"; проверьте путь, заданный в настройках." -#: ../src/search.c:1574 +#: ../src/search.c:1589 #, c-format msgid "Cannot parse extra options: %s" msgstr "" -#: ../src/search.c:1640 +#: ../src/search.c:1655 msgid "Searching..." msgstr "Поиск..." -#: ../src/search.c:1651 +#: ../src/search.c:1666 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (в каталоге: %s)" -#: ../src/search.c:1692 +#: ../src/search.c:1707 #, c-format msgid "Could not open directory (%s)" msgstr "Не могу открыть каталог (%s)" -#: ../src/search.c:1794 +#: ../src/search.c:1809 msgid "Search failed." msgstr "Не удалось выполнить поиск." -#: ../src/search.c:1814 +#: ../src/search.c:1829 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." @@ -4443,11 +4475,11 @@ msgstr[0] "Поиск завершен, найдено %d совпадений." msgstr[1] "Поиск завершен, найдено %d совпадение." msgstr[2] "Поиск завершен, найдено %d совпадение." -#: ../src/search.c:1822 +#: ../src/search.c:1837 msgid "No matches found." msgstr "Совпадений нет." -#: ../src/search.c:1852 +#: ../src/search.c:1867 #, c-format msgid "Bad regex: %s" msgstr "Неверное регулярное выражение: %s" @@ -4471,270 +4503,270 @@ msgstr "Имя:" msgid "Value" msgstr "" -#: ../src/symbols.c:693 ../src/symbols.c:743 ../src/symbols.c:810 +#: ../src/symbols.c:694 ../src/symbols.c:744 ../src/symbols.c:811 msgid "Chapter" msgstr "Глава" -#: ../src/symbols.c:694 ../src/symbols.c:739 ../src/symbols.c:811 +#: ../src/symbols.c:695 ../src/symbols.c:740 ../src/symbols.c:812 msgid "Section" msgstr "Раздел" -#: ../src/symbols.c:695 +#: ../src/symbols.c:696 msgid "Sect1" msgstr "Секция1" -#: ../src/symbols.c:696 +#: ../src/symbols.c:697 msgid "Sect2" msgstr "Секция2" -#: ../src/symbols.c:697 +#: ../src/symbols.c:698 msgid "Sect3" msgstr "Секция3" -#: ../src/symbols.c:698 +#: ../src/symbols.c:699 msgid "Appendix" msgstr "" -#: ../src/symbols.c:699 ../src/symbols.c:744 ../src/symbols.c:760 -#: ../src/symbols.c:771 ../src/symbols.c:858 ../src/symbols.c:869 -#: ../src/symbols.c:881 ../src/symbols.c:895 ../src/symbols.c:907 -#: ../src/symbols.c:919 ../src/symbols.c:934 ../src/symbols.c:963 -#: ../src/symbols.c:993 +#: ../src/symbols.c:700 ../src/symbols.c:745 ../src/symbols.c:761 +#: ../src/symbols.c:772 ../src/symbols.c:859 ../src/symbols.c:870 +#: ../src/symbols.c:882 ../src/symbols.c:896 ../src/symbols.c:908 +#: ../src/symbols.c:920 ../src/symbols.c:935 ../src/symbols.c:964 +#: ../src/symbols.c:994 msgid "Other" msgstr "Другое" -#: ../src/symbols.c:705 ../src/symbols.c:927 ../src/symbols.c:972 +#: ../src/symbols.c:706 ../src/symbols.c:928 ../src/symbols.c:973 msgid "Module" msgstr "Модуль" -#: ../src/symbols.c:706 ../src/symbols.c:854 ../src/symbols.c:905 -#: ../src/symbols.c:917 ../src/symbols.c:932 ../src/symbols.c:944 +#: ../src/symbols.c:707 ../src/symbols.c:855 ../src/symbols.c:906 +#: ../src/symbols.c:918 ../src/symbols.c:933 ../src/symbols.c:945 msgid "Types" msgstr "Типы" -#: ../src/symbols.c:707 +#: ../src/symbols.c:708 msgid "Type constructors" msgstr "Конструкторы типов" -#: ../src/symbols.c:708 ../src/symbols.c:730 ../src/symbols.c:751 -#: ../src/symbols.c:759 ../src/symbols.c:768 ../src/symbols.c:780 -#: ../src/symbols.c:789 ../src/symbols.c:842 ../src/symbols.c:891 -#: ../src/symbols.c:914 ../src/symbols.c:929 ../src/symbols.c:957 -#: ../src/symbols.c:980 +#: ../src/symbols.c:709 ../src/symbols.c:731 ../src/symbols.c:752 +#: ../src/symbols.c:760 ../src/symbols.c:769 ../src/symbols.c:781 +#: ../src/symbols.c:790 ../src/symbols.c:843 ../src/symbols.c:892 +#: ../src/symbols.c:915 ../src/symbols.c:930 ../src/symbols.c:958 +#: ../src/symbols.c:981 msgid "Functions" msgstr "Функции" -#: ../src/symbols.c:713 +#: ../src/symbols.c:714 msgid "Program" msgstr "" -#: ../src/symbols.c:715 ../src/symbols.c:723 ../src/symbols.c:729 +#: ../src/symbols.c:716 ../src/symbols.c:724 ../src/symbols.c:730 msgid "Sections" msgstr "Разделы" -#: ../src/symbols.c:716 +#: ../src/symbols.c:717 msgid "Paragraph" msgstr "" -#: ../src/symbols.c:717 +#: ../src/symbols.c:718 #, fuzzy msgid "Group" msgstr "Группа:" -#: ../src/symbols.c:718 +#: ../src/symbols.c:719 msgid "Data" msgstr "" -#: ../src/symbols.c:724 +#: ../src/symbols.c:725 msgid "Keys" msgstr "Клавиши" -#: ../src/symbols.c:731 ../src/symbols.c:782 ../src/symbols.c:843 -#: ../src/symbols.c:868 ../src/symbols.c:893 ../src/symbols.c:906 -#: ../src/symbols.c:915 ../src/symbols.c:931 ../src/symbols.c:992 +#: ../src/symbols.c:732 ../src/symbols.c:783 ../src/symbols.c:844 +#: ../src/symbols.c:869 ../src/symbols.c:894 ../src/symbols.c:907 +#: ../src/symbols.c:916 ../src/symbols.c:932 ../src/symbols.c:993 msgid "Variables" msgstr "Переменные" -#: ../src/symbols.c:738 +#: ../src/symbols.c:739 msgid "Environment" msgstr "Окружение" -#: ../src/symbols.c:740 ../src/symbols.c:812 +#: ../src/symbols.c:741 ../src/symbols.c:813 msgid "Subsection" msgstr "Подраздел" -#: ../src/symbols.c:741 ../src/symbols.c:813 +#: ../src/symbols.c:742 ../src/symbols.c:814 msgid "Subsubsection" msgstr "Субподраздел" -#: ../src/symbols.c:752 +#: ../src/symbols.c:753 msgid "Structures" msgstr "Структуры" -#: ../src/symbols.c:767 ../src/symbols.c:851 ../src/symbols.c:876 -#: ../src/symbols.c:888 +#: ../src/symbols.c:768 ../src/symbols.c:852 ../src/symbols.c:877 +#: ../src/symbols.c:889 msgid "Package" msgstr "Пакет" -#: ../src/symbols.c:769 ../src/symbols.c:918 ../src/symbols.c:941 +#: ../src/symbols.c:770 ../src/symbols.c:919 ../src/symbols.c:942 msgid "Labels" msgstr "Метки" -#: ../src/symbols.c:770 ../src/symbols.c:781 ../src/symbols.c:894 -#: ../src/symbols.c:916 +#: ../src/symbols.c:771 ../src/symbols.c:782 ../src/symbols.c:895 +#: ../src/symbols.c:917 msgid "Constants" msgstr "Константы" -#: ../src/symbols.c:778 ../src/symbols.c:877 ../src/symbols.c:889 -#: ../src/symbols.c:902 ../src/symbols.c:928 ../src/symbols.c:979 +#: ../src/symbols.c:779 ../src/symbols.c:878 ../src/symbols.c:890 +#: ../src/symbols.c:903 ../src/symbols.c:929 ../src/symbols.c:980 msgid "Interfaces" msgstr "Интерфейсы" -#: ../src/symbols.c:779 ../src/symbols.c:800 ../src/symbols.c:821 -#: ../src/symbols.c:831 ../src/symbols.c:840 ../src/symbols.c:878 -#: ../src/symbols.c:890 ../src/symbols.c:903 ../src/symbols.c:978 +#: ../src/symbols.c:780 ../src/symbols.c:801 ../src/symbols.c:822 +#: ../src/symbols.c:832 ../src/symbols.c:841 ../src/symbols.c:879 +#: ../src/symbols.c:891 ../src/symbols.c:904 ../src/symbols.c:979 msgid "Classes" msgstr "Классы " -#: ../src/symbols.c:790 +#: ../src/symbols.c:791 msgid "Anchors" msgstr "Якоря" -#: ../src/symbols.c:791 +#: ../src/symbols.c:792 msgid "H1 Headings" msgstr "Заголовок (H1)" -#: ../src/symbols.c:792 +#: ../src/symbols.c:793 msgid "H2 Headings" msgstr "Заголовок (H2)" -#: ../src/symbols.c:793 +#: ../src/symbols.c:794 msgid "H3 Headings" msgstr "Заголовок (H3)" -#: ../src/symbols.c:801 +#: ../src/symbols.c:802 msgid "ID Selectors" msgstr "Идентификаторы" -#: ../src/symbols.c:802 +#: ../src/symbols.c:803 msgid "Type Selectors" msgstr "Типы" -#: ../src/symbols.c:820 ../src/symbols.c:866 +#: ../src/symbols.c:821 ../src/symbols.c:867 msgid "Modules" msgstr "Модули" -#: ../src/symbols.c:822 +#: ../src/symbols.c:823 msgid "Singletons" msgstr "Синглтоны" -#: ../src/symbols.c:823 ../src/symbols.c:832 ../src/symbols.c:841 -#: ../src/symbols.c:879 ../src/symbols.c:904 +#: ../src/symbols.c:824 ../src/symbols.c:833 ../src/symbols.c:842 +#: ../src/symbols.c:880 ../src/symbols.c:905 msgid "Methods" msgstr "Методы" -#: ../src/symbols.c:830 ../src/symbols.c:975 +#: ../src/symbols.c:831 ../src/symbols.c:976 msgid "Namespaces" msgstr "Пространства имен" -#: ../src/symbols.c:833 ../src/symbols.c:958 +#: ../src/symbols.c:834 ../src/symbols.c:959 msgid "Procedures" msgstr "Процедуры" -#: ../src/symbols.c:844 +#: ../src/symbols.c:845 msgid "Imports" msgstr "Импорт" -#: ../src/symbols.c:852 +#: ../src/symbols.c:853 #, fuzzy msgid "Entities" msgstr "Без имени" -#: ../src/symbols.c:853 +#: ../src/symbols.c:854 msgid "Architectures" msgstr "Архитектуры" -#: ../src/symbols.c:855 +#: ../src/symbols.c:856 msgid "Functions / Procedures" msgstr "Функции / Процедуры" -#: ../src/symbols.c:856 +#: ../src/symbols.c:857 msgid "Variables / Signals" msgstr "Переменные / Сигналы" -#: ../src/symbols.c:857 +#: ../src/symbols.c:858 msgid "Processes / Components" msgstr "Процессы / Компоненты" -#: ../src/symbols.c:865 +#: ../src/symbols.c:866 msgid "Events" msgstr "События" -#: ../src/symbols.c:867 +#: ../src/symbols.c:868 msgid "Functions / Tasks" msgstr "Функции / Задачи" -#: ../src/symbols.c:880 ../src/symbols.c:981 +#: ../src/symbols.c:881 ../src/symbols.c:982 msgid "Members" msgstr "Члены" -#: ../src/symbols.c:930 +#: ../src/symbols.c:931 msgid "Subroutines" msgstr "Подпрограммы" -#: ../src/symbols.c:933 +#: ../src/symbols.c:934 msgid "Blocks" msgstr "Блоки" -#: ../src/symbols.c:942 ../src/symbols.c:951 ../src/symbols.c:989 +#: ../src/symbols.c:943 ../src/symbols.c:952 ../src/symbols.c:990 msgid "Macros" msgstr "Макросы" -#: ../src/symbols.c:943 +#: ../src/symbols.c:944 msgid "Defines" msgstr "Определения" -#: ../src/symbols.c:950 +#: ../src/symbols.c:951 msgid "Targets" msgstr "Цели" -#: ../src/symbols.c:959 +#: ../src/symbols.c:960 msgid "Indexes" msgstr "" -#: ../src/symbols.c:960 +#: ../src/symbols.c:961 #, fuzzy msgid "Tables" msgstr "Переменные" -#: ../src/symbols.c:961 +#: ../src/symbols.c:962 msgid "Triggers" msgstr "" -#: ../src/symbols.c:962 +#: ../src/symbols.c:963 #, fuzzy msgid "Views" msgstr "Вид" -#: ../src/symbols.c:982 +#: ../src/symbols.c:983 msgid "Structs" msgstr "Структуры" -#: ../src/symbols.c:983 +#: ../src/symbols.c:984 msgid "Typedefs / Enums" msgstr "Типы / Перечисления" -#: ../src/symbols.c:1728 +#: ../src/symbols.c:1729 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Неизвестное расширение имени файла для \"%s\".\n" -#: ../src/symbols.c:1751 +#: ../src/symbols.c:1752 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "Не удалось создать файл тегов, возможно, тегов найдено не было.\n" -#: ../src/symbols.c:1758 +#: ../src/symbols.c:1759 #, c-format msgid "" "Usage: %s -g <Tag File> <File list>\n" @@ -4743,7 +4775,7 @@ msgstr "" "Использование: %s -g <Файл Тегов> <Список Файлов>\n" "\n" -#: ../src/symbols.c:1759 +#: ../src/symbols.c:1760 #, c-format msgid "" "Example:\n" @@ -4754,41 +4786,41 @@ msgstr "" "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1773 +#: ../src/symbols.c:1774 msgid "Load Tags" msgstr "Загрузить теги" -#: ../src/symbols.c:1780 +#: ../src/symbols.c:1781 #, fuzzy msgid "Geany tag files (*.*.tags)" msgstr "Файл тегов Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1800 +#: ../src/symbols.c:1801 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Загружено %s файлов с тегами \"%s\"." -#: ../src/symbols.c:1803 +#: ../src/symbols.c:1804 #, c-format msgid "Could not load tags file '%s'." msgstr "Не удалось загрузить файл тегов \"%s\"." -#: ../src/symbols.c:1943 +#: ../src/symbols.c:1944 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Предварительное объявление \"%s\" не найдено." -#: ../src/symbols.c:1945 +#: ../src/symbols.c:1946 #, c-format msgid "Definition of \"%s\" not found." msgstr "Определение \"%s\" не найдено." -#: ../src/symbols.c:2251 +#: ../src/symbols.c:2252 msgid "Sort by _Name" msgstr "Сортировать по _имени" -#: ../src/symbols.c:2258 +#: ../src/symbols.c:2259 msgid "Sort by _Appearance" msgstr "Сортировать по _появлению" @@ -5033,23 +5065,23 @@ msgstr "Символов:" msgid "No tags found" msgstr "Тегов нет." -#: ../src/sidebar.c:588 +#: ../src/sidebar.c:589 msgid "Show S_ymbol List" msgstr "Показать список _тегов" -#: ../src/sidebar.c:596 +#: ../src/sidebar.c:597 msgid "Show _Document List" msgstr "Показать список _документов" -#: ../src/sidebar.c:604 ../plugins/filebrowser.c:659 +#: ../src/sidebar.c:605 ../plugins/filebrowser.c:659 msgid "H_ide Sidebar" msgstr "_Скрыть боковую панель" -#: ../src/sidebar.c:709 ../plugins/filebrowser.c:630 +#: ../src/sidebar.c:710 ../plugins/filebrowser.c:630 msgid "_Find in Files" msgstr "_Найти в файлах" -#: ../src/sidebar.c:719 +#: ../src/sidebar.c:720 msgid "Show _Paths" msgstr "Показать _пути" @@ -5142,23 +5174,23 @@ msgstr "С++ STL" msgid "_Set Custom Date Format" msgstr "_Установить формат даты" -#: ../src/ui_utils.c:1819 +#: ../src/ui_utils.c:1820 msgid "Select Folder" msgstr "Выбрать каталог" -#: ../src/ui_utils.c:1819 +#: ../src/ui_utils.c:1820 msgid "Select File" msgstr "Выбрать файл" -#: ../src/ui_utils.c:1978 +#: ../src/ui_utils.c:1979 msgid "Save All" msgstr "Сохранить _все" -#: ../src/ui_utils.c:1979 +#: ../src/ui_utils.c:1980 msgid "Close All" msgstr "_Закрыть все" -#: ../src/ui_utils.c:2225 +#: ../src/ui_utils.c:2226 msgid "Geany cannot start!" msgstr "" @@ -5212,6 +5244,11 @@ msgstr "Файлы проекта Geany" msgid "Executables" msgstr "Выполняемые" +#: ../src/win32.c:1103 +#, c-format +msgid "Process timed out after %.02f s!" +msgstr "" + #: ../plugins/classbuilder.c:38 msgid "Class Builder" msgstr "Генератор классов" @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] e20a57: Use all supported keyword sets for Scintilla Forth lexer
by oco 17 Aug '12

17 Aug '12

Branch: refs/heads/master Author: oco <oco(a)newmail.ru> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 17 Aug 2012 01:35:27 Commit: e20a57927dc6b760611c8ea2fb72bd43ffc507b4 https://github.com/geany/geany/commit/e20a57927dc6b760611c8ea2fb72bd43ffc50… Log Message: ----------- Use all supported keyword sets for Scintilla Forth lexer Submitted on geany-devel mailing list Modified Paths: -------------- data/filetypes.forth src/highlightingmappings.h Modified: data/filetypes.forth 8 files changed, 6 insertions(+), 2 deletions(-) =================================================================== @@ -16,8 +16,12 @@ locale=other [keywords] # all items must be in one line -primary=ABORT EXIT DO LOOP UNLOOP BEGIN UNTIL WHILE REPEAT EXIT IF ELSE THEN CASE ENDCASE OF ENDOF - +primary=abort exit do loop unloop begin until while repeat exit if else then case endcase of endof again leave +keyword=require included decimal hex also only previous +defword=create does> variable value 2variable constant , 2, c, +string=." " s" c" abort" +preword1=dup drop swap over pick roll 2dup 2drop 2swas 2over +preword2=! c! @ c@ 2! 2@ and or xor invert negate / /mod mod rshift lshift [settings] # default extension used when saving files Modified: src/highlightingmappings.h 7 files changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -546,7 +546,12 @@ }; static const HLKeyword highlighting_keywords_FORTH[] = { - { 0, "primary", FALSE } + { 0, "primary", FALSE }, + { 1, "keyword", FALSE }, + { 2, "defword", FALSE }, + { 3, "preword1", FALSE }, + { 4, "preword2", FALSE }, + { 5, "string", FALSE } }; #define highlighting_properties_FORTH EMPTY_PROPERTIES @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 7b65d7: Fix comment style and wording from last commit
by Matthew Brush 17 Aug '12

17 Aug '12

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 17 Aug 2012 00:52:22 Commit: 7b65d76d5f6e5cad5ad0e8fe9a4c0a1653fec0cf https://github.com/geany/geany/commit/7b65d76d5f6e5cad5ad0e8fe9a4c0a1653fec… Log Message: ----------- Fix comment style and wording from last commit Don't use C99/C++ style comments and elaborate a bit on the purpose of the call. Modified Paths: -------------- src/editor.c Modified: src/editor.c 4 files changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -4656,7 +4656,9 @@ static ScintillaObject *create_new_sci(GeanyEditor *editor) sci = SCINTILLA(scintilla_new()); - // Code is usually in English, keep text direction LTR + /* Scintilla doesn't support RTL languages properly and is primarily + * intended to be used with LTR source code, so override the + * GTK+ default text direction for the Scintilla widget. */ gtk_widget_set_direction(GTK_WIDGET(sci), GTK_TEXT_DIR_LTR); gtk_widget_show(GTK_WIDGET(sci)); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] e1a1c5: Keep code direction LTR
by Yosef Or 17 Aug '12

17 Aug '12

Branch: refs/heads/master Author: Yosef Or <Yosefor3(a)walla.com> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 17 Aug 2012 00:37:01 Commit: e1a1c54d784c3285b536f1608bb98e1355094644 https://github.com/geany/geany/commit/e1a1c54d784c3285b536f1608bb98e1355094… Log Message: ----------- Keep code direction LTR Modified Paths: -------------- src/editor.c Modified: src/editor.c 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -4656,6 +4656,9 @@ static ScintillaObject *create_new_sci(GeanyEditor *editor) sci = SCINTILLA(scintilla_new()); + // Code is usually in English, keep text direction LTR + gtk_widget_set_direction(GTK_WIDGET(sci), GTK_TEXT_DIR_LTR); + gtk_widget_show(GTK_WIDGET(sci)); sci_set_codepage(sci, SC_CP_UTF8); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] d36db7: ClassBuilder: Defy GTK+ conventions and instead generate valid C code
by Matthew Brush 11 Aug '12

11 Aug '12

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Sat, 11 Aug 2012 04:05:41 Commit: d36db75bcbcbc43c747d86da0d647528cbb2b904 https://github.com/geany/geany/commit/d36db75bcbcbc43c747d86da0d647528cbb2b… Log Message: ----------- ClassBuilder: Defy GTK+ conventions and instead generate valid C code Modified Paths: -------------- plugins/classbuilder.c Modified: plugins/classbuilder.c 18 files changed, 9 insertions(+), 9 deletions(-) =================================================================== @@ -127,8 +127,8 @@ class {class_name}{base_decl}\n\ "; static const gchar templates_gtk_class_header[] = "{fileheader}\n\n\ -#ifndef __{header_guard}__\n\ -#define __{header_guard}__\n\ +#ifndef {header_guard}_\n\ +#define {header_guard}_ 1\n\ {base_include}\n\ G_BEGIN_DECLS\n\ \n\n\ @@ -139,18 +139,18 @@ class {class_name}{base_decl}\n\ #define {namespace_up}IS_{class_name_up}_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), {namespace_up}TYPE_{class_name_up}))\n\ #define {namespace_up}{class_name_up}_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), {namespace_up}TYPE_{class_name_up}, {namespace}{class_name}Class))\n\ \n\ -typedef struct _{namespace}{class_name} {namespace}{class_name};\n\ -typedef struct _{namespace}{class_name}Class {namespace}{class_name}Class;\n\ -typedef struct _{namespace}{class_name}Private {namespace}{class_name}Private;\n\ +typedef struct {namespace}{class_name}_ {namespace}{class_name};\n\ +typedef struct {namespace}{class_name}Class_ {namespace}{class_name}Class;\n\ +typedef struct {namespace}{class_name}Private_ {namespace}{class_name}Private;\n\ \n\ -struct _{namespace}{class_name}\n\ +struct {namespace}{class_name}_\n\ {\n\ {base_name} parent;\n\ /* add your public declarations here */\n\ {namespace}{class_name}Private *priv;\n\ };\n\ \n\ -struct _{namespace}{class_name}Class\n\ +struct {namespace}{class_name}Class_\n\ {\n\ {base_name}Class parent_class;\n\ };\n\ @@ -160,13 +160,13 @@ struct _{namespace}{class_name}Class\n\ \n\n\ G_END_DECLS\n\ \n\ -#endif /* __{header_guard}__ */\n\ +#endif /* {header_guard}_ */\n\ "; static const gchar templates_gtk_class_source[] = "{fileheader}\n\ #include \"{header}\"\n\ \n\ -struct _{namespace}{class_name}Private\n\ +struct {namespace}{class_name}Private_\n\ {\n\ /* add your private declarations here */\n\ gpointer delete_me;\n\ @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 7193a1: Minor style changes from last commit
by Matthew Brush 11 Aug '12

11 Aug '12

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Sat, 11 Aug 2012 01:19:54 Commit: 7193a1161b0078dedea3dd588910daaf8b1f5dc7 https://github.com/geany/geany/commit/7193a1161b0078dedea3dd588910daaf8b1f5… Log Message: ----------- Minor style changes from last commit Modified Paths: -------------- src/editor.c Modified: src/editor.c 11 files changed, 2 insertions(+), 9 deletions(-) =================================================================== @@ -1401,16 +1401,9 @@ static gint get_indent_size_after_line(GeanyEditor *editor, gint line) gint additional_indent = 0; if (lexer_has_braces(sci)) - { additional_indent = iprefs->width * get_brace_indent(sci, line); - } - else - { - /* Instead of testing the filetype directly, test for the lexer being - * used. Otherwise Cython indentation will break. */ - if (sci_get_lexer(sci) == SCLEX_PYTHON) - additional_indent = iprefs->width * get_python_indent(sci, line); - } + else if (sci_get_lexer(sci) == SCLEX_PYTHON) /* Python/Cython */ + additional_indent = iprefs->width * get_python_indent(sci, line); /* HTML lexer "has braces" because of PHP and JavaScript. If get_brace_indent() did not * recommend us to insert additional indent, we are probably not in PHP/JavaScript chunk and @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2012