SF.net SVN: geany:[5043] branches/sm
statc at users.sourceforge.net
statc at xxxxx
Thu Jun 17 14:58:58 UTC 2010
Revision: 5043
http://geany.svn.sourceforge.net/geany/?rev=5043&view=rev
Author: statc
Date: 2010-06-17 14:58:57 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
Merge trunk (revisions 4961..5031)
Modified Paths:
--------------
branches/sm/ChangeLog
branches/sm/Makefile.am
branches/sm/NEWS
branches/sm/THANKS
branches/sm/configure.ac
branches/sm/data/filetypes.css
branches/sm/doc/geany.1.in
branches/sm/doc/geany.html
branches/sm/doc/geany.txt
branches/sm/doc/images/build_menu_commands_dialog.png
branches/sm/doc/images/main_window.png
branches/sm/doc/images/pref_dialog_edit_completions.png
branches/sm/doc/images/pref_dialog_edit_display.png
branches/sm/doc/images/pref_dialog_edit_features.png
branches/sm/doc/images/pref_dialog_edit_indentation.png
branches/sm/doc/images/pref_dialog_files.png
branches/sm/doc/images/pref_dialog_gen_misc.png
branches/sm/doc/images/pref_dialog_gen_startup.png
branches/sm/doc/images/pref_dialog_interface.png
branches/sm/doc/images/pref_dialog_keys.png
branches/sm/doc/images/pref_dialog_printing.png
branches/sm/doc/images/pref_dialog_templ.png
branches/sm/doc/images/pref_dialog_toolbar.png
branches/sm/doc/images/pref_dialog_tools.png
branches/sm/doc/images/pref_dialog_vte.png
branches/sm/geany.nsi
branches/sm/geany_private.rc
branches/sm/po/ChangeLog
branches/sm/po/POTFILES.skip
branches/sm/po/ca.po
branches/sm/po/de.po
branches/sm/po/fr.po
branches/sm/po/gl.po
branches/sm/po/ja.po
branches/sm/po/nl.po
branches/sm/po/pt.po
branches/sm/po/pt_BR.po
branches/sm/po/sl.po
branches/sm/po/sv.po
branches/sm/po/tr.po
branches/sm/scintilla/CellBuffer.cxx
branches/sm/scintilla/CellBuffer.h
branches/sm/scintilla/CharacterSet.h
branches/sm/scintilla/ContractionState.cxx
branches/sm/scintilla/Document.cxx
branches/sm/scintilla/Document.h
branches/sm/scintilla/DocumentAccessor.cxx
branches/sm/scintilla/DocumentAccessor.h
branches/sm/scintilla/Editor.cxx
branches/sm/scintilla/Editor.h
branches/sm/scintilla/ExternalLexer.cxx
branches/sm/scintilla/ExternalLexer.h
branches/sm/scintilla/LexBash.cxx
branches/sm/scintilla/LexCPP.cxx
branches/sm/scintilla/LexCSS.cxx
branches/sm/scintilla/LexCaml.cxx
branches/sm/scintilla/LexHTML.cxx
branches/sm/scintilla/LexPerl.cxx
branches/sm/scintilla/LexPython.cxx
branches/sm/scintilla/LexVHDL.cxx
branches/sm/scintilla/LexVerilog.cxx
branches/sm/scintilla/LineMarker.cxx
branches/sm/scintilla/LineMarker.h
branches/sm/scintilla/Makefile.am
branches/sm/scintilla/Partitioning.h
branches/sm/scintilla/PerLine.cxx
branches/sm/scintilla/PerLine.h
branches/sm/scintilla/PlatGTK.cxx
branches/sm/scintilla/PropSet.cxx
branches/sm/scintilla/SVector.h
branches/sm/scintilla/ScintillaBase.h
branches/sm/scintilla/ScintillaGTK.cxx
branches/sm/scintilla/Selection.cxx
branches/sm/scintilla/Selection.h
branches/sm/scintilla/SplitVector.h
branches/sm/scintilla/Style.h
branches/sm/scintilla/UniConversion.cxx
branches/sm/scintilla/UniConversion.h
branches/sm/scintilla/ViewStyle.cxx
branches/sm/scintilla/WindowAccessor.cxx
branches/sm/scintilla/XPM.cxx
branches/sm/scintilla/XPM.h
branches/sm/scintilla/include/Platform.h
branches/sm/scintilla/include/SciLexer.h
branches/sm/scintilla/include/Scintilla.iface
branches/sm/scintilla/include/WindowAccessor.h
branches/sm/scintilla/makefile.win32
branches/sm/src/about.c
branches/sm/src/build.c
branches/sm/src/editor.c
branches/sm/src/geany.h
branches/sm/src/highlighting.c
branches/sm/src/keybindings.c
branches/sm/src/notebook.c
branches/sm/src/plugindata.h
branches/sm/src/plugins.c
branches/sm/src/sidebar.c
branches/sm/src/symbols.c
branches/sm/src/templates.c
branches/sm/tagmanager/c.c
branches/sm/tagmanager/sort.c
branches/sm/tagmanager/tm_project.c
branches/sm/tagmanager/tm_workspace.c
branches/sm/win32-config.h
branches/sm/wscript
Added Paths:
-----------
branches/sm/data/templates/bsd
branches/sm/data/templates/changelog
branches/sm/data/templates/fileheader
branches/sm/data/templates/function
branches/sm/data/templates/gpl
Removed Paths:
-------------
branches/sm/scintilla/LexCrontab.cxx
Property Changed:
----------------
branches/sm/po/sv.po
Modified: branches/sm/ChangeLog
===================================================================
--- branches/sm/ChangeLog 2010-06-17 14:55:33 UTC (rev 5042)
+++ branches/sm/ChangeLog 2010-06-17 14:58:57 UTC (rev 5043)
@@ -1,3 +1,121 @@
+2010-06-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/sidebar.c:
+ Replace /home/user with ~ in the documents list (patch by Jon
+ Strait, thanks).
+ * src/build.c:
+ Make default Build dialog entries grey, not light grey (too hard to
+ read on a white background).
+ * src/ui_utils.c:
+ Display 'new instance' on title bar (patch by Eugene Arshinov,
+ thanks).
+
+
+2010-06-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/notebook.c:
+ Align notebook tab close buttons centred vertically - thanks to
+ Robux.Biz (galyuk).
+ * Merge unstable branch:
+ - src/build.c:
+ Make build config entries light grey until set.
+ - src/keybindings.c, src/about.c, THANKS:
+ Fix the wrong file being put on top of the stack when switching tabs
+ too quickly (patch from Jiří Techet, thanks).
+ - src/templates.c, data/templates/gpl, data/templates/function,
+ data/templates/changelog, data/templates/bsd,
+ data/templates/fileheader, wscript, Makefile.am:
+ Move general templates from source code into files.
+ Load general templates from system path instead of creating them in
+ the user's config dir.
+
+
+2010-06-12 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * po/POTFILES.skip:
+ Add doc/stash-example.c to fix 'make distcheck'.
+ * geany.nsi:
+ Change the RequestExecutionLevel for the Windows installer to
+ 'highest'.
+ * New release: Geany 0.19 "Vellam".
+ * configure.ac, doc/geany.html, doc/geany.txt, geany.nsi,
+ geany_private.rc, win32-config.h, wscript, src/geany.h:
+ Post-release version bump.
+
+
+2010-06-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/editor.c:
+ Group undo action for Insert Multiline Comment.
+
+
+2010-06-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * Makefile.am:
+ Don't individually install data/*.tags as all data/* files will be
+ installed anyway.
+
+
+2010-06-07 Frank Lanitz <frank at frank.uvena.de>
+
+ * tagmanager/tm_project.c:
+ Fix a double free. (patch by Daniel Marjamaki, thanks).
+
+
+2010-06-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * tagmanager/tm_workspace.c:
+ Fix two memory leaks (patch by Daniel Marjamaki, thanks).
+ * src/sidebar.c:
+ Fix reducing paths to project name in the Documents list
+ (patch by Eugene Arshinov, thanks).
+ * src/symbols.c:
+ Fix crash when trying to sort NULL pointers as tags in the Symbols
+ list (closes #3011986).
+ * NEWS, scintilla/*, scintilla/include/*, src/plugindata.h:
+ Update Scintilla to version 2.12.
+ * wscript, scintilla/Makefile.am, scintilla/makefile.win32,
+ scintilla/LexCrontab.cxx:
+ Remove unused Crontab lexer.
+ * data/filetypes.css, src/highlighting.c:
+ Add new style "media" for filetype CSS.
+
+
+2010-06-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * doc/geany.txt, doc/geany.html:
+ Build section: minor rewording, formatting fixes; move some
+ sentences.
+
+
+2010-06-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/build.c:
+ Explicitly try to localise build menu item labels with
+ gettext to enforce getting default labels translated.
+ * tagmanager/tm_workspace.c:
+ Fix not closed FILE pointer on early exit
+ (patch by Daniel Marjamaki, thanks).
+ * doc/images/*.png:
+ Update images for Geany 0.19.
+ * src/sidebar.c:
+ Destroy the default symbol list treeview only once
+ (fixes gtk_widget_destroy warning on exit).
+
+
+2010-05-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * tagmanager/sort.c:
+ Replace free() by g_free() (patch by Daniel Marjamaki, thanks).
+ * tagmanager/c.c:
+ Fix parsing of C++ classes contain attributes with bitfields
+ (patch by Lex Trotman, thanks).
+ * src/plugindata.h, src/plugins.c:
+ Add PLUGIN_SET_TRANSLATABLE_INFO macro to the plugin API so
+ plugins' meta information can be translated already in the
+ plugin manager dialog (patch by Colomban Wendling, thanks).
+
+
2010-05-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/main.c:
@@ -126,7 +244,7 @@
* src/support.h:
Replace one non breaking space by normal space. Patch by
- Daniel Marjamak.
+ Daniel Marjamaki.
2010-05-14 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
@@ -214,7 +332,7 @@
2010-05-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* wscript:
- Don't ignore the 'intltool' check on non-Windows system, instead
+ Don't ignore the 'intltool' check on non-Windows systems, instead
raise a configure error.
@@ -963,7 +1081,8 @@
2010-01-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/plugindata.h:
- Fix renaming sci_send_message(), sci_send_command() function pointers.
+ Fix renaming sci_send_message(), sci_send_command() function
+ pointers.
2010-01-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
@@ -974,7 +1093,8 @@
plugins/pluginmacros.h, plugins/genapi.py, ChangeLog, wscript:
Use full function name for GeanyFunctions function pointers. This
avoids naming conflicts e.g. with C++'s 'new' keyword.
- Remove deprecated header pluginmacros.h - use geanyfunctions.h instead.
+ Remove deprecated header pluginmacros.h - use geanyfunctions.h
+ instead.
2010-01-24 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
@@ -1012,8 +1132,8 @@
* doc/plugins.dox:
Add gcc commands to build a plugin to the HowTo.
* src/search.c, src/document.c, src/document.h:
- Show 'Replaced X matches in Y documents' message when using Replace in
- Session.
+ Show 'Replaced X matches in Y documents' message when using
+ Replace in Session.
2010-01-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
@@ -1178,8 +1298,8 @@
* src/msgwindow.c:
Refactor msgwin_goto_compiler_file_line().
* src/interface.c, src/keybindings.c, geany.glade:
- Capitalize, add mnemonics, sync with kb.c the Edit->Commands menu item
- labels.
+ Capitalize, add mnemonics, sync with kb.c the Edit->Commands menu
+ item labels.
* src/search.c:
Refactor/reformat on_replace_dialog_response().
@@ -1298,8 +1418,8 @@
Make stylesets take a ft_id argument so they can be reused fully with
custom filetypes, so custom styles and keywords can be set.
* src/highlighting.c:
- Fix setting filetype properties when both the system and the user file
- have properties set.
+ Fix setting filetype properties when both the system and the user
+ file have properties set.
* src/symbols.c, tagmanager/vhdl.c:
Parse VHDL signals.
* src/highlighting.c:
@@ -1402,7 +1522,8 @@
Fix invalid tree iter access when using tv_iters.tag_other but not
using tv_iters.tag_variable.
* HACKING, tagmanager/perl.c:
- Fix parsing Perl format statements ("other" type doesn't seem to work).
+ Fix parsing Perl format statements ("other" type doesn't seem
+ to work).
* tagmanager/tm_tag.c, tagmanager/perl.c, HACKING:
Fix using "other" tag type.
@@ -1545,10 +1666,11 @@
Fix using tab to autocomplete in some other situations that word part
completion doesn't apply in.
* src/templates.c, src/interface.c, src/ui_utils.c, geany.glade:
- Add Edit->Commands submenu which is shared with the editor popup menu.
+ Add Edit->Commands submenu which is shared with the editor popup
+ menu.
* src/interface.c, src/keybindings.c, src/ui_utils.c, geany.glade:
- Change editor popup Commands submenu to start as child of menubar Edit
- menu, as this is more usual e.g. for keybindings initialization.
+ Change editor popup Commands submenu to start as child of menubar
+ Edit menu, as this is more usual e.g. for keybindings initialization.
* src/interface.c, src/keybindings.c, src/tools.c, src/ui_utils.c,
geany.glade:
Share a single Format submenu for menubar Edit and popup menu.
@@ -1636,7 +1758,8 @@
Include code for project filetype execute commands and fix bug in
saving project filetypes list.
* src/project.c, src/build.c, doc/geany.txt:
- Make non-project execute configuration save to filetypes not geany.conf.
+ Make non-project execute configuration save to filetypes not
+ geany.conf.
Fix closing of project failing to remove build commands dialog entry.
@@ -1698,7 +1821,8 @@
reshown (this also stops the selection changing).
Add SCI_AUTOCGETCURRENTTEXT message (will be sent upstream).
* src/editor.c:
- Improve CamelCase word part autocompletion for runs of capital letters.
+ Improve CamelCase word part autocompletion for runs of capital
+ letters.
* src/editor.c:
Don't complete snippets if there's a selection.
@@ -1759,8 +1883,8 @@
* src/notebook.c, src/plugindata.h, src/plugins.c, src/ui_utils.c,
src/ui_utils.h, plugins/geanyfunctions.h, plugins/splitwindow.c:
- Make Split Window 'Show current document' button have a drop-down menu
- to select the other documents.
+ Make Split Window 'Show current document' button have a drop-down
+ menu to select the other documents.
Add new API function ui_menu_add_document_items().
@@ -1795,13 +1919,15 @@
2009-10-12 Lex Trotman <elextr(at)gmail(dot)com>
* src/build.c:
- Ensure that old style build config is not loaded if it does not exist.
+ Ensure that old style build config is not loaded if it does
+ not exist.
2009-10-12 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* THANKS, src/about.c, po/LINGUAS, po/gl.po:
- Added Galician translation. Thanks to José Manuel Castroagudín Silva.
+ Added Galician translation.
+ Thanks to José Manuel Castroagudín Silva.
2009-10-11 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
@@ -1815,7 +1941,8 @@
2009-10-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/highlighting.c:
- Move new_styleset() and preprocessor setup code into styleset_c_like().
+ Move new_styleset() and preprocessor setup code into
+ styleset_c_like().
* src/highlighting.c:
Call apply_filetype_properties() from styleset_c_like().
@@ -1841,8 +1968,8 @@
* src/highlighting.c:
Use jscript_keyword for SCE_HB[A]_WORD markup styles.
* src/templates.c:
- Group 'New with template' items by filetype submenu (currently only for
- toolbar menu).
+ Group 'New with template' items by filetype submenu (currently only
+ for toolbar menu).
Show custom file template items before filetype template items.
* src/templates.c, src/interface.c, src/geanymenubuttonaction.c,
geany.glade:
@@ -1864,8 +1991,8 @@
* src/highlighting.c, data/filetypes.vala:
Add Vala keywords to conf file.
* src/templates.c, doc/geany.txt, doc/geany.html:
- Read custom file templates from $prefix/share/geany/templates/files as
- well as user dir.
+ Read custom file templates from $prefix/share/geany/templates/files
+ as well as user dir.
* src/templates.c, data/templates, data/templates/files,
data/templates/files/file.rb, data/templates/files/file.html,
data/templates/files/main.java, data/templates/files/main.c,
@@ -2151,7 +2278,7 @@
2009-09-11 Lex Trotman <elextr(at)gmail(dot)com>
- * src/build.c
+ * src/build.c:
Fix erroneous free of returned string in prepare_run_script.
@@ -2233,10 +2360,10 @@
2009-09-03 Lex Trotman <elextr(at)gmail(dot)com>
- * src/build.c, src/filetypes.h, src/filetypes.c
+ * src/build.c, src/filetypes.h, src/filetypes.c:
Only write filetype config files when build command or regex is
actually changed. Removed commented code in src/filetypes.c.
- * src/build.c
+ * src/build.c:
Ensure uses of filename are protected against nulls when running
a build command and give status message if not.
@@ -2300,12 +2427,12 @@
2009-08-27 Lex Trotman <elextr(at)gmail(dot)com>
- * src/build.c
+ * src/build.c:
Fix implementation of loading old project files with base
directories. Use project_make_base_path instead of re-
implementing. Now depends on project.c reading base dir
prior to calling load_build_menu.
- * src/build.c
+ * src/build.c:
Change usage of project base directory to conform with
previous documented behavior when loading old project files.
* src/build.c:
@@ -2370,13 +2497,13 @@
2009-07-30 Lex Trotman <elextr(at)gmail(dot)com>
* src/build.h, src/build.c, src/keybindings.c, src/filetypes.c
- src/keyfile.c, src/project.c
+ src/keyfile.c, src/project.c:
Changed names of symbols visible in build API to GEANY_xxx.
2009-07-29 Lex Trotman <elextr(at)gmail(dot)com>
- * src/project.h, src/project.c, src/build.c
+ * src/project.h, src/project.c, src/build.c:
Remove make_in_base_dir and run_cmd fields from project structure.
Replaced by build functionality. Remove incorrect use in src/build.c
build_run_cmd function.
@@ -2384,14 +2511,15 @@
2009-07-28 Lex Trotman <elextr(at)gmail(dot)com>
- * src/project.h, src/project.c
+ * src/project.h, src/project.c:
Removed unused project_get_make_dir function, this is now per
command.
2009-07-28 Lex Trotman <elextr(at)gmail(dot)com>
- * src/build.c, src/build.h, src/project.c, src/keyfile.c, src/filetypes.c
+ * src/build.c, src/build.h, src/project.c, src/keyfile.c,
+ src/filetypes.c:
Fix some more warnings.
Fix commented out execute/stop toolbar code in build.c.
Add extra plugins documentation for GBO_TO_CMD and GBO_TO_GBG macros.
@@ -2406,54 +2534,54 @@
2009-07-25 Lex Trotman <elextr(at)gmail(dot)com>
- * src/build.c
- Fixed leaks and crashes due to inconsistent use of static vs dynamic strings
- when reading old format configuration & project files.
- * src/build.c, src/project.c
+ * src/build.c:
+ Fixed leaks and crashes due to inconsistent use of static vs dynamic
+ strings when reading old format configuration & project files.
+ * src/build.c, src/project.c:
Fixed GLib array assertion warnings when no project filetypes are
available to be saved.
2009-07-24 Lex Trotman <elextr(at)gmail(dot)com>
- * src/build.c
+ * src/build.c:
Fix build warnings.
2009-07-22 Lex Trotman <elextr(at)gmail(dot)com>
- * src/build.h, src/build.c, src/project.c
+ * src/build.h, src/build.c, src/project.c:
Created and documented plugins interface to build menu.
Factored out new get_cmd_group function.
- Changed name of remove_command function to be consistent with the rest
- of the interface & changed calls in project.c.
- * src/Makefile.am, wscript
+ Changed name of remove_command function to be consistent with the
+ rest of the interface & changed calls in project.c.
+ * src/Makefile.am, wscript:
Added build.h to installed files lists.
2009-07-20 Lex Trotman <elextr(at)gmail(dot)com>
- * doc/geany.txt
+ * doc/geany.txt:
Updated manual to match build-menu capability.
2009-07-19 Lex Trotman <elextr(at)gmail(dot)com>
- * src/build.c, src/build.h
+ * src/build.c, src/build.h:
Added set_build_non_ft_wd_to_proj() for use by project dialog.
Improved interpretation of run_in_base_dir from old [build-settings]
Added spacing to build commands dialog
- * src/project.c
- Removed run in base path option from project dialog and added button to
- set working directories to d the same.
+ * src/project.c:
+ Removed run in base path option from project dialog and added button
+ to set working directories to d the same.
2009-07-18 Lex Trotman <elextr(at)gmail(dot)com>
- * src/build.c
+ * src/build.c:
Re-incorporated toolbar changes in trunk accidently excluded in merge
2009-07-17 Lex Trotman <elextr(at)gmail(dot)com>
- * src/build.c
+ * src/build.c:
Fixed substitute %f etc in commands
Fixed potential leak in build_replace_placeholder
Fixed leak in prepare_run_script (Thanks for patch Thomas)
@@ -2461,44 +2589,44 @@
2009-07-17 Lex Trotman <elextr(at)gmail(dot)com>
- * src/build.c, src/build.h, src/filetypes.h, src/filetypes.c
+ * src/build.c, src/build.h, src/filetypes.h, src/filetypes.c:
Fixed crash and lots of warnings, deleted some commented out code.
- * geany.glade, src/keyfile.c, src/prefs.c, src/prefs.h, src/project.c
+ * geany.glade, src/keyfile.c, src/prefs.c, src/prefs.h, src/project.c:
Removed make command from preferences and associated code
2009-07-16 Lex Trotman <elextr(at)gmail(dot)com>
- * src/build.c, src/build.h
+ * src/build.c, src/build.h:
Incorporated patch for working directory field (thanks Thomas)
Removed run_in_base_dir option and associated code that it replaces
Improved handling of old config files and mapping to new ones.
2009-07-15 Lex Trotman <elextr(at)gmail(dot)com>
- * src/build.h, src/build.c
+ * src/build.h, src/build.c:
Changed to itterate over entries in build commands dialog to allow
additional fields to be added
Implement support for multiple run commands
- * data/filetypes.latex
+ * data/filetypes.latex:
Implement configured commands and labels for latex.
2009-07-14 Lex Trotman <elextr(at)gmail(dot)com>
- * src/build.h, src/build.c
- added dialog support for error regular expressions from multiple sources
- and storing and loading them
- fixed some typos and memory leaks
- * src/filetypes.c, src/filetypes.h, project.c
+ * src/build.h, src/build.c:
+ added dialog support for error regular expressions from multiple
+ sources and storing and loading them fixed some typos and memory
+ leaks
+ * src/filetypes.c, src/filetypes.h, project.c:
added support for using error regexes from multiple sources
2009-07-11 Lex Trotman <elextr(at)gmail(dot)com>
* src/filetypes.h, src/filetypes.c, src/build.c, src/build.h,
- src/project.c
+ src/project.c:
Removal of build menu item source made redundant by the following fix
- * src/build.c
+ * src/build.c:
Corrected priority oreder and loading of filetype dependent build
menu items saved in the project file. Added print routine for
debugging command sources and priorities set compile symbol
@@ -2506,11 +2634,11 @@
2009-07-10 Lex Trotman <elextr(at)gmail(dot)com>
- * src/build.c
- fixed problem loading old format filetype files, some formatting fixes
- fixed saving new format files
+ * src/build.c:
+ fixed problem loading old format filetype files, some formatting
+ fixes fixed saving new format files
added operation for clear button on build commands dialog
- * src/filetypes.c
+ * src/filetypes.c:
fixed loading and saving filetype files
Modified: branches/sm/Makefile.am
===================================================================
--- branches/sm/Makefile.am 2010-06-17 14:55:33 UTC (rev 5042)
+++ branches/sm/Makefile.am 2010-06-17 14:58:57 UTC (rev 5043)
@@ -22,6 +22,7 @@
data/filetype_extensions.conf \
data/snippets.conf \
data/ui_toolbar.xml \
+ $(srcdir)/data/templates/* \
$(srcdir)/data/templates/files/*
EXTRA_DIST = \
@@ -56,11 +57,6 @@
install-data-local:
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \
- $(INSTALL_DATA) $(srcdir)/data/c99.tags $(DESTDIR)$(pkgdatadir); \
- $(INSTALL_DATA) $(srcdir)/data/php.tags $(DESTDIR)$(pkgdatadir); \
- $(INSTALL_DATA) $(srcdir)/data/python.tags $(DESTDIR)$(pkgdatadir); \
- $(INSTALL_DATA) $(srcdir)/data/pascal.tags $(DESTDIR)$(pkgdatadir); \
- $(INSTALL_DATA) $(srcdir)/data/html_entities.tags $(DESTDIR)$(pkgdatadir); \
$(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/GPL-2; \
for file in $(srcdir)/data/*; do \
if test -f $$file; then \
@@ -68,6 +64,11 @@
fi \
done
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/templates;
+ for file in $(srcdir)/data/templates/*; do \
+ if test -f $$file; then \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/templates/; \
+ fi \
+ done
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/templates/files;
for file in $(srcdir)/data/templates/files/*; do \
if test -f $$file; then \
Modified: branches/sm/NEWS
===================================================================
--- branches/sm/NEWS 2010-06-17 14:55:33 UTC (rev 5042)
+++ branches/sm/NEWS 2010-06-17 14:58:57 UTC (rev 5043)
@@ -1,3 +1,129 @@
+Geany 0.19 (June 12, 2010)
+
+ General:
+ * Build system reworked to be much more configurable (by Lex Trotman).
+ * Use POSIX system/GNU regex engine for find & replace. This alters
+ regex syntax - we now support '?' operator and match newlines.
+ * Support adding custom filetype files.
+ * Add new command line option --list-documents to return a list
+ of currently opened documents
+ * Remove deprecated --debug flag. Please use --verbose/-v instead.
+
+ Interface:
+ * Add option 'System Default' for toolbar icon style and size to use
+ the GTK default value.
+ * Allow '+<number>' and '-<number>' as values for Goto Line inputs
+ to jump relative to the current line.
+ * Add preference to add new document tabs beside the current one
+ (patch by Colomban Wendling).
+ * Enable type-ahead find for sidebar symbols and documents tabs
+ (patch by Thomas Martitz).
+ * Make Ctrl-click on any notebook tab switch to the last used
+ document.
+ * Add 'Edit->Commands' menu.
+ * Add 'Edit->Plugin Preferences' menu item and keybinding.
+ * Add 'View->Editor->Color Schemes' menu (only shown if color
+ scheme files exist).
+
+ Prefs:
+ * Hide 'Tabs and Spaces: Hard tab width' preference - it should
+ always be 8. (Hidden setting kept in case users have modified it).
+ * Add sidebar position interface pref.
+ * Add project long line marker customisation (patch from Eugene
+ Arshinov).
+
+ Editor:
+ * Update Scintilla to 2.12.
+ * Add preference and support for virtual spaces.
+ * Add word part autocompletion for the current selected item when
+ pressing keybinding (default Tab) - Enter still completes normally.
+ * Remove LaTeX autocompletion from Geany's core and move it to the
+ geanyLaTeX plugin.
+
+ Filetypes:
+ * New filetype: Txt2Tags (patch by Eric Forgeot).
+ * New filetype: Abc (patch by Eric Forgeot).
+ * New filetype: Verilog (patch from Kelvin Gardiner).
+ * New custom filetype: Genie.
+ * Improvements in symbol parsing of PHP and Python files.
+ * Add R tagmanager symbol parser (patch by Jon Senior).
+ * Update Perl tag parser from ctags - removes support for
+ buggy local/my/our but parses constant/format/labels.
+ * Parse more VHDL tags (patch from Kelvin Gardiner).
+ * Highlight D & Java types from a global tags file.
+ * Parse Python lambda functions (patch from Colomban Wendling).
+
+ Keybindings:
+ * Add keybindings to switch to the sidebar's Document and Symbol list as
+ well as to the Message Window's current tab (patch by Eugene Arshinov).
+ * Add 'Remove Markers' and 'Remove Error Indicators' keybindings.
+ * Make 'Reflow block/lines(s)' keybinding use line breaking column when
+ enabled (patch by Lex Trotman).
+ * Add 'Select to previous/next word part' keybindings.
+ * Add 'Switch to Messages' focus keybinding.
+ * Add 'Move line(s) up/down' keybindings.
+ * Make Switch to Editor keybinding reshow the document statistics line.
+
+ Templates:
+ * Move filetype template defaults into custom file template files.
+ * Read custom file templates from system as well as user dir.
+ * Add new special template wildcard "{command:...}" to use the output
+ of a shell command in templates.
+ * Support {ob}, {cb} and {pc} to escape wildcard strings with {, }, %
+ for snippets, fileheader and file templates.
+ * Add {project}, {description} template wildcards (#2954737).
+ * Reload templates when saving a document in the templates config dir.
+
+ Configuration files:
+ * Support more filetypes.common folding icon styles: arrows, +/- and no
+ lines (#2935059).
+ * Support Scintilla lexer properties in [lexer_properties] filetypes.*
+ group.
+ * Add filetypes.xml asp.default.language property (Ross McKay).
+
+ Plugins:
+ * Classbuilder: Add support for creating PHP classes
+ (patch by Ondrej Donek).
+ * HTMLchars: Make plugin remember whether replacement of special
+ characters was activated.
+
+ Windows:
+ * Support very long build commands.
+ * Add a preference for choosing between GTK and native File Open/Save
+ dialogs (only available on Windows).
+
+ Internationalisation:
+ * Added translations: ast.
+ * Updated translations: de, en_GB, es, fr, gl, ja, nl, pt, ru, sl, sv,
+ tr, vi, zh_CN.
+
+ API:
+ * Improve documentation contents page.
+ * Add Stash mini-library setting, pref & widget functions to API.
+ * Add plugin_configure_single() plugin symbol which is easier to
+ implement than plugin_configure().
+ * Add new plugin signals: "document-before-save", "document-filetype-set",
+ "geany-startup-complete".
+ * Add PLUGIN_SET_TRANSLATABLE_INFO macro to the plugin API so plugins' meta
+ information can be translated already in the plugin manager dialog
+ (patch by Colomban Wendling).
+ * Use full function name for GeanyFunctions function pointers. This
+ avoids naming conflicts e.g. with C++'s 'new' keyword.
+ * GeanyKeyBinding label fields can now contain underscores, which won't
+ be displayed by Geany. This saves adding near-duplicate translation
+ strings.
+ * Add GeanyKeyGroup callback support.
+ * Add more Scintilla function wrappers, foreach_dir(), foreach_str(),
+ utils_get_file_list_full(), document_get_notebook_page(),
+ editor_insert_text_block().
+ * Don't install unnecessary headers.
+ * Remove deprecated header pluginmacros.h - use geanyfunctions.h
+ instead.
+ * Deprecate documents_foreach(), use foreach_document() instead.
+ * Deprecate PLUGIN_KEY_GROUP() macro - use plugin_set_key_group()
+ instead.
+
+
Geany 0.18.1 (February 14, 2010)
Build fixes:
Modified: branches/sm/THANKS
===================================================================
--- branches/sm/THANKS 2010-06-17 14:55:33 UTC (rev 5042)
+++ branches/sm/THANKS 2010-06-17 14:58:57 UTC (rev 5043)
@@ -7,7 +7,8 @@
Testers and contributors:
-------------------------
These people have contributed to Geany by testing the software,
-reporting problems, sending patches and making useful suggestions.
+reporting problems, sending patches and making useful suggestions:
+
Frank Lanitz <frank(at)frank(dot)uvena(dot)de> - heavy testing
Christoph Berg <Christoph(dot)Berg(at)kpm-sport(dot)de> - testing and patch for filetype D
Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - many patches
@@ -79,10 +80,12 @@
Dimitar Zhekov <hamster(at)mbox(dot)contact(dot)bg> - matching brace improvements patch
Ondrej Donek <ondrejd(at)gmail(dot)com> - Support for creating PHP classes with the classbuilder plugin
Daniel Marjamaki <danielm77(at)spray(dot)se> - Small improvements
+Jiří Techet <techet(at)gmail(dot)com> - Fix switch to last used tab ordering bug
Translators:
------------
-These people have translated Geany to foreign languages.
+These people have translated Geany to foreign languages:
+
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
Modified: branches/sm/configure.ac
===================================================================
--- branches/sm/configure.ac 2010-06-17 14:55:33 UTC (rev 5042)
+++ branches/sm/configure.ac 2010-06-17 14:58:57 UTC (rev 5043)
@@ -2,7 +2,7 @@
dnl $Id$
AC_INIT(configure.ac)
-AM_INIT_AUTOMAKE(geany, 0.19)
+AM_INIT_AUTOMAKE(geany, 0.20)
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
Modified: branches/sm/data/filetypes.css
===================================================================
--- branches/sm/data/filetypes.css 2010-06-17 14:55:33 UTC (rev 5042)
+++ branches/sm/data/filetypes.css 2010-06-17 14:58:57 UTC (rev 5043)
@@ -23,6 +23,7 @@
extended_identifier=0x9090a0;0xffffff;true;false
extended_pseudoclass=0x907080;0xffffff;true;true
extended_pseudoelement=0x909080;0xffffff;true;true
+media=0x006bff;0xffffff;false;true
[keywords]
# CSS 1 properties
Added: branches/sm/data/templates/bsd
===================================================================
--- branches/sm/data/templates/bsd (rev 0)
+++ branches/sm/data/templates/bsd 2010-06-17 14:58:57 UTC (rev 5043)
@@ -0,0 +1,26 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+* Neither the name of the {company} nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
Added: branches/sm/data/templates/changelog
===================================================================
--- branches/sm/data/templates/changelog (rev 0)
+++ branches/sm/data/templates/changelog 2010-06-17 14:58:57 UTC (rev 5043)
@@ -0,0 +1,6 @@
+{date} {developer} <{mail}>
+
+ *
+
+
+
Added: branches/sm/data/templates/fileheader
===================================================================
--- branches/sm/data/templates/fileheader (rev 0)
+++ branches/sm/data/templates/fileheader 2010-06-17 14:58:57 UTC (rev 5043)
@@ -0,0 +1,5 @@
+{filename}
+
+Copyright {year} {developer} <{mail}>
+
+{gpl}
Added: branches/sm/data/templates/function
===================================================================
--- branches/sm/data/templates/function (rev 0)
+++ branches/sm/data/templates/function 2010-06-17 14:58:57 UTC (rev 5043)
@@ -0,0 +1,5 @@
+
+name: {functionname}
+ at param
+ at return
+
Added: branches/sm/data/templates/gpl
===================================================================
--- branches/sm/data/templates/gpl (rev 0)
+++ branches/sm/data/templates/gpl 2010-06-17 14:58:57 UTC (rev 5043)
@@ -0,0 +1,15 @@
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.
+
Modified: branches/sm/doc/geany.1.in
===================================================================
--- branches/sm/doc/geany.1.in 2010-06-17 14:55:33 UTC (rev 5042)
+++ branches/sm/doc/geany.1.in 2010-06-17 14:58:57 UTC (rev 5043)
@@ -1,4 +1,4 @@
-.TH "GEANY" "1" "August 16, 2009" "geany @VERSION@" ""
+.TH "GEANY" "1" "June 12, 2010" "geany @VERSION@" ""
.SH "NAME"
Geany \(em a small and lightweight IDE
.SH "SYNOPSIS"
Modified: branches/sm/doc/geany.html
===================================================================
--- branches/sm/doc/geany.html 2010-06-17 14:55:33 UTC (rev 5042)
+++ branches/sm/doc/geany.html 2010-06-17 14:58:57 UTC (rev 5043)
@@ -6,7 +6,7 @@
<meta name="generator" content="Docutils 0.6: http://docutils.sourceforge.net/" />
<title>Geany</title>
<meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" />
-<meta name="date" content="$Date$" />
+<meta name="date" content="2010-06-04" />
<style type="text/css">
/*
@@ -139,9 +139,9 @@
<br />Nick Treleaven
<br />Frank Lanitz</td></tr>
<tr><th class="docinfo-name">Date:</th>
-<td>$Date$</td></tr>
+<td>2010-06-04</td></tr>
<tr><th class="docinfo-name">Version:</th>
-<td>0.19</td></tr>
+<td>0.20</td></tr>
</tbody>
</table>
<p>Copyright © 2005-2010</p>
@@ -2012,7 +2012,7 @@
</dd>
<dt>Use Windows File Open/Save dialogs</dt>
<dd>Defines whether to use the native Windows File Open/Save dialogs or
-whether to use the GTK default dialogs</dd>
+whether to use the GTK default dialogs.</dd>
<dt>Auto-focus widgets (focus follows mouse)</dt>
<dd>Give the focus automatically to widgets below the mouse cursor.
This works for the main editor widget, the scribble, the toolbar search field
@@ -2096,7 +2096,7 @@
right of all existing tabs.</dd>
<dt>Next to current</dt>
<dd>Whether to place file tabs next to the current tab
-rather than at the edges of the notebook</dd>
+rather than at the edges of the notebook.</dd>
<dt>Double-clicking hides all additional widgets</dt>
<dd>Whether to call the View->Toggle All Additional Widgets command
when double-clicking on a notebook tab.</dd>
@@ -2631,7 +2631,7 @@
in the non-filetype Build menu items to %p to use the project base path.</p>
<div class="note">
<p class="first admonition-title">Note</p>
-<p class="last">Pressing the 'set' button will overright any working directories
+<p class="last">Pressing the 'set' button will override any working directories
you have configured for the project.</p>
</div>
</div>
@@ -2655,8 +2655,8 @@
<h2><a class="toc-backref" href="#id127">Build Menu</a></h2>
<p>After editing code with Geany, the next step is to compile, link, build,
interpret, run etc. As Geany supports many languages each with a different
-approach to such operations, and as there are also many language independant
-software building systems, Geany does not have a built in build system, nor
+approach to such operations, and as there are also many language independent
+software building systems, Geany does not have a built-in build system, nor
does it limit which system you can use. Instead the build menu provides
a configurable and flexible means of running any external commands to
execute your preferred build system.</p>
@@ -2664,9 +2664,9 @@
build menu and then covers how to configure it, and where the defaults fit in.</p>
<p>Running the commands from within Geany has two benefits:</p>
<ul class="simple">
-<li>the current file is automatically saved before the command is run</li>
-<li>the output is captured in the Compiler notebook tab and parsed for
-warnings or errors</li>
+<li>The current file is automatically saved before the command is run.</li>
+<li>The output is captured in the Compiler notebook tab and parsed for
+warnings or errors.</li>
</ul>
<p>Warnings and errors that can be parsed for line numbers will be shown in
red in the Compiler tab and you can click on them to switch to the relevant
@@ -2676,16 +2676,16 @@
<p class="first admonition-title">Tip</p>
<p class="last">If Geany's default error message parsing does not parse errors for
the tool you're using, you can set a custom regex in the Build Commands
-Dialog, see <a class="reference internal" href="#build-menu-configuration">Build Menu Configuration</a></p>
+Dialog, see <a class="reference internal" href="#build-menu-configuration">Build Menu Configuration</a>.</p>
</div>
<div class="section" id="indicators">
<h3><a class="toc-backref" href="#id128">Indicators</a></h3>
<p>Indicators are red squiggly underlines which are used to highlight
errors which occurred while compiling the current file. So you can
-easily see where your code failed to compile. To remove the indicators,
-just select "Remove all indicators" in the document file menu.</p>
-<p>If you do not like this feature, you can disable it in the preferences
-dialog.</p>
+easily see where your code failed to compile. You can remove them by
+selecting <em>Remove Error Indicators</em> in the Document menu.</p>
+<p>If you do not like this feature, you can disable it - see <a class="reference internal" href="#editor-features-preferences">Editor Features
+preferences</a>.</p>
</div>
<div class="section" id="default-build-menu-items">
<h3><a class="toc-backref" href="#id129">Default Build Menu Items</a></h3>
@@ -2719,7 +2719,14 @@
the object file does not exist, the source will be compiled and linked
in one step, producing just the executable binary.</p>
<p>Interpreted languages do not use the Build command.</p>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you need complex settings for your build system, or several
+different settings, then writing a Makefile and using the Make
+commands is recommended; this will also make it easier for users to
+build your software.</p>
</div>
+</div>
<div class="section" id="make">
<h4><a class="toc-backref" href="#id132">Make</a></h4>
<p>This runs "make" in the same directory as the
@@ -2752,20 +2759,22 @@
path must be correctly set in the Tools tab of the Preferences dialog -
you can use any terminal program that runs a Bourne compatible shell
and accept the "-e" command line argument to start a command or can be
-selected to us the build-in VTE if it is available, see
+selected to use the built-in VTE if it is available - see
<a class="reference internal" href="#virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a>.</p>
<p>After your program or script has finished executing, you will be
prompted to press the return key. This allows you to review any text
output from the program before the terminal window is closed.</p>
-<p>The execute command output is not parsed for errors.</p>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">The execute command output is not parsed for errors.</p>
</div>
+</div>
<div class="section" id="stopping-running-processes">
<h4><a class="toc-backref" href="#id138">Stopping running processes</a></h4>
<p>When there is a running program, the Execute menu item in the menu and
the Run button in the toolbar
-becomes a stop button and you can stop the current running program. This
-works by sending a signal to the process (and its child process(es))
-to stop the process. The signal used is SIGQUIT.</p>
+each become a stop button so you can stop the current running program (and
+any child processes). This works by sending the SIGQUIT signal to the process.</p>
<p>Depending on the process you started it is possible that the process
cannot be stopped. For example this can happen when the process creates
more than one child process.</p>
@@ -2782,20 +2791,11 @@
<h4><a class="toc-backref" href="#id140">Set Build Commands</a></h4>
<p>By default the Compile and Build commands invoke the GCC compiler and
linker with only the basic arguments needed by all programs. Using
-Set Build Commands you can add any include paths and compile
+<em>Set Build Commands</em> you can add any include paths and compile
flags for the compiler, any library names and paths for the linker,
and any arguments you want to use when running Execute.</p>
-<p>For details of configuration see <a class="reference internal" href="#build-menu-configuration">Build Menu Configuration</a> below.</p>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">If you need complex settings for your build system, or several
-different settings, then writing a Makefile and using the Make
-commands is recommended; this will also make it easier for users to
-build your software.</p>
</div>
-<p>These settings are saved automatically when Geany is shut down.</p>
</div>
-</div>
<div class="section" id="build-menu-configuration">
<h3><a class="toc-backref" href="#id141">Build Menu Configuration</a></h3>
<p>The build menu has considerable flexibility and configurability, allowing
@@ -2803,34 +2803,45 @@
in to be configured.</p>
<p>For example, if you change one of the default make commands to run say 'waf'
you can also change the label to match.</p>
-<p>Underlines in the labels set mnemonic characters.</p>
+<p>These settings are saved automatically when Geany is shut down.</p>
<p>The build menu is divided into four groups of items each with different
behaviors:</p>
-<ul class="simple">
-<li>file items - are configurable and depend on the filetype of the current
-document, put the output in the compiler tab and parse it for errors</li>
-<li>non-file items - are configurable and mostly don't depend on the filetype
-of the current document, put the output in the compiler tab and parse
-it for errors</li>
-<li>execute items - are configurable and intended for executing your
+<ul>
+<li><p class="first">File items - are configurable and depend on the filetype of the current
+document; they capture output in the compiler tab and parse it for
+errors.</p>
+</li>
+<li><p class="first">Non-file items - are configurable and mostly don't depend on the filetype
+of the current document; they also capture output in the compiler tab and
+parse it for errors.</p>
+</li>
+<li><p class="first">Execute items - are configurable and intended for executing your
program or other long running programs. The output is not parsed for errors
-and is directed to the terminal selected in preferences.</li>
-<li>fixed items - are not configurable because they perform the Geany built in actions,
-go to the next error, go to the previous error and show the build menu
-commands dialog</li>
+and is directed to the terminal selected in preferences.</p>
+</li>
+<li><dl class="first docutils">
+<dt>Fixed items - these perform built-in actions:</dt>
+<dd><ul class="first last simple">
+<li>Go to the next error.</li>
+<li>Go to the previous error.</li>
+<li>Show the build menu commands dialog.</li>
</ul>
+</dd>
+</dl>
+</li>
+</ul>
<p>The maximum numbers of items in each of the configurable groups can be
-configured when Geany starts using hidden settings(see <a class="reference internal" href="#preferences-file-format">Preferences File Format</a>).
+configured when Geany starts using hidden settings (see <a class="reference internal" href="#preferences-file-format">Preferences File Format</a>).
Even though the maximum number of items may have been increased, only
those menu items that have values configured are shown in the menu.</p>
<p>The groups of menu items obtain their configuration from four potential
-sources. The highest pririty source that has the menu item defined will
+sources. The highest priority source that has the menu item defined will
be used. The sources in decreasing priority are:</p>
<ul class="simple">
-<li>a project file if open</li>
-<li>the user preferences</li>
-<li>the system filetype definitions</li>
-<li>the defaults</li>
+<li>A project file if open</li>
+<li>The user preferences</li>
+<li>The system filetype definitions</li>
+<li>The defaults</li>
</ul>
<p>The detailed relationships between sources and the configurable menu item groups
is shown in the following table.</p>
@@ -2959,11 +2970,11 @@
<p>The dialog is divided into three sections:</p>
<ul class="simple">
<li>Filetype menu items which will be selected based on the filetype of the
-currently open document,</li>
-<li>Non-filetype menu items, and</li>
+currently open document.</li>
+<li>Non-filetype menu items.</li>
<li>Execute menu items.</li>
</ul>
-<p>The filetype and non-filetype sections also contains a field for the regular
+<p>The filetype and non-filetype sections also each contain a field for the regular
expression used for parsing command output for error and warning messages.</p>
<p>The columns in the first three sections allow setting of the label, command,
and working directory to run the command in.</p>
@@ -3004,15 +3015,16 @@
</div>
<div class="section" id="build-menu-keyboard-shortcuts">
<h4><a class="toc-backref" href="#id144">Build Menu Keyboard Shortcuts</a></h4>
-<p>Keyboard shortcuts can be defiend for the first two filetype menu items, the first three
+<p>Keyboard shortcuts can be defined for the first two filetype menu items, the first three
non-filetype menu items, the first two execute menu items and the fixed menu items.
In the keybindings configuration dialog (see <a class="reference internal" href="#keybinding-preferences">Keybinding preferences</a>)
these items are identified by the default labels shown in the <a class="reference internal" href="#build-menu">Build Menu</a> section above.</p>
<p>It is currently not possible to bind keyboard shortcuts to more than these menu items.</p>
+<p>You can also use underlines in the labels to set mnemonic characters.</p>
</div>
<div class="section" id="configuration-files">
<h4><a class="toc-backref" href="#id145">Configuration Files</a></h4>
-<p>The configurable Build Menu capability was introduced in Geany V0.19 and
+<p>The configurable Build Menu capability was introduced in Geany 0.19 and
required a new section to be added to the configuration files (See
<a class="reference internal" href="#preferences-file-format">Preferences File Format</a>). Geany will still load older format project,
preferences and filetype file settings and will attempt to map them into the new
@@ -4301,7 +4313,7 @@
</div>
<div class="section" id="build-settings-section">
<h4><a class="toc-backref" href="#id180">[build_settings] Section</a></h4>
-<p>As of Geany v0.19 this section is supplemented by the <a class="reference internal" href="#build-menu-section">[build-menu] Section</a>.
+<p>As of Geany 0.19 this section is supplemented by the <a class="reference internal" href="#build-menu-section">[build-menu] Section</a>.
Values that are set in the [build-menu] section will override those in this section.</p>
<dl class="docutils">
<dt>error_regex</dt>
@@ -5039,7 +5051,7 @@
</tr>
<tr><td>geanyversion</td>
<td>The actual Geany version, e.g.
-"Geany 0.19".</td>
+"Geany 0.20".</td>
<td>file templates, file header,
function description, ChangeLog entry,
bsd, gpl, snippets.</td>
@@ -5322,7 +5334,7 @@
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-0.19.pdf.</p>
+geany-0.20.pdf.</p>
<p>After you are happy with your changes, create a patch:</p>
<pre class="literal-block">
% svn diff geany.txt > foo.patch
@@ -6097,7 +6109,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2010-05-22 19:36 UTC.
+Generated on: 2010-06-12 13:39 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: branches/sm/doc/geany.txt
===================================================================
--- branches/sm/doc/geany.txt 2010-06-17 14:55:33 UTC (rev 5042)
+++ branches/sm/doc/geany.txt 2010-06-17 14:58:57 UTC (rev 5043)
@@ -1,4 +1,4 @@
-.. |(version)| replace:: 0.19
+.. |(version)| replace:: 0.20
=======
Geany
@@ -1673,7 +1673,7 @@
Use Windows File Open/Save dialogs
Defines whether to use the native Windows File Open/Save dialogs or
- whether to use the GTK default dialogs
+ whether to use the GTK default dialogs.
Auto-focus widgets (focus follows mouse)
Give the focus automatically to widgets below the mouse cursor.
@@ -1766,7 +1766,7 @@
Next to current
Whether to place file tabs next to the current tab
- rather than at the edges of the notebook
+ rather than at the edges of the notebook.
Double-clicking hides all additional widgets
Whether to call the View->Toggle All Additional Widgets command
@@ -2383,7 +2383,7 @@
in the non-filetype Build menu items to %p to use the project base path.
.. note::
- Pressing the 'set' button will overright any working directories
+ Pressing the 'set' button will override any working directories
you have configured for the project.
@@ -2411,8 +2411,8 @@
----------
After editing code with Geany, the next step is to compile, link, build,
interpret, run etc. As Geany supports many languages each with a different
-approach to such operations, and as there are also many language independant
-software building systems, Geany does not have a built in build system, nor
+approach to such operations, and as there are also many language independent
+software building systems, Geany does not have a built-in build system, nor
does it limit which system you can use. Instead the build menu provides
a configurable and flexible means of running any external commands to
execute your preferred build system.
@@ -2422,9 +2422,9 @@
Running the commands from within Geany has two benefits:
-* the current file is automatically saved before the command is run
-* the output is captured in the Compiler notebook tab and parsed for
- warnings or errors
+* The current file is automatically saved before the command is run.
+* The output is captured in the Compiler notebook tab and parsed for
+ warnings or errors.
Warnings and errors that can be parsed for line numbers will be shown in
red in the Compiler tab and you can click on them to switch to the relevant
@@ -2434,18 +2434,18 @@
.. tip::
If Geany's default error message parsing does not parse errors for
the tool you're using, you can set a custom regex in the Build Commands
- Dialog, see `Build Menu Configuration`_
+ Dialog, see `Build Menu Configuration`_.
Indicators
^^^^^^^^^^
Indicators are red squiggly underlines which are used to highlight
errors which occurred while compiling the current file. So you can
-easily see where your code failed to compile. To remove the indicators,
-just select "Remove all indicators" in the document file menu.
+easily see where your code failed to compile. You can remove them by
+selecting *Remove Error Indicators* in the Document menu.
-If you do not like this feature, you can disable it in the preferences
-dialog.
+If you do not like this feature, you can disable it - see `Editor Features
+preferences`_.
Default Build Menu Items
@@ -2478,7 +2478,6 @@
bytecode if the language supports it, or will run a syntax check,
or if that is not available will run the file in its language interpreter.
-
Build
`````
@@ -2489,7 +2488,13 @@
Interpreted languages do not use the Build command.
+.. note::
+ If you need complex settings for your build system, or several
+ different settings, then writing a Makefile and using the Make
+ commands is recommended; this will also make it easier for users to
+ build your software.
+
Make
````
@@ -2528,14 +2533,15 @@
path must be correctly set in the Tools tab of the Preferences dialog -
you can use any terminal program that runs a Bourne compatible shell
and accept the "-e" command line argument to start a command or can be
-selected to us the build-in VTE if it is available, see
+selected to use the built-in VTE if it is available - see
`Virtual terminal emulator widget (VTE)`_.
After your program or script has finished executing, you will be
prompted to press the return key. This allows you to review any text
output from the program before the terminal window is closed.
-The execute command output is not parsed for errors.
+.. note::
+ The execute command output is not parsed for errors.
Stopping running processes
@@ -2543,9 +2549,8 @@
When there is a running program, the Execute menu item in the menu and
the Run button in the toolbar
-becomes a stop button and you can stop the current running program. This
-works by sending a signal to the process (and its child process(es))
-to stop the process. The signal used is SIGQUIT.
+each become a stop button so you can stop the current running program (and
+any child processes). This works by sending the SIGQUIT signal to the process.
Depending on the process you started it is possible that the process
cannot be stopped. For example this can happen when the process creates
@@ -2567,20 +2572,10 @@
By default the Compile and Build commands invoke the GCC compiler and
linker with only the basic arguments needed by all programs. Using
-Set Build Commands you can add any include paths and compile
+*Set Build Commands* you can add any include paths and compile
flags for the compiler, any library names and paths for the linker,
and any arguments you want to use when running Execute.
-For details of configuration see `Build Menu Configuration`_ below.
-
-.. note::
- If you need complex settings for your build system, or several
- different settings, then writing a Makefile and using the Make
- commands is recommended; this will also make it easier for users to
- build your software.
-
-These settings are saved automatically when Geany is shut down.
-
Build Menu Configuration
^^^^^^^^^^^^^^^^^^^^^^^^
@@ -2591,36 +2586,38 @@
For example, if you change one of the default make commands to run say 'waf'
you can also change the label to match.
-Underlines in the labels set mnemonic characters.
+These settings are saved automatically when Geany is shut down.
The build menu is divided into four groups of items each with different
behaviors:
-* file items - are configurable and depend on the filetype of the current
- document, put the output in the compiler tab and parse it for errors
-* non-file items - are configurable and mostly don't depend on the filetype
- of the current document, put the output in the compiler tab and parse
- it for errors
-* execute items - are configurable and intended for executing your
+* File items - are configurable and depend on the filetype of the current
+ document; they capture output in the compiler tab and parse it for
+ errors.
+* Non-file items - are configurable and mostly don't depend on the filetype
+ of the current document; they also capture output in the compiler tab and
+ parse it for errors.
+* Execute items - are configurable and intended for executing your
program or other long running programs. The output is not parsed for errors
and is directed to the terminal selected in preferences.
-* fixed items - are not configurable because they perform the Geany built in actions,
- go to the next error, go to the previous error and show the build menu
- commands dialog
+* Fixed items - these perform built-in actions:
+ * Go to the next error.
+ * Go to the previous error.
+ * Show the build menu commands dialog.
The maximum numbers of items in each of the configurable groups can be
-configured when Geany starts using hidden settings(see `Preferences File Format`_).
+configured when Geany starts using hidden settings (see `Preferences File Format`_).
Even though the maximum number of items may have been increased, only
those menu items that have values configured are shown in the menu.
The groups of menu items obtain their configuration from four potential
-sources. The highest pririty source that has the menu item defined will
+sources. The highest priority source that has the menu item defined will
be used. The sources in decreasing priority are:
-* a project file if open
-* the user preferences
-* the system filetype definitions
-* the defaults
+* A project file if open
+* The user preferences
+* The system filetype definitions
+* The defaults
The detailed relationships between sources and the configurable menu item groups
is shown in the following table.
@@ -2694,13 +2691,11 @@
The dialog is divided into three sections:
* Filetype menu items which will be selected based on the filetype of the
- currently open document,
-
-* Non-filetype menu items, and
-
+ currently open document.
+* Non-filetype menu items.
* Execute menu items.
-The filetype and non-filetype sections also contains a field for the regular
+The filetype and non-filetype sections also each contain a field for the regular
expression used for parsing command output for error and warning messages.
The columns in the first three sections allow setting of the label, command,
@@ -2748,17 +2743,19 @@
Build Menu Keyboard Shortcuts
`````````````````````````````
-Keyboard shortcuts can be defiend for the first two filetype menu items, the first three
+Keyboard shortcuts can be defined for the first two filetype menu items, the first three
non-filetype menu items, the first two execute menu items and the fixed menu items.
In the keybindings configuration dialog (see `Keybinding preferences`_)
these items are identified by the default labels shown in the `Build Menu`_ section above.
It is currently not possible to bind keyboard shortcuts to more than these menu items.
+You can also use underlines in the labels to set mnemonic characters.
+
Configuration Files
```````````````````
-The configurable Build Menu capability was introduced in Geany V0.19 and
+The configurable Build Menu capability was introduced in Geany 0.19 and
required a new section to be added to the configuration files (See
`Preferences File Format`_). Geany will still load older format project,
preferences and filetype file settings and will attempt to map them into the new
@@ -3643,7 +3640,7 @@
[build_settings] Section
````````````````````````
-As of Geany v0.19 this section is supplemented by the `[build-menu] Section`_.
+As of Geany 0.19 this section is supplemented by the `[build-menu] Section`_.
Values that are set in the [build-menu] section will override those in this section.
error_regex
Modified: branches/sm/doc/images/build_menu_commands_dialog.png
===================================================================
(Binary files differ)
Modified: branches/sm/doc/images/main_window.png
===================================================================
(Binary files differ)
Modified: branches/sm/doc/images/pref_dialog_edit_completions.png
===================================================================
(Binary files differ)
Modified: branches/sm/doc/images/pref_dialog_edit_display.png
===================================================================
(Binary files differ)
Modified: branches/sm/doc/images/pref_dialog_edit_features.png
===================================================================
(Binary files differ)
Modified: branches/sm/doc/images/pref_dialog_edit_indentation.png
===================================================================
(Binary files differ)
Modified: branches/sm/doc/images/pref_dialog_files.png
===================================================================
(Binary files differ)
Modified: branches/sm/doc/images/pref_dialog_gen_misc.png
===================================================================
(Binary files differ)
Modified: branches/sm/doc/images/pref_dialog_gen_startup.png
===================================================================
(Binary files differ)
Modified: branches/sm/doc/images/pref_dialog_interface.png
===================================================================
(Binary files differ)
Modified: branches/sm/doc/images/pref_dialog_keys.png
===================================================================
(Binary files differ)
Modified: branches/sm/doc/images/pref_dialog_printing.png
===================================================================
(Binary files differ)
Modified: branches/sm/doc/images/pref_dialog_templ.png
===================================================================
(Binary files differ)
Modified: branches/sm/doc/images/pref_dialog_toolbar.png
===================================================================
(Binary files differ)
Modified: branches/sm/doc/images/pref_dialog_tools.png
===================================================================
(Binary files differ)
Modified: branches/sm/doc/images/pref_dialog_vte.png
===================================================================
(Binary files differ)
Modified: branches/sm/geany.nsi
===================================================================
--- branches/sm/geany.nsi 2010-06-17 14:55:33 UTC (rev 5042)
+++ branches/sm/geany.nsi 2010-06-17 14:58:57 UTC (rev 5043)
@@ -27,14 +27,14 @@
; Do a Cyclic Redundancy Check to make sure the installer was not corrupted by the download
CRCCheck force
-RequestExecutionLevel user ; set execution level for Windows Vista
+RequestExecutionLevel highest ; set execution level for Windows Vista
;;;;;;;;;;;;;;;;;;;
; helper defines ;
;;;;;;;;;;;;;;;;;;;
!define PRODUCT_NAME "Geany"
-!define PRODUCT_VERSION "0.19"
-!define PRODUCT_VERSION_ID "0.19.0.0"
+!define PRODUCT_VERSION "0.20"
+!define PRODUCT_VERSION_ID "0.20.0.0"
!define PRODUCT_PUBLISHER "The Geany developer team"
!define PRODUCT_WEB_SITE "http://www.geany.org/"
!define PRODUCT_DIR_REGKEY "Software\Geany"
@@ -54,7 +54,7 @@
VIAddVersionKey "LegalCopyright" "Copyright 2005-2010 by the Geany developer team"
VIAddVersionKey "FileDescription" "${PRODUCT_NAME} Installer"
-BrandingText "$(^NAME) installer (NSIS 2.45)"
+BrandingText "$(^NAME) installer (NSIS 2.46)"
InstallDir "$PROGRAMFILES\Geany"
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
SetCompressor /SOLID lzma
Modified: branches/sm/geany_private.rc
===================================================================
--- branches/sm/geany_private.rc 2010-06-17 14:55:33 UTC (rev 5042)
+++ branches/sm/geany_private.rc 2010-06-17 14:58:57 UTC (rev 5043)
@@ -5,8 +5,8 @@
A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico"
1 VERSIONINFO
-FILEVERSION 0,19,0,0
-PRODUCTVERSION 0,19,0,0
+FILEVERSION 0,20,0,0
+PRODUCTVERSION 0,20,0,0
FILETYPE VFT_APP
{
BLOCK "StringFileInfo"
@@ -14,14 +14,14 @@
BLOCK "040704E4"
{
VALUE "CompanyName", ""
- VALUE "FileVersion", "0.19"
+ VALUE "FileVersion", "0.20"
VALUE "FileDescription", "Geany"
VALUE "InternalName", "geany"
VALUE "LegalCopyright", "Copyright 2005-2010 by the Geany developers"
VALUE "LegalTrademarks", ""
VALUE "OriginalFilename", "geany"
VALUE "ProductName", "geany"
- VALUE "ProductVersion", "0.19"
+ VALUE "ProductVersion", "0.20"
}
}
}
Modified: branches/sm/po/ChangeLog
===================================================================
--- branches/sm/po/ChangeLog 2010-06-17 14:55:33 UTC (rev 5042)
+++ branches/sm/po/ChangeLog 2010-06-17 14:58:57 UTC (rev 5043)
@@ -1,6 +1,53 @@
+2010-06-07 Frank Lanitz <frank at frank.uvena.de>
+
+ * ja.po: Update of Japanese translation. Thanks to Chikahiro Masami.
+
+
+2010-06-04 Frank Lanitz <frank at frank.uvena.de>
+
+ * sv.po: Update of Swedish translation. Thanks to Tony Mattsson.
+
+
+2010-06-03 Frank Lanitz <frank at frank.uvena.de>
+
+ * de.po: Minor update of German translation.
+ * gl.po: Update of Galician translation. Thanks to José Manuel
+ Castroagudín Silva.
+ * sl.po: Update of Slovenian translation. Patch by Jože Klepec, thanks.
+
+
+2010-06-02 Frank Lanitz <frank at frank.uvena.de>
+
+ * ca.po: Update of Catalan translation. Thanks to Toni Garcia-Navarro.
+ * ja.po: Update of Japanese translation. Thanks to Chikahiro Masami.
+ * pt_BR.po: Update of Brasilian Portuguese translation.
+ Thanks to Adrovane Marques Kade.
+
+
+2010-06-01 Frank Lanitz <frank at frank.uvena.de>
+
+ * fr.po: Update of French translation. Thanks Jean-Philippe Moal.
+ * ja.po: Update of Japanese translation. Thanks to Chikahiro Masami.
+ * pt.po: Update of Portugese translation. Thanks to André Glória for
+ providing
+
+
+2010-05-31 Frank Lanitz <frank at frank.uvena.de>
+
+ * pt.po: Update of Portugese translation. Thanks to André Glória for
+ providing
+ * tr.po: Update of Turkish translation. Thanks to Gürkan Gür.
+
+
+2010-05-30 Peter Scholtens <peter(dot)scholtens(at)xs4all(dot)nl>
+
+ * nl.po: Update of Dutch translation.
+
+
2010-05-29 Frank Lanitz <frank at frank.uvena.de>
- * zh_CN.po: Update of simplified Chinese translation. Thanks to Xhacker Liu.
+ * zh_CN.po: Update of simplified Chinese translation. Thanks to
+ Xhacker Liu.
2010-05-28 Frank Lanitz <frank at frank.uvena.de>
@@ -238,8 +285,8 @@
* *.po, geany.pot:
Regenerate message catalog template.
Remove a fuzzy mark from all translations.
+ * New release: Geany 0.18 "Kaine".
-
2009-08-13 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* fi.po: Update of Finnish translation. Thanks to Jari Rahkonen and
Modified: branches/sm/po/POTFILES.skip
===================================================================
--- branches/sm/po/POTFILES.skip 2010-06-17 14:55:33 UTC (rev 5042)
+++ branches/sm/po/POTFILES.skip 2010-06-17 14:58:57 UTC (rev 5043)
@@ -4,5 +4,6 @@
geany.desktop.in
# generated src/interface.c will be translated
geany.glade
-# no need to translate this file
+# no need to translate these files
plugins/demoplugin.c
+doc/stash-example.c
Modified: branches/sm/po/ca.po
===================================================================
--- branches/sm/po/ca.po 2010-06-17 14:55:33 UTC (rev 5042)
+++ branches/sm/po/ca.po 2010-06-17 14:58:57 UTC (rev 5043)
@@ -1,7 +1,7 @@
# Catalan translations for Geany package.
-# Copyright (C) 2007 by Geany's COPYRIGHT HOLDER
+# Copyright (C) 2007-2010 by Geany's COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-# toni <topi at elpiset.net>, 2007-2009.
+# toni <topi at elpiset.net>, 2007-2010.
#
#
msgid ""
@@ -9,7 +9,7 @@
"Project-Id-Version: geany 0.19\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-05-23 10:05+0200\n"
-"PO-Revision-Date: 2009-08-12 23:58+0100\n"
+"PO-Revision-Date: 2010-06-01 23:59+0100\n"
"Last-Translator: Toni Garcia-Navarro <topi at elpiset.net>\n"
"Language-Team: Catalan <ca at dodds.net>\n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,9 @@
msgid "A fast and lightweight IDE using GTK2"
msgstr "Un IDE lleuger i veloç que usa GTK2"
-#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624
+#: ../geany.desktop.in.h:2
+#: ../src/interface.c:281
+#: ../src/interface.c:1624
msgid "Geany"
msgstr "Geany"
@@ -77,8 +79,7 @@
#: ../src/about.c:348
#, c-format
-msgid ""
-"Some of the many contributors (for a more detailed list, see the file %s):"
+msgid "Some of the many contributors (for a more detailed list, see the file %s):"
msgstr "Alguns dels col·laboradors (per a més detalls, veieu el fitxer %s):"
#: ../src/about.c:374
@@ -90,30 +91,27 @@
msgstr "Llicència"
#: ../src/about.c:397
-msgid ""
-"License text could not be found, please visit http://www.gnu.org/licenses/"
-"gpl-2.0.txt to view it online."
-msgstr ""
-"No s'ha pogut trobar el text de la llicència, per favor visiteu http://www."
-"gnu.org/licenses/gpl-2.0.txt per veure-la online."
+msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online."
+msgstr "No s'ha pogut trobar el text de la llicència, per favor visiteu http://www.gnu.org/licenses/gpl-2.0.txt per veure-la online."
#. fall back to %d
#: ../src/build.c:635
#, c-format
msgid "failed to substitute %%p, no project active"
-msgstr ""
+msgstr "error en substituir %%p, no hi ha cap projecte actiu"
#: ../src/build.c:673
-#, fuzzy
msgid "Process failed, no working directory"
-msgstr "S'ha produït un error en canviar al directori \"%s\""
+msgstr "El procés ha fallat, no hi ha directori de treball"
#: ../src/build.c:699
#, c-format
msgid "%s (in directory: %s)"
msgstr "%s (al directori: %s)"
-#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475
+#: ../src/build.c:719
+#: ../src/build.c:944
+#: ../src/search.c:1475
#, c-format
msgid "Process failed (%s)"
msgstr "Ha fallat el procés (%s)"
@@ -126,25 +124,16 @@
#: ../src/build.c:819
#, c-format
msgid "Failed to execute \"%s\" (start-script could not be created)"
-msgstr ""
-"S'ha produït un error en executar \"%s\" (és possible que el script d'inici "
-"no s'hagi creat)"
+msgstr "S'ha produït un error en executar \"%s\" (és possible que el script d'inici no s'hagi creat)"
#: ../src/build.c:873
-msgid ""
-"Could not execute the file in the VTE because it probably contains a command."
-msgstr ""
-"No s'ha pogut executar el fitxer en l'emulador de terminal virtual (VTE), "
-"probablement perquè ja conté una ordre en execució."
+msgid "Could not execute the file in the VTE because it probably contains a command."
+msgstr "No s'ha pogut executar el fitxer en l'emulador de terminal virtual (VTE), probablement perquè ja conté una ordre en execució."
#: ../src/build.c:911
#, c-format
-msgid ""
-"Could not find terminal \"%s\" (check path for Terminal tool setting in "
-"Preferences)"
-msgstr ""
-"No s'ha trobat el terminal '%s' (comproveu la ruta del Terminal a les "
-"Preferències)"
+msgid "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)"
+msgstr "No s'ha trobat el terminal '%s' (comproveu la ruta del Terminal a les Preferències)"
#: ../src/build.c:1081
msgid "Compilation failed."
@@ -155,14 +144,12 @@
msgstr "La compilació ha acabat sense errors."
#: ../src/build.c:1252
-#, fuzzy
msgid "Custom Text"
-msgstr "Make..."
+msgstr "Text a Mida"
#: ../src/build.c:1253
-#, fuzzy
msgid "Enter custom text here, all entered text is appended to the command."
-msgstr "Indica les opcions que es passaran a l'ordre make."
+msgstr "Introdueix text ací, el text introduït serà postposat a l'ordre."
#: ../src/build.c:1331
msgid "_Next Error"
@@ -173,11 +160,11 @@
msgstr "Error _Anterior"
#: ../src/build.c:1343
-#, fuzzy
msgid "_Set Build Commands"
-msgstr "Indica Ordre Pròpia"
+msgstr "E_specifica Ordre de Muntatge"
-#: ../src/build.c:1623 ../src/toolbar.c:373
+#: ../src/build.c:1623
+#: ../src/toolbar.c:373
msgid "Build the current file"
msgstr "Compila el fitxer"
@@ -198,108 +185,112 @@
msgid "Process could not be stopped (%s)."
msgstr "No es pot aturar el procés (%s)."
-#: ../src/build.c:1685 ../src/build.c:1697
+#: ../src/build.c:1685
+#: ../src/build.c:1697
msgid "No more build errors."
msgstr "No hi ha més errors de compilació."
#: ../src/build.c:1778
msgid "Set menu item label"
-msgstr ""
+msgstr "Especifica l'etiqueta de l'element del menú"
#: ../src/build.c:1788
msgid "Item"
-msgstr ""
+msgstr "Element"
-#: ../src/build.c:1789 ../src/symbols.c:650
+#: ../src/build.c:1789
+#: ../src/symbols.c:650
msgid "Label"
msgstr "Etiqueta"
-#: ../src/build.c:1790 ../src/symbols.c:645
+#: ../src/build.c:1790
+#: ../src/symbols.c:645
msgid "Command"
msgstr "Ordre"
#: ../src/build.c:1791
-#, fuzzy
msgid "Working directory"
-msgstr "_Directori:"
+msgstr "Directori de treball"
#: ../src/build.c:1792
-#, fuzzy
msgid "Clear"
-msgstr "Compilador"
+msgstr "Neteja"
#: ../src/build.c:1831
msgid "Click to set menu item label"
-msgstr ""
+msgstr "Clica per a especificar l'etiqueta de l'element del menú"
-#: ../src/build.c:1904 ../src/build.c:1906
-#, fuzzy, c-format
+#: ../src/build.c:1904
+#: ../src/build.c:1906
+#, c-format
msgid "%s Commands"
-msgstr "%s ordres"
+msgstr "%s Ordres"
#: ../src/build.c:1906
-#, fuzzy
msgid "No Filetype"
-msgstr "Indica el _Tipus del Fitxer"
+msgstr "Sense Tipus de Fitxer"
-#: ../src/build.c:1914 ../src/build.c:1949
-#, fuzzy
+#: ../src/build.c:1914
+#: ../src/build.c:1949
msgid "Error Regular Expression:"
-msgstr "_Grep amb expressions regulars"
+msgstr "Error en l'Expressió Regular:"
#: ../src/build.c:1942
msgid "Non-Filetype Commands"
-msgstr ""
+msgstr "Ordres (sense tipus de fitxer)"
#: ../src/build.c:1972
msgid "Note: Item 2 opens a dialog and appends the response to the command."
-msgstr ""
+msgstr "Nota: Element 2 obre un diàleg i postposa la resposta a l'ordre."
#: ../src/build.c:1981
-#, fuzzy
msgid "Execute Commands"
-msgstr "Indica Ordre Pròpia"
+msgstr "Executa les Ordres"
#: ../src/build.c:1992
#, c-format
-msgid ""
-"%d, %e, %f, %p are substituted in command and directory fields, see manual "
-"for details."
-msgstr ""
+msgid "%d, %e, %f, %p are substituted in command and directory fields, see manual for details."
+msgstr "%d, %e, %f, %p es substitueixen en els capms directori i ordre, per a més detalls veieu el manual."
#: ../src/build.c:2177
-#, fuzzy
msgid "Set Build Commands"
-msgstr "Indica Ordre Pròpia"
+msgstr "Especifica Ordre de Muntatge"
#: ../src/build.c:2399
msgid "_Compile"
msgstr "_Compila"
#. build the code
-#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075
+#: ../src/build.c:2406
+#: ../src/build.c:2669
+#: ../src/interface.c:1075
msgid "_Build"
msgstr "_Munta"
-#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636
-#, fuzzy
+#: ../src/build.c:2413
+#: ../src/build.c:2443
+#: ../src/build.c:2636
msgid "_Execute"
-msgstr "Execució:"
+msgstr "_Executa"
#. build the code with make custom
-#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689
+#: ../src/build.c:2458
+#: ../src/build.c:2634
+#: ../src/build.c:2689
msgid "Make Custom _Target"
msgstr "M_ake..."
#. build the code with make object
-#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697
+#: ../src/build.c:2460
+#: ../src/build.c:2635
+#: ../src/build.c:2697
msgid "Make _Object"
msgstr "Make _Object"
-#: ../src/build.c:2462 ../src/build.c:2633
-#, fuzzy
+#: ../src/build.c:2462
+#: ../src/build.c:2633
msgid "_Make"
-msgstr "Make:"
+msgstr "_Munta"
#. build the code with make all
#: ../src/build.c:2681
@@ -308,22 +299,23 @@
#. arguments
#: ../src/build.c:2709
-#, fuzzy
msgid "_Set Build Menu Commands"
-msgstr "Indica Ordre Pròpia"
+msgstr "_Especifica Ordres de Muntatge Pròpies"
#: ../src/callbacks.c:150
msgid "Do you really want to quit?"
msgstr "Esteu segurs de voler sortir?"
#: ../src/callbacks.c:228
-#, fuzzy, c-format
+#, c-format
msgid "%d file saved."
msgid_plural "%d files saved."
-msgstr[0] "S'ha desat el fitxer %s."
-msgstr[1] "S'ha desat el fitxer %s."
+msgstr[0] "%d fitxer desat."
+msgstr[1] "%d fitxers desats."
-#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352
+#: ../src/callbacks.c:488
+#: ../src/document.c:2895
+#: ../src/interface.c:352
#: ../src/sidebar.c:618
msgid "_Reload"
msgstr "A_ctualitza"
@@ -337,7 +329,8 @@
msgid "Are you sure you want to reload '%s'?"
msgstr "Esteu segurs que voleu actualitzar '%s'?"
-#: ../src/callbacks.c:1202 ../src/keybindings.c:428
+#: ../src/callbacks.c:1202
+#: ../src/keybindings.c:428
msgid "Go to Line"
msgstr "Vés a la Línia"
@@ -345,36 +338,43 @@
msgid "Enter the line you want to go to:"
msgstr "Introdueix la línia on vols anar:"
-#: ../src/callbacks.c:1296 ../src/callbacks.c:1321
-msgid ""
-"Please set the filetype for the current file before using this function."
+#: ../src/callbacks.c:1296
+#: ../src/callbacks.c:1321
+msgid "Please set the filetype for the current file before using this function."
msgstr "Heu d'indicat el tipus de fitxer abans d'utilitzar aquesta funció."
-#: ../src/callbacks.c:1429 ../src/ui_utils.c:548
+#: ../src/callbacks.c:1429
+#: ../src/ui_utils.c:548
msgid "dd.mm.yyyy"
msgstr "dd.mm.aaaa"
-#: ../src/callbacks.c:1431 ../src/ui_utils.c:549
+#: ../src/callbacks.c:1431
+#: ../src/ui_utils.c:549
msgid "mm.dd.yyyy"
msgstr "mm.dd.aaaa"
-#: ../src/callbacks.c:1433 ../src/ui_utils.c:550
+#: ../src/callbacks.c:1433
+#: ../src/ui_utils.c:550
msgid "yyyy/mm/dd"
msgstr "aaaa/mm/dd"
-#: ../src/callbacks.c:1435 ../src/ui_utils.c:559
+#: ../src/callbacks.c:1435
+#: ../src/ui_utils.c:559
msgid "dd.mm.yyyy hh:mm:ss"
msgstr "dd.mm.aaaa hh:mm:ss"
-#: ../src/callbacks.c:1437 ../src/ui_utils.c:560
+#: ../src/callbacks.c:1437
+#: ../src/ui_utils.c:560
msgid "mm.dd.yyyy hh:mm:ss"
msgstr "mm.dd.aaaa hh.mm.ss"
-#: ../src/callbacks.c:1439 ../src/ui_utils.c:561
+#: ../src/callbacks.c:1439
+#: ../src/ui_utils.c:561
msgid "yyyy/mm/dd hh:mm:ss"
msgstr "aaaa/mm/dd hh:mm:ss"
-#: ../src/callbacks.c:1441 ../src/ui_utils.c:570
+#: ../src/callbacks.c:1441
+#: ../src/ui_utils.c:570
msgid "_Use Custom Date Format"
msgstr "_Usa Format de Data Propi"
@@ -383,42 +383,39 @@
msgstr "Format de Data"
#: ../src/callbacks.c:1447
-msgid ""
-"Enter here a custom date and time format. You can use any conversion "
-"specifiers which can be used with the ANSI C strftime function."
-msgstr ""
-"Indiqueu el format de la data i l'hora. Podeu utilitzar qualsevol variable "
-"suportada per la funció ANSI C strftime."
+msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function."
+msgstr "Indiqueu el format de la data i l'hora. Podeu utilitzar qualsevol variable suportada per la funció ANSI C strftime."
#: ../src/callbacks.c:1466
msgid "Date format string could not be converted (possibly too long)."
msgstr "El format de data no pot ser convertit (probablement és massa llarg)."
-#: ../src/callbacks.c:1689 ../src/callbacks.c:1699
+#: ../src/callbacks.c:1689
+#: ../src/callbacks.c:1699
msgid "No more message items."
msgstr "No hi ha més missatges."
-#: ../src/dialogs.c:144 ../src/dialogs.c:229
+#: ../src/dialogs.c:144
+#: ../src/dialogs.c:229
msgid "Open File"
msgstr "Obre un Fitxer"
-#: ../src/dialogs.c:148 ../src/interface.c:790
+#: ../src/dialogs.c:148
+#: ../src/interface.c:790
msgid "_View"
msgstr "_Visualitza"
#: ../src/dialogs.c:151
-msgid ""
-"Opens the file in read-only mode. If you choose more than one file to open, "
-"all files will be opened read-only."
-msgstr ""
-"Obre el fitxer en mode només lectura. Si trieu més d'un fitxer, tots seran "
-"oberts en aquest mode."
+msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only."
+msgstr "Obre el fitxer en mode només lectura. Si trieu més d'un fitxer, tots seran oberts en aquest mode."
#: ../src/dialogs.c:173
msgid "Detect by file extension"
msgstr "Detecta per l'extensió del fitxer"
-#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263
+#: ../src/dialogs.c:200
+#: ../src/interface.c:3651
+#: ../src/interface.c:5263
msgid "Detect from file"
msgstr "Detecta pel fitxer"
@@ -437,15 +434,10 @@
#: ../src/dialogs.c:290
msgid ""
-"Explicitly defines an encoding for the file, if it would not be detected. "
-"This is useful when you know that the encoding of a file cannot be detected "
-"correctly by Geany.\n"
-"Note if you choose multiple files, they will all be opened with the chosen "
-"encoding."
+"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n"
+"Note if you choose multiple files, they will all be opened with the chosen encoding."
msgstr ""
-"Defineix explícitament la codificació del fitxer, si aquesta no pot ser "
-"determinada. Açò és útil quan coneixes la codificació i Geany no la "
-"determina correctament.\n"
+"Defineix explícitament la codificació del fitxer, si aquesta no pot ser determinada. Açò és útil quan coneixes la codificació i Geany no la determina correctament.\n"
"Si trieu més d'un fitxer, tots s'obriran amb aquesta codificació."
#. line 2 with filetype combo
@@ -455,10 +447,8 @@
#: ../src/dialogs.c:307
msgid ""
-"Explicitly defines a filetype for the file, if it would not be detected by "
-"filename extension.\n"
-"Note if you choose multiple files, they will all be opened with the chosen "
-"filetype."
+"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n"
+"Note if you choose multiple files, they will all be opened with the chosen filetype."
msgstr ""
"Defineix explícitament el tipus de fitxer, si aquest no pot ser determinat.\n"
"Si trieu més d'un fitxer, tots s'obriran com a aquest tipus."
@@ -471,7 +461,8 @@
msgid "Filename already exists!"
msgstr "El nom del fitxer ja existeix!"
-#: ../src/dialogs.c:422 ../src/dialogs.c:552
+#: ../src/dialogs.c:422
+#: ../src/dialogs.c:552
msgid "Save File"
msgstr "Desa el Fitxer"
@@ -488,33 +479,34 @@
msgstr "_Obre un fitxer en una pestanya nova"
#: ../src/dialogs.c:442
-msgid ""
-"Keep the current unsaved document open and open the newly saved file in a "
-"new tab"
-msgstr ""
-"Mantingues el document actual sense desar i obre el fitxer desat en una "
-"pestanya nova."
+msgid "Keep the current unsaved document open and open the newly saved file in a new tab"
+msgstr "Mantingues el document actual sense desar i obre el fitxer desat en una pestanya nova."
-#: ../src/dialogs.c:570 ../src/win32.c:681
+#: ../src/dialogs.c:570
+#: ../src/win32.c:681
msgid "Error"
msgstr "Error"
-#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687
+#: ../src/dialogs.c:573
+#: ../src/dialogs.c:1443
+#: ../src/win32.c:687
#: ../src/win32.c:746
msgid "Question"
msgstr "Pregunta"
-#: ../src/dialogs.c:576 ../src/win32.c:693
+#: ../src/dialogs.c:576
+#: ../src/win32.c:693
msgid "Warning"
msgstr "Advertència"
-#: ../src/dialogs.c:579 ../src/win32.c:699
+#: ../src/dialogs.c:579
+#: ../src/win32.c:699
msgid "Information"
msgstr "Informació"
#: ../src/dialogs.c:660
msgid "_Don't save"
-msgstr "_No desis"
+msgstr "_No deseu"
#: ../src/dialogs.c:691
#, c-format
@@ -530,21 +522,24 @@
msgstr "Tria la font"
#: ../src/dialogs.c:1057
-msgid ""
-"An error occurred or file information could not be retrieved (e.g. from a "
-"new file)."
-msgstr ""
-"S'ha produït un error o no es pot accedir a la informació del fitxer (p.e. "
-"d'un fitxer nou)."
+msgid "An error occurred or file information could not be retrieved (e.g. from a new file)."
+msgstr "S'ha produït un error o no es pot accedir a la informació del fitxer (p.e. d'un fitxer nou)."
-#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078
-#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086
-#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797
+#: ../src/dialogs.c:1076
+#: ../src/dialogs.c:1077
+#: ../src/dialogs.c:1078
+#: ../src/dialogs.c:1084
+#: ../src/dialogs.c:1085
+#: ../src/dialogs.c:1086
+#: ../src/symbols.c:1724
+#: ../src/symbols.c:1745
+#: ../src/symbols.c:1797
#: ../src/ui_utils.c:222
msgid "unknown"
msgstr "desconegut"
-#: ../src/dialogs.c:1091 ../src/symbols.c:800
+#: ../src/dialogs.c:1091
+#: ../src/symbols.c:800
msgid "Properties"
msgstr "Propietats"
@@ -573,7 +568,8 @@
msgstr "<b>Codificació:</b>"
#. BOM = byte order mark
-#: ../src/dialogs.c:1190 ../src/ui_utils.c:225
+#: ../src/dialogs.c:1190
+#: ../src/ui_utils.c:225
msgid "(with BOM)"
msgstr "(amb BOM)"
@@ -635,7 +631,8 @@
msgid "New file \"%s\" opened."
msgstr "S'ha obert el fitxer nou \"%s\"."
-#: ../src/document.c:948 ../src/document.c:1464
+#: ../src/document.c:948
+#: ../src/document.c:1464
#, c-format
msgid "Could not open file %s (%s)"
msgstr "No s'ha pogut obrir el fitxer %s (%s)"
@@ -643,14 +640,10 @@
#: ../src/document.c:978
#, c-format
msgid ""
-"The file \"%s\" could not be opened properly and has been truncated. This "
-"can occur if the file contains a NULL byte. Be aware that saving it can "
-"cause data loss.\n"
+"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n"
"The file was set to read-only."
msgstr ""
-"El fitxer \"%s\" no es pot obrir i ha quedat truncat. Açò pot passar si el "
-"fitxer conté un byte NULL. Aneu amb compte, si el guardeu es poden perdre "
-"dades.\n"
+"El fitxer \"%s\" no es pot obrir i ha quedat truncat. Açò pot passar si el fitxer conté un byte NULL. Aneu amb compte, si el guardeu es poden perdre dades.\n"
"El fitxer s'ha posat en mode només lectura."
#. For translators: the second wildcard is an encoding name, e.g.
@@ -662,12 +655,8 @@
#: ../src/document.c:1014
#, c-format
-msgid ""
-"The file \"%s\" does not look like a text file or the file encoding is not "
-"supported."
-msgstr ""
-"El fitxer \"%s\" no sembla un fitxer de text o la codificació no està "
-"suportada."
+msgid "The file \"%s\" does not look like a text file or the file encoding is not supported."
+msgstr "El fitxer \"%s\" no sembla un fitxer de text o la codificació no està suportada."
#: ../src/document.c:1163
msgid "Spaces"
@@ -715,12 +704,8 @@
#: ../src/document.c:1643
#, c-format
-msgid ""
-"An error occurred while converting the file from UTF-8 in \"%s\". The file "
-"remains unsaved."
-msgstr ""
-"S'ha produït un error en convertir el fitxer de UTF-8 a \"%s\". El fitxer no "
-"s'ha desat."
+msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved."
+msgstr "S'ha produït un error en convertir el fitxer de UTF-8 a \"%s\". El fitxer no s'ha desat."
#: ../src/document.c:1665
#, c-format
@@ -736,7 +721,8 @@
msgid "Error message: %s."
msgstr "Missatge d'error: %s."
-#: ../src/document.c:1770 ../src/document.c:1833
+#: ../src/document.c:1770
+#: ../src/document.c:1833
msgid "Error saving file."
msgstr "S'ha produït un error en desar el fitxer."
@@ -750,7 +736,9 @@
msgid "File %s saved."
msgstr "S'ha desat el fitxer %s."
-#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990
+#: ../src/document.c:1925
+#: ../src/document.c:1982
+#: ../src/document.c:1990
#, c-format
msgid "\"%s\" was not found."
msgstr "No s'ha trobat \"%s\""
@@ -759,13 +747,17 @@
msgid "Wrap search and find again?"
msgstr "Tornar a començar la cerca des del principi?"
-#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171
-#: ../src/search.c:1875 ../src/search.c:1876
+#: ../src/document.c:2069
+#: ../src/search.c:1127
+#: ../src/search.c:1171
+#: ../src/search.c:1875
+#: ../src/search.c:1876
#, c-format
msgid "No matches found for \"%s\"."
msgstr "No s'ha trobat '%s'."
-#: ../src/document.c:2080 ../src/document.c:2089
+#: ../src/document.c:2080
+#: ../src/document.c:2089
#, c-format
msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"."
msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"."
@@ -787,12 +779,12 @@
#: ../src/document.c:2915
msgid "Close _without saving"
-msgstr ""
+msgstr "Tanca _sense desar"
#: ../src/document.c:2919
-#, fuzzy, c-format
+#, c-format
msgid "File \"%s\" was not found on disk! Try to resave the file?"
-msgstr "No s'ha trobat \"%s\" al disc!"
+msgstr "No s'ha trobat el fitxer \"%s\" al disc! Tornem a desar el fitxer?"
#: ../src/editor.c:4425
msgid "Enter Tab Width"
@@ -800,19 +792,19 @@
#: ../src/editor.c:4426
msgid "Enter the amount of spaces which should be replaced by a tab character."
-msgstr ""
-"Introdueix la quantitat d'espais que s'ha de reemplaçar amb una tabulació."
+msgstr "Introdueix la quantitat d'espais que s'ha de reemplaçar amb una tabulació."
#: ../src/editor.c:4577
#, c-format
msgid "Warning: non-standard hard tab width: %d != 8!"
-msgstr ""
+msgstr "Advertència: amplada de tabulació no estàndard: %d != 8!"
#: ../src/encodings.c:76
msgid "Celtic"
msgstr "Celta"
-#: ../src/encodings.c:77 ../src/encodings.c:78
+#: ../src/encodings.c:77
+#: ../src/encodings.c:78
msgid "Greek"
msgstr "Grec"
@@ -824,22 +816,31 @@
msgid "South European"
msgstr "Sudeuropeu"
-#: ../src/encodings.c:81 ../src/encodings.c:82 ../src/encodings.c:83
+#: ../src/encodings.c:81
+#: ../src/encodings.c:82
+#: ../src/encodings.c:83
#: ../src/encodings.c:84
msgid "Western"
msgstr "Occidental"
-#: ../src/encodings.c:86 ../src/encodings.c:87 ../src/encodings.c:88
+#: ../src/encodings.c:86
+#: ../src/encodings.c:87
+#: ../src/encodings.c:88
msgid "Baltic"
msgstr "Bàltic"
-#: ../src/encodings.c:89 ../src/encodings.c:90 ../src/encodings.c:91
+#: ../src/encodings.c:89
+#: ../src/encodings.c:90
+#: ../src/encodings.c:91
msgid "Central European"
msgstr "Centreeuropeu"
#. ISO-IR-111 not available on Windows
-#: ../src/encodings.c:92 ../src/encodings.c:93 ../src/encodings.c:95
-#: ../src/encodings.c:96 ../src/encodings.c:97
+#: ../src/encodings.c:92
+#: ../src/encodings.c:93
+#: ../src/encodings.c:95
+#: ../src/encodings.c:96
+#: ../src/encodings.c:97
msgid "Cyrillic"
msgstr "Ciríl·lic"
@@ -855,12 +856,16 @@
msgid "Romanian"
msgstr "Romanès"
-#: ../src/encodings.c:102 ../src/encodings.c:103 ../src/encodings.c:104
+#: ../src/encodings.c:102
+#: ../src/encodings.c:103
+#: ../src/encodings.c:104
msgid "Arabic"
msgstr "Àrab"
#. not available at all, ?
-#: ../src/encodings.c:105 ../src/encodings.c:107 ../src/encodings.c:108
+#: ../src/encodings.c:105
+#: ../src/encodings.c:107
+#: ../src/encodings.c:108
msgid "Hebrew"
msgstr "Hebreu"
@@ -880,36 +885,53 @@
msgid "Thai"
msgstr "Thai"
-#: ../src/encodings.c:114 ../src/encodings.c:115 ../src/encodings.c:116
+#: ../src/encodings.c:114
+#: ../src/encodings.c:115
+#: ../src/encodings.c:116
msgid "Turkish"
msgstr "Turc"
-#: ../src/encodings.c:117 ../src/encodings.c:118 ../src/encodings.c:119
+#: ../src/encodings.c:117
+#: ../src/encodings.c:118
+#: ../src/encodings.c:119
msgid "Vietnamese"
msgstr "Vietnamita"
-#: ../src/encodings.c:121 ../src/encodings.c:122 ../src/encodings.c:123
-#: ../src/encodings.c:124 ../src/encodings.c:125 ../src/encodings.c:126
-#: ../src/encodings.c:127 ../src/encodings.c:128
+#: ../src/encodings.c:121
+#: ../src/encodings.c:122
+#: ../src/encodings.c:123
+#: ../src/encodings.c:124
+#: ../src/encodings.c:125
+#: ../src/encodings.c:126
+#: ../src/encodings.c:127
+#: ../src/encodings.c:128
msgid "Unicode"
msgstr "Unicode"
#. maybe not available on Linux
-#: ../src/encodings.c:130 ../src/encodings.c:131 ../src/encodings.c:132
+#: ../src/encodings.c:130
+#: ../src/encodings.c:131
+#: ../src/encodings.c:132
#: ../src/encodings.c:134
msgid "Chinese Simplified"
msgstr "Xinès simplificat"
-#: ../src/encodings.c:135 ../src/encodings.c:136 ../src/encodings.c:137
+#: ../src/encodings.c:135
+#: ../src/encodings.c:136
+#: ../src/encodings.c:137
msgid "Chinese Traditional"
msgstr "Xinès tradicional"
-#: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140
+#: ../src/encodings.c:138
+#: ../src/encodings.c:139
+#: ../src/encodings.c:140
#: ../src/encodings.c:141
msgid "Japanese"
msgstr "Japonès"
-#: ../src/encodings.c:142 ../src/encodings.c:143 ../src/encodings.c:144
+#: ../src/encodings.c:142
+#: ../src/encodings.c:143
+#: ../src/encodings.c:144
#: ../src/encodings.c:145
msgid "Korean"
msgstr "Coreà"
@@ -942,8 +964,11 @@
msgid "_Unicode"
msgstr "_Unicode"
-#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231
-#: ../src/filetypes.c:242 ../src/filetypes.c:264
+#: ../src/filetypes.c:101
+#: ../src/filetypes.c:209
+#: ../src/filetypes.c:231
+#: ../src/filetypes.c:242
+#: ../src/filetypes.c:264
#, c-format
msgid "%s source file"
msgstr "Codi font %s"
@@ -953,7 +978,9 @@
msgid "%s file"
msgstr "fitxer %s"
-#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594
+#: ../src/filetypes.c:118
+#: ../src/filetypes.c:119
+#: ../src/interface.c:3594
#: ../src/interface.c:5206
msgid "None"
msgstr "Cap"
@@ -1008,17 +1035,20 @@
msgstr "Llenguatges _Diversos"
#: ../src/filetypes.c:830
-#, fuzzy
msgid "_Custom Filetypes"
-msgstr "Indica el _Tipus del Fitxer"
+msgstr "Tipus del Fitxer _Predeterminat"
-#: ../src/filetypes.c:1403 ../src/win32.c:105
+#: ../src/filetypes.c:1403
+#: ../src/win32.c:105
msgid "All Source"
msgstr "Tot Codi Font"
#. create meta file filter "All files"
-#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95
-#: ../src/win32.c:143 ../src/win32.c:145
+#: ../src/filetypes.c:1428
+#: ../src/project.c:285
+#: ../src/win32.c:95
+#: ../src/win32.c:143
+#: ../src/win32.c:145
msgid "All files"
msgstr "Tots els fitxers"
@@ -1031,20 +1061,21 @@
msgid "untitled"
msgstr "sense títol"
-#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165
+#: ../src/highlighting.c:3349
+#: ../src/main.c:802
+#: ../src/socket.c:165
#: ../src/templates.c:384
#, c-format
msgid "Could not find file '%s'."
msgstr "No s'ha pogut trobar el fitxer '%s'."
#: ../src/highlighting.c:3398
-#, fuzzy
msgid "_Color Schemes"
-msgstr "Selector de _Color"
+msgstr "Esquemes de _Color"
#: ../src/highlighting.c:3405
msgid "_Default"
-msgstr ""
+msgstr "_Predeterminat"
#: ../src/interface.c:295
msgid "_File"
@@ -1054,7 +1085,8 @@
msgid "New (with _Template)"
msgstr "Nou (des de plan_tilla)"
-#: ../src/interface.c:323 ../src/interface.c:2022
+#: ../src/interface.c:323
+#: ../src/interface.c:2022
msgid "Open Selected F_ile"
msgstr "Obre el F_itxer Seleccionat"
@@ -1070,9 +1102,14 @@
msgid "R_eload As"
msgstr "Ac_tualitza com a..."
-#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682
-#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960
-#: ../src/interface.c:2090 ../src/interface.c:2104
+#: ../src/interface.c:371
+#: ../src/interface.c:553
+#: ../src/interface.c:682
+#: ../src/interface.c:696
+#: ../src/interface.c:950
+#: ../src/interface.c:960
+#: ../src/interface.c:2090
+#: ../src/interface.c:2104
msgid "invisible"
msgstr "invisible"
@@ -1080,11 +1117,13 @@
msgid "Page Set_up"
msgstr "_Configuració de la pàgina"
-#: ../src/interface.c:405 ../src/notebook.c:214
+#: ../src/interface.c:405
+#: ../src/notebook.c:214
msgid "Close Ot_her Documents"
msgstr "Tanca Altres _Documents"
-#: ../src/interface.c:413 ../src/notebook.c:219
+#: ../src/interface.c:413
+#: ../src/notebook.c:219
msgid "C_lose All"
msgstr "_Tanca-ho Tot"
@@ -1092,22 +1131,25 @@
msgid "_Edit"
msgstr "_Edita"
-#: ../src/interface.c:480 ../src/interface.c:2031
+#: ../src/interface.c:480
+#: ../src/interface.c:2031
msgid "_Format"
msgstr "_Formata"
-#: ../src/interface.c:487 ../src/keybindings.c:372
+#: ../src/interface.c:487
+#: ../src/keybindings.c:372
+#, fuzzy
msgid "_Reflow Lines/Block"
-msgstr ""
+msgstr "_Reflow Lines/Block"
#: ../src/interface.c:491
msgid "T_oggle Case of Selection"
msgstr "C_anvia la Caixa de la Selecció"
-#: ../src/interface.c:495 ../src/keybindings.c:277
-#, fuzzy
+#: ../src/interface.c:495
+#: ../src/keybindings.c:277
msgid "_Transpose Current Line"
-msgstr "Transposa la línia(es) actual"
+msgstr "_Transposa la Línia(es) Actual"
#: ../src/interface.c:504
msgid "_Comment Line(s)"
@@ -1129,102 +1171,112 @@
msgid "_Decrease Indent"
msgstr "_Redueix el Sagnat"
-#: ../src/interface.c:537 ../src/keybindings.c:361
-#, fuzzy
+#: ../src/interface.c:537
+#: ../src/keybindings.c:361
msgid "_Smart Line Indent"
-msgstr "Sagnat de línia \"intel·ligent\""
+msgstr "_Sagnat de Línia Intel·ligent"
#: ../src/interface.c:546
msgid "_Send Selection to"
msgstr "_Envia la Selecció a..."
-#: ../src/interface.c:556 ../src/interface.c:2035
-#, fuzzy
+#: ../src/interface.c:556
+#: ../src/interface.c:2035
msgid "_Commands"
-msgstr "Ordre"
+msgstr "_Ordres"
-#: ../src/interface.c:563 ../src/keybindings.c:318
-#, fuzzy
+#: ../src/interface.c:563
+#: ../src/keybindings.c:318
msgid "_Cut Current Line(s)"
-msgstr "Talla la línia(es) actual"
+msgstr "_Talla la Línia(es) Actual"
-#: ../src/interface.c:571 ../src/keybindings.c:315
-#, fuzzy
+#: ../src/interface.c:571
+#: ../src/keybindings.c:315
msgid "_Copy Current Line(s)"
-msgstr "Copia la línia(es) actual"
+msgstr "_Copia la Línia(es) Actual"
-#: ../src/interface.c:579 ../src/keybindings.c:270
-#, fuzzy
+#: ../src/interface.c:579
+#: ../src/keybindings.c:270
msgid "_Delete Current Line(s)"
-msgstr "Suprimeix la línia(es) actual"
+msgstr "_Suprimeix la Línia(es) Actual"
-#: ../src/interface.c:583 ../src/keybindings.c:267
-#, fuzzy
+#: ../src/interface.c:583
+#: ../src/keybindings.c:267
msgid "_Duplicate Line or Selection"
msgstr "Du_plica la Línia o Selecció"
-#: ../src/interface.c:592 ../src/keybindings.c:328
-#, fuzzy
+#: ../src/interface.c:592
+#: ../src/keybindings.c:328
msgid "_Select Current Line(s)"
-msgstr "Selecciona la línia(es) actual"
+msgstr "_Selecciona la Línia(es) Actual"
-#: ../src/interface.c:596 ../src/keybindings.c:331
-#, fuzzy
+#: ../src/interface.c:596
+#: ../src/keybindings.c:331
msgid "_Select Current Paragraph"
-msgstr "Selecciona el paràgraf actual"
+msgstr "_Selecciona el Paràgraf Actual"
-#: ../src/interface.c:605 ../src/keybindings.c:381
-#, fuzzy
+#: ../src/interface.c:605
+#: ../src/keybindings.c:381
msgid "_Insert Alternative White Space"
-msgstr "Insereix espai en blanc alternatiu"
+msgstr "_Insereix Espai en Blanc Alternatiu"
-#: ../src/interface.c:614 ../src/keybindings.c:437
-#, fuzzy
+#: ../src/interface.c:614
+#: ../src/keybindings.c:437
msgid "_Go to Next Marker"
-msgstr "Ves a la marca següent"
+msgstr "Ves a la Marca _Següent"
-#: ../src/interface.c:618 ../src/keybindings.c:440
-#, fuzzy
+#: ../src/interface.c:618
+#: ../src/keybindings.c:440
msgid "_Go to Previous Marker"
-msgstr "Ves a la marca anterior"
+msgstr "Ves a la Marca _Anterior"
-#: ../src/interface.c:627 ../src/keybindings.c:370
+#: ../src/interface.c:627
+#: ../src/keybindings.c:370
msgid "_Send Selection to Terminal"
msgstr "_Envia la Selecció al Terminal"
-#: ../src/interface.c:636 ../src/interface.c:2044
+#: ../src/interface.c:636
+#: ../src/interface.c:2044
msgid "I_nsert Comments"
msgstr "I_nsereix Comentari"
-#: ../src/interface.c:647 ../src/interface.c:2055
+#: ../src/interface.c:647
+#: ../src/interface.c:2055
msgid "Insert _ChangeLog Entry"
msgstr "Insereix Entrada al _ChangeLog"
-#: ../src/interface.c:651 ../src/interface.c:2059
+#: ../src/interface.c:651
+#: ../src/interface.c:2059
msgid "Insert File _Header"
msgstr "Insereix C_apçalera de Fitxer"
-#: ../src/interface.c:655 ../src/interface.c:2063
+#: ../src/interface.c:655
+#: ../src/interface.c:2063
msgid "Insert _Function Description"
msgstr "Insereix Descripció de la _Funció"
-#: ../src/interface.c:659 ../src/interface.c:2067
+#: ../src/interface.c:659
+#: ../src/interface.c:2067
msgid "Insert _Multiline Comment"
msgstr "Insereix Comentari _Multilínia"
-#: ../src/interface.c:663 ../src/interface.c:2071
+#: ../src/interface.c:663
+#: ../src/interface.c:2071
msgid "Insert _GPL Notice"
msgstr "Insereix Text _GPL"
-#: ../src/interface.c:667 ../src/interface.c:2075
+#: ../src/interface.c:667
+#: ../src/interface.c:2075
msgid "Insert _BSD License Notice"
msgstr "Insereix Text de Llicència _BSD"
-#: ../src/interface.c:671 ../src/interface.c:2079
+#: ../src/interface.c:671
+#: ../src/interface.c:2079
msgid "Insert Dat_e"
msgstr "Insereix _Data"
-#: ../src/interface.c:685 ../src/interface.c:2093
+#: ../src/interface.c:685
+#: ../src/interface.c:2093
msgid "_Insert \"include <...>\""
msgstr "_Insereix \"include <...>\""
@@ -1232,10 +1284,10 @@
msgid "Preference_s"
msgstr "Preferèncie_s"
-#: ../src/interface.c:712 ../src/keybindings.c:390
-#, fuzzy
+#: ../src/interface.c:712
+#: ../src/keybindings.c:390
msgid "P_lugin Preferences"
-msgstr "Preferències"
+msgstr "_Preferències dels Plugins"
#: ../src/interface.c:720
msgid "_Search"
@@ -1253,7 +1305,8 @@
msgid "Find in F_iles"
msgstr "Cerca en els F_itxers"
-#: ../src/interface.c:743 ../src/search.c:551
+#: ../src/interface.c:743
+#: ../src/search.c:551
msgid "_Replace"
msgstr "_Reemplaça"
@@ -1273,7 +1326,8 @@
msgid "Pr_evious Message"
msgstr "Missatge _Anterior"
-#: ../src/interface.c:782 ../src/interface.c:2145
+#: ../src/interface.c:782
+#: ../src/interface.c:2145
msgid "_Go to Line"
msgstr "_Vés a la Línia"
@@ -1301,8 +1355,11 @@
msgid "Show Side_bar"
msgstr "Mostra la _Barra Lateral"
-#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347
-#: ../src/keybindings.c:260 ../src/prefs.c:1531
+#: ../src/interface.c:833
+#: ../src/interface.c:4025
+#: ../src/interface.c:5347
+#: ../src/keybindings.c:260
+#: ../src/prefs.c:1531
msgid "Editor"
msgstr "Editor"
@@ -1346,15 +1403,21 @@
msgid "In_dent Type"
msgstr "Tipus de Sagnat"
-#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245
+#: ../src/interface.c:907
+#: ../src/interface.c:3633
+#: ../src/interface.c:5245
msgid "_Tabs"
msgstr "_Tabulacions"
-#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236
+#: ../src/interface.c:913
+#: ../src/interface.c:3624
+#: ../src/interface.c:5236
msgid "_Spaces"
msgstr "E_spais"
-#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254
+#: ../src/interface.c:919
+#: ../src/interface.c:3642
+#: ../src/interface.c:5254
msgid "T_abs and Spaces"
msgstr "T_abulacions i Espais"
@@ -1462,7 +1525,8 @@
msgid "Load Ta_gs"
msgstr "Carrega _Etiquetes"
-#: ../src/interface.c:1123 ../src/interface.c:1130
+#: ../src/interface.c:1123
+#: ../src/interface.c:1130
msgid "_Help"
msgstr "A_juda"
@@ -1478,7 +1542,8 @@
msgid "_Debug Messages"
msgstr "Missatges de _Depuració"
-#: ../src/interface.c:1185 ../src/sidebar.c:130
+#: ../src/interface.c:1185
+#: ../src/sidebar.c:130
msgid "Symbols"
msgstr "Símbols"
@@ -1503,9 +1568,8 @@
msgstr "Notes"
#: ../src/interface.c:1887
-#, fuzzy
msgid "_Toolbar Preferences"
-msgstr "Preferències"
+msgstr "Preferències de la _Barra d'Eines"
#: ../src/interface.c:1900
msgid "_Hide Toolbar"
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list