Commits July 2012

commits@lists.geany.org

1 participants
381 discussions

[geany/geany] 95d767: Document sci_get_lexer()
by Colomban Wendling 28 Jul '12

28 Jul '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 27 Jul 2012 22:32:26 Commit: 95d767f873729db6a2feadac358a4a5d7a3e564c https://github.com/geany/geany/commit/95d767f873729db6a2feadac358a4a5d7a3e5… Log Message: ----------- Document sci_get_lexer() This function is part of the plugin API but missed its documentation, leading to it not appearing in the generated API documentation. Modified Paths: -------------- src/sciwrappers.c Modified: src/sciwrappers.c 4 files changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -523,6 +523,10 @@ gint sci_get_length(ScintillaObject *sci) } +/** Gets the currently used lexer + * @param sci Scintilla widget. + * @returns The lexer ID + */ gint sci_get_lexer(ScintillaObject *sci) { return (gint) SSM(sci, SCI_GETLEXER, 0, 0); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 1ce4b1: Fix a reference to a file in HACKING
by Colomban Wendling 28 Jul '12

28 Jul '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 27 Jul 2012 22:32:26 Commit: 1ce4b1fac516f89dadb639cb773c76b68cfa286b https://github.com/geany/geany/commit/1ce4b1fac516f89dadb639cb773c76b68cfa2… Log Message: ----------- Fix a reference to a file in HACKING Modified Paths: -------------- HACKING Modified: HACKING 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -424,7 +424,7 @@ When adding a lexer, update: * scintilla/Makefile.am * scintilla/makefile.win32 * wscript -* scintilla/KeyWords.cxx - add a LINK_LEXER command *manually* +* scintilla/src/Catalogue.cxx - add a LINK_LEXER command *manually* For syntax highlighting, you will need to edit highlighting.c and highlightingmappings.h and add the following things: @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] f90bdc: Only set Find in Files directory once per-document
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Thu, 26 Jul 2012 15:13:34 Commit: f90bdc5957a827ce044fed6d0a7cd286a7301014 https://github.com/geany/geany/commit/f90bdc5957a827ce044fed6d0a7cd286a7301… Log Message: ----------- Only set Find in Files directory once per-document Use the current document's directory unless the directory field has already been edited and the current document has not changed. Otherwise, prepend the current document's directory to the drop-down history in case it is wanted. This is useful to avoid losing the edited directory when it is less likely the user wants to use the current document's directory. Modified Paths: -------------- doc/geany.html doc/geany.txt src/search.c Modified: doc/geany.html 12 files changed, 9 insertions(+), 3 deletions(-) =================================================================== @@ -1704,6 +1704,8 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> must be correctly set in Preferences to the path of the system's Grep utility. GNU Grep is recommended (see note below).</p> <img alt="./images/find_in_files_dialog.png" src="./images/find_in_files_dialog.png" /> +<p>The <em>Search</em> field is initially set to the current word in the editor +(depending on <a class="reference internal" href="#search">Search</a> preferences).</p> <p>The <em>Files</em> setting allows to choose which files are included in the search, depending on the mode:</p> <dl class="docutils"> @@ -1719,6 +1721,10 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> use: <tt class="docutils literal">*.c *.h</tt>. Note that an empty pattern list searches in all files rather than none.</p> +<p>The <em>Directory</em> field is initially set to the current document's directory, +unless this field has already been edited and the current document has +not changed. Otherwise, the current document's directory is prepended to +the drop-down history. This can be disabled - see <a class="reference internal" href="#search">Search</a> preferences.</p> <p>The <em>Encoding</em> field can be used to define the encoding of the files to be searched. The entered search text is converted to the chosen encoding and the search results are converted back to UTF-8.</p> @@ -2218,9 +2224,9 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> there is no selection. When this option is disabled, the search term last used in the appropriate Find dialog is used.</dd> <dt>Use the current file's directory for Find in Files</dt> -<dd>When opening the <a class="reference internal" href="#find-in-files">Find in Files</a> dialog, set the directory to search to the directory of the current +<dd>When opening the Find in Files dialog, set the directory to search to the directory of the current active file. When this option is disabled, the directory of the last use of the Find in Files -dialog is used.</dd> +dialog is used. See <a class="reference internal" href="#find-in-files">Find in Files</a> for details.</dd> </dl> </div> <div class="section" id="projects"> @@ -6797,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:29 UTC. +Generated on: 2012-07-26 14:56 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 12 files changed, 10 insertions(+), 2 deletions(-) =================================================================== @@ -1277,6 +1277,9 @@ utility. GNU Grep is recommended (see note below). .. image:: ./images/find_in_files_dialog.png +The *Search* field is initially set to the current word in the editor +(depending on `Search`_ preferences). + The *Files* setting allows to choose which files are included in the search, depending on the mode: @@ -1293,6 +1296,11 @@ use: ``*.c *.h``. Note that an empty pattern list searches in all files rather than none. +The *Directory* field is initially set to the current document's directory, +unless this field has already been edited and the current document has +not changed. Otherwise, the current document's directory is prepended to +the drop-down history. This can be disabled - see `Search`_ preferences. + The *Encoding* field can be used to define the encoding of the files to be searched. The entered search text is converted to the chosen encoding and the search results are converted back to UTF-8. @@ -1829,9 +1837,9 @@ Use the current word under the cursor for Find dialogs appropriate Find dialog is used. Use the current file's directory for Find in Files - When opening the `Find in Files`_ dialog, set the directory to search to the directory of the current + When opening the Find in Files dialog, set the directory to search to the directory of the current active file. When this option is disabled, the directory of the last use of the Find in Files - dialog is used. + dialog is used. See `Find in Files`_ for details. Projects ```````` Modified: src/search.c 21 files changed, 18 insertions(+), 3 deletions(-) =================================================================== @@ -1073,12 +1073,27 @@ void search_show_find_in_files_dialog(const gchar *dir) cur_dir = g_strdup(dir); /* custom directory argument passed */ else { - gboolean entry_empty = ! NZV(gtk_entry_get_text(GTK_ENTRY(entry))); - - if (search_prefs.use_current_file_dir || entry_empty) + if (search_prefs.use_current_file_dir) { + static gchar *last_cur_dir = NULL; + static GeanyDocument *last_doc = NULL; + + /* Only set the directory entry once for the current document */ cur_dir = utils_get_current_file_dir_utf8(); + if (doc == last_doc && cur_dir && utils_str_equal(cur_dir, last_cur_dir)) + { + /* in case the user now wants the current directory, add it to history */ + ui_combo_box_add_to_history( + GTK_COMBO_BOX_ENTRY(fif_dlg.dir_combo), cur_dir, 0); + SETPTR(cur_dir, NULL); + } + else + SETPTR(last_cur_dir, g_strdup(cur_dir)); + last_doc = doc; + } + if (!cur_dir && ! NZV(gtk_entry_get_text(GTK_ENTRY(entry)))) + { /* use default_open_path if no directory could be determined * (e.g. when no files are open) */ if (!cur_dir) @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 98452e: Update manual for search pref changes; add some links
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Thu, 26 Jul 2012 14:34:45 Commit: 98452edcc9e2ee542ba722f816fc6f0deeabc6f7 https://github.com/geany/geany/commit/98452edcc9e2ee542ba722f816fc6f0deeabc… Log Message: ----------- Update manual for search pref changes; add some links Modified Paths: -------------- doc/geany.html doc/geany.txt Modified: doc/geany.html 14 files changed, 8 insertions(+), 6 deletions(-) =================================================================== @@ -756,7 +756,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> <li>An optional message window which can show the following tabs:<ul> <li>Status - A list of status messages.</li> <li>Compiler - The output of compiling or building programs.</li> -<li>Messages - Results of 'Find Usage', 'Find Usage' 'Find in Files' and other actions</li> +<li>Messages - Results of 'Find Usage', 'Find in Files' and other actions</li> <li>Scribble - A text scratchpad for any use.</li> <li>Terminal - An optional terminal window.</li> </ul> @@ -1585,6 +1585,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> <li>Go to tag declaration</li> <li>Go to line</li> </ul> +<p>See also <a class="reference internal" href="#search">Search</a> preferences.</p> <div class="section" id="toolbar-entries"> <h3><a class="toc-backref" href="#id59">Toolbar entries</a></h3> <p>There are also two toolbar entries:</p> @@ -2208,15 +2209,16 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> <div class="section" id="search"> <h4><a class="toc-backref" href="#id94">Search</a></h4> <dl class="docutils"> -<dt>Always wrap search and hide the Find dialog</dt> -<dd>Always wrap search around the document and hide the Find dialog after clicking -Find Next/Previous.</dd> +<dt>Always wrap search</dt> +<dd>Always wrap search around the document when finding a match.</dd> +<dt>Hide the Find dialog</dt> +<dd>Hide the <a class="reference internal" href="#find">Find</a> dialog after clicking Find Next/Previous.</dd> <dt>Use the current word under the cursor for Find dialogs</dt> <dd>Use current word under the cursor when opening the Find, Find in Files or Replace dialog and there is no selection. When this option is disabled, the search term last used in the appropriate Find dialog is used.</dd> <dt>Use the current file's directory for Find in Files</dt> -<dd>When opening the Find in Files dialog, set the directory to search to the directory of the current +<dd>When opening the <a class="reference internal" href="#find-in-files">Find in Files</a> dialog, set the directory to search to the directory of the current active file. When this option is disabled, the directory of the last use of the Find in Files dialog is used.</dd> </dl> @@ -6795,7 +6797,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-06-25 13:30 UTC. +Generated on: 2012-07-26 14:29 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 14 files changed, 9 insertions(+), 5 deletions(-) =================================================================== @@ -293,7 +293,7 @@ The workspace has the following parts: * Status - A list of status messages. * Compiler - The output of compiling or building programs. - * Messages - Results of 'Find Usage', 'Find Usage' 'Find in Files' and other actions + * Messages - Results of 'Find Usage', 'Find in Files' and other actions * Scribble - A text scratchpad for any use. * Terminal - An optional terminal window. @@ -1153,6 +1153,8 @@ and the editor window's popup menu: * Go to tag declaration * Go to line +See also `Search`_ preferences. + Toolbar entries ^^^^^^^^^^^^^^^ There are also two toolbar entries: @@ -1815,9 +1817,11 @@ Auto-focus widgets (focus follows mouse) Search `````` -Always wrap search and hide the Find dialog - Always wrap search around the document and hide the Find dialog after clicking - Find Next/Previous. +Always wrap search + Always wrap search around the document when finding a match. + +Hide the Find dialog + Hide the `Find`_ dialog after clicking Find Next/Previous. Use the current word under the cursor for Find dialogs Use current word under the cursor when opening the Find, Find in Files or Replace dialog and @@ -1825,7 +1829,7 @@ Use the current word under the cursor for Find dialogs appropriate Find dialog is used. Use the current file's directory for Find in Files - When opening the Find in Files dialog, set the directory to search to the directory of the current + When opening the `Find in Files`_ dialog, set the directory to search to the directory of the current active file. When this option is disabled, the directory of the last use of the Find in Files dialog is used. @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 924882: Fix installing data files with MSYS (Windows makefiles)
by Nick Treleaven 26 Jul '12

26 Jul '12

1 0

[geany/geany] 14daf9: indent switch, add braces
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Thu, 26 Jul 2012 11:58:55 Commit: 14daf925ac03b2889a18921f5698ef849a247255 https://github.com/geany/geany/commit/14daf925ac03b2889a18921f5698ef849a247… Log Message: ----------- indent switch, add braces Modified Paths: -------------- tagmanager/ctags/c.c Modified: tagmanager/ctags/c.c 196 files changed, 99 insertions(+), 97 deletions(-) =================================================================== @@ -2369,125 +2369,127 @@ static int parseParens (statementInfo *const st, parenInfo *const info) info->isKnrParamList = FALSE; } else - switch (c) { - case '&': - case '*': - { - /* DEBUG_PRINT("parseParens, po++\n"); */ - info->isKnrParamList = FALSE; - if (identifierCount == 0) - info->isParamList = FALSE; - initToken (token); - break; - } - case ':': - { - info->isKnrParamList = FALSE; - break; - } - case '.': - { - info->isNameCandidate = FALSE; - info->isKnrParamList = FALSE; - break; - } - case ',': + switch (c) { - info->isNameCandidate = FALSE; - if (info->isKnrParamList) + case '&': + case '*': { - ++info->parameterCount; - identifierCount = 0; + /* DEBUG_PRINT("parseParens, po++\n"); */ + info->isKnrParamList = FALSE; + if (identifierCount == 0) + info->isParamList = FALSE; + initToken (token); + break; } - break; - } - case '=': - { - info->isKnrParamList = FALSE; - info->isNameCandidate = FALSE; - if (firstChar) + case ':': { - info->isParamList = FALSE; - skipMacro (st); - depth = 0; + info->isKnrParamList = FALSE; + break; } - break; - } - case '[': - { - info->isKnrParamList = FALSE; - skipToMatch ("[]"); - break; - } - case '<': - { - info->isKnrParamList = FALSE; - skipToMatch ("<>"); - break; - } - case ')': - { - if (firstChar) - info->parameterCount = 0; - --depth; - break; - } - case '(': - { - info->isKnrParamList = FALSE; - if (firstChar) + case '.': { info->isNameCandidate = FALSE; - cppUngetc (c); - skipMacro (st); - depth = 0; + info->isKnrParamList = FALSE; + break; } - else if (isType (token, TOKEN_PAREN_NAME)) + case ',': { - c = skipToNonWhite (); - if (c == '*') /* check for function pointer */ + info->isNameCandidate = FALSE; + if (info->isKnrParamList) { - skipToMatch ("()"); - c = skipToNonWhite (); - if (c == '(') - skipToMatch ("()"); + ++info->parameterCount; + identifierCount = 0; } - else + break; + } + case '=': + { + info->isKnrParamList = FALSE; + info->isNameCandidate = FALSE; + if (firstChar) { - cppUngetc (c); - cppUngetc ('('); - info->nestedArgs = TRUE; + info->isParamList = FALSE; + skipMacro (st); + depth = 0; } + break; } - else - ++depth; - break; - } - - default: - { - if (isident1 (c)) + case '[': { - if (++identifierCount > 1) - info->isKnrParamList = FALSE; - readIdentifier (token, c); - if (isType (token, TOKEN_NAME) && info->isNameCandidate) - token->type = TOKEN_PAREN_NAME; - else if (isType (token, TOKEN_KEYWORD)) + info->isKnrParamList = FALSE; + skipToMatch ("[]"); + break; + } + case '<': + { + info->isKnrParamList = FALSE; + skipToMatch ("<>"); + break; + } + case ')': + { + if (firstChar) + info->parameterCount = 0; + --depth; + break; + } + case '(': + { + info->isKnrParamList = FALSE; + if (firstChar) { - info->isKnrParamList = FALSE; info->isNameCandidate = FALSE; + cppUngetc (c); + skipMacro (st); + depth = 0; } + else if (isType (token, TOKEN_PAREN_NAME)) + { + c = skipToNonWhite (); + if (c == '*') /* check for function pointer */ + { + skipToMatch ("()"); + c = skipToNonWhite (); + if (c == '(') + skipToMatch ("()"); + } + else + { + cppUngetc (c); + cppUngetc ('('); + info->nestedArgs = TRUE; + } + } + else + ++depth; + break; } - else + + default: { - info->isParamList = FALSE; - info->isKnrParamList = FALSE; - info->isNameCandidate = FALSE; - info->invalidContents = TRUE; + if (isident1 (c)) + { + if (++identifierCount > 1) + info->isKnrParamList = FALSE; + readIdentifier (token, c); + if (isType (token, TOKEN_NAME) && info->isNameCandidate) + token->type = TOKEN_PAREN_NAME; + else if (isType (token, TOKEN_KEYWORD)) + { + info->isKnrParamList = FALSE; + info->isNameCandidate = FALSE; + } + } + else + { + info->isParamList = FALSE; + info->isKnrParamList = FALSE; + info->isNameCandidate = FALSE; + info->invalidContents = TRUE; + } + break; } - break; } } firstChar = FALSE; @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] c72dce: Merge remote-tracking branch 'origin/master' into tm/tree-refactoring
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Wed, 04 Jul 2012 11:15:53 Commit: c72dce06a55594247cad232d78bec9868f585587 https://github.com/geany/geany/commit/c72dce06a55594247cad232d78bec9868f585… Log Message: ----------- Merge remote-tracking branch 'origin/master' into tm/tree-refactoring Conflicts: makefile.win32 src/makefile.win32 Modified Paths: -------------- ChangeLog ChangeLog.pre-1-22 Makefile.am NEWS README README.Packagers THANKS configure.ac data/colorschemes/alt.conf data/filetypes.Genie.conf data/filetypes.ada data/filetypes.asm data/filetypes.c data/filetypes.common data/filetypes.cpp data/filetypes.css data/filetypes.d data/filetypes.perl data/filetypes.sh data/filetypes.vala doc/geany.1.in doc/geany.html doc/geany.txt doc/making-a-release doc/plugins.dox doc/pluginsignals.c doc/pluginsymbols.c geany.nsi geany_private.rc m4/geany-i18n.m4 makefile.win32 plugins/Makefile.am plugins/classbuilder.c plugins/demoplugin.c plugins/export.c plugins/filebrowser.c plugins/geanyplugin.h plugins/htmlchars.c plugins/saveactions.c plugins/splitwindow.c po/de.po po/es.po po/fr.po po/hu.po po/it.po po/kk.po po/pt_BR.po po/sv.po po/tr.po po/zh_CN.po scintilla/gtk/PlatGTK.cxx scintilla/gtk/ScintillaGTK.cxx scintilla/include/ILexer.h scintilla/include/Platform.h scintilla/include/SciLexer.h scintilla/include/Scintilla.h scintilla/include/Scintilla.iface scintilla/lexers/LexAda.cxx scintilla/lexers/LexAsm.cxx scintilla/lexers/LexBash.cxx scintilla/lexers/LexBasic.cxx scintilla/lexers/LexCPP.cxx scintilla/lexers/LexCSS.cxx scintilla/lexers/LexD.cxx scintilla/lexers/LexHTML.cxx scintilla/lexers/LexNsis.cxx scintilla/lexers/LexOthers.cxx scintilla/lexers/LexPascal.cxx scintilla/lexers/LexPerl.cxx scintilla/lexers/LexRuby.cxx scintilla/lexers/LexSQL.cxx scintilla/lexers/LexVHDL.cxx scintilla/lexlib/LexAccessor.h scintilla/lexlib/PropSetSimple.cxx scintilla/scintilla_changes.patch scintilla/src/AutoComplete.cxx scintilla/src/AutoComplete.h scintilla/src/CallTip.cxx scintilla/src/CallTip.h scintilla/src/CellBuffer.cxx scintilla/src/CellBuffer.h scintilla/src/Decoration.cxx scintilla/src/Document.cxx scintilla/src/Document.h scintilla/src/Editor.cxx scintilla/src/Editor.h scintilla/src/FontQuality.h scintilla/src/Indicator.cxx scintilla/src/Indicator.h scintilla/src/LineMarker.cxx scintilla/src/LineMarker.h scintilla/src/PerLine.cxx scintilla/src/PerLine.h scintilla/src/PositionCache.cxx scintilla/src/PositionCache.h scintilla/src/ScintillaBase.cxx scintilla/src/ScintillaBase.h scintilla/src/SplitVector.h scintilla/src/Style.cxx scintilla/src/Style.h scintilla/src/UniConversion.cxx scintilla/src/UniConversion.h scintilla/src/ViewStyle.cxx scintilla/src/ViewStyle.h scintilla/src/XPM.cxx scintilla/src/XPM.h scintilla/version.txt scripts/update-scintilla.sh 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/makefile.win32 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/ui_utils.h src/utils.c src/utils.h src/vte.c src/vte.h src/win32.c src/win32.h tagmanager/ctags/c.c win32-config.h wscript Modified: ChangeLog 6877 files changed, 2 insertions(+), 6875 deletions(-) =================================================================== No diff available, check online Modified: ChangeLog.pre-1-22 6875 files changed, 6875 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: Makefile.am 20 files changed, 13 insertions(+), 7 deletions(-) =================================================================== @@ -34,6 +34,7 @@ EXTRA_DIST = \ geany.pc.in \ geany.spec \ ChangeLog.pre-0-17 \ + ChangeLog.pre-1-22 \ HACKING \ README.I18N \ README.Packagers \ @@ -85,11 +86,19 @@ install-data-only: done -BZIP2_ENV =--best +dist-hook: + @if test -d "$(top_srcdir)/.git"; then \ + echo ' GEN ChangeLog'; \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.' && echo && \ + git log --stat 0.21.0.. ) > ChangeLog.tmp \ + && mv -f ChangeLog.tmp "$(distdir)/ChangeLog" \ + || ( rm -f ChangeLog.tmp ; \ + echo 'Failed to generate ChangeLog' >&2 ); \ + else \ + echo 'A git clone is required to generate a ChangeLog' >&2; \ + fi -dist-bzip2: distdir - BZIP2=$(BZIP2_ENV) $(AMTAR) --bzip2 -chof $(distdir).tar.bz2 $(distdir) - -rm -rf $(distdir) sign: if test -f $(PACKAGE)-$(VERSION).tar.gz; then \ @@ -97,9 +106,6 @@ sign: if test -f $(PACKAGE)-$(VERSION).tar.bz2; then \ gpg --detach-sign --digest-algo SHA512 $(PACKAGE)-$(VERSION).tar.bz2; fi -deb: - dpkg-buildpackage -rfakeroot - rpm: dist rpmbuild -ta $(distdir).tar.gz Modified: NEWS 33 files changed, 26 insertions(+), 7 deletions(-) =================================================================== @@ -1,4 +1,10 @@ -Geany 1.22 (unreleased) +Geany 1.23 (unreleased) + + Editor + * Update Scintilla to version 3.2.0. + + +Geany 1.22 (June 18, 2012) General * Bump dependencies to GTK >= 2.16 and GLib >= 2.20. @@ -6,28 +12,39 @@ Geany 1.22 (unreleased) * Rewrite theming support for better flexibility. * Add support for opening files read-only from the command line. * Always load the default session if configured to do so. - * Make all filetypes use named styles to simplify colour scheme + * Make all filetypes use named styles to simplify color scheme authoring. * Make 'Replace Spaces by Tabs' only match leading spaces to preserve alignment. + Possibly incompatible changes + * Theming and filetype style changes mean old filetypes and color + schemes are not compatible with this version of Geany. + * There are some default keybinding changes but these will only + apply to newly created configurations. + * Changes to the "project-dialog*" signals may affect plugins. + Bug fixes * Fix escaping of session file paths (#3425969). * Fix closing when minimized under Windows (#3421282). * Properly handle remote URIs received through drag 'n drop (#2966770, #3479567). * Fix build with bleeding-edge GLib (#3483388). - * Fix colour scheme selection in Ubuntu Unity (#3479674). + * Fix color scheme selection in Ubuntu Unity (#3479674). * Fix very slow regex tag parsing on Windows (e.g. for HTML). * Fix detecting a changed file on disk when opening from the command-line (Windows). * Fix quick search entry behavior on Windows. + * Fix keybindings conflicts check when swapping a binding. + * Fix comments insertion in some cases (#3449635, #3534320). * Add missing Windows mio makefile. Prefs * Split "always wrap search and hide find dialog" pref into "always wrap search" and "hide find dialog" (Dimitar Zhekov). * Add Project Properties overrides for 'Saving files' prefs. + * Add hidden VTE preference "send_cmd_prefix" to prefix commands sent + to the VTE. (See the manual for details). Interface * Add support for switching to the last used document after closing @@ -73,8 +90,9 @@ Geany 1.22 (unreleased) * Parse PHP functions with multiline argument list (#3037797). * Handle ``/bin/dash`` shebang (#3470986). * Update JavaScript parser from CTags. - * Parse D class, struct, interface template bodies and template - blocks; ignore 'static if' expressions. + * Parse D class/struct/interface template bodies and template + blocks; ignore 'static if' expressions; parse function + @attributes, pure/nothrow and immutable/inout/shared return types. * Fix broken tag/word autocompletion in HTML/PHP documents. * Enable &entity; completion for all XML-based filetypes. @@ -94,9 +112,10 @@ Geany 1.22 (unreleased) * Add stash_group_free_settings(). * Add support for plugins written in C++. - Internationalisation: + Internationalization: * Add translations: ar, id, lt, mn, nn, sk - * Update translations: de, hu, it, kk, pl, sl, sv, zh_TW + * Update translations: de, es, fr, hu, it, ja, kk, lt, nl, pl, pt, + pt_BR, sk, sl, sv, tr, zh_CN, zh_TW Geany 0.21 (October 2, 2011) Modified: README 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -102,7 +102,7 @@ file. -- -2005-2011 by Enrico Tröger, Nick Treleaven, Colomban Wendling, Matthew Brush and Frank Lanitz +2005-2012 by Enrico Tröger, Nick Treleaven, Colomban Wendling, Matthew Brush and Frank Lanitz enrico(dot)troeger(at)uvena(dot)de nick(dot)treleaven(at)btinternet(dot)com lists(dot)ban(at)herbesfolles(dot)org Modified: README.Packagers 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -82,7 +82,7 @@ list to stay informed about major changes and of course, new releases. -- -2008-2011 by Enrico Tröger, Nick Treleaven, Colomban Wendling, Matthew Brush and Frank Lanitz +2008-2012 by Enrico Tröger, Nick Treleaven, Colomban Wendling, Matthew Brush and Frank Lanitz enrico(dot)troeger(at)uvena(dot)de nick(dot)treleaven(at)btinternet(dot)com lists(dot)ban(at)herbesfolles(dot)org Modified: THANKS 16 files changed, 8 insertions(+), 8 deletions(-) =================================================================== @@ -94,8 +94,8 @@ Translators: ------------ These people have translated Geany to foreign languages: -Fayssal Chamekh <chamfay(at)gmail(dot)com - ar -Marcos Costales <marcoscostales(at)gmail(dot)com - ast +Fayssal Chamekh <chamfay(at)gmail(dot)com> - ar +Marcos Costales <marcoscostales(at)gmail(dot)com> - ast Yura Siamashka <yurand2(at)gmail(dot)com> - be_BY Dilyan Rusev <dilyanrusev(at)gmail(dot)com> - bg Toni Garcia-Navarro <topi(at)elpiset(dot)net> - ca_ES @@ -105,7 +105,7 @@ Karel Kolman <kolmis(at)gmail(dot)com> - cs_CZ Frank Lanitz <frank(at)frank(dot)uvena(dot)de> - de_DE Dominic Hopf <dmaphy(at)googlemail(dot)com> - de_DE Stavros Temertzidis <bullgr(at)gmail(dot)com> - el -Jeff Bailes <thepizzaking(at)gmail(dot)com - en_GB +Jeff Bailes <thepizzaking(at)gmail(dot)com> - en_GB Damián Viano <debian(at)damianv(dot)com(dot)ar> - es Antonio Jiménez González <tonificante(at)hotmail(dot)com> - es Nacho Cabanes <ncabanes(at)gmail(dot)com> - es @@ -116,7 +116,7 @@ Jari Rahkonen <jari(dot)rahkonen(at)pp1(dot)inet(dot)fi> - fi Jean-Philippe Moal <skateinmars(at)skateinmars(dot)net> - fr Roland Baudin <roland(dot)baudin(at)thalesaleniaspace(dot)com> - fr Lionel Fuentes <funto66(at)gmail(dot)com> - fr -Benjamin Ballet <benjamin(dot)ballet(at)gmail(dot)com -fr +Benjamin Ballet <benjamin(dot)ballet(at)gmail(dot)com> -fr José Manuel Castroagudín Silva <chavescesures(at)mail(dot)com> - gl Gabor Kmetyko aka kilo <kg_kilo(at)freemail(dot)hu> - hu M.Baldinelli <m(dot)baldinelli(at)agora(dot)it> - it @@ -127,10 +127,10 @@ Chikahiro Masami <cmasa(dot)z321(at)gmail(dot)com> - ja Park Jang-heon <dotkabi(at)gmail(dot)com> - ko Baurzhan Muftakhidinov <baurthefirst(at)gmail(dot)com> - kk Laurent Hoeltgen <hoeltgman(at)gmail(dot)com> - lb -Algimantas Margevičius <margevicius(dot)algimantas(at)gmail(dot)com - lt +Algimantas Margevičius <margevicius(dot)algimantas(at)gmail(dot)com> - lt tsetsee <tsetsee(dot)yugi(at)gmail(dot)com> - mn Kurt De Bree <kdebree(at)telenet(dot)be> - nl -Peter Scholtens <<peter(dot)scholtens(at)xs4all(dot)nl> - nl +Peter Scholtens <peter(dot)scholtens(at)xs4all(dot)nl> - nl Ayke van Laethem <aykevanlaethem(at)gmail(dot)com> - nl Jacek Wolszczak <shutdownrunner(at)o2(dot)pl> - pl_PL Jarosław Foksa <jfoksa(at)gmail(dot)com> - pl_PL @@ -138,7 +138,7 @@ Krzysztof Troska <elleander86(at)gmail(dot)com> - pl_PL Wojciech Świderski <woj.swiderski(a)gmail.com> - pl_PL Alexandre Moreira <alexandream(at)gmail(dot)com> - pt_BR Adrovane Marques Kade <adrovane(at)gmail(dot)com> - pt_BR -Rafael Peregrino da Silva <rperegrino(at)linuxnewmedia(dot)com(dot)br - pt_BR +Rafael Peregrino da Silva <rperegrino(at)linuxnewmedia(dot)com(dot)br> - pt_BR Alex Eftimie <alex(at)rosedu(dot)org> - ro brahmann_ <brahmann(at)pisem(dot)net> - ru_RU Nikita E. Shalaev <nshalaev(at)eu(dot)spb(dot)ru> - ru_RU @@ -148,7 +148,7 @@ John Wehin <john(dot)wehin(at)gmail(dot)com> - ru_RU Tomáš Vadina <kyberdev(at)gmail(dot)com> - sk Jože Klepec <joze(dot)klepec(at)siol(dot)net> - sl Tony Mattsson <superxorn(at)gmail(dot)com> - sv -Gürkan Gür <seqizz(at)gmail(dot)com - tr +Gürkan Gür <seqizz(at)gmail(dot)com> - tr Boris Dibrov <dibrov(dot)bor(at)gmail(dot)com> - uk Clytie Siddall <clytie(at)riverland(dot)net(dot)au> - vi_VN Dormouse Young <mouselinux(at)163(dot)com> - zh_CN Modified: configure.ac 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([Geany], [1.22], +AC_INIT([Geany], [1.23], [https://sourceforge.net/tracker/?group_id=153444&atid=787791]) AC_CONFIG_SRCDIR([src/geany.h]) AC_CONFIG_AUX_DIR([build-aux]) Modified: data/colorschemes/alt.conf 1 files changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -69,7 +69,6 @@ character=string_1 backticks=string_2 here_doc=string_2 -scalar=string_2 label=default,bold preprocessor=0x808000 regex=number_1 Modified: data/filetypes.Genie.conf 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -5,8 +5,8 @@ # all items must be in one line primary=abstract and array as assert async bool break byte case cast char class const construct continue date datetime decimal dedent def default delegate delete dict div do double downto dynamic else ensures enum errordomain event except exception extern false final finally float for foreach get hash identifier if implements implements in init inline int int16 int32 int64 int8 interface internal is isa list lock long max min namespace namespace new not null object of or otherwise out override owned params pass print private prop protected public raise raises readonly ref requires return sbyte self set short single sizeof size_t ssize_t static string struct super to true try typeof uint uint32 uint64 uint8 ulong unichar unit16 unless unowned uses uses ushort var virtual void volatile weak when while writeonly yield #secondary= -# these are some doxygen keywords (incomplete) -docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union +# these are the Doxygen and Valadoc keywords +docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup inheritDoc interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsu bsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem [lexer_properties] lexer.cpp.triplequoted.strings=1 Modified: data/filetypes.ada 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -6,7 +6,7 @@ word=keyword_1 identifier=identifier_1 number=number delimiter=operator -character=string_1 +character=character charactereol=string_eol string=string_1 stringeol=string_eol Modified: data/filetypes.asm 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -14,7 +14,7 @@ mathinstruction=keyword_2 register=type directive=preprocessor directiveoperand=keyword_3 -character=string_1 +character=character stringeol=string_eol extinstruction=keyword_4 Modified: data/filetypes.c 7 files changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -9,7 +9,7 @@ word=keyword_1 word2=keyword_2 string=string_1 -character=string_1 +character=character uuid=other preprocessor=preprocessor operator=operator @@ -23,13 +23,14 @@ globalclass=class # """verbatim""" tripleverbatim=string_2 +hashquotedstring=string_2 [keywords] # all items must be in one line primary=asm auto break case char const continue default do double else enum extern float for goto if inline int long register restrict return short signed sizeof static struct switch typedef union unsigned void volatile while FALSE NULL TRUE secondary= -# these are some doxygen keywords (incomplete) -docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union +# these are the Doxygen keywords +docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection ta bleofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem [lexer_properties] styling.within.preprocessor=1 Modified: data/filetypes.common 1 files changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -154,7 +154,6 @@ character=string_1 backticks=string_2 here_doc=string_2 -scalar=string_2 label=default,bold preprocessor=0x007f7f regex=number_1 Modified: data/filetypes.cpp 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -5,8 +5,8 @@ # all items must be in one line primary=alignas alignof and and_eq asm auto bitand bitor bool break case catch char char16_t char32_t class compl const const_cast constexpr continue decltype default delete do double dynamic_cast else enum explicit export extern false final float for friend goto if inline int int8_t int16_t int32_t int64_t long mutable namespace new noexcept not not_eq nullptr operator or or_eq override private protected ptrdiff_t public register reinterpret_cast return short signed sizeof size_t static static_assert static_cast struct switch template this thread_local throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq secondary= -# these are some doxygen keywords (incomplete) -docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo tparam typedef var version warning union +# these are the Doxygen keywords +docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection ta bleofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem [lexer_properties] styling.within.preprocessor=1 Modified: data/filetypes.css 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -16,6 +16,7 @@ attribute=attribute value=value id=number identifier2=keyword_2 +variable=identifier_1 important=extra directive=preprocessor identifier3=keyword_3 Modified: data/filetypes.d 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -28,6 +28,9 @@ secondary= docComment=Authors Bugs Copyright Date Deprecated Examples History License Macros Params Returns See_Also Standards Throws Version types= +[lexer_properties] +fold.d.comment.explicit=0 + [settings] # default extension used when saving files extension=d Modified: data/filetypes.perl 10 files changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -10,13 +10,13 @@ character=character preprocessor=preprocessor operator=operator -identifier=identifier_1 -scalar=scalar +identifier=identifier +scalar=identifier_1 pod=comment_doc regex=regex -array=regex -hash=regex -symboltable=number_2 +array=identifier_2 +hash=identifier_3 +symboltable=identifier_4 backticks=backticks pod_verbatim=comment_doc_keyword reg_subst=regex Modified: data/filetypes.sh 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -8,10 +8,10 @@ word=keyword_1 string=string_1 character=character operator=operator -identifier=identifier_1 +identifier=identifier backticks=backticks param=parameter -scalar=scalar +scalar=identifier_1 error=error here_delim=here_doc here_q=here_doc Modified: data/filetypes.vala 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -5,8 +5,8 @@ # all items must be in one line primary=abstract as async base bool break callback case catch char class const constpointer construct continue default delegate delete do double dynamic else ensures enum errordomain extern false finally float for foreach generic get global if in inline int int16 int32 int64 int8 interface internal is lock long namespace new null out override owned private protected public ref requires return set sealed short signal size_t sizeof ssize_t static string struct switch this throw throws time_t true try typeof uchar uint uint16 uint32 uint64 uint8 ulong unichar unowned ushort using value var virtual void weak while yield #secondary= -# these are some doxygen and valadoc keywords (incomplete) -docComment=attention author brief bug class code date def deprecated enum example exception file fn inheritDoc link namespace note param remarks return see since struct throw throws todo typedef union var version warning +# these are the Doxygen and Valadoc keywords +docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup inheritDoc interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsu bsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem [lexer_properties] styling.within.preprocessor=1 Modified: doc/geany.1.in 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -.TH "GEANY" "1" "October 02, 2011" "geany @VERSION@" "" +.TH "GEANY" "1" "June 18, 2012" "geany @VERSION@" "" .SH "NAME" Geany \(em a small and lightweight IDE .SH "SYNOPSIS" Modified: doc/geany.html 42 files changed, 25 insertions(+), 17 deletions(-) =================================================================== @@ -5,8 +5,8 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" /> <title>Geany</title> -<meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz Colomban Wendling" /> -<meta name="date" content="2011-10-02" /> +<meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz Colomban Wendling Matthew Brush" /> +<meta name="date" content="2012-06-18" /> <style type="text/css"> /* @@ -138,14 +138,15 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> <td>Enrico Tröger <br />Nick Treleaven <br />Frank Lanitz -<br />Colomban Wendling</td></tr> +<br />Colomban Wendling +<br />Matthew Brush</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2011-10-02</td></tr> +<td>2012-06-18</td></tr> <tr><th class="docinfo-name">Version:</th> -<td>1.22</td></tr> +<td>1.23</td></tr> </tbody> </table> -<p>Copyright © 2005-2011</p> +<p>Copyright © 2005-2012</p> <p>This document is distributed 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. A copy of this @@ -2352,6 +2353,8 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> <dl class="docutils"> <dt>Line wrapping</dt> <dd>Show long lines wrapped around to new display lines.</dd> +</dl> +<dl class="docutils" id="smart-home-key"> <dt>"Smart" home key</dt> <dd>Whether to move the cursor to the first non-whitespace character on the line when you hit the home key on your keyboard. Pressing it @@ -4195,29 +4198,34 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> </tr> <tr><td>Go to Start of Line</td> <td>Home</td> -<td>Move the caret to the end of the line indentation -unless it is already there, in which case it moves -it to the start of the line.</td> +<td>Move the caret to the start of the line. +Behaves differently if <a class="reference internal" href="#smart-home-key">smart_home_key</a> is set.</td> </tr> <tr><td>Go to End of Line</td> <td>End</td> <td>Move the caret to the end of the line.</td> </tr> +<tr><td>Go to Start of Display Line</td> +<td>Alt-Home</td> +<td>Move the caret to the start of the display line. +This is useful when you use line wrapping and +want to jump to the start of the wrapped, virtual +line, not the real start of the whole line. +If the line is not wrapped, it behaves like +<cite>Go to Start of Line</cite>.</td> +</tr> <tr><td>Go to End of Display Line</td> <td>Alt-End</td> <td>Move the caret to the end of the display line. -This is useful when you use line wrapping and -want to jump to the end of the wrapped, virtual -line, not the real end of the whole line. If the line is not wrapped, it behaves like -<cite>Go to End of Line</cite>, see above.</td> +<cite>Go to End of Line</cite>.</td> </tr> <tr><td>Go to Previous Word Part</td> <td>Ctrl-/</td> <td>Goto the previous part of the current word.</td> </tr> <tr><td>Go to Next Word Part</td> -<td>Ctrl-</td> +<td>Ctrl-\</td> <td>Goto the next part of the current word.</td> </tr> </tbody> @@ -5654,7 +5662,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> </tr> <tr><td>geanyversion</td> <td>The actual Geany version, e.g. -"Geany 1.22".</td> +"Geany 1.23".</td> <td>file templates, file header, function description, ChangeLog entry, bsd, gpl, snippets.</td> @@ -5986,7 +5994,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> look, run "<tt class="docutils literal">make doc</tt>" in the subdirectory <tt class="docutils literal">doc</tt> of Geany's source directory. This regenerates the <tt class="docutils literal">geany.html</tt> file. To generate a PDF file, use the command "<tt class="docutils literal">make pdf</tt>" which should generate a file called -geany-1.22.pdf.</p> +geany-1.23.pdf.</p> <p>After you are happy with your changes, create a patch e.g. by using:</p> <pre class="literal-block"> % git diff geany.txt > foo.patch @@ -6787,7 +6795,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-06-04 21:07 UTC. +Generated on: 2012-06-25 13:30 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 30 files changed, 18 insertions(+), 12 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -.. |(version)| replace:: 1.22 +.. |(version)| replace:: 1.23 ======= Geany @@ -11,11 +11,12 @@ :Authors: Enrico Tröger, Nick Treleaven, Frank Lanitz, - Colomban Wendling -:Date: 2011-10-02 + Colomban Wendling, + Matthew Brush +:Date: 2012-06-18 :Version: |(version)| -Copyright © 2005-2011 +Copyright © 2005-2012 This document is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 @@ -1976,6 +1977,8 @@ Features Line wrapping Show long lines wrapped around to new display lines. +.. _smart_home_key: + "Smart" home key Whether to move the cursor to the first non-whitespace character on the line when you hit the home key on your keyboard. Pressing it @@ -3485,22 +3488,25 @@ Go to tag definition Ctrl-T Jump to the definition Go to tag declaration Ctrl-Shift-T Jump to the declaration of the current word or selection. See `Go to tag declaration`_. -Go to Start of Line Home Move the caret to the end of the line indentation - unless it is already there, in which case it moves - it to the start of the line. +Go to Start of Line Home Move the caret to the start of the line. + Behaves differently if smart_home_key_ is set. Go to End of Line End Move the caret to the end of the line. -Go to End of Display Line Alt-End Move the caret to the end of the display line. +Go to Start of Display Line Alt-Home Move the caret to the start of the display line. This is useful when you use line wrapping and - want to jump to the end of the wrapped, virtual - line, not the real end of the whole line. + want to jump to the start of the wrapped, virtual + line, not the real start of the whole line. + If the line is not wrapped, it behaves like + `Go to Start of Line`. + +Go to End of Display Line Alt-End Move the caret to the end of the display line. If the line is not wrapped, it behaves like - `Go to End of Line`, see above. + `Go to End of Line`. Go to Previous Word Part Ctrl-/ Goto the previous part of the current word. -Go to Next Word Part Ctrl-\ Goto the next part of the current word. +Go to Next Word Part Ctrl-\\ Goto the next part of the current word. =============================== ========================= ================================================== View keybindings Modified: doc/making-a-release 33 files changed, 17 insertions(+), 16 deletions(-) =================================================================== @@ -4,44 +4,45 @@ For major releases: * Try to synchronize release date with geany-plugins. Update NEWS file - ideally each committer should review their changes -and summarise the interesting ones. Use scripts/changelist.pl to -format & filter commits by a particular developer name. +and summarize the interesting ones. Use `git log --author='name'` +to filter commits by a particular developer name. Ensure version numbers are all updated in: configure.ac geany.nsi geany_private.rc win32-config.h wscript doc/geany.txt Ensure release date is updated in: - doc/geany.txt doc/geany.1.in + NEWS doc/geany.txt doc/geany.1.in Regenerate doc/geany.html. Check GEANY_CODENAME is set in src/geany.h. -Update NEWS release date. -Add changelog entry for new release. Export the code into a new directory (i.e. not usual working copy). Run 'make distcheck'. Delete the created archive and run 'make dist' and 'make dist-bzip2'. +Sign the archives with 'make sign'. -Put the resulting tarballs on uvena.de - upload to home directory -and after the upload is finished move them into -/home/www/files.uvena.de/geany/. +Put the resulting tarballs and signature files on geany.org - upload +to home directory and after the upload is finished move them into +/srv/www/download.geany.org/. Rename LATEST-IS-... to the new version number in -/home/www/files.uvena.de/geany/ and /home/www/www.geany.org/files. -Add the GPG signatures - use 'make sign' and check the public key +/srv/www/download.geany.org/ and /srv/www/www.geany.org/files. +Make sure the public part of the GPG key used to sign the archives can be found on the download page. + Windows builds (enrico?). -Tag release in SVN, remove the branch if used. +Create a signed tag for the release in Git with 'git tag -s <version>'. Website: update Releases, Documentation links and add a News item. Update the manual data and links in the filesystem in -/home/www/www.geany.org/manual. Remember to update current/hacking.html +/srv/www/www.geany.org/manual. Remember to update current/hacking.html too. Announce on geany, devel, i18n mailing lists (check you're subscribed). -Put a news item on Sourceforge, add a new release on Freshmeat.net -and update the information on gnomefiles.org. +Put a news item on SourceForge (https://sourceforge.net/news/?group_id=153444) +and a new release on freecode.com (https://freecode.com/projects/geany). -For non-trunk releases, merge NEWS into trunk and any branch-only +For non-master releases, merge NEWS into master and any branch-only commits that need to merged. -For trunk releases, bump version strings and merge unstable branch. +For merge releases, bump version strings and codename and merge unstable +branch if any. Modified: doc/plugins.dox 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ * * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * Copyright 2009-2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2009-2012 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: doc/pluginsignals.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ /* * pluginsignals.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-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 Modified: doc/pluginsymbols.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ /* * pluginsymbols.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-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 Modified: geany.nsi 14 files changed, 9 insertions(+), 5 deletions(-) =================================================================== @@ -1,8 +1,8 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; geany.nsi - this file is part of Geany, a fast and lightweight IDE ; -; Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> -; Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> +; Copyright 2007-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +; Copyright 2007-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 @@ -32,8 +32,8 @@ RequestExecutionLevel highest ; set execution level for Windows Vista ; helper defines ; ;;;;;;;;;;;;;;;;;;; !define PRODUCT_NAME "Geany" -!define PRODUCT_VERSION "1.22" -!define PRODUCT_VERSION_ID "1.22.0.0" +!define PRODUCT_VERSION "1.23" +!define PRODUCT_VERSION_ID "1.23.0.0" !define PRODUCT_PUBLISHER "The Geany developer team" !define PRODUCT_WEB_SITE "http://www.geany.org/" !define PRODUCT_DIR_REGKEY "Software\Geany" @@ -50,7 +50,7 @@ VIProductVersion "${PRODUCT_VERSION_ID}" VIAddVersionKey "ProductName" "${PRODUCT_NAME}" VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}" VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}" -VIAddVersionKey "LegalCopyright" "Copyright 2005-2011 by the Geany developer team" +VIAddVersionKey "LegalCopyright" "Copyright 2005-2012 by the Geany developer team" VIAddVersionKey "FileDescription" "${PRODUCT_NAME} Installer" BrandingText "$(^NAME) installer (NSIS 2.46)" @@ -128,12 +128,16 @@ Section "!Program Files" SEC01 SetOutPath "$INSTDIR\data" File "${RESOURCEDIR}\data\GPL-2" File "${RESOURCEDIR}\data\file*" + File "${RESOURCEDIR}\data\geany.glade" File "${RESOURCEDIR}\data\snippets.conf" File "${RESOURCEDIR}\data\ui_toolbar.xml" SetOutPath "$INSTDIR\data\templates" File /r "${RESOURCEDIR}\data\templates\*" + SetOutPath "$INSTDIR\data\colorschemes" + File /r "${RESOURCEDIR}\data\colorschemes\*" + SetOutPath "$INSTDIR\share\icons" File /r "${RESOURCEDIR}\share\icons\*" Modified: geany_private.rc 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1,8 +1,8 @@ #include <windows.h> // include for version info constants -#define VER_FILEVERSION 1,22,0,0 -#define VER_FILEVERSION_STR "1.22" +#define VER_FILEVERSION 1,23,0,0 +#define VER_FILEVERSION_STR "1.23" A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico" @@ -21,7 +21,7 @@ FILETYPE VFT_APP VALUE "FileVersion", VER_FILEVERSION_STR VALUE "FileDescription", "Geany" VALUE "InternalName", "Geany" - VALUE "LegalCopyright", "Copyright 2005-2011 by the Geany developers" + VALUE "LegalCopyright", "Copyright 2005-2012 by the Geany developers" VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "Geany.exe" VALUE "ProductName", "Geany" Modified: m4/geany-i18n.m4 5 files changed, 1 insertions(+), 4 deletions(-) =================================================================== @@ -13,10 +13,7 @@ AC_DEFUN([GEANY_I18N], if test -n "${LINGUAS}"; then ALL_LINGUAS="${LINGUAS}" else - if test -z "$conf_dir"; then - conf_dir="." - fi - ALL_LINGUAS=`cd "$conf_dir/po" 2>/dev/null && ls *.po 2>/dev/null | $AWK 'BEGIN { FS="."; ORS=" " } { print $[]1 }'` + ALL_LINGUAS=`cd "$srcdir/po" 2>/dev/null && ls *.po 2>/dev/null | $AWK 'BEGIN { FS="."; ORS=" " } { print $[]1 }'` fi AM_GLIB_GNU_GETTEXT Modified: makefile.win32 57 files changed, 33 insertions(+), 24 deletions(-) =================================================================== @@ -1,33 +1,37 @@ +# See http://www.geany.org/Support/BuildingOnWin32 # Running make creates config.h then calls the sub makefiles. # # Other targets are: # deps: delete the dependencies so they are regenerated on next make # clean: clean all generated files +# install: install to DESTDIR # # localwin32.mk is an optional file to override make variables. # Use localwin32.mk instead of editing variables as it is included in sub # makefiles. -# localwin32.mk to set PREFIX instead of the default C:\libs -# For MSYS use localwin32.mk to set CP and RM. -# By default this will work in a Windows command prompt. +# E.g. use localwin32.mk to set PREFIX=C:/libs instead of the default C:\libs +# For MSYS use localwin32.mk to set CP, CP_R, RM, DIRSEP. +# By default this should work in a Windows command prompt (cmd.exe). WINDRES = windres.exe CC = gcc CXX = g++ -CP = copy +CP = copy /Y +CP_R = xcopy /S /Y RM = del -MAKE = make +MKDIR = mkdir +# strip is used to prevent line wrap +DIRSEP := $(strip \) +DESTDIR = C:/Program Files/Geany -include localwin32.mk -# Note: && is needed after cd because each line is executed in a different -# shell. (cd .. is just for clarity). all: config.h - cd tagmanager/ctags && $(MAKE) -f makefile.win32 && cd ../.. - cd tagmanager/mio && $(MAKE) -f makefile.win32 && cd ../.. - cd tagmanager/src && $(MAKE) -f makefile.win32 && cd ../.. - cd scintilla && $(MAKE) -f makefile.win32 && cd .. - cd plugins && $(MAKE) -f makefile.win32 && cd .. - cd src && $(MAKE) -f makefile.win32 && cd .. + $(MAKE) -C tagmanager/ctags -f makefile.win32 + $(MAKE) -C tagmanager/mio -f makefile.win32 + $(MAKE) -C tagmanager/src -f makefile.win32 + $(MAKE) -C scintilla -f makefile.win32 + $(MAKE) -C plugins -f makefile.win32 + $(MAKE) -C src -f makefile.win32 config.h: win32-config.h $(CP) $< $@ @@ -40,18 +44,23 @@ clean-local: -$(RM) geany_private.res geany.exe clean: deps - cd tagmanager/ctags && $(MAKE) -f makefile.win32 clean && cd ../.. - cd tagmanager/mio && $(MAKE) -f makefile.win32 clean && cd ../.. - cd tagmanager/src && $(MAKE) -f makefile.win32 clean && cd ../.. - cd scintilla && $(MAKE) -f makefile.win32 clean && cd .. - cd plugins && $(MAKE) -f makefile.win32 clean && cd .. - cd src && $(MAKE) -f makefile.win32 clean && cd .. + $(MAKE) -C tagmanager/ctags -f makefile.win32 clean + $(MAKE) -C tagmanager/mio -f makefile.win32 clean + $(MAKE) -C tagmanager/src -f makefile.win32 clean + $(MAKE) -C scintilla -f makefile.win32 clean + $(MAKE) -C plugins -f makefile.win32 clean + $(MAKE) -C src -f makefile.win32 clean .PHONY: install -DESTDIR='C:/Program Files/Geany' -# requires admin privileges and MSYS +# likely requires admin privileges +# mkdir output is ignored in case dir exists +# 'copy' seems to only accept / in the destination install: - cp -r data $(DESTDIR) - cp plugins/*.dll $(DESTDIR)/lib - cp geany.exe $(DESTDIR)/bin + -$(MKDIR) "$(DESTDIR)" + -$(MKDIR) "$(DESTDIR)/bin" + $(CP) geany.exe "$(DESTDIR)/bin" + -$(MKDIR) "$(DESTDIR)/lib" + $(CP) plugins$(DIRSEP)*.dll "$(DESTDIR)/lib" + -$(MKDIR) "$(DESTDIR)/data" + $(CP_R) data "$(DESTDIR)/data" Modified: plugins/Makefile.am 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -94,7 +94,7 @@ splitwindow_la_CFLAGS = -DG_LOG_DOMAIN=\""SplitWindow"\" demoplugin_la_LIBADD = $(GTK_LIBS) classbuilder_la_LIBADD = $(GTK_LIBS) htmlchars_la_LIBADD = $(GTK_LIBS) -export_la_LIBADD = $(GTK_LIBS) +export_la_LIBADD = $(GTK_LIBS) -lm saveactions_la_LIBADD = $(GTK_LIBS) filebrowser_la_LIBADD = $(GTK_LIBS) splitwindow_la_LIBADD = $(GTK_LIBS) Modified: plugins/classbuilder.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -2,8 +2,8 @@ * classbuilder.c - this file is part of Geany, a fast and lightweight IDE * * Copyright 2007 Alexander Rodin <rodin(dot)alexander(at)gmail(dot)com> - * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-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 Modified: plugins/demoplugin.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ /* * demoplugin.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-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 Modified: plugins/export.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ /* * export.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-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 Modified: plugins/filebrowser.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ /* * filebrowser.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-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 Modified: plugins/geanyplugin.h 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ /* * geanyplugin.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2009-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 Modified: plugins/htmlchars.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1,9 +1,9 @@ /* * htmlchars.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009-2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> - * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2009-2012 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2006-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-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 Modified: plugins/saveactions.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ /* * saveactions.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2007-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 Modified: plugins/splitwindow.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ /* * splitwindow.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * 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 Modified: po/de.po 1865 files changed, 840 insertions(+), 1025 deletions(-) =================================================================== No diff available, check online Modified: po/es.po 21 files changed, 10 insertions(+), 11 deletions(-) =================================================================== @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Geany 1.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-04 17:26+0200\n" -"PO-Revision-Date: 2012-06-04 09:21+0100\n" +"POT-Creation-Date: 2012-06-13 18:44+0200\n" +"PO-Revision-Date: 2012-06-12 12:24+0100\n" "Last-Translator: Lucas Vieites <lucas.vieites(a)gmail.com>\n" "Language-Team: Español <geany-i18n(a)uvena.de>\n" "Language: es\n" @@ -187,11 +187,10 @@ msgstr "Ruta de inicio:" #: ../data/geany.glade.h:38 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 "" "Ruta en la que iniciar cuando se abren o guardan archivos. Debe ser una ruta " -"absoluta. Dejar en blanco para usar el directorio de trabajo actual." +"absoluta." #: ../data/geany.glade.h:39 msgid "Project files:" @@ -3249,7 +3248,7 @@ msgid "Document" msgstr "Documento" #: ../src/keybindings.c:238 ../src/keybindings.c:585 ../src/project.c:444 -#: ../src/ui_utils.c:1980 +#: ../src/ui_utils.c:1981 msgid "Build" msgstr "Construir" @@ -5138,23 +5137,23 @@ msgstr "C++ STL" msgid "_Set Custom Date Format" msgstr "_Establecer formato de fecha personalizado" -#: ../src/ui_utils.c:1819 +#: ../src/ui_utils.c:1820 msgid "Select Folder" msgstr "Seleccionar carpeta" -#: ../src/ui_utils.c:1819 +#: ../src/ui_utils.c:1820 msgid "Select File" msgstr "Seleccionar archivo" -#: ../src/ui_utils.c:1978 +#: ../src/ui_utils.c:1979 msgid "Save All" msgstr "Guardar _todo" -#: ../src/ui_utils.c:1979 +#: ../src/ui_utils.c:1980 msgid "Close All" msgstr "C_errar todo" -#: ../src/ui_utils.c:2225 +#: ../src/ui_utils.c:2226 msgid "Geany cannot start!" msgstr "Geany no puede iniciarse." Modified: po/fr.po 1760 files changed, 759 insertions(+), 1001 deletions(-) =================================================================== No diff available, check online Modified: po/hu.po 1707 files changed, 724 insertions(+), 983 deletions(-) =================================================================== No diff available, check online Modified: po/it.po 9 files changed, 4 insertions(+), 5 deletions(-) =================================================================== @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Geany 1.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 21:50+0200\n" -"PO-Revision-Date: 2012-06-04 23:18+0100\n" +"POT-Creation-Date: 2012-06-09 08:57+0200\n" +"PO-Revision-Date: 2012-06-07 18:58+0100\n" "Last-Translator: Giuseppe Penone <giuspen(a)gmail.com>\n" "Language-Team: <geany-i18n(a)uvena.de>\n" "Language: it\n" @@ -188,12 +188,11 @@ msgid "Startup path:" msgstr "Percorso di avvio:" #: ../data/geany.glade.h:38 -#, fuzzy msgid "" "Path to start in when opening or saving files. Must be an absolute path." msgstr "" -"Percorso iniziale per l'apertura o il salvataggio dei file. Dev'essere un " -"percorso assoluto. Lasciare vuoto per usare la cartella di lavoro corrente." +"Percorso iniziale per l'apertura o il salvataggio dei file. Deve essere un " +"percorso assoluto." #: ../data/geany.glade.h:39 msgid "Project files:" Modified: po/kk.po 446 files changed, 222 insertions(+), 224 deletions(-) =================================================================== @@ -7,8 +7,8 @@ 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: 2012-02-21 10:43+0600\n" +"POT-Creation-Date: 2012-06-11 19:05+0200\n" +"PO-Revision-Date: 2012-06-10 19:41+0600\n" "Last-Translator: Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>\n" "Language-Team: Kazakh <kk_KZ(a)googlegroups.com>\n" "Language: kk\n" @@ -29,7 +29,7 @@ msgstr "Интеграцияланған өндіру ортасы" #: ../geany.desktop.in.h:3 msgid "A fast and lightweight IDE using GTK2" -msgstr "GTK2 негізінде жылдам әрі жеңіл өндіру ортасы" +msgstr "GTK2 негізіндегі жылдам әрі жеңіл өндіру ортасы" #: ../data/geany.glade.h:1 msgid "_Edit" @@ -83,7 +83,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 "_Альтернативті бос аралықты енгізу" @@ -127,7 +127,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 "Баптаулар" @@ -157,7 +157,7 @@ msgstr "Плагиндерді қолдауды іске қосу" #: ../data/geany.glade.h:31 msgid "<b>Startup</b>" -msgstr "<b>Қосылу</b>" +msgstr "<b>Іске қосылу</b>" #: ../data/geany.glade.h:32 msgid "Save window position and geometry" @@ -181,12 +181,12 @@ msgstr "<b>Сөндіру</b>" #: ../data/geany.glade.h:37 msgid "Startup path:" -msgstr "Қосылу жолы:" +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 "" "Файлдарды ашу не сақтау үшін бастау жолы. Абсолютті жол болуы тиіс. Ағымдағы " "жұмыс бумасын қолдану үшін осыны бос қалдырыңыз." @@ -219,7 +219,7 @@ msgstr "<b>Жолдар</b>" #: ../data/geany.glade.h:44 msgid "Startup" -msgstr "Қосылу" +msgstr "Іске қосылу" #: ../data/geany.glade.h:45 msgid "Beep on errors or when compilation has finished" @@ -280,11 +280,11 @@ msgstr "<b>Таңдамалы</b>" #: ../data/geany.glade.h:56 msgid "Always wrap search" -msgstr "" +msgstr "Құжат соңына жеткенде, іздеуді құжат басынан қайта бастау" #: ../data/geany.glade.h:57 msgid "Always wrap search around the document" -msgstr "" +msgstr "Іздеуді құжат аумағында әрқашан айналдыру" #: ../data/geany.glade.h:58 msgid "Hide the Find dialog" @@ -628,7 +628,7 @@ msgstr "Жолды үзу бағаны:" #: ../data/geany.glade.h:135 msgid "Comment toggle marker:" -msgstr "" +msgstr "Комментарийді ауыстыру маркері:" #: ../data/geany.glade.h:136 msgid "" @@ -825,7 +825,7 @@ msgstr "Жақшалар ( )" #: ../data/geany.glade.h:178 msgid "Auto-close parenthesis when typing an opening one" -msgstr "" +msgstr "Ашылу жақшасын терген кезде, жабылу жақшасын енгізу" #: ../data/geany.glade.h:179 msgid "Single quotes ' '" @@ -833,15 +833,15 @@ msgstr "Бірлік тырнақша ' '" #: ../data/geany.glade.h:180 msgid "Auto-close single quote when typing an opening one" -msgstr "" +msgstr "Ашылу бірлік тырнақшасын терген кезде, жабылу тырнақшасын енгізу" #: ../data/geany.glade.h:181 msgid "Curly brackets { }" -msgstr "" +msgstr "Пішінді жақша { }" #: ../data/geany.glade.h:182 msgid "Auto-close curly bracket when typing an opening one" -msgstr "" +msgstr "Ашылу пішінді жақшасын терген кезде, жабылу жақшасын енгізу" #: ../data/geany.glade.h:183 msgid "Square brackets [ ]" @@ -849,7 +849,7 @@ msgstr "Тік жақша [ ]" #: ../data/geany.glade.h:184 msgid "Auto-close square-bracket when typing an opening one" -msgstr "" +msgstr "Ашылу тік жақшасын терген кезде, жабылу жақшасын енгізу" #: ../data/geany.glade.h:185 msgid "Double quotes \" \"" @@ -857,7 +857,7 @@ msgstr "Тырнақша \" \"" #: ../data/geany.glade.h:186 msgid "Auto-close double quote when typing an opening one" -msgstr "" +msgstr "Ашылу қос тырнақшасын терген кезде, жабылу тырнақшасын енгізу" #: ../data/geany.glade.h:187 msgid "<b>Auto-close quotes and brackets</b>" @@ -977,7 +977,7 @@ msgstr "" #: ../data/geany.glade.h:213 msgid "Enabled" -msgstr "Қосулы" +msgstr "Іске қосулы" #: ../data/geany.glade.h:214 msgid "<b>Long line marker</b>" @@ -989,7 +989,7 @@ msgstr "Сөндірулі" #: ../data/geany.glade.h:216 msgid "Do not show virtual spaces" -msgstr "" +msgstr "Виртуалды бос аралықтарды көрсетпеу" #: ../data/geany.glade.h:217 msgid "Only for rectangular selections" @@ -1007,17 +1007,17 @@ msgstr "Әрқашан" #: ../data/geany.glade.h:220 msgid "Always show virtual spaces beyond the end of lines" -msgstr "" +msgstr "Жол соңынан кейінгі виртуалды бос аралықтарды әрқашан көрсету" #: ../data/geany.glade.h:221 msgid "<b>Virtual spaces</b>" -msgstr "" +msgstr "<b>Виртуалды бос аралықтар</b>" #: ../data/geany.glade.h:222 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 "Түзетуші" @@ -1094,7 +1094,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:562 msgid "Replace tabs by space" msgstr "Бос аралықтарды табуляциямен алмастыру" @@ -1175,7 +1175,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 "Саймандар" @@ -1251,7 +1251,7 @@ msgstr "" #: ../data/geany.glade.h:276 msgid "<b>Template data</b>" -msgstr "" +msgstr "<b>Үлгілер мәліметі</b>" #: ../data/geany.glade.h:277 ../src/prefs.c:1587 msgid "Templates" @@ -1419,12 +1419,11 @@ msgid "Override Geany keybindings" msgstr "Geany пернетақта жарлықтарын алмастыру" #: ../data/geany.glade.h:316 -#, fuzzy msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" -"VTE үшін пернетақта жарлықтарын қабылдауға рұқсат ету (фокустағы " -"командалардан басқа)" +"VTE үшін пернетақта жарлықтарын қабылдауға рұқсат ету (фокус командаларынан " +"басқа)" #: ../data/geany.glade.h:317 msgid "Disable menu shortcut key (F10 by default)" @@ -1524,14 +1523,13 @@ msgid "" "project filename." msgstr "" -#: ../data/geany.glade.h:338 ../src/keybindings.c:234 +#: ../data/geany.glade.h:338 ../src/keybindings.c:237 msgid "Project" msgstr "Жоба" #: ../data/geany.glade.h:339 -#, fuzzy msgid "Display:" -msgstr "Көрсетілуі" +msgstr "Көрсетілуі:" #: ../data/geany.glade.h:340 msgid "Custom" @@ -1598,45 +1596,45 @@ 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 "" +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 "Таңдауд_ын регистрін ауыстыру" +msgstr "Таңдауд_ың регистрін ауыстыру" -#: ../data/geany.glade.h:366 ../src/keybindings.c:302 +#: ../data/geany.glade.h:366 ../src/keybindings.c:305 msgid "_Transpose Current Line" -msgstr "" +msgstr "Жолд_ы алмастыру" #: ../data/geany.glade.h:367 msgid "_Comment Line(s)" @@ -1658,9 +1656,9 @@ 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 "" +msgstr "\"Ақылды\" ш_егінуді қолдану" #: ../data/geany.glade.h:373 msgid "_Send Selection to" @@ -1674,7 +1672,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 "Плаг_ин баптаулары" @@ -1702,11 +1700,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 "Алдыңғы маркерге ө_ту" @@ -1714,15 +1712,15 @@ msgstr "Алдыңғы маркерге ө_ту" msgid "_Go to Line" msgstr "Ж_олға өту" -#: ../data/geany.glade.h:386 ../src/keybindings.c:433 +#: ../data/geany.glade.h:386 ../src/keybindings.c:436 msgid "Find Next _Selection" msgstr "Кел_есі таңдауды табу" -#: ../data/geany.glade.h:387 ../src/keybindings.c:435 +#: ../data/geany.glade.h:387 ../src/keybindings.c:438 msgid "Find Pre_vious Selection" msgstr "А_лдыңғы таңдауды табу" -#: ../data/geany.glade.h:388 ../src/keybindings.c:452 +#: ../data/geany.glade.h:388 ../src/keybindings.c:455 msgid "_Mark All" msgstr "Барлығын _ерекшелеу" @@ -1880,7 +1878,7 @@ msgstr "Түрл_ендіру және CR (Mac) етіп орнату" #: ../data/geany.glade.h:427 msgid "_Strip Trailing Spaces" -msgstr "" +msgstr "Ар_тық бос аралықтарды өшіру" #: ../data/geany.glade.h:428 msgid "_Replace Tabs by Spaces" @@ -1972,9 +1970,8 @@ msgid "_Keyboard Shortcuts" msgstr "П_ернетақта жарлықтары" #: ../data/geany.glade.h:450 -#, fuzzy msgid "Debug _Messages" -msgstr "Жөндеу хабарламалары" +msgstr "Жөндеу ха_барламалары" #: ../data/geany.glade.h:451 msgid "_Website" @@ -1982,16 +1979,15 @@ msgstr "Веб са_йт" #: ../data/geany.glade.h:452 msgid "Wi_ki" -msgstr "" +msgstr "Ви_ки" #: ../data/geany.glade.h:453 msgid "Report a _Bug" -msgstr "" +msgstr "Ақ_аулық жөнінде хабарлау" #: ../data/geany.glade.h:454 -#, fuzzy msgid "_Donate" -msgstr "Сақ_тамау" +msgstr "Ақ_шалай көмектесу" #: ../data/geany.glade.h:455 ../src/sidebar.c:124 msgid "Symbols" @@ -2048,7 +2044,7 @@ msgstr "Ақпарат" #: ../src/about.c:275 msgid "Developers" -msgstr "Өндірушілер" +msgstr "Жасағандар" #: ../src/about.c:282 msgid "maintainer" @@ -2123,9 +2119,9 @@ msgid "Failed to change the working directory to \"%s\"" msgstr "Жұмыс бумасын \"%s\" етіп орнату сәтсіз" #: ../src/build.c:929 -#, fuzzy, c-format +#, c-format msgid "Failed to execute \"%s\" (start-script could not be created: %s)" -msgstr " \"%s\" орындау сәтсіз (бастау скриптін жасау мүмкін емес)" +msgstr " \"%s\" орындау сәтсіз (іске қосылу скриптін жасау мүмкін емес: %s)" #: ../src/build.c:984 msgid "" @@ -2302,7 +2298,7 @@ msgstr "Барлық сақталмаған өзгерістер жоғалад msgid "Are you sure you want to reload '%s'?" msgstr "'%s' қайтадан жүктеуді шынымен қалайсыз ба?" -#: ../src/callbacks.c:1062 ../src/keybindings.c:461 +#: ../src/callbacks.c:1062 ../src/keybindings.c:464 msgid "Go to Line" msgstr "Жолға өту" @@ -2417,7 +2413,7 @@ msgid "" "Note if you choose multiple files, they will all be opened with the chosen " "encoding." msgstr "" -"Файл үшін кодталауын қолмен орнату, егер ол дұрыс анықталмаса. Бұл әрекет " +"Файл үшін кодталуын қолмен орнату, егер ол дұрыс анықталмаса. Бұл әрекет " "файлдың кодталуын білсеңіз, бірақ Geany оны дұрыс анықтай алмаған кезде " "пайдалы.\n" "Бірнеше файл таңдалса, олардың барлығы осы кодталуда ашылатынын есте " @@ -2668,12 +2664,12 @@ msgstr "Табуляция мен бос аралықтар" #: ../src/document.c:1044 #, c-format msgid "Setting %s indentation mode for %s." -msgstr "" +msgstr "%s шегіну режимін орнату, %s үшін." #: ../src/document.c:1055 #, c-format msgid "Setting indentation width to %d for %s." -msgstr "" +msgstr "Шегіну өлшемін %d етіп орнату, %s үшін." #: ../src/document.c:1207 #, c-format @@ -2811,7 +2807,7 @@ msgstr "Табуляция таңбасымен алмастырылатын б #: ../src/editor.c:4469 #, c-format msgid "Warning: non-standard hard tab width: %d != 8!" -msgstr "" +msgstr "Назарыңызға: стандартты емес табуляция ені: %d != 8!" #: ../src/encodings.c:67 msgid "Celtic" @@ -3011,539 +3007,536 @@ msgstr "" msgid "untitled" msgstr "атаусыз" -#: ../src/highlighting.c:1225 ../src/main.c:828 ../src/socket.c:166 +#: ../src/highlighting.c:1232 ../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 -#, fuzzy +#: ../src/highlighting.c:1304 msgid "Default" -msgstr "Ба_стапқы" +msgstr "Бастапқы" -#: ../src/highlighting.c:1336 +#: ../src/highlighting.c:1343 #, fuzzy msgid "The current filetype overrides the default style." msgstr "Ағымдағы файлды Make және үнсіз келісім бойынша мақсатпен құрастыру" -#: ../src/highlighting.c:1337 +#: ../src/highlighting.c:1344 msgid "This may cause color schemes to display incorrectly." msgstr "" -#: ../src/highlighting.c:1358 -#, fuzzy +#: ../src/highlighting.c:1365 msgid "Color Schemes" -msgstr "Тү_стер схемалары" +msgstr "Түстер схемалары" #. visual group order -#: ../src/keybindings.c:223 ../src/symbols.c:714 +#: ../src/keybindings.c:226 ../src/symbols.c:714 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:585 ../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:610 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 -#, fuzzy +#: ../src/keybindings.c:403 msgid "Join lines" -msgstr "Жол(дар)ды комментарий қылу" +msgstr "Жолдарды біріктіру" -#: ../src/keybindings.c:405 +#: ../src/keybindings.c:408 msgid "Insert date" msgstr "Күн / Уақытты енгізу" -#: ../src/keybindings.c:411 +#: ../src/keybindings.c:414 msgid "Insert New Line Before Current" msgstr "Ағымдағы жолға дейін жаңа жолды енгізу" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:416 msgid "Insert New Line After Current" 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 msgid "Go to End of Display Line" msgstr "Көрсетілетін жолдың соңына өту" -#: ../src/keybindings.c:487 +#: ../src/keybindings.c:490 msgid "Go to Previous Word Part" msgstr "Сөздің алдыңғы бөлігіне өту" -#: ../src/keybindings.c:489 +#: ../src/keybindings.c:492 msgid "Go to Next Word Part" msgstr "Сөздің келесі бөлігіне өту" -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:497 msgid "Toggle All Additional Widgets" msgstr "Барлық қосымша виджеттерді іске қосу/сөндіру" -#: ../src/keybindings.c:497 +#: ../src/keybindings.c:500 msgid "Fullscreen" msgstr "Толық экранға" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:502 msgid "Toggle Messages Window" msgstr "Хабарламалар терезесін іске қосу/сөндіру" -#: ../src/keybindings.c:502 +#: ../src/keybindings.c:505 msgid "Toggle Sidebar" msgstr "Бүйір панелін өшіру не қосу" -#: ../src/keybindings.c:504 +#: ../src/keybindings.c:507 msgid "Zoom In" msgstr "Үлкейту" -#: ../src/keybindings.c:506 +#: ../src/keybindings.c:509 msgid "Zoom Out" msgstr "Кішірейту" -#: ../src/keybindings.c:508 +#: ../src/keybindings.c:511 msgid "Zoom Reset" msgstr "Масштабты тастау" -#: ../src/keybindings.c:513 +#: ../src/keybindings.c:516 msgid "Switch to Editor" msgstr "Түзеткішке ауысу" -#: ../src/keybindings.c:515 +#: ../src/keybindings.c:518 msgid "Switch to Search Bar" msgstr "Іздеу өрісіне ауысу" -#: ../src/keybindings.c:517 +#: ../src/keybindings.c:520 msgid "Switch to Message Window" msgstr "Хабарламалар терезесіне ауысу" -#: ../src/keybindings.c:519 +#: ../src/keybindings.c:522 msgid "Switch to Compiler" msgstr "Компиляторға ауысу" -#: ../src/keybindings.c:521 +#: ../src/keybindings.c:524 msgid "Switch to Messages" msgstr "Хабарламаларға ауысу" -#: ../src/keybindings.c:523 +#: ../src/keybindings.c:526 msgid "Switch to Scribble" msgstr "Жазбаларға ауысу" -#: ../src/keybindings.c:525 +#: ../src/keybindings.c:528 msgid "Switch to VTE" msgstr "VTE-ге ауысу" -#: ../src/keybindings.c:527 +#: ../src/keybindings.c:530 msgid "Switch to Sidebar" msgstr "Бүйір панеліне ауысу" -#: ../src/keybindings.c:529 +#: ../src/keybindings.c:532 msgid "Switch to Sidebar Symbol List" msgstr "Бүйір панелінің таңбалар тізіміне ауысу" -#: ../src/keybindings.c:531 +#: ../src/keybindings.c:534 msgid "Switch to Sidebar Document List" msgstr "Бүйір панелінің құжаттар тізіміне ауысу" -#: ../src/keybindings.c:536 +#: ../src/keybindings.c:539 msgid "Switch to left document" msgstr "Сол жақтағы құжатқа ауысу" -#: ../src/keybindings.c:538 +#: ../src/keybindings.c:541 msgid "Switch to right document" msgstr "Оң жақтағы құжатқа ауысу" -#: ../src/keybindings.c:540 +#: ../src/keybindings.c:543 msgid "Switch to last used document" msgstr "Соңғы қолданылған құжатқа ауысу" -#: ../src/keybindings.c:543 +#: ../src/keybindings.c:546 msgid "Move document left" msgstr "Құжатты солға жылжыту" -#: ../src/keybindings.c:546 +#: ../src/keybindings.c:549 msgid "Move document right" msgstr "Құжатты оңға жылжыту" -#: ../src/keybindings.c:548 +#: ../src/keybindings.c:551 msgid "Move document first" msgstr "Құжатты бірінші етіп жылжыту" -#: ../src/keybindings.c:550 +#: ../src/keybindings.c:553 msgid "Move document last" msgstr "Құжатты соңғы етіп жылжыту" -#: ../src/keybindings.c:555 +#: ../src/keybindings.c:558 msgid "Toggle Line wrapping" msgstr "Жол тасымалдауды іске косу не сөндіру" -#: ../src/keybindings.c:557 +#: ../src/keybindings.c:560 msgid "Toggle Line breaking" msgstr "Жол үзуді іске қосу не сөндіру" -#: ../src/keybindings.c:561 +#: ../src/keybindings.c:564 msgid "Replace spaces by tabs" msgstr "Бос аралықтарды табуляциямен алмастыру" -#: ../src/keybindings.c:563 +#: ../src/keybindings.c:566 msgid "Toggle current fold" msgstr "Жазық / жиналған күйді ауыстыру" -#: ../src/keybindings.c:565 +#: ../src/keybindings.c:568 msgid "Fold all" msgstr "Барлығын жазу" -#: ../src/keybindings.c:567 +#: ../src/keybindings.c:570 msgid "Unfold all" msgstr "Барлығын жинау" -#: ../src/keybindings.c:569 +#: ../src/keybindings.c:572 msgid "Reload symbol list" msgstr "Таңбалар тізімін қайта жүктеу" -#: ../src/keybindings.c:571 +#: ../src/keybindings.c:574 msgid "Remove Markers" msgstr "Маркерлерді өшіру" -#: ../src/keybindings.c:573 +#: ../src/keybindings.c:576 msgid "Remove Error Indicators" msgstr "Қателер индикаторларын өшіру" -#: ../src/keybindings.c:575 +#: ../src/keybindings.c:578 msgid "Remove Markers and Error Indicators" msgstr "Маркерлер мен қателер индикаторларын өшіру" -#: ../src/keybindings.c:580 ../src/toolbar.c:68 +#: ../src/keybindings.c:583 ../src/toolbar.c:68 msgid "Compile" msgstr "Компиляциялау" -#: ../src/keybindings.c:584 +#: ../src/keybindings.c:587 msgid "Make all" msgstr "Барлығын жасау" -#: ../src/keybindings.c:587 +#: ../src/keybindings.c:590 msgid "Make custom target" msgstr "Таңдауыңызша мақсатты жасау" -#: ../src/keybindings.c:589 +#: ../src/keybindings.c:592 msgid "Make object" msgstr "Объектті жасау" -#: ../src/keybindings.c:591 +#: ../src/keybindings.c:594 msgid "Next error" msgstr "Келесі қате" -#: ../src/keybindings.c:593 +#: ../src/keybindings.c:596 msgid "Previous error" msgstr "Алдыңғы қате" -#: ../src/keybindings.c:595 +#: ../src/keybindings.c:598 msgid "Run" msgstr "Орындау" -#: ../src/keybindings.c:597 +#: ../src/keybindings.c:600 msgid "Build options" msgstr "Құрастыру опциялары" -#: ../src/keybindings.c:602 +#: ../src/keybindings.c:605 msgid "Show Color Chooser" msgstr "Түстер таңдаушысын көрсету" -#: ../src/keybindings.c:849 +#: ../src/keybindings.c:852 msgid "Keyboard Shortcuts" msgstr "Пернетақта жарлықтары" -#: ../src/keybindings.c:861 +#: ../src/keybindings.c:864 msgid "The following keyboard shortcuts are configurable:" msgstr "Келесі пернетақта жарлықтары баптауға келеді:" @@ -3979,9 +3972,9 @@ msgid "Do you want to close it before proceeding?" msgstr "Жалғастыру алдында оны жабуды қалайсыз ба?" #: ../src/project.c:597 -#, fuzzy, c-format +#, c-format msgid "The '%s' project is open." -msgstr "'%s' жобасы ашық боп тұр." +msgstr "'%s' жобасы ашық." #: ../src/project.c:646 msgid "The specified project name is too short." @@ -4554,9 +4547,8 @@ msgid "Load Tags" msgstr "Тегтерді жүктеу" #: ../src/symbols.c:1780 -#, fuzzy msgid "Geany tag files (*.*.tags)" -msgstr "Geany тег файлдары (*.tags)" +msgstr "Geany тег файлдары (*.*.tags)" #. For translators: the first wildcard is the filetype, the second the filename #: ../src/symbols.c:1800 @@ -4860,7 +4852,7 @@ msgstr "" #: ../src/ui_utils.c:219 #, c-format msgid "%dL" -msgstr "" +msgstr "%dж" #. RO = read-only #: ../src/ui_utils.c:225 ../src/ui_utils.c:232 @@ -4937,23 +4929,23 @@ msgstr "C++ 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 "Geany іске қосылу сәтсіз!" @@ -5347,6 +5339,11 @@ msgid "" "%d will be replaced with the path name of the selected file without the " "filename" msgstr "" +"\"Көмегімен ашу\" кезінде қолданылатын команда. Сіз %f және %d үлгілерін " +"қолдана аласыз.\n" +"%f файл атымен, толық орналасу жолымен қоса, алмастырылады\n" +"%d таңдалған файлдың толық орналасу жолымен, сол файлдың атауына дейін, " +"алмастырылады" #: ../plugins/filebrowser.c:1235 msgid "Show hidden files" @@ -5365,7 +5362,6 @@ msgid "Use the project's base directory" msgstr "Жобаның басты бумасын қолдану" #: ../plugins/filebrowser.c:1272 -#, fuzzy msgid "" "Change the directory to the base directory of the currently opened project" msgstr "Буманы ағымдағы ашық жобасының басты бумасына ауыстыру" @@ -5381,18 +5377,18 @@ msgstr "Бұл плагин файлдарды сақтауға байланыс #: ../plugins/saveactions.c:171 #, c-format msgid "Backup Copy: Directory could not be created (%s)." -msgstr "" +msgstr "Қор көшірме: Буманы жасау мүмкін емес (%s)." #. it's unlikely that this happens #: ../plugins/saveactions.c:203 #, c-format msgid "Backup Copy: File could not be read (%s)." -msgstr "" +msgstr "Қор көшірме: Файлды оқу мүмкін емес (%s)." #: ../plugins/saveactions.c:221 #, c-format msgid "Backup Copy: File could not be saved (%s)." -msgstr "" +msgstr "Қор көшірме: Файлды сақтау мүмкін емес (%s)." #: ../plugins/saveactions.c:313 #, c-format @@ -5407,7 +5403,7 @@ msgstr "Буманы таңдау" #: ../plugins/saveactions.c:467 msgid "Backup directory does not exist or is not writable." -msgstr "" +msgstr "Қор көшірме бумасы жоқ болып тұр не оған жазуға құқық жоқ." #: ../plugins/saveactions.c:548 msgid "Auto Save" @@ -5457,10 +5453,12 @@ msgstr "К_ор көшірмелер файлдарын сақтау бумас #: ../plugins/saveactions.c:684 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" +"Қор көшірме файлдары үшін күн/уақы_т пішімі (Көбірек ақпарап үшін \"man " +"strftime\"):" #: ../plugins/saveactions.c:697 msgid "Directory _levels to include in the backup destination:" -msgstr "" +msgstr "Қор көшірмеге кіретін бума_лар тереңдігі:" #: ../plugins/splitwindow.c:34 msgid "Split Window" Modified: po/pt_BR.po 443 files changed, 215 insertions(+), 228 deletions(-) =================================================================== @@ -2,15 +2,15 @@ # Copyright (C) 2006-2011 GEANY'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Alexandre Moreira <alexandream(a)gmail.com>, 2006 -# Adrovane Marques Kade <adrovane(a)gmail.com>, 2007-2011 +# Adrovane Marques Kade <adrovane(a)gmail.com>, 2007-2012 # Rafael Peregrino da Silva <rperegrino(a)linuxmagazine.com.br>, 2011 # 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: 2011-09-17 09:54-0300\n" +"POT-Creation-Date: 2012-06-16 08:16+0200\n" +"PO-Revision-Date: 2012-06-15 20:35-0300\n" "Last-Translator: Adrovane Marques Kade <adrovane(a)gmail.com>\n" "Language-Team: Portuguese <geany-i18n(a)uvena.de>\n" "Language: pt\n" @@ -83,7 +83,7 @@ msgstr "invisível" msgid "_Insert \"include <...>\"" msgstr "_Inserir \"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 "_Inserir Espaço em Branco Alternativo" @@ -127,7 +127,7 @@ msgstr "Caracteres atuais" msgid "Match braces" msgstr "Casar delimitadores" -#: ../data/geany.glade.h:25 ../src/keybindings.c:418 +#: ../data/geany.glade.h:25 ../src/keybindings.c:421 msgid "Preferences" msgstr "Preferências" @@ -184,9 +184,9 @@ msgid "Startup path:" msgstr "Caminho inicial:" #: ../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 "" "Caminho inicial para abrir ou salvar arquivos. Deve ser um caminho absoluto. " "Deixe em branco para usar o diretório de trabalho atual." @@ -289,24 +289,19 @@ msgstr "<b>Miscelânea</b>" #: ../data/geany.glade.h:56 msgid "Always wrap search" -msgstr "" +msgstr "Sempre circular a pesquisa" #: ../data/geany.glade.h:57 -#, fuzzy msgid "Always wrap search around the document" -msgstr "Sempre circular a pesquisa e ocultar o diálogo Localizar" +msgstr "Sempre circular a pesquisa pelo documento" #: ../data/geany.glade.h:58 -#, fuzzy msgid "Hide the Find dialog" -msgstr "Sempre circular a pesquisa e ocultar o diálogo Localizar" +msgstr "Ocultar o diálogo Pesquisar" #: ../data/geany.glade.h:59 -#, fuzzy msgid "Hide the Find dialog after clicking Find Next/Previous" -msgstr "" -"Sempre circula a pesquisa pelo documento e oculta o diálogo Localizar após " -"clicar Próximo/Anterior" +msgstr "Oculta o diálogo Pesquisar após clicar em Encontrar Próximo/Anterior" #: ../data/geany.glade.h:60 msgid "Use the current word under the cursor for Find dialogs" @@ -497,9 +492,8 @@ msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Chama o comando Exibir->Alternar Todos os Painéis Adicionais" #: ../data/geany.glade.h:100 -#, fuzzy msgid "Switch to last used document after closing a tab" -msgstr "Ir para o último documento usado" +msgstr "Ir para o último documento usado após fechar uma aba" #: ../data/geany.glade.h:101 msgid "<b>Editor tabs</b>" @@ -1092,7 +1086,7 @@ msgstr "<b>Espaços virtuais</b>" msgid "Display" msgstr "Exibição" -#: ../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 "Editor" @@ -1176,7 +1170,7 @@ msgstr "Remover espaços e tabs no final" msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Remove espaços e tabulações e finais de linha" -#: ../data/geany.glade.h:241 ../src/keybindings.c:559 +#: ../data/geany.glade.h:241 ../src/keybindings.c:562 msgid "Replace tabs by space" msgstr "Substituir tabs por espaços" @@ -1263,7 +1257,7 @@ msgstr "" msgid "<b>Commands</b>" msgstr "<b>Comandos</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 "Ferramentas" @@ -1453,9 +1447,8 @@ msgid "Sets the font for the terminal widget" msgstr "Define a fonte do terminal" #: ../data/geany.glade.h:300 -#, fuzzy msgid "Choose Terminal Font" -msgstr "Fonte do terminal" +msgstr "Escolher Fonte do terminal" #: ../data/geany.glade.h:301 msgid "Foreground color:" @@ -1478,9 +1471,8 @@ msgid "Sets the foreground color of the text in the terminal widget" msgstr "Define a cor do texto do terminal" #: ../data/geany.glade.h:306 -#, fuzzy msgid "Sets the backround color of the text in the terminal widget" -msgstr "Define a cor do fundo do texto do terminal" +msgstr "Define a cor de fundo do texto no terminal" #: ../data/geany.glade.h:307 msgid "" @@ -1546,22 +1538,19 @@ msgstr "" "Commander dentro do VTE." #: ../data/geany.glade.h:319 -#, fuzzy msgid "Follow path of the current file" -msgstr "Seguir o caminho do arquivo padrão" +msgstr "Seguir o caminho do arquivo atual" #: ../data/geany.glade.h:320 -#, fuzzy msgid "" "Whether to execute \\\"cd $path\\\" when you switch between opened files" msgstr "" -"Habilita/desabilita a execução de \"cd $caminho\" quando você alternar entre " -"arquivos abertos" +"Habilita/desabilita a execução de \\\"cd $caminho\\\" quando você alterna " +"entre arquivos abertos" #: ../data/geany.glade.h:321 -#, fuzzy msgid "Execute programs in the VTE" -msgstr "Executar programas em VTE" +msgstr "Executar programas no VTE" #: ../data/geany.glade.h:322 msgid "" @@ -1585,9 +1574,8 @@ msgstr "" "interrompidos" #: ../data/geany.glade.h:325 -#, fuzzy msgid "<b>Terminal</b>" -msgstr "<b>Permissões:</b>" +msgstr "<b>Terminal</b>" #: ../data/geany.glade.h:326 ../src/prefs.c:1595 ../src/vte.c:281 msgid "Terminal" @@ -1648,7 +1636,7 @@ msgstr "" "novo caminho, ou uma árvore de diretório já existente. Você pode usar " "caminhos relativos ao nome de arquivo do projeto." -#: ../data/geany.glade.h:338 ../src/keybindings.c:234 +#: ../data/geany.glade.h:338 ../src/keybindings.c:237 msgid "Project" msgstr "Projeto" @@ -1721,43 +1709,43 @@ msgstr "Fechar T_udo" msgid "_Commands" msgstr "_Comandos" -#: ../data/geany.glade.h:357 ../src/keybindings.c:343 +#: ../data/geany.glade.h:357 ../src/keybindings.c:346 msgid "_Cut Current Line(s)" msgstr "Re_cortar Linha(s) Atual(is)" -#: ../data/geany.glade.h:358 ../src/keybindings.c:340 +#: ../data/geany.glade.h:358 ../src/keybindings.c:343 msgid "_Copy Current Line(s)" msgstr "_Copiar Linha(s) Atual(is)" -#: ../data/geany.glade.h:359 ../src/keybindings.c:295 +#: ../data/geany.glade.h:359 ../src/keybindings.c:298 msgid "_Delete Current Line(s)" msgstr "_Deletar Linha(s) Atual(is)" -#: ../data/geany.glade.h:360 ../src/keybindings.c:292 +#: ../data/geany.glade.h:360 ../src/keybindings.c:295 msgid "_Duplicate Line or Selection" msgstr "_Duplicar Linha ou Seleção" -#: ../data/geany.glade.h:361 ../src/keybindings.c:353 +#: ../data/geany.glade.h:361 ../src/keybindings.c:356 msgid "_Select Current Line(s)" msgstr "_Selecionar Linha(s) Atual(is)" -#: ../data/geany.glade.h:362 ../src/keybindings.c:356 +#: ../data/geany.glade.h:362 ../src/keybindings.c:359 msgid "_Select Current Paragraph" msgstr "_Selecionar Parágrafo Atual" -#: ../data/geany.glade.h:363 ../src/keybindings.c:395 +#: ../data/geany.glade.h:363 ../src/keybindings.c:398 msgid "_Send Selection to Terminal" msgstr "_Enviar Seleção para o Terminal" -#: ../data/geany.glade.h:364 ../src/keybindings.c:397 +#: ../data/geany.glade.h:364 ../src/keybindings.c:400 msgid "_Reflow Lines/Block" msgstr "_Refluir Linhas/Bloco" -#: ../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 "A_lterar maiúsculas/minúsculas da seleção" -#: ../data/geany.glade.h:366 ../src/keybindings.c:302 +#: ../data/geany.glade.h:366 ../src/keybindings.c:305 msgid "_Transpose Current Line" msgstr "_Transpor linha atual" @@ -1781,7 +1769,7 @@ msgstr "Aumen_tar Endentação" msgid "_Decrease Indent" msgstr "Dimi_nuir Endentação" -#: ../data/geany.glade.h:372 ../src/keybindings.c:386 +#: ../data/geany.glade.h:372 ../src/keybindings.c:389 msgid "_Smart Line Indent" msgstr "Endentação Inteligente de Linha_s" @@ -1797,7 +1785,7 @@ msgstr "I_nserir Comentários" msgid "Preference_s" msgstr "Preferência_s" -#: ../data/geany.glade.h:376 ../src/keybindings.c:421 +#: ../data/geany.glade.h:376 ../src/keybindings.c:424 msgid "P_lugin Preferences" msgstr "Preferências de P_lugins" @@ -1825,11 +1813,11 @@ msgstr "Próxima _Mensagem" msgid "Pr_evious Message" msgstr "M_ensagem Prévia" -#: ../data/geany.glade.h:383 ../src/keybindings.c:470 +#: ../data/geany.glade.h:383 ../src/keybindings.c:473 msgid "_Go to Next Marker" msgstr "Ir Para o _Próximo Marcador" -#: ../data/geany.glade.h:384 ../src/keybindings.c:473 +#: ../data/geany.glade.h:384 ../src/keybindings.c:476 msgid "_Go to Previous Marker" msgstr "Ir para o Marcador _Anterior" @@ -1837,15 +1825,15 @@ msgstr "Ir para o Marcador _Anterior" msgid "_Go to Line" msgstr "_Ir para Linha" -#: ../data/geany.glade.h:386 ../src/keybindings.c:433 +#: ../data/geany.glade.h:386 ../src/keybindings.c:436 msgid "Find Next _Selection" msgstr "Localizar Próxima _Seleção" -#: ../data/geany.glade.h:387 ../src/keybindings.c:435 +#: ../data/geany.glade.h:387 ../src/keybindings.c:438 msgid "Find Pre_vious Selection" msgstr "Localizar Seleção Anterior" -#: ../data/geany.glade.h:388 ../src/keybindings.c:452 +#: ../data/geany.glade.h:388 ../src/keybindings.c:455 msgid "_Mark All" msgstr "Marcar Tudo" @@ -2095,9 +2083,8 @@ msgid "_Keyboard Shortcuts" msgstr "Atalhos de _Teclado" #: ../data/geany.glade.h:450 -#, fuzzy msgid "Debug _Messages" -msgstr "Mensagens de Depuração" +msgstr "_Mensagens de Depuração" #: ../data/geany.glade.h:451 msgid "_Website" @@ -2105,16 +2092,15 @@ msgstr "Sítio na _Web" #: ../data/geany.glade.h:452 msgid "Wi_ki" -msgstr "" +msgstr "Wi_ki" #: ../data/geany.glade.h:453 msgid "Report a _Bug" -msgstr "" +msgstr "Relatar um _Bug" #: ../data/geany.glade.h:454 -#, fuzzy msgid "_Donate" -msgstr "_Não salvar" +msgstr "_Doar" #: ../data/geany.glade.h:455 ../src/sidebar.c:124 msgid "Symbols" @@ -2150,6 +2136,13 @@ msgid "" "Frank Lanitz\n" "All rights reserved." msgstr "" +"Copyright (c) 2005-2012\n" +"Colomban Wendling\n" +"Nick Treleaven\n" +"Matthew Brush\n" +"Enrico Tröger\n" +"Frank Lanitz\n" +"Todos os direitos reservados." #: ../src/about.c:157 msgid "About Geany" @@ -2247,9 +2240,10 @@ msgid "Failed to change the working directory to \"%s\"" msgstr "Falha ao alterar o diretório atual para %s" #: ../src/build.c:929 -#, fuzzy, c-format +#, c-format msgid "Failed to execute \"%s\" (start-script could not be created: %s)" -msgstr "Falha ao executar %s (script de inicialização não pôde ser criado)" +msgstr "" +"Falhou ao executar \"%s\" (script de inicialização não pôde ser criado: %s)" #: ../src/build.c:984 msgid "" @@ -2434,7 +2428,7 @@ msgstr "Quaisquer mudanças não salvas serão perdidas." msgid "Are you sure you want to reload '%s'?" msgstr "Tem certeza de que deseja recarregar '%s'?" -#: ../src/callbacks.c:1062 ../src/keybindings.c:461 +#: ../src/callbacks.c:1062 ../src/keybindings.c:464 msgid "Go to Line" msgstr "Ir para Linha" @@ -2500,9 +2494,9 @@ msgid "No more message items." msgstr "Não há mais itens de mensagens." #: ../src/callbacks.c:1673 -#, fuzzy, c-format +#, c-format msgid "Could not open file %s (File not found)" -msgstr "Não foi possível abrir o arquivo %s (%s)" +msgstr "Não foi possível abrir o arquivo %s (Arquivo não encontrado)" #: ../src/dialogs.c:226 msgid "Detect from file" @@ -3166,539 +3160,536 @@ msgstr "Regex ruim para o tipo de arquivo %s: %s" msgid "untitled" msgstr "sem título" -#: ../src/highlighting.c:1225 ../src/main.c:828 ../src/socket.c:166 +#: ../src/highlighting.c:1232 ../src/main.c:828 ../src/socket.c:166 #: ../src/templates.c:224 #, c-format msgid "Could not find file '%s'." msgstr "Não foi possível procurar o arquivo '%s'." -#: ../src/highlighting.c:1297 -#, fuzzy +#: ../src/highlighting.c:1304 msgid "Default" -msgstr "_Default" +msgstr "Default" -#: ../src/highlighting.c:1336 -#, fuzzy +#: ../src/highlighting.c:1343 @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 8d2645: Add status bar warning if Windows spawn timed out
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Mon, 09 Jul 2012 12:31:04 Commit: 8d26450f07cac40812a04fe2adfd29fa54f25059 https://github.com/geany/geany/commit/8d26450f07cac40812a04fe2adfd29fa54f25… Log Message: ----------- Add status bar warning if Windows spawn timed out Modified Paths: -------------- src/win32.c Modified: src/win32.c 9 files changed, 7 insertions(+), 2 deletions(-) =================================================================== @@ -1093,10 +1093,15 @@ static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline else { gint i; + gsize ms = 30*1000; - for (i = 0; i < 2 && WaitForSingleObject(piProcInfo.hProcess, 30*1000) == WAIT_TIMEOUT; i++) + /* FIXME: this seems to timeout when there are many lines + * to read - maybe because the child's pipe is full */ + for (i = 0; i < 2 && + WaitForSingleObject(piProcInfo.hProcess, ms) == WAIT_TIMEOUT; i++) { - geany_debug("CreateChildProcess: CreateProcess failed"); + ui_set_statusbar(FALSE, _("Process timed out after %.02f s!"), ms / 1000.0F); + geany_debug("CreateChildProcess: timed out"); TerminateProcess(piProcInfo.hProcess, WAIT_TIMEOUT); /* NOTE: This will not kill grandkids. */ } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] f0f3fc: Allow '!' char in D parameter lists
by Nick Treleaven 26 Jul '12

26 Jul '12

1 0

[geany/geany] deb5f3: Bump API version to reflect Scintilla's SCI_{GET, SET}USEPALETTE removal
by Colomban Wendling 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 08 Jul 2012 23:07:52 Commit: deb5f3542b5b618e56ca9d823f40df062188eb6a https://github.com/geany/geany/commit/deb5f3542b5b618e56ca9d823f40df062188e… Log Message: ----------- Bump API version to reflect Scintilla's SCI_{GET,SET}USEPALETTE removal Scintilla deprecated SCI_GETUSEPALETTE and SCI_SETUSEPALETTE messages, and since we don't build with deprecated API support they aren't available anymore. Modified Paths: -------------- src/plugindata.h Modified: src/plugindata.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -55,7 +55,7 @@ * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 215 +#define GEANY_API_VERSION 216 /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2012