Commits June 2006

commits@lists.geany.org

3 participants
126 discussions

SF.net SVN: geany: [421] trunk
by ntrel＠users.sourceforge.net 07 Jun '06

07 Jun '06

Revision: 421 Author: ntrel Date: 2006-06-07 14:24:15 -0700 (Wed, 07 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=421&view=rev Log Message: ----------- Fix bug with Go to tag defn/decl when the filename is a link (TagManager dereferences linked filenames) Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/document.c trunk/src/document.h trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-07 19:25:20 UTC (rev 420) +++ trunk/ChangeLog 2006-06-07 21:24:15 UTC (rev 421) @@ -5,6 +5,9 @@ * src/callbacks.c, src/sciwrappers.c, src/sciwrappers.h: Use the character position under the mouse click for Go to definition/declaration and for overridden middle click text paste. + * src/utils.c, src/utils.h, src/callbacks.c, src/document.c, + src/document.h: Fix bug with Go to tag defn/decl when the filename + is a link (TagManager dereferences linked filenames) 2006-06-06 Enrico Troeger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-07 19:25:20 UTC (rev 420) +++ trunk/src/callbacks.c 2006-06-07 21:24:15 UTC (rev 421) @@ -1318,6 +1318,7 @@ { if (! utils_goto_workspace_tag( TM_TAG(tags->pdata[i])->atts.entry.file->work_object.file_name, + TRUE, TM_TAG(tags->pdata[i])->atts.entry.line)) { utils_beep(); @@ -1372,7 +1373,7 @@ gtk_tree_model_get(model, &iter, 0, &line, 1, &file, -1); if (file && strlen (file) > 0) { - utils_goto_workspace_tag(file, line); + utils_goto_workspace_tag(file, FALSE, line); } g_free(file); } Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-06-07 19:25:20 UTC (rev 420) +++ trunk/src/document.c 2006-06-07 21:24:15 UTC (rev 421) @@ -54,8 +54,10 @@ -/* returns the index of the notebook page which has the given filename */ -gint document_find_by_filename(const gchar *filename) +/* returns the index of the notebook page which has the given filename + * is_tm_filename is needed when passing TagManager filenames because they are + * dereferenced, and would not match the link filename. */ +gint document_find_by_filename(const gchar *filename, gboolean is_tm_filename) { guint i; @@ -63,11 +65,13 @@ for(i = 0; i < GEANY_MAX_OPEN_FILES; i++) { + gchar *dl_fname = (is_tm_filename) ? doc_list[i].tm_file->file_name : + doc_list[i].file_name; #ifdef GEANY_WIN32 // ignore the case of filenames and paths under WIN32, causes errors if not - if (doc_list[i].file_name && ! strcasecmp(doc_list[i].file_name, filename)) return i; + if (dl_fname && ! strcasecmp(dl_fname, filename)) return i; #else - if (doc_list[i].file_name && utils_strcmp(doc_list[i].file_name, filename)) return i; + if (dl_fname && utils_strcmp(dl_fname, filename)) return i; #endif } return -1; @@ -439,7 +443,7 @@ } // if file is already open, switch to it and go - idx = document_find_by_filename(utf8_filename); + idx = document_find_by_filename(utf8_filename, FALSE); if (idx >= 0) { gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2006-06-07 19:25:20 UTC (rev 420) +++ trunk/src/document.h 2006-06-07 21:24:15 UTC (rev 421) @@ -26,7 +26,7 @@ /* returns the index of the notebook page which has the given filename */ -gint document_find_by_filename(const gchar*); +gint document_find_by_filename(const gchar*, gboolean is_tm_filename); /* returns the index of the notebook page which has sci */ Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-06-07 19:25:20 UTC (rev 420) +++ trunk/src/utils.c 2006-06-07 21:24:15 UTC (rev 421) @@ -457,10 +457,10 @@ } -gboolean utils_goto_workspace_tag(const gchar *file, gint line) +gboolean utils_goto_workspace_tag(const gchar *file, gboolean is_tm_filename, gint line) { gint page_num; - gint file_idx = document_find_by_filename(file); + gint file_idx = document_find_by_filename(file, is_tm_filename); gboolean ret; if (file_idx < 0) return FALSE; Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2006-06-07 19:25:20 UTC (rev 420) +++ trunk/src/utils.h 2006-06-07 21:24:15 UTC (rev 421) @@ -59,7 +59,7 @@ gint utils_get_local_tag(gint idx, const gchar *qual_name); -gboolean utils_goto_workspace_tag(const gchar *file, gint line); +gboolean utils_goto_workspace_tag(const gchar *file, gboolean is_tm_filename, gint line); gboolean utils_goto_line(gint idx, gint line); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [420] trunk
by ntrel＠users.sourceforge.net 07 Jun '06

07 Jun '06

Revision: 420 Author: ntrel Date: 2006-06-07 12:25:20 -0700 (Wed, 07 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=420&view=rev Log Message: ----------- Use the character position under the mouse click for Go to definition/declaration and for overridden middle click text paste Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/sciwrappers.c trunk/src/sciwrappers.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-07 16:50:41 UTC (rev 419) +++ trunk/ChangeLog 2006-06-07 19:25:20 UTC (rev 420) @@ -2,6 +2,9 @@ * src/callbacks.c: Fixed segfault when inserting comments and no filetype is set. + * src/callbacks.c, src/sciwrappers.c, src/sciwrappers.h: + Use the character position under the mouse click for Go to + definition/declaration and for overridden middle click text paste. 2006-06-06 Enrico Troeger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-07 16:50:41 UTC (rev 419) +++ trunk/src/callbacks.c 2006-06-07 19:25:20 UTC (rev 420) @@ -964,11 +964,13 @@ GdkEventButton *event, gpointer user_data) { + gint idx = GPOINTER_TO_INT(user_data); + gint clickpos = sci_get_position_from_xy(doc_list[idx].sci, event->x, event->y, FALSE); #ifndef GEANY_WIN32 if (event->button == 1) { - utils_check_disk_status(GPOINTER_TO_INT(user_data)); + utils_check_disk_status(idx); } #endif @@ -979,12 +981,11 @@ if (gtk_clipboard_wait_is_text_available(cp)) { - gint idx = document_get_cur_idx(); gchar *text = gtk_clipboard_wait_for_text(cp); - if (idx >= 0 && text != NULL) + if (text != NULL) { - sci_add_text(doc_list[idx].sci, text); + sci_insert_text(doc_list[idx].sci, clickpos, text); g_free(text); return TRUE; } @@ -993,16 +994,12 @@ if (event->button == 3) { - /// TODO pos should possibly be the position of the mouse pointer instead of the - /// current sci position - gint pos = sci_get_current_position(doc_list[GPOINTER_TO_INT(user_data)].sci); + utils_find_current_word(doc_list[idx].sci, clickpos, + current_word, sizeof current_word); - utils_find_current_word(doc_list[GPOINTER_TO_INT(user_data)].sci, pos, - current_word, sizeof current_word); - utils_update_popup_goto_items((current_word[0] != '\0') ? TRUE : FALSE); - utils_update_popup_copy_items(GPOINTER_TO_INT(user_data)); - utils_update_insert_include_item(GPOINTER_TO_INT(user_data), 0); + utils_update_popup_copy_items(idx); + utils_update_insert_include_item(idx, 0); gtk_menu_popup(GTK_MENU(app->popup_menu), NULL, NULL, NULL, NULL, event->button, event->time); return TRUE; Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2006-06-07 16:50:41 UTC (rev 419) +++ trunk/src/sciwrappers.c 2006-06-07 19:25:20 UTC (rev 420) @@ -480,6 +480,13 @@ } +gint sci_get_position_from_xy(ScintillaObject* sci, gint x, gint y, gboolean nearby) +{ + // for nearby return -1 if there is no character near to the x,y point. + return SSM(sci, (nearby) ? SCI_POSITIONFROMPOINTCLOSE : SCI_POSITIONFROMPOINT, x, y); +} + + void sci_get_xy_from_position(ScintillaObject* sci,gint pos, gint* x, gint* y) { *x = SSM(sci, SCI_POINTXFROMPOSITION,0, (int) pos); Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2006-06-07 16:50:41 UTC (rev 419) +++ trunk/src/sciwrappers.h 2006-06-07 19:25:20 UTC (rev 420) @@ -81,6 +81,7 @@ gint sci_get_line_length (ScintillaObject* sci, gint line); gint sci_get_line_count ( ScintillaObject* sci ); void sci_get_xy_from_position (ScintillaObject* sci,gint pos, gint* x, gint* y); +gint sci_get_position_from_xy (ScintillaObject* sci, gint x, gint y, gboolean nearby); void sci_set_undo_collection (ScintillaObject* sci, gboolean set); gboolean sci_get_undo_collection (ScintillaObject* sci); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [419] trunk
by ntrel＠users.sourceforge.net 07 Jun '06

07 Jun '06

Revision: 419 Author: ntrel Date: 2006-06-07 09:50:41 -0700 (Wed, 07 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=419&view=rev Log Message: ----------- Fixed segfault when inserting comments and no filetype is set Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-06 19:06:38 UTC (rev 418) +++ trunk/ChangeLog 2006-06-07 16:50:41 UTC (rev 419) @@ -1,3 +1,9 @@ +2006-06-07 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/callbacks.c: Fixed segfault when inserting comments and no + filetype is set. + + 2006-06-06 Enrico Troeger <enrico.troeger(a)uvena.de> * src/highlighting.c: enabled folding for markup filetypes @@ -9,7 +15,7 @@ * doc/geany.docbook: Added save current file behaviour when building. * src/sci_cb.c: Fix empty white box glitch with tag autocompletion, - also improves typing response efficiency. + also improves typing response efficiency. 2006-06-05 Enrico Troeger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-06 19:06:38 UTC (rev 418) +++ trunk/src/callbacks.c 2006-06-07 16:50:41 UTC (rev 419) @@ -2020,6 +2020,12 @@ gchar *cur_tag = NULL; gint line = -1, pos = 0; + if (doc_list[idx].file_type == NULL) + { + msgwin_status_add(_("Please set the filetype for the current file before using this function.")); + return; + } + if (doc_list[idx].file_type->id != GEANY_FILETYPES_JAVA && doc_list[idx].file_type->id != GEANY_FILETYPES_ALL) { @@ -2064,6 +2070,12 @@ gint idx = document_get_cur_idx(); gchar *text; + if (doc_list[idx].file_type == NULL) + { + msgwin_status_add(_("Please set the filetype for the current file before using this function.")); + return; + } + switch (doc_list[idx].file_type->id) { case GEANY_FILETYPES_PASCAL: @@ -2098,6 +2110,12 @@ gint idx = document_get_cur_idx(); gchar *text; + if (doc_list[idx].file_type == NULL) + { + msgwin_status_add(_("Please set the filetype for the current file before using this function.")); + return; + } + switch (doc_list[idx].file_type->id) { case GEANY_FILETYPES_PASCAL: @@ -2152,6 +2170,12 @@ gchar *text; gchar *ext = NULL; + if (doc_list[idx].file_type == NULL) + { + msgwin_status_add(_("Please set the filetype for the current file before using this function.")); + return; + } + if (doc_list[idx].file_name == NULL) ext = doc_list[idx].file_type->extension; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [418] trunk/src/callbacks.c
by eht16＠users.sourceforge.net 06 Jun '06

06 Jun '06

Revision: 418 Author: eht16 Date: 2006-06-06 12:06:38 -0700 (Tue, 06 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=418&view=rev Log Message: ----------- test own pasting code Modified Paths: -------------- trunk/src/callbacks.c Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-06 17:53:03 UTC (rev 417) +++ trunk/src/callbacks.c 2006-06-06 19:06:38 UTC (rev 418) @@ -972,8 +972,25 @@ } #endif - //if (event->type == GDK_2BUTTON_PRESS) geany_debug("double click"); + // experimental code to simulate pasting by middle mouse button + if (event->button == 2) + { + GtkClipboard *cp = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE)); + if (gtk_clipboard_wait_is_text_available(cp)) + { + gint idx = document_get_cur_idx(); + gchar *text = gtk_clipboard_wait_for_text(cp); + + if (idx >= 0 && text != NULL) + { + sci_add_text(doc_list[idx].sci, text); + g_free(text); + return TRUE; + } + } + } + if (event->button == 3) { /// TODO pos should possibly be the position of the mouse pointer instead of the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [417] trunk
by eht16＠users.sourceforge.net 06 Jun '06

06 Jun '06

Revision: 417 Author: eht16 Date: 2006-06-06 10:53:03 -0700 (Tue, 06 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=417&view=rev Log Message: ----------- updated FSF address in COPYING, replaced "Members" by "Methods" to make it clearer Modified Paths: -------------- trunk/COPYING trunk/ChangeLog trunk/src/treeviews.c Modified: trunk/COPYING =================================================================== --- trunk/COPYING 2006-06-06 17:23:27 UTC (rev 416) +++ trunk/COPYING 2006-06-06 17:53:03 UTC (rev 417) @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-06 17:23:27 UTC (rev 416) +++ trunk/ChangeLog 2006-06-06 17:53:03 UTC (rev 417) @@ -2,6 +2,7 @@ * src/highlighting.c: enabled folding for markup filetypes (HTML, XML, PHP, DocBook) + * src/treeviews.c: replaced "Members" by "Methods" to make it clearer 2006-06-05 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2006-06-06 17:23:27 UTC (rev 416) +++ trunk/src/treeviews.c 2006-06-06 17:53:03 UTC (rev 417) @@ -148,7 +148,7 @@ gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_class), NULL); gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_class), 0, _("Class"), -1); gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_member), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_member), 0, _("Members"), -1); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_member), 0, _("Methods"), -1); gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_macro), NULL); gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_macro), 0, _("Macro"), -1); gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_variable), NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [416] trunk
by eht16＠users.sourceforge.net 06 Jun '06

06 Jun '06

Revision: 416 Author: eht16 Date: 2006-06-06 10:23:27 -0700 (Tue, 06 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=416&view=rev Log Message: ----------- added Nick and Frank to AUTHORS, enabled folding for markup filetypes Modified Paths: -------------- trunk/AUTHORS trunk/ChangeLog trunk/src/highlighting.c Modified: trunk/AUTHORS =================================================================== --- trunk/AUTHORS 2006-06-06 16:38:19 UTC (rev 415) +++ trunk/AUTHORS 2006-06-06 17:23:27 UTC (rev 416) @@ -1 +1,3 @@ Enrico Troeger <enrico.troeger(a)uvena.de> +Nick Treleaven <nick.treleaven(a)btinternet.com> +Frank Lanitz <frank(a)frank.uvena.de> Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-06 16:38:19 UTC (rev 415) +++ trunk/ChangeLog 2006-06-06 17:23:27 UTC (rev 416) @@ -1,3 +1,9 @@ +2006-06-06 Enrico Troeger <enrico.troeger(a)uvena.de> + + * src/highlighting.c: enabled folding for markup filetypes + (HTML, XML, PHP, DocBook) + + 2006-06-05 Nick Treleaven <nick.treleaven(a)btinternet.com> * doc/geany.docbook: Added save current file behaviour when building. Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-06-06 16:38:19 UTC (rev 415) +++ trunk/src/highlighting.c 2006-06-06 17:23:27 UTC (rev 416) @@ -1070,6 +1070,9 @@ styleset_set_style(sci, SCE_HPHP_OPERATOR, GEANY_FILETYPES_XML, 40); styleset_set_style(sci, SCE_HPHP_HSTRING_VARIABLE, GEANY_FILETYPES_XML, 41); styleset_set_style(sci, SCE_HPHP_COMPLEX_VARIABLE, GEANY_FILETYPES_XML, 42); + + SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold.html", (sptr_t) "1"); + SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold.html.preprocessor", (sptr_t) "1"); } @@ -1649,6 +1652,9 @@ styleset_set_style(sci, SCE_H_SGML_BLOCK_DEFAULT, GEANY_FILETYPES_DOCBOOK, 26); styleset_set_style(sci, SCE_H_SGML_1ST_PARAM_COMMENT, GEANY_FILETYPES_DOCBOOK, 27); styleset_set_style(sci, SCE_H_SGML_ERROR, GEANY_FILETYPES_DOCBOOK, 28); + + SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold.html", (sptr_t) "1"); + SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold.html.preprocessor", (sptr_t) "1"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [415] trunk/po
by kretek＠users.sourceforge.net 06 Jun '06

06 Jun '06

Revision: 415 Author: kretek Date: 2006-06-06 09:38:19 -0700 (Tue, 06 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=415&view=rev Log Message: ----------- Minor changes: last version of strings Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po trunk/po/geany.pot Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2006-06-05 22:04:50 UTC (rev 414) +++ trunk/po/ChangeLog 2006-06-06 16:38:19 UTC (rev 415) @@ -1,3 +1,7 @@ +2006-06-06 Frank Lanitz <frank(a)frank.uvena.de> + * de.po: Minor update + * geany.pot: Minor update of strings + 2006-06-01 Frank Lanitz <frank(a)frank.uvena.de> * de.po: Update for final release of geany 0.7 Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2006-06-05 22:04:50 UTC (rev 414) +++ trunk/po/de.po 2006-06-06 16:38:19 UTC (rev 415) @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: geany 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-29 23:47+0200\n" -"PO-Revision-Date: 2006-06-01 15:48+0100\n" +"POT-Creation-Date: 2006-06-06 17:58+0200\n" +"PO-Revision-Date: 2006-06-06 18:01+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <frank(a)frank.uvena.de>\n" "MIME-Version: 1.0\n" @@ -22,14 +22,10 @@ #: src/main.c:389 msgid "" -"Geany is exiting because a named pipe was found. Mostly this means, Geany is " -"already running. If you know Geany is not running, you can delete the file " -"and start Geany anyway.\n" +"Geany is exiting because a named pipe was found. Mostly this means, Geany is already running. If you know Geany is not running, you can delete the file and start Geany anyway.\n" "Delete the named pipe and start Geany?" msgstr "" -"Geany wird beendet, da ein FIFO (named pipe) gefunden wurde. Das bedeutet " -"meistens, dass Geany bereits läuft. Wenn Sie genau wissen, dass Geany nicht " -"läuft, können Sie die Datei löschen und Geany trotzdem starten.\n" +"Geany wird beendet, da ein FIFO (named pipe) gefunden wurde. Das bedeutet meistens, dass Geany bereits läuft. Wenn Sie genau wissen, dass Geany nicht läuft, können Sie die Datei löschen und Geany trotzdem starten.\n" "Die Datei löschen und Geany starten?" #: src/main.c:429 @@ -47,7 +43,8 @@ msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." -#: src/interface.c:210 src/interface.c:1171 +#: src/interface.c:210 +#: src/interface.c:1171 msgid "Geany" msgstr "Geany" @@ -59,12 +56,16 @@ msgid "New (with template)" msgstr "Neu (aus Vorlage)" -#: src/interface.c:242 src/interface.c:319 src/interface.c:384 -#: src/interface.c:607 src/interface.c:1556 +#: src/interface.c:242 +#: src/interface.c:319 +#: src/interface.c:384 +#: src/interface.c:607 +#: src/interface.c:1556 msgid "invisible" msgstr "invisible" -#: src/interface.c:267 src/interface.c:709 +#: src/interface.c:267 +#: src/interface.c:709 msgid "Save all" msgstr "Alle speichern" @@ -84,7 +85,8 @@ msgid "Recent files" msgstr "Zuletzt geöffnet" -#: src/interface.c:330 src/interface.c:819 +#: src/interface.c:330 +#: src/interface.c:819 msgid "Quit Geany" msgstr "Geany beenden" @@ -92,15 +94,18 @@ msgid "_Edit" msgstr "_Bearbeiten" -#: src/interface.c:373 src/interface.c:1545 +#: src/interface.c:373 +#: src/interface.c:1545 msgid "Insert \"include <...>\"" msgstr "\"include <...>\" einfügen" -#: src/interface.c:387 src/interface.c:1559 +#: src/interface.c:387 +#: src/interface.c:1559 msgid "Insert Comments" msgstr "Kommentare einfügen" -#: src/interface.c:398 src/interface.c:1570 +#: src/interface.c:398 +#: src/interface.c:1570 msgid "Insert ChangeLog entry" msgstr "ChangeLog-Eintrag hinzufügen" @@ -108,49 +113,58 @@ msgid "Inserts a typical ChangeLog entry in the current file" msgstr "Fügt einen typischen ChangeLog-Eintrag an den Anfang der Datei ein" -#: src/interface.c:403 src/interface.c:1575 +#: src/interface.c:403 +#: src/interface.c:1575 msgid "Insert file header" msgstr "Dateikopf einfügen" -#: src/interface.c:406 src/interface.c:1578 +#: src/interface.c:406 +#: src/interface.c:1578 msgid "Inserts a few information at the beginning of the file" msgstr "Fügt einen Dateiopf am Anfang einer neu erzeugten Datei ein" -#: src/interface.c:408 src/interface.c:1580 +#: src/interface.c:408 +#: src/interface.c:1580 msgid "Insert function description" msgstr "Funktionsbeschreibung einfügen" -#: src/interface.c:411 src/interface.c:1583 +#: src/interface.c:411 +#: src/interface.c:1583 msgid "Inserts a description before the current function" msgstr "Fügt eine Funktionsbeschreibung vor der Funktion ein." -#: src/interface.c:413 src/interface.c:1585 +#: src/interface.c:413 +#: src/interface.c:1585 msgid "Insert multiline comment" msgstr "Mehrzeiligen Kommentar einfügen" -#: src/interface.c:416 src/interface.c:1588 +#: src/interface.c:416 +#: src/interface.c:1588 msgid "Inserts a multiline comment" msgstr "Fügt einen mehrzeiligen Kommentar ein." -#: src/interface.c:418 src/interface.c:1590 +#: src/interface.c:418 +#: src/interface.c:1590 msgid "Insert GPL notice" msgstr "GPL-Hinweis am Dateianfang einfügen" -#: src/interface.c:421 src/interface.c:1593 +#: src/interface.c:421 +#: src/interface.c:1593 msgid "Inserts a GPL notice (should be done at the beginning of the file)" -msgstr "" -"Fügt einen kurzen Lizenz-Hinweis auf die GPL am Anfang einer neu erzeugten " -"Datei ein" +msgstr "Fügt einen kurzen Lizenz-Hinweis auf die GPL am Anfang einer neu erzeugten Datei ein" -#: src/interface.c:428 src/interface.c:1600 +#: src/interface.c:428 +#: src/interface.c:1600 msgid "Change Selection" msgstr "Auswahl verändern" -#: src/interface.c:435 src/interface.c:1607 +#: src/interface.c:435 +#: src/interface.c:1607 msgid "To lower-case" msgstr "In Kleinbuchstaben" -#: src/interface.c:439 src/interface.c:1611 +#: src/interface.c:439 +#: src/interface.c:1611 msgid "To upper-case" msgstr "In Großbuchstaben" @@ -159,12 +173,8 @@ msgstr "Wörter _zählen" #: src/interface.c:446 -msgid "" -"Counts the words and characters in the current selection or the whole " -"document" -msgstr "" -"Zählt die Wörter und Zeichen in der aktuellen Auswahl bzw. dem aktuellen " -"Dokument." +msgid "Counts the words and characters in the current selection or the whole document" +msgstr "Zählt die Wörter und Zeichen in der aktuellen Auswahl bzw. dem aktuellen Dokument." #: src/interface.c:457 msgid "_Search" @@ -178,7 +188,8 @@ msgid "Find _Previous" msgstr "_Vorheriges" -#: src/interface.c:476 src/dialogs.c:924 +#: src/interface.c:476 +#: src/dialogs.c:906 msgid "_Replace" msgstr "_Ersetzen" @@ -186,7 +197,8 @@ msgid "_Go to line" msgstr "Gehe zu _Zeile" -#: src/interface.c:497 src/dialogs.c:72 +#: src/interface.c:497 +#: src/dialogs.c:72 msgid "_View" msgstr "_Ansicht" @@ -202,11 +214,10 @@ msgid "Show Color Chooser" msgstr "Farb-Wähler öffnen" -#: src/interface.c:516 src/interface.c:749 -msgid "" -"Open a color chooser dialog, to interactively pick colors from a palette." -msgstr "" -"Öffnet einen Farbauswahl-Dialog zum Auswählen einer Farbe von einer Palette." +#: src/interface.c:516 +#: src/interface.c:749 +msgid "Open a color chooser dialog, to interactively pick colors from a palette." +msgstr "Öffnet einen Farbauswahl-Dialog zum Auswählen einer Farbe von einer Palette." #: src/interface.c:527 msgid "Fullscreen" @@ -218,8 +229,7 @@ #: src/interface.c:534 msgid "Toggle the window with status and compiler messages on and off" -msgstr "" -"Schaltet das Meldungsfenster(beinhaltet auch Compiler-Ausgaben) ein und aus." +msgstr "Schaltet das Meldungsfenster(beinhaltet auch Compiler-Ausgaben) ein und aus." #: src/interface.c:537 msgid "Show Toolbar" @@ -234,12 +244,8 @@ msgstr "Markierungsrand anzeigen" #: src/interface.c:546 -msgid "" -"Shows or hides the small margin right of the line numbers, which is used to " -"mark lines." -msgstr "" -"Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, der zum " -"Anzeigen von Markierungen genutzt wird." +msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines." +msgstr "Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, der zum Anzeigen von Markierungen genutzt wird." #: src/interface.c:549 msgid "Show Line Numbers" @@ -318,7 +324,8 @@ msgstr "Klappt alle ausgeblendeten Codeblöcke wieder aus" #. build the code -#: src/interface.c:654 src/dialogs.c:539 +#: src/interface.c:654 +#: src/dialogs.c:521 msgid "Build" msgstr "_Erstellen" @@ -370,7 +377,8 @@ msgid "Run" msgstr "Ausführen" -#: src/interface.c:738 src/dialogs.c:578 +#: src/interface.c:738 +#: src/dialogs.c:560 msgid "Run or view the current file" msgstr "Aktuelle Datei anzeigen oder ausführen" @@ -386,7 +394,8 @@ msgid "Zoom out the text" msgstr "Text verkleinern" -#: src/interface.c:776 src/interface.c:781 +#: src/interface.c:776 +#: src/interface.c:781 msgid "Find the entered text in the current file" msgstr "Findet den eingegebenen Text im aktuellen Dokument" @@ -398,11 +407,13 @@ msgid "Jump to the entered line number." msgstr "Springe zu angegebener Zeile" -#: src/interface.c:846 src/treeviews.c:40 +#: src/interface.c:846 +#: src/treeviews.c:40 msgid "Symbols" msgstr "Symbole" -#: src/interface.c:859 src/treeviews.c:180 +#: src/interface.c:859 +#: src/treeviews.c:180 msgid "Open files" msgstr "Geöffnete Dateien" @@ -462,7 +473,8 @@ msgid "Go to tag definition" msgstr "Gehe zu Tag Definition" -#: src/interface.c:1641 src/dialogs.c:781 +#: src/interface.c:1641 +#: src/dialogs.c:763 msgid "Go to line" msgstr "Gehe zu Zeile" @@ -479,8 +491,7 @@ msgstr "Anzahl der \"Zuletzt geöffneten\" Dateien" #: src/interface.c:1933 -msgid "" -"Specifies the number of files which are stored in the Recent files list." +msgid "Specifies the number of files which are stored in the Recent files list." msgstr "Gibt die Länge der Liste von Dateien an, die zuletzt geöffnet wurden." #: src/interface.c:1937 @@ -504,36 +515,24 @@ msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" #: src/interface.c:1954 -msgid "" -"Whether to beep if an error occured or when the compilation process has " -"finished." -msgstr "" -"Soll bei Fehlern oder beendeter Kompilierung ein Piepton ausgegeben werden?" +msgid "Whether to beep if an error occured or when the compilation process has finished." +msgstr "Soll bei Fehlern oder beendeter Kompilierung ein Piepton ausgegeben werden?" #: src/interface.c:1957 msgid "Switch to status message list at new message" msgstr "Wechsele zum Statusmeldungsfenster bei neuer Meldung" #: src/interface.c:1960 -msgid "" -"Switch to the status message tab(in the notebook window at the bottom) if a " -"new status message arrive." -msgstr "" -"Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn " -"eine neue Statusmeldung vorliegt." +msgid "Switch to the status message tab(in the notebook window at the bottom) if a new status message arrive." +msgstr "Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn eine neue Statusmeldung vorliegt." #: src/interface.c:1963 msgid "Load virtual terminal emulation at startup" -msgstr "Starte die virtual terminal emulation (VTE) beim Starten" +msgstr "Starte die Virtual Terminal Emulation beim Starten" #: src/interface.c:1965 -msgid "" -"Whether the virtual terminal emulation(VTE) should be loaded at startup. " -"Disable it if you do not need it." -msgstr "" -"Stellt ein, ob die virtual terminal emulation (VTE) beim Starten geladen " -"werden soll oder nicht. Wenn sie nicht benötigt wird, sollte dieser Punkt " -"deaktiviert werden" +msgid "Whether the virtual terminal emulation(VTE) should be loaded at startup. Disable it if you do not need it." +msgstr "Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden soll oder nicht. Wenn sie nicht benötigt wird, sollte dieser Punkt deaktiviert werden" #: src/interface.c:1968 msgid "Confirm exit" @@ -563,7 +562,8 @@ msgid "New file tabs will be placed to the right of the tab list" msgstr "Neue Dateien werden rechts von der Datei-Liste platziert." -#: src/interface.c:2002 src/interface.c:2327 +#: src/interface.c:2002 +#: src/interface.c:2327 msgid "<b>Miscellaneous</b>" msgstr "<b>Verschiedenes</b>" @@ -591,7 +591,8 @@ msgid "Show symbol list" msgstr "Symbol-Ansicht anzeigen" -#: src/interface.c:2067 src/interface.c:2073 +#: src/interface.c:2067 +#: src/interface.c:2073 msgid "Toggle the symbol list on and off" msgstr "Schaltet die Symbol-Ansicht ein und aus." @@ -665,8 +666,7 @@ #: src/interface.c:2238 msgid "Shows small dotted lines to help you to use the right indention." -msgstr "" -"Blendet kleine punktierte Linien ein, um die Einrückung zu erleichtern." +msgstr "Blendet kleine punktierte Linien ein, um die Einrückung zu erleichtern." #: src/interface.c:2241 msgid "Show white space" @@ -690,8 +690,7 @@ #: src/interface.c:2256 msgid "Automatic completion of open XML tags(includes HTML tags)" -msgstr "" -"Autovervollständigung von offenen XML-Tags, das schließt auch HTML-Tags ein." +msgstr "Autovervollständigung von offenen XML-Tags, das schließt auch HTML-Tags ein." #: src/interface.c:2259 msgid "Construct auto completion" @@ -699,9 +698,7 @@ #: src/interface.c:2262 msgid "Automatic completion of often used constructs like if and for" -msgstr "" -"Autovervollständigung von häufig benutzten Konstrukten wie if, for und " -"switch." +msgstr "Autovervollständigung von häufig benutzten Konstrukten wie if, for und switch." #: src/interface.c:2265 msgid "Enable folding" @@ -728,23 +725,17 @@ msgstr "Ändert die Schriftart des Editors" #: src/interface.c:2315 -msgid "" -"The long line marker is a thin vertical line in the editor. It helps to mark " -"long lines, or as a hint to break the line. To disable set the value to 0, " -"or greater than 0 to specify the column where it should appear." -msgstr "" -"Der \"long line marker\" ist eine dünne Linie im Editorfenster. Sie hilft " -"dabei, lange Zeilen zu markieren und dabei auf einen eventuell notwendigen " -"Zeilenumbruch hinzuweißen. Um sie zu deaktivieren, setzen Sie den Wert auf " -"0. Werte größer als 0 geben hingegen die Spalte an, in der die Linie " -"angezeigt werden soll. " +msgid "The long line marker is a thin vertical line in the editor. It helps to mark long lines, or as a hint to break the line. To disable set the value to 0, or greater than 0 to specify the column where it should appear." +msgstr "Der \"long line marker\" ist eine dünne Linie im Editorfenster. Sie hilft dabei, lange Zeilen zu markieren und dabei auf einen eventuell notwendigen Zeilenumbruch hinzuweißen. Um sie zu deaktivieren, setzen Sie den Wert auf 0. Werte größer als 0 geben hingegen die Spalte an, in der die Linie angezeigt werden soll. " #: src/interface.c:2324 msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe des \"long line markers\" ein." -#: src/interface.c:2325 src/dialogs.c:495 src/dialogs.c:1722 -#: src/dialogs.c:1729 +#: src/interface.c:2325 +#: src/dialogs.c:477 +#: src/dialogs.c:1705 +#: src/dialogs.c:1712 msgid "Color Chooser" msgstr "Farb-Wähler" @@ -764,7 +755,9 @@ msgid "Make" msgstr "Make" -#: src/interface.c:2358 src/dialogs.c:1772 src/vte.c:163 +#: src/interface.c:2358 +#: src/dialogs.c:1755 +#: src/vte.c:163 msgid "Terminal" msgstr "Terminal" @@ -777,12 +770,8 @@ msgstr "Pfad und spezielle Optionen und / oder Targets für \"make\" angeben." #: src/interface.c:2384 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" -"Ein Terminal-Emulator wie z.B. xterm, gnome-terminal oder konsole (es sollte " -"die Option -e akzeptieren)" +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "Ein Terminal-Emulator wie z.B. xterm, gnome-terminal oder konsole (es sollte die Option -e akzeptieren)" #: src/interface.c:2391 msgid "Path (and possibly additional arguments) to your favorite browser" @@ -853,16 +842,8 @@ msgstr "Vorlagen" #: src/interface.c:2524 -msgid "" -"Here you can change keyboard shortcuts for various actions. Just double " -"click on a action or select one and press the Change button to enter a new " -"shortcut. You can also edit the string representation of the shortcut " -"directly." -msgstr "" -"Hier können die Tastenkominationen für verschiedene Aktionen innerhalb " -"Geanys festgelegt bzw. verändert werden. Um die Tastenkombinationen zu " -"ändern, einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem " -"können die Tastenkombinationen auch direkt eingegeben werden. " +msgid "Here you can change keyboard shortcuts for various actions. Just double click on a action or select one and press the Change button to enter a new shortcut. You can also edit the string representation of the shortcut directly." +msgstr "Hier können die Tastenkominationen für verschiedene Aktionen innerhalb Geanys festgelegt bzw. verändert werden. Um die Tastenkombinationen zu ändern, einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können die Tastenkombinationen auch direkt eingegeben werden. " #: src/interface.c:2547 msgid "Change" @@ -872,7 +853,8 @@ msgid "Keybindings" msgstr "Tastenkürzel" -#: src/callbacks.c:204 src/callbacks.c:219 +#: src/callbacks.c:204 +#: src/callbacks.c:219 msgid "Do you really want to quit?" msgstr "Möchten Sie wirklich beenden?" @@ -890,11 +872,8 @@ msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Die Datei '%s' existiert bereits. Möchten Sie sie überschreiben?" -#: src/callbacks.c:1291 -msgid "Goto tag definition" -msgstr "Gehe zu Tag Definition" - -#: src/callbacks.c:1310 src/callbacks.c:1319 +#: src/callbacks.c:1310 +#: src/callbacks.c:1319 #, c-format msgid "Declaration or definition of \"%s()\" not found" msgstr "Deklaration oder Definition von '%s' nicht gefunden." @@ -908,59 +887,61 @@ msgstr "Konnte das Terminal-Programm nicht ausführen" #. initialize the dialog -#: src/callbacks.c:1974 src/dialogs.c:69 +#: src/callbacks.c:1959 +#: src/dialogs.c:69 msgid "Open File" msgstr "Datei öffnen" -#: src/support.c:90 src/support.c:114 +#: src/support.c:90 +#: src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Konnte PixMap %s nicht finden." #: src/dialogs.c:74 -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 "" -"Öffnet die Datei als schreibgeschützt. Wenn Sie mehrere Dateien wählen, " -"werden alle schreibgeschützt geöffnet." +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 "Öffnet die Datei als schreibgeschützt. Wenn Sie mehrere Dateien wählen, werden alle schreibgeschützt geöffnet." #: src/dialogs.c:110 msgid "Detect by file extension " msgstr "Durch Dateiendung erkennen" -#: src/dialogs.c:162 +#: src/dialogs.c:163 msgid "Save File" msgstr "Datei speichern" -#: src/dialogs.c:211 +#: src/dialogs.c:215 #, c-format msgid "There is a limit of %d concurrent open tabs." msgstr "Es dürfen maximal %d Datei gleichzeitg geöffnet sein." -#: src/dialogs.c:212 +#: src/dialogs.c:216 msgid "error: too many open files" msgstr "Fehler: zu viele offene Dateien" -#: src/dialogs.c:235 +#: src/dialogs.c:239 #, c-format msgid "The match \"%s\" was not found. Wrap search around the document?" msgstr "\"%s\" wurde nicht gefunden. Am Anfang des Dokumentes beginnen?" -#: src/dialogs.c:238 src/dialogs.c:1840 +#: src/dialogs.c:242 +#: src/dialogs.c:1823 msgid "Question" msgstr "Frage" -#: src/dialogs.c:267 +#: src/dialogs.c:271 msgid "Information" msgstr "Information" -#: src/dialogs.c:314 src/dialogs.c:346 src/dialogs.c:1284 src/win32.c:217 +#: src/dialogs.c:296 +#: src/dialogs.c:328 +#: src/dialogs.c:1267 +#: src/win32.c:217 #: src/win32.c:378 msgid "Error" msgstr "Fehler" -#: src/dialogs.c:338 +#: src/dialogs.c:320 #, c-format msgid "" "The file '%s' is not saved.\n" @@ -969,7 +950,7 @@ "%s ist nicht gespeichert.\n" "Möchten Sie die Datei vor dem Beenden speichern?" -#: src/dialogs.c:343 +#: src/dialogs.c:325 msgid "" "The file is not saved.\n" "Do you want to save it before closing?" @@ -977,27 +958,27 @@ "Die Datei ist nicht gespeichert.\n" "Möchten Sie die Datei vor dem Beenden speichern?" -#: src/dialogs.c:360 +#: src/dialogs.c:342 msgid "Don't save" msgstr "Nicht speichern" -#: src/dialogs.c:412 +#: src/dialogs.c:394 msgid "Choose font" msgstr "Schriftart auswählen" -#: src/dialogs.c:451 +#: src/dialogs.c:433 msgid "Word Count" msgstr "Wörter zählen" -#: src/dialogs.c:460 +#: src/dialogs.c:442 msgid "selection" msgstr "Auswahl" -#: src/dialogs.c:468 +#: src/dialogs.c:450 msgid "whole document" msgstr "Ganzes Dokument" -#: src/dialogs.c:470 +#: src/dialogs.c:452 #, c-format msgid "" "Range:\t\t%s\n" @@ -1013,158 +994,164 @@ "Zeichen:\t\t%d\n" #. compile the code -#: src/dialogs.c:523 +#: src/dialogs.c:505 msgid "Compile" msgstr "Kompilieren" -#: src/dialogs.c:526 +#: src/dialogs.c:508 msgid "Compiles the current file" msgstr "Kompiliert die aktuelle Datei" -#: src/dialogs.c:543 +#: src/dialogs.c:525 msgid "Builds the current file (generate an executable file)" msgstr "Erstellt die aktuelle Datei(erzeugt eine ausführbare Datei)" #. build the code with make all -#: src/dialogs.c:552 src/dialogs.c:649 +#: src/dialogs.c:534 +#: src/dialogs.c:631 msgid "Build with \"make\"" msgstr "Mit \"make\" erstellen" -#: src/dialogs.c:555 src/dialogs.c:652 +#: src/dialogs.c:537 +#: src/dialogs.c:634 msgid "Builds the current file with the make tool and the default target" msgstr "Erstellt die aktuelle Datei mit \"make\" und dem Default-Target" #. build the code with make -#: src/dialogs.c:563 src/dialogs.c:660 +#: src/dialogs.c:545 +#: src/dialogs.c:642 msgid "Build with make (custom target)" msgstr "Mit \"make\" erstellen (eigenes Target angeben)" -#: src/dialogs.c:569 src/dialogs.c:666 +#: src/dialogs.c:551 +#: src/dialogs.c:648 msgid "Builds the current file with the make tool and the specified target" msgstr "Erstellt die aktuelle Datei mit \"make\" und dem angegebenem Target" -#: src/dialogs.c:595 src/dialogs.c:1123 +#: src/dialogs.c:577 +#: src/dialogs.c:1105 msgid "Set Includes and Arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:602 -msgid "" -"Sets the includes and library paths for the compiler and the program " -"arguments for execution" -msgstr "" -"Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen" +#: src/dialogs.c:584 +msgid "Sets the includes and library paths for the compiler and the program arguments for execution" +msgstr "Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen" #. DVI -#: src/dialogs.c:623 +#: src/dialogs.c:605 msgid "LaTeX -> DVI" msgstr "LaTeX -> DVI" -#: src/dialogs.c:626 +#: src/dialogs.c:608 msgid "Compiles the current file into a DVI file" msgstr "Kompiliert die aktuelle Datei als DVI-Datei" #. PDF -#: src/dialogs.c:636 +#: src/dialogs.c:618 msgid "LaTeX -> PDF" msgstr "LaTeX -> PDF" -#: src/dialogs.c:639 +#: src/dialogs.c:621 msgid "Compiles the current file into a PDF file" msgstr "Kompiliert die aktuelle Datei als PDF-Datei" #. DVI view -#: src/dialogs.c:671 +#: src/dialogs.c:653 msgid "View DVI file" msgstr "DVI-Datei anzeigen" -#: src/dialogs.c:677 src/dialogs.c:690 +#: src/dialogs.c:659 +#: src/dialogs.c:672 msgid "Compiles and view the current file" msgstr "Kompiliert und zeigt die aktuelle Datei an" #. PDF view -#: src/dialogs.c:684 +#: src/dialogs.c:666 msgid "View PDF file" msgstr "PDF-Datei anzeigen" #. arguments -#: src/dialogs.c:703 src/dialogs.c:1016 +#: src/dialogs.c:685 +#: src/dialogs.c:998 msgid "Set Arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:710 +#: src/dialogs.c:692 msgid "Sets the program paths and arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:751 +#: src/dialogs.c:733 msgid "Enter custom options for the make tool" msgstr "Spezielle Optionen / Targets für \"make\" angeben." -#: src/dialogs.c:756 -msgid "" -"Enter custom options here, all entered text is passed to the make command." +#: src/dialogs.c:738 +msgid "Enter custom options here, all entered text is passed to the make command." msgstr "Alles was Sie hier angeben, wird direkt an \"make\" übergeben." -#: src/dialogs.c:786 +#: src/dialogs.c:768 msgid "Enter the line you want to go to" msgstr "Geben Sie die Zeile an, zu der Sie springen möchten" -#: src/dialogs.c:818 +#: src/dialogs.c:800 msgid "Find" msgstr "Suchen" -#: src/dialogs.c:823 src/dialogs.c:929 +#: src/dialogs.c:805 +#: src/dialogs.c:911 msgid "Enter the search text here" msgstr "Geben Sie hier den Suchbegriff ein" -#: src/dialogs.c:844 src/dialogs.c:962 +#: src/dialogs.c:826 +#: src/dialogs.c:944 msgid "_Case sensitive" msgstr "Groß- / Kleinschreibung beachten" -#: src/dialogs.c:849 src/dialogs.c:967 +#: src/dialogs.c:831 +#: src/dialogs.c:949 msgid "Match only a _whole word" msgstr "Nur ganze Wörter finden" -#: src/dialogs.c:854 src/dialogs.c:972 +#: src/dialogs.c:836 +#: src/dialogs.c:954 msgid "_Use regular expressions" msgstr "Reguläre Ausdrücke benutzen" -#: src/dialogs.c:859 src/dialogs.c:977 -msgid "" -"For detailed information about using regular expressions, please read the " -"documentation." -msgstr "" -"Für weitere Informationen über reguläre Ausdrücke lesen Sie bitte die " -"Dokumentation." +#: src/dialogs.c:841 +#: src/dialogs.c:959 +msgid "For detailed information about using regular expressions, please read the documentation." +msgstr "Für weitere Informationen über reguläre Ausdrücke lesen Sie bitte die Dokumentation." -#: src/dialogs.c:861 src/dialogs.c:979 +#: src/dialogs.c:843 +#: src/dialogs.c:961 msgid "_Search backwards" msgstr "Rückwärts suchen" -#: src/dialogs.c:866 src/dialogs.c:984 +#: src/dialogs.c:848 +#: src/dialogs.c:966 msgid "Match only word s_tart" msgstr "Nur Wort_anfänge finden" -#: src/dialogs.c:911 +#: src/dialogs.c:893 msgid "Replace" msgstr "Ersetzen" -#: src/dialogs.c:914 +#: src/dialogs.c:896 msgid "_In Selection" msgstr "_Auswahl ersetzen" -#: src/dialogs.c:916 +#: src/dialogs.c:898 msgid "Replace all matches found in the currently selected text" msgstr "Ersetze alle Treffer im aktuell markierten Text" -#: src/dialogs.c:920 +#: src/dialogs.c:902 msgid "Replace _All" msgstr "_Alle ersetzen" -#: src/dialogs.c:933 +#: src/dialogs.c:915 msgid "Enter the replace text here" msgstr "Geben Sie hier den Ersetzungstext ein" -#: src/dialogs.c:1021 +#: src/dialogs.c:1003 msgid "" "Set programs and options for compilation and viewing (La)TeX files.\n" "The filename is appended automatically at the end.\n" @@ -1172,42 +1159,33 @@ "Set programs and options for compilation and viewing (La)TeX files.\n" "The filename is appended automatically at the end.\n" -#: src/dialogs.c:1029 -msgid "" -"Enter here the (La)TeX command (for DVI creation) and some useful options." -msgstr "" -"Geben Sie hier den Befehl und dessen Optionen, für die DVI-Erzeugung, an." +#: src/dialogs.c:1011 +msgid "Enter here the (La)TeX command (for DVI creation) and some useful options." +msgstr "Geben Sie hier den Befehl und dessen Optionen, für die DVI-Erzeugung, an." -#: src/dialogs.c:1050 -msgid "" -"Enter here the (La)TeX command (for PDF creation) and some useful options." -msgstr "" -"Geben Sie hier den Befehl und dessen Optionen, für die PDF-Erzeugung, an." +#: src/dialogs.c:1032 +msgid "Enter here the (La)TeX command (for PDF creation) and some useful options." +msgstr "Geben Sie hier den Befehl und dessen Optionen, für die PDF-Erzeugung, an." -#: src/dialogs.c:1071 -msgid "" -"Enter here the (La)TeX command (for DVI preview) and some useful options." -msgstr "" -"Geben Sie hier den Befehl und dessen Optionen, für die DVI-Anzeige, an." +#: src/dialogs.c:1053 +msgid "Enter here the (La)TeX command (for DVI preview) and some useful options." +msgstr "Geben Sie hier den Befehl und dessen Optionen, für die DVI-Anzeige, an." -#: src/dialogs.c:1092 -msgid "" -"Enter here the (La)TeX command (for PDF preview) and some useful options." -msgstr "" -"Geben Sie hier den Befehl und dessen Optionen, für die PDF-Anzeige, an." +#: src/dialogs.c:1074 +msgid "Enter here the (La)TeX command (for PDF preview) and some useful options." +msgstr "Geben Sie hier den Befehl und dessen Optionen, für die PDF-Anzeige, an." -#: src/dialogs.c:1128 -msgid "" -"Sets the includes and library paths for the compiler and the program " -"arguments for execution\n" -msgstr "" -"Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen.\n" +#: src/dialogs.c:1110 +msgid "Sets the includes and library paths for the compiler and the program arguments for execution\n" +msgstr "Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen.\n" -#: src/dialogs.c:1137 +#: src/dialogs.c:1119 msgid "Enter here arguments to your compiler." msgstr "Geben Sie hier Paramter für den Compiler an." -#: src/dialogs.c:1143 src/dialogs.c:1166 src/dialogs.c:1190 +#: src/dialogs.c:1125 +#: src/dialogs.c:1148 +#: src/dialogs.c:1172 #, c-format msgid "" "%f will be replaced by the complete filename\n" @@ -1222,36 +1200,32 @@ "%f -> test_datei.c\n" "%e -> test_datei" -#: src/dialogs.c:1160 +#: src/dialogs.c:1142 msgid "Enter here arguments to your linker." msgstr "Geben Sie hier Parameter für den Linker an." #. program-args -#: src/dialogs.c:1184 +#: src/dialogs.c:1166 msgid "Enter here arguments to your program." msgstr "Geben Sie hier Parameter für Ihr Programm an." -#: src/dialogs.c:1229 +#: src/dialogs.c:1211 msgid "Show _hidden files" msgstr "_Versteckte Dateien anzeigen" -#: src/dialogs.c:1246 +#: src/dialogs.c:1228 msgid "Set filetype:" msgstr "Dateityp festlegen:" -#: src/dialogs.c:1249 +#: src/dialogs.c:1231 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 "" -"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die " -"Dateiendung erkannt wird.\n" -"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit dem " -"gewählten Dateityp geöffnet." +"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die Dateiendung erkannt wird.\n" +"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit dem gewählten Dateityp geöffnet." -#: src/dialogs.c:1280 +#: src/dialogs.c:1263 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -1259,160 +1233,162 @@ "Start %s anyway?" msgstr "" "Konfigurationsverzeichnis konnte nicht erstellt werden (%s).\n" -"Es können einige Probleme in %s ohne ein Konfigurationsverzeichnis " -"auftreten.\n" +"Es können einige Probleme in %s ohne ein Konfigurationsverzeichnis auftreten.\n" "%s trotzdem starten?" -#: src/dialogs.c:1329 -msgid "" -"An error occurred or file information could not be retrieved(e.g. from a new " -"file)." -msgstr "" -"Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen " -"werden(z.B. bei einer neuen Datei)." +#: src/dialogs.c:1312 +msgid "An error occurred or file information could not be retrieved(e.g. from a new file)." +msgstr "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen werden(z.B. bei einer neuen Datei)." -#: src/dialogs.c:1349 src/dialogs.c:1350 src/dialogs.c:1351 src/dialogs.c:1357 -#: src/dialogs.c:1358 src/dialogs.c:1359 src/utils.c:107 src/utils.c:127 -#: src/utils.c:128 src/utils.c:1029 +#: src/dialogs.c:1332 +#: src/dialogs.c:1333 +#: src/dialogs.c:1334 +#: src/dialogs.c:1340 +#: src/dialogs.c:1341 +#: src/dialogs.c:1342 +#: src/utils.c:108 +#: src/utils.c:128 +#: src/utils.c:129 +#: src/utils.c:1030 msgid "unknown" msgstr "unbekannt" -#: src/dialogs.c:1363 +#: src/dialogs.c:1346 msgid "Properties" msgstr "Eigenschaften" -#: src/dialogs.c:1391 +#: src/dialogs.c:1374 msgid "<b>Type:</b>" msgstr "<b>Dateityp:</b>" -#: src/dialogs.c:1404 +#: src/dialogs.c:1387 msgid "<b>Size:</b>" msgstr "<b>Größe:</b>" -#: src/dialogs.c:1419 +#: src/dialogs.c:1402 msgid "<b>Location:</b>" msgstr "<b>Ort:</b>" -#: src/dialogs.c:1432 +#: src/dialogs.c:1415 msgid "<b>Read-only:</b>" msgstr "<b>Schreibgeschützt:</b>" -#: src/dialogs.c:1439 +#: src/dialogs.c:1422 msgid "(only inside Geany)" msgstr "(nur innerhalb von Geany)" -#: src/dialogs.c:1448 +#: src/dialogs.c:1431 msgid "<b>Encoding:</b>" msgstr "<b>Kodierung:</b>" -#: src/dialogs.c:1461 +#: src/dialogs.c:1444 msgid "<b>Modified:</b>" msgstr "<b>Modifiziert:</b>" -#: src/dialogs.c:1474 +#: src/dialogs.c:1457 msgid "<b>Changed:</b>" msgstr "<b>Geändert:</b>" -#: src/dialogs.c:1487 +#: src/dialogs.c:1470 msgid "<b>Accessed:</b>" msgstr "<b>Zugriff:</b>" #. Header -#: src/dialogs.c:1516 +#: src/dialogs.c:1499 msgid "Read:" msgstr "Lesen" -#: src/dialogs.c:1523 +#: src/dialogs.c:1506 msgid "Write:" msgstr "Schreiben:" -#: src/dialogs.c:1530 +#: src/dialogs.c:1513 msgid "Execute:" msgstr "Ausführen:" #. Owner -#: src/dialogs.c:1538 +#: src/dialogs.c:1521 msgid "Owner:" msgstr "Eigentümer:" #. Group -#: src/dialogs.c:1574 +#: src/dialogs.c:1557 msgid "Group:" msgstr "Gruppe:" #. Other -#: src/dialogs.c:1610 +#: src/dialogs.c:1593 msgid "Other:" msgstr "Andere:" -#: src/dialogs.c:1677 -msgid "" -"These are settings for the virtual terminal emulator widget (VTE). They only " -"apply, if the VTE library could be loaded." -msgstr "" -"Hier sehen Sie Einstellungen für die Terminalemulation (VTE). Änderungen " -"werden nur wirksam, wenn die VTE-Bibliothek geladen werden konnte." +#: src/dialogs.c:1660 +msgid "These are settings for the virtual terminal emulator widget (VTE). They only apply, if the VTE library could be loaded." +msgstr "Hier sehen Sie Einstellungen für die Terminalemulation (VTE). Änderungen werden nur wirksam, wenn die VTE-Bibliothek geladen werden konnte." -#: src/dialogs.c:1693 +#: src/dialogs.c:1676 msgid "Terminal font" msgstr "Terminal Schriftart" -#: src/dialogs.c:1703 +#: src/dialogs.c:1686 msgid "Sets the font for the terminal widget." msgstr "Ändert die Schriftart für das Terminal" -#: src/dialogs.c:1705 +#: src/dialogs.c:1688 msgid "Foreground color" msgstr "Vordergrundfarbe" -#: src/dialogs.c:1711 +#: src/dialogs.c:1694 msgid "Background color" msgstr "Hintergrundfarbe" -#: src/dialogs.c:1721 +#: src/dialogs.c:1704 msgid "Sets the foreground color of the text in the terminal widget." msgstr "Setzt die Vordergrundfarbe für Text im Terminal." -#: src/dialogs.c:1728 +#: src/dialogs.c:1711 msgid "Sets the background color of the text in the terminal widget." msgstr "Setzt die Hintergrundfarbe für Text im Terminal." -#: src/dialogs.c:1731 +#: src/dialogs.c:1714 msgid "Scrollback lines" msgstr "Zeilen zum Zurückrollen" -#: src/dialogs.c:1742 -msgid "" -"Specifies the history in lines, which you can scroll back in the terminal " -"widget." +#: src/dialogs.c:1725 +msgid "Specifies the history in lines, which you can scroll back in the terminal widget." msgstr "Gibt die Zeilen an, die man im Terminal zurückscrollen kann." -#: src/dialogs.c:1746 +#: src/dialogs.c:1729 msgid "Terminal emulation" msgstr "Terminalemulation" -#: src/dialogs.c:1756 -msgid "" -"Controls how the terminal emulator should behave. xterm is a good start." -msgstr "" -"Steuert wie sich das Terminal verhalten soll. xterm ist ein guter Startwert." +#: src/dialogs.c:1739 +msgid "Controls how the terminal emulator should behave. xterm is a good start." +msgstr "Steuert wie sich das Terminal verhalten soll. xterm ist ein guter Startwert." -#: src/dialogs.c:1758 +#: src/dialogs.c:1741 msgid "Scroll on keystroke" msgstr "Bei Tastendruck scrollen" -#: src/dialogs.c:1762 +#: src/dialogs.c:1745 msgid "Whether to scroll to the bottom if a key was pressed." msgstr "Ob das Fenster bei Tastendruck bis zum Ende gescrollt werden soll" -#: src/dialogs.c:1765 +#: src/dialogs.c:1748 msgid "Scroll on output" msgstr "Bei Ausgabe scrollen" -#: src/dialogs.c:1769 +#: src/dialogs.c:1752 msgid "Whether to scroll to the bottom if an output was generated." msgstr "Ob das Fenster bei Ausgabe bis zum Ende gescrollt werden soll" +#: src/dialogs.c:1846 +msgid "Keyboard shortcuts" +msgstr "Tastenkürzel" + +#: src/dialogs.c:1851 +msgid "The following keyboard shortcuts are defined:" +msgstr "Folgende Tastenkürzel sind definiert: " + #: src/document.c:332 #, c-format msgid "File %s closed." @@ -1422,7 +1398,9 @@ msgid "New file opened." msgstr "Neue Datei geöffnet." -#: src/document.c:425 src/document.c:434 src/document.c:435 +#: src/document.c:425 +#: src/document.c:434 +#: src/document.c:435 msgid "Invalid filename" msgstr "Ungültiger Dateiname" @@ -1432,92 +1410,86 @@ msgstr "Konnte Datei '%s' nicht öffnen(%s)." #: src/document.c:489 -msgid "" -"The file does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"Diese Datei scheint keine Textdatei zu sein, oder das Format wird nicht " -"unterstützt." +msgid "The file does not look like a text file or the file encoding is not supported." +msgstr "Diese Datei scheint keine Textdatei zu sein, oder das Format wird nicht unterstützt." #: src/document.c:527 #, c-format msgid "File %s reloaded." msgstr "Datei %s neu geladen." -#: src/document.c:555 +#: src/document.c:553 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei %s geöffnet(%d%s)." -#: src/document.c:557 +#: src/document.c:555 msgid ", read-only" msgstr ", schreibgeschützt" -#: src/document.c:595 src/document.c:634 +#: src/document.c:593 +#: src/document.c:632 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: src/document.c:615 +#: src/document.c:613 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: src/document.c:656 +#: src/document.c:654 #, c-format msgid "File %s saved." msgstr "Datei %s wurde gespeichert." -#: src/document.c:907 +#: src/document.c:905 msgid "tag list updating failed" msgstr "Neuladen der Symbol-Liste ist fehlgeschlagen." -#: src/document.c:974 +#: src/document.c:972 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: src/document.c:975 +#: src/document.c:973 msgid "Max (CR)" msgstr "Max (CR)" -#: src/document.c:977 +#: src/document.c:975 msgid "Unix (LF)" msgstr "Unix (LF)" -#: src/utils.c:119 +#: src/utils.c:120 #, c-format -msgid "" -"%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. " -"function: %s encoding: %s filetype: %s" -msgstr "" -"%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. " -"Funktion: %s Kodierung: %s Dateityp: %s" +msgid "%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. function: %s encoding: %s filetype: %s" +msgstr "%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. Funktion: %s Kodierung: %s Dateityp: %s" -#: src/utils.c:123 +#: src/utils.c:124 msgid "OVR" msgstr "ÜBER" -#: src/utils.c:123 +#: src/utils.c:124 msgid "INS" msgstr "EINF" -#: src/utils.c:359 +#: src/utils.c:360 #, c-format msgid "Font updated (%s)." msgstr "Schriftart gewechselt (%s)." -#: src/utils.c:373 src/geany.h:71 +#: src/utils.c:374 +#: src/geany.h:72 msgid "untitled" msgstr "unbenannt" -#: src/utils.c:374 +#: src/utils.c:375 msgid "(Unsaved)" msgstr "(Ungespeichert)" -#: src/utils.c:648 +#: src/utils.c:649 msgid "No tags found" msgstr "Keine Symbole gefunden." -#: src/utils.c:951 +#: src/utils.c:952 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -1625,17 +1597,12 @@ msgstr "%s configuration file, edit as you need" #: src/keyfile.c:104 -msgid "" -" VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on " -"keystroke;scroll on output" -msgstr "" -"VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;" -"scroll on output" +msgid " VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;scroll on output" +msgstr "VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;scroll on output" -#: src/keyfile.c:232 +#: src/keyfile.c:229 msgid "Type here what you want, use it as a notice/scratch board" -msgstr "" -"Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." +msgstr "Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." #: src/msgwindow.c:44 msgid "Status messages" @@ -1646,7 +1613,9 @@ msgid "Failed to view %s (make sure it is already compiled)" msgstr "Konnte %s nicht anzeigen (die Datei muss bereits erzeugt worden sein)" -#: src/build.c:116 src/build.c:277 src/build.c:414 +#: src/build.c:116 +#: src/build.c:277 +#: src/build.c:414 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" @@ -1663,12 +1632,8 @@ #: src/build.c:362 #, c-format -msgid "" -"Could not find terminal '%s' (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"Konnte das Terminalprogramm '%s' nicht finden (Pfad zum Terminalprogramm in " -"den Einstellungen überprüfen)" +msgid "Could not find terminal '%s' (check path for Terminal tool setting in Preferences)" +msgstr "Konnte das Terminalprogramm '%s' nicht finden (Pfad zum Terminalprogramm in den Einstellungen überprüfen)" #: src/build.c:377 #, c-format @@ -1688,23 +1653,28 @@ msgid "compilation finished successful" msgstr "Kompilierung beendet - erfolgreich." -#: src/prefs.c:193 +#: src/prefs.c:195 msgid "Action" msgstr "Aktion" -#: src/prefs.c:198 +#: src/prefs.c:200 msgid "Shortcut" msgstr "Tastenkürzel" -#: src/prefs.c:556 +#: src/prefs.c:564 msgid "Grab key" msgstr "Tasten festlegen" -#: src/prefs.c:560 +#: src/prefs.c:568 #, c-format msgid "Type the combination of the keys you want to use for \"%s\"" msgstr "Welche Tastenkomination soll für \"%s\" benutzt werden? " +#: src/prefs.c:692 +#, c-format +msgid "The combination '%s' is already used for \"%s\". Please choose another one." +msgstr "Die Tastenkombination '%s' wird bereits für \"%s\" verwendet. Bitte wählen Sie eine andere Tastenkombination. " + #: src/about.c:91 msgid "About Geany" msgstr "Über Geany" @@ -1754,7 +1724,8 @@ msgid "Chapter" msgstr "Kapitel" -#: src/treeviews.c:67 src/treeviews.c:89 +#: src/treeviews.c:67 +#: src/treeviews.c:89 msgid "Section" msgstr "Section" @@ -1774,7 +1745,9 @@ msgid "Appendix" msgstr "Anhang" -#: src/treeviews.c:77 src/treeviews.c:99 src/treeviews.c:161 +#: src/treeviews.c:77 +#: src/treeviews.c:99 +#: src/treeviews.c:161 msgid "Other" msgstr "Sonstiges" @@ -1802,7 +1775,8 @@ msgid "Begin" msgstr "Begin" -#: src/treeviews.c:105 src/treeviews.c:147 +#: src/treeviews.c:105 +#: src/treeviews.c:147 msgid "Function" msgstr "Funktion" @@ -1826,7 +1800,8 @@ msgid "Methods" msgstr "Methoden" -#: src/treeviews.c:128 src/treeviews.c:149 +#: src/treeviews.c:128 +#: src/treeviews.c:149 msgid "Class" msgstr "Klassen" @@ -1838,11 +1813,13 @@ msgid "Mixin" msgstr "Mixin" -#: src/treeviews.c:134 src/treeviews.c:155 +#: src/treeviews.c:134 +#: src/treeviews.c:155 msgid "Variables" msgstr "Variablen" -#: src/treeviews.c:136 src/treeviews.c:151 +#: src/treeviews.c:136 +#: src/treeviews.c:151 msgid "Members" msgstr "Instanzvariablen" @@ -1858,14 +1835,20 @@ msgid "Struct / Typedef" msgstr "Strukt / Typedef" -#: src/treeviews.c:227 src/treeviews.c:279 +#: src/treeviews.c:227 +#: src/treeviews.c:279 msgid "Hide" msgstr "Verbergen" -#: src/treeviews.c:235 src/treeviews.c:287 +#: src/treeviews.c:235 +#: src/treeviews.c:287 msgid "Hide sidebar" msgstr "Sidebar verbergen" #: src/treeviews.c:267 msgid "Reload" msgstr "Neu laden" + +#~ msgid "Goto tag definition" +#~ msgstr "Gehe zu Tag Definition" + Modified: trunk/po/geany.pot =================================================================== --- trunk/po/geany.pot 2006-06-05 22:04:50 UTC (rev 414) +++ trunk/po/geany.pot 2006-06-06 16:38:19 UTC (rev 415) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-29 23:47+0200\n" +"POT-Creation-Date: 2006-06-06 17:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -166,7 +166,7 @@ msgid "Find _Previous" msgstr "" -#: src/interface.c:476 src/dialogs.c:924 +#: src/interface.c:476 src/dialogs.c:906 msgid "_Replace" msgstr "" @@ -302,7 +302,7 @@ msgstr "" #. build the code -#: src/interface.c:654 src/dialogs.c:539 +#: src/interface.c:654 src/dialogs.c:521 msgid "Build" msgstr "" @@ -354,7 +354,7 @@ msgid "Run" msgstr "" -#: src/interface.c:738 src/dialogs.c:578 +#: src/interface.c:738 src/dialogs.c:560 msgid "Run or view the current file" msgstr "" @@ -446,7 +446,7 @@ msgid "Go to tag definition" msgstr "" -#: src/interface.c:1641 src/dialogs.c:781 +#: src/interface.c:1641 src/dialogs.c:763 msgid "Go to line" msgstr "" @@ -712,8 +712,8 @@ msgid "Sets the color of the long line marker" msgstr "" -#: src/interface.c:2325 src/dialogs.c:495 src/dialogs.c:1722 -#: src/dialogs.c:1729 +#: src/interface.c:2325 src/dialogs.c:477 src/dialogs.c:1705 +#: src/dialogs.c:1712 msgid "Color Chooser" msgstr "" @@ -731,7 +731,7 @@ msgid "Make" msgstr "" -#: src/interface.c:2358 src/dialogs.c:1772 src/vte.c:163 +#: src/interface.c:2358 src/dialogs.c:1755 src/vte.c:163 msgid "Terminal" msgstr "" @@ -845,10 +845,6 @@ msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "" -#: src/callbacks.c:1291 -msgid "Goto tag definition" -msgstr "" - #: src/callbacks.c:1310 src/callbacks.c:1319 #, c-format msgid "Declaration or definition of \"%s()\" not found" @@ -863,7 +859,7 @@ msgstr "" #. initialize the dialog -#: src/callbacks.c:1974 src/dialogs.c:69 +#: src/callbacks.c:1959 src/dialogs.c:69 msgid "Open File" msgstr "" @@ -882,71 +878,71 @@ msgid "Detect by file extension " msgstr "" -#: src/dialogs.c:162 +#: src/dialogs.c:163 msgid "Save File" msgstr "" -#: src/dialogs.c:211 +#: src/dialogs.c:215 #, c-format msgid "There is a limit of %d concurrent open tabs." msgstr "" -#: src/dialogs.c:212 +#: src/dialogs.c:216 msgid "error: too many open files" msgstr "" -#: src/dialogs.c:235 +#: src/dialogs.c:239 #, c-format msgid "The match \"%s\" was not found. Wrap search around the document?" msgstr "" -#: src/dialogs.c:238 src/dialogs.c:1840 +#: src/dialogs.c:242 src/dialogs.c:1823 msgid "Question" msgstr "" -#: src/dialogs.c:267 +#: src/dialogs.c:271 msgid "Information" msgstr "" -#: src/dialogs.c:314 src/dialogs.c:346 src/dialogs.c:1284 src/win32.c:217 +#: src/dialogs.c:296 src/dialogs.c:328 src/dialogs.c:1267 src/win32.c:217 #: src/win32.c:378 msgid "Error" msgstr "" -#: src/dialogs.c:338 +#: src/dialogs.c:320 #, c-format msgid "" "The file '%s' is not saved.\n" "Do you want to save it before closing?" msgstr "" -#: src/dialogs.c:343 +#: src/dialogs.c:325 msgid "" "The file is not saved.\n" "Do you want to save it before closing?" msgstr "" -#: src/dialogs.c:360 +#: src/dialogs.c:342 msgid "Don't save" msgstr "" -#: src/dialogs.c:412 +#: src/dialogs.c:394 msgid "Choose font" msgstr "" -#: src/dialogs.c:451 +#: src/dialogs.c:433 msgid "Word Count" msgstr "" -#: src/dialogs.c:460 +#: src/dialogs.c:442 msgid "selection" msgstr "" -#: src/dialogs.c:468 +#: src/dialogs.c:450 msgid "whole document" msgstr "" -#: src/dialogs.c:470 +#: src/dialogs.c:452 #, c-format msgid "" "Range:\t\t%s\n" @@ -957,191 +953,191 @@ msgstr "" #. compile the code -#: src/dialogs.c:523 +#: src/dialogs.c:505 msgid "Compile" msgstr "" -#: src/dialogs.c:526 +#: src/dialogs.c:508 msgid "Compiles the current file" msgstr "" -#: src/dialogs.c:543 +#: src/dialogs.c:525 msgid "Builds the current file (generate an executable file)" msgstr "" #. build the code with make all -#: src/dialogs.c:552 src/dialogs.c:649 +#: src/dialogs.c:534 src/dialogs.c:631 msgid "Build with \"make\"" msgstr "" -#: src/dialogs.c:555 src/dialogs.c:652 +#: src/dialogs.c:537 src/dialogs.c:634 msgid "Builds the current file with the make tool and the default target" msgstr "" #. build the code with make -#: src/dialogs.c:563 src/dialogs.c:660 +#: src/dialogs.c:545 src/dialogs.c:642 msgid "Build with make (custom target)" msgstr "" -#: src/dialogs.c:569 src/dialogs.c:666 +#: src/dialogs.c:551 src/dialogs.c:648 msgid "Builds the current file with the make tool and the specified target" msgstr "" -#: src/dialogs.c:595 src/dialogs.c:1123 +#: src/dialogs.c:577 src/dialogs.c:1105 msgid "Set Includes and Arguments" msgstr "" -#: src/dialogs.c:602 +#: src/dialogs.c:584 msgid "" "Sets the includes and library paths for the compiler and the program " "arguments for execution" msgstr "" #. DVI -#: src/dialogs.c:623 +#: src/dialogs.c:605 msgid "LaTeX -> DVI" msgstr "" -#: src/dialogs.c:626 +#: src/dialogs.c:608 msgid "Compiles the current file into a DVI file" msgstr "" #. PDF -#: src/dialogs.c:636 +#: src/dialogs.c:618 msgid "LaTeX -> PDF" msgstr "" -#: src/dialogs.c:639 +#: src/dialogs.c:621 msgid "Compiles the current file into a PDF file" msgstr "" #. DVI view -#: src/dialogs.c:671 +#: src/dialogs.c:653 msgid "View DVI file" msgstr "" -#: src/dialogs.c:677 src/dialogs.c:690 +#: src/dialogs.c:659 src/dialogs.c:672 msgid "Compiles and view the current file" msgstr "" #. PDF view -#: src/dialogs.c:684 +#: src/dialogs.c:666 msgid "View PDF file" msgstr "" #. arguments -#: src/dialogs.c:703 src/dialogs.c:1016 +#: src/dialogs.c:685 src/dialogs.c:998 msgid "Set Arguments" msgstr "" -#: src/dialogs.c:710 +#: src/dialogs.c:692 msgid "Sets the program paths and arguments" msgstr "" -#: src/dialogs.c:751 +#: src/dialogs.c:733 msgid "Enter custom options for the make tool" msgstr "" -#: src/dialogs.c:756 +#: src/dialogs.c:738 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" -#: src/dialogs.c:786 +#: src/dialogs.c:768 msgid "Enter the line you want to go to" msgstr "" -#: src/dialogs.c:818 +#: src/dialogs.c:800 msgid "Find" msgstr "" -#: src/dialogs.c:823 src/dialogs.c:929 +#: src/dialogs.c:805 src/dialogs.c:911 msgid "Enter the search text here" msgstr "" -#: src/dialogs.c:844 src/dialogs.c:962 +#: src/dialogs.c:826 src/dialogs.c:944 msgid "_Case sensitive" msgstr "" -#: src/dialogs.c:849 src/dialogs.c:967 +#: src/dialogs.c:831 src/dialogs.c:949 msgid "Match only a _whole word" msgstr "" -#: src/dialogs.c:854 src/dialogs.c:972 +#: src/dialogs.c:836 src/dialogs.c:954 msgid "_Use regular expressions" msgstr "" -#: src/dialogs.c:859 src/dialogs.c:977 +#: src/dialogs.c:841 src/dialogs.c:959 msgid "" "For detailed information about using regular expressions, please read the " "documentation." msgstr "" -#: src/dialogs.c:861 src/dialogs.c:979 +#: src/dialogs.c:843 src/dialogs.c:961 msgid "_Search backwards" msgstr "" -#: src/dialogs.c:866 src/dialogs.c:984 +#: src/dialogs.c:848 src/dialogs.c:966 msgid "Match only word s_tart" msgstr "" -#: src/dialogs.c:911 +#: src/dialogs.c:893 msgid "Replace" msgstr "" -#: src/dialogs.c:914 +#: src/dialogs.c:896 msgid "_In Selection" msgstr "" -#: src/dialogs.c:916 +#: src/dialogs.c:898 msgid "Replace all matches found in the currently selected text" msgstr "" -#: src/dialogs.c:920 +#: src/dialogs.c:902 msgid "Replace _All" msgstr "" -#: src/dialogs.c:933 +#: src/dialogs.c:915 msgid "Enter the replace text here" msgstr "" -#: src/dialogs.c:1021 +#: src/dialogs.c:1003 msgid "" "Set programs and options for compilation and viewing (La)TeX files.\n" "The filename is appended automatically at the end.\n" msgstr "" -#: src/dialogs.c:1029 +#: src/dialogs.c:1011 msgid "" "Enter here the (La)TeX command (for DVI creation) and some useful options." msgstr "" -#: src/dialogs.c:1050 +#: src/dialogs.c:1032 msgid "" "Enter here the (La)TeX command (for PDF creation) and some useful options." msgstr "" -#: src/dialogs.c:1071 +#: src/dialogs.c:1053 msgid "" "Enter here the (La)TeX command (for DVI preview) and some useful options." msgstr "" -#: src/dialogs.c:1092 +#: src/dialogs.c:1074 msgid "" "Enter here the (La)TeX command (for PDF preview) and some useful options." msgstr "" -#: src/dialogs.c:1128 +#: src/dialogs.c:1110 msgid "" "Sets the includes and library paths for the compiler and the program " "arguments for execution\n" msgstr "" -#: src/dialogs.c:1137 +#: src/dialogs.c:1119 msgid "Enter here arguments to your compiler." msgstr "" -#: src/dialogs.c:1143 src/dialogs.c:1166 src/dialogs.c:1190 +#: src/dialogs.c:1125 src/dialogs.c:1148 src/dialogs.c:1172 #, c-format msgid "" "%f will be replaced by the complete filename\n" @@ -1151,24 +1147,24 @@ "%e -> test_file" msgstr "" -#: src/dialogs.c:1160 +#: src/dialogs.c:1142 msgid "Enter here arguments to your linker." msgstr "" #. program-args -#: src/dialogs.c:1184 +#: src/dialogs.c:1166 msgid "Enter here arguments to your program." msgstr "" -#: src/dialogs.c:1229 +#: src/dialogs.c:1211 msgid "Show _hidden files" msgstr "" -#: src/dialogs.c:1246 +#: src/dialogs.c:1228 msgid "Set filetype:" msgstr "" -#: src/dialogs.c:1249 +#: src/dialogs.c:1231 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -1176,7 +1172,7 @@ "filetype." msgstr "" -#: src/dialogs.c:1280 +#: src/dialogs.c:1263 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -1184,151 +1180,159 @@ "Start %s anyway?" msgstr "" -#: src/dialogs.c:1329 +#: src/dialogs.c:1312 msgid "" "An error occurred or file information could not be retrieved(e.g. from a new " "file)." msgstr "" -#: src/dialogs.c:1349 src/dialogs.c:1350 src/dialogs.c:1351 src/dialogs.c:1357 -#: src/dialogs.c:1358 src/dialogs.c:1359 src/utils.c:107 src/utils.c:127 -#: src/utils.c:128 src/utils.c:1029 +#: src/dialogs.c:1332 src/dialogs.c:1333 src/dialogs.c:1334 src/dialogs.c:1340 +#: src/dialogs.c:1341 src/dialogs.c:1342 src/utils.c:108 src/utils.c:128 +#: src/utils.c:129 src/utils.c:1030 msgid "unknown" msgstr "" -#: src/dialogs.c:1363 +#: src/dialogs.c:1346 msgid "Properties" msgstr "" -#: src/dialogs.c:1391 +#: src/dialogs.c:1374 msgid "<b>Type:</b>" msgstr "" -#: src/dialogs.c:1404 +#: src/dialogs.c:1387 msgid "<b>Size:</b>" msgstr "" -#: src/dialogs.c:1419 +#: src/dialogs.c:1402 msgid "<b>Location:</b>" msgstr "" -#: src/dialogs.c:1432 +#: src/dialogs.c:1415 msgid "<b>Read-only:</b>" msgstr "" -#: src/dialogs.c:1439 +#: src/dialogs.c:1422 msgid "(only inside Geany)" msgstr "" -#: src/dialogs.c:1448 +#: src/dialogs.c:1431 msgid "<b>Encoding:</b>" msgstr "" -#: src/dialogs.c:1461 +#: src/dialogs.c:1444 msgid "<b>Modified:</b>" msgstr "" -#: src/dialogs.c:1474 +#: src/dialogs.c:1457 msgid "<b>Changed:</b>" msgstr "" -#: src/dialogs.c:1487 +#: src/dialogs.c:1470 msgid "<b>Accessed:</b>" msgstr "" #. Header -#: src/dialogs.c:1516 +#: src/dialogs.c:1499 msgid "Read:" msgstr "" -#: src/dialogs.c:1523 +#: src/dialogs.c:1506 msgid "Write:" msgstr "" -#: src/dialogs.c:1530 +#: src/dialogs.c:1513 msgid "Execute:" msgstr "" #. Owner -#: src/dialogs.c:1538 +#: src/dialogs.c:1521 msgid "Owner:" msgstr "" #. Group -#: src/dialogs.c:1574 +#: src/dialogs.c:1557 msgid "Group:" msgstr "" #. Other -#: src/dialogs.c:1610 +#: src/dialogs.c:1593 msgid "Other:" msgstr "" -#: src/dialogs.c:1677 +#: src/dialogs.c:1660 msgid "" "These are settings for the virtual terminal emulator widget (VTE). They only " "apply, if the VTE library could be loaded." msgstr "" -#: src/dialogs.c:1693 +#: src/dialogs.c:1676 msgid "Terminal font" msgstr "" -#: src/dialogs.c:1703 +#: src/dialogs.c:1686 msgid "Sets the font for the terminal widget." msgstr "" -#: src/dialogs.c:1705 +#: src/dialogs.c:1688 msgid "Foreground color" msgstr "" -#: src/dialogs.c:1711 +#: src/dialogs.c:1694 msgid "Background color" msgstr "" -#: src/dialogs.c:1721 +#: src/dialogs.c:1704 msgid "Sets the foreground color of the text in the terminal widget." msgstr "" -#: src/dialogs.c:1728 +#: src/dialogs.c:1711 msgid "Sets the background color of the text in the terminal widget." msgstr "" -#: src/dialogs.c:1731 +#: src/dialogs.c:1714 msgid "Scrollback lines" msgstr "" -#: src/dialogs.c:1742 +#: src/dialogs.c:1725 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget." msgstr "" -#: src/dialogs.c:1746 +#: src/dialogs.c:1729 msgid "Terminal emulation" msgstr "" -#: src/dialogs.c:1756 +#: src/dialogs.c:1739 msgid "" "Controls how the terminal emulator should behave. xterm is a good start." msgstr "" -#: src/dialogs.c:1758 +#: src/dialogs.c:1741 msgid "Scroll on keystroke" msgstr "" -#: src/dialogs.c:1762 +#: src/dialogs.c:1745 msgid "Whether to scroll to the bottom if a key was pressed." msgstr "" -#: src/dialogs.c:1765 +#: src/dialogs.c:1748 msgid "Scroll on output" msgstr "" -#: src/dialogs.c:1769 +#: src/dialogs.c:1752 msgid "Whether to scroll to the bottom if an output was generated." msgstr "" +#: src/dialogs.c:1846 +msgid "Keyboard shortcuts" +msgstr "" + +#: src/dialogs.c:1851 +msgid "The following keyboard shortcuts are defined:" +msgstr "" + #: src/document.c:332 #, c-format msgid "File %s closed." @@ -1358,78 +1362,78 @@ msgid "File %s reloaded." msgstr "" -#: src/document.c:555 +#: src/document.c:553 #, c-format msgid "File %s opened(%d%s)." msgstr "" -#: src/document.c:557 +#: src/document.c:555 msgid ", read-only" msgstr "" -#: src/document.c:595 src/document.c:634 +#: src/document.c:593 src/document.c:632 msgid "Error saving file." msgstr "" -#: src/document.c:615 +#: src/document.c:613 #, c-format msgid "Error saving file (%s)." msgstr "" -#: src/document.c:656 +#: src/document.c:654 #, c-format msgid "File %s saved." msgstr "" -#: src/document.c:907 +#: src/document.c:905 msgid "tag list updating failed" msgstr "" -#: src/document.c:974 +#: src/document.c:972 msgid "Win (CRLF)" msgstr "" -#: src/document.c:975 +#: src/document.c:973 msgid "Max (CR)" msgstr "" -#: src/document.c:977 +#: src/document.c:975 msgid "Unix (LF)" msgstr "" -#: src/utils.c:119 +#: src/utils.c:120 #, c-format msgid "" "%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. " "function: %s encoding: %s filetype: %s" msgstr "" -#: src/utils.c:123 +#: src/utils.c:124 msgid "OVR" msgstr "" -#: src/utils.c:123 +#: src/utils.c:124 msgid "INS" msgstr "" -#: src/utils.c:359 +#: src/utils.c:360 #, c-format msgid "Font updated (%s)." msgstr "" -#: src/utils.c:373 src/geany.h:71 +#: src/utils.c:374 src/geany.h:72 msgid "untitled" msgstr "" -#: src/utils.c:374 +#: src/utils.c:375 msgid "(Unsaved)" msgstr "" -#: src/utils.c:648 +#: src/utils.c:649 msgid "No tags found" msgstr "" -#: src/utils.c:951 +#: src/utils.c:952 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -1540,7 +1544,7 @@ "keystroke;scroll on output" msgstr "" -#: src/keyfile.c:232 +#: src/keyfile.c:229 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" @@ -1593,23 +1597,29 @@ msgid "compilation finished successful" msgstr "" -#: src/prefs.c:193 +#: src/prefs.c:195 msgid "Action" msgstr "" -#: src/prefs.c:198 +#: src/prefs.c:200 msgid "Shortcut" msgstr "" -#: src/prefs.c:556 +#: src/prefs.c:564 msgid "Grab key" msgstr "" -#: src/prefs.c:560 +#: src/prefs.c:568 #, c-format msgid "Type the combination of the keys you want to use for \"%s\"" msgstr "" +#: src/prefs.c:692 +#, c-format +msgid "" +"The combination '%s' is already used for \"%s\". Please choose another one." +msgstr "" + #: src/about.c:91 msgid "About Geany" msgstr "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [414] trunk
by ntrel＠users.sourceforge.net 05 Jun '06

05 Jun '06

Revision: 414 Author: ntrel Date: 2006-06-05 15:04:50 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=414&view=rev Log Message: ----------- Fix empty white box glitch with tag autocompletion, also improves typing response efficiency Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-05 17:39:58 UTC (rev 413) +++ trunk/ChangeLog 2006-06-05 22:04:50 UTC (rev 414) @@ -1,6 +1,8 @@ 2006-06-05 Nick Treleaven <nick.treleaven(a)btinternet.com> * doc/geany.docbook: Added save current file behaviour when building. + * src/sci_cb.c: Fix empty white box glitch with tag autocompletion, + also improves typing response efficiency. 2006-06-05 Enrico Troeger <enrico.troeger(a)uvena.de> Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-06-05 17:39:58 UTC (rev 413) +++ trunk/src/sci_cb.c 2006-06-05 22:04:50 UTC (rev 414) @@ -398,7 +398,6 @@ gint line_start = sci_get_position_from_line(sci, line); gint line_len = sci_get_line_length(sci, line); gint line_pos = pos - line_start - 1; - gint i = 0; gint current = pos - line_start; gint rootlen; gint startword = current, lexer = SSM(sci, SCI_GETLEXER, 0, 0); @@ -407,14 +406,15 @@ gchar *root; const GPtrArray *tags; - sci_get_line(sci, line, linebuf); - //if (lexer != SCLEX_CPP && lexer != SCLEX_HTML && lexer != SCLEX_PASCAL) return FALSE; if (lexer == SCLEX_HTML && style == SCE_H_DEFAULT) return FALSE; if (lexer == SCLEX_CPP && (style == SCE_C_COMMENT || style == SCE_C_COMMENTLINE || style == SCE_C_COMMENTDOC)) return FALSE; - while ((startword > 0) && (strchr(GEANY_WORDCHARS, linebuf[startword - 1]) || strchr(GEANY_WORDCHARS, linebuf[startword - 1]))) + sci_get_line(sci, line, linebuf); + + // find the start of the current word + while ((startword > 0) && (strchr(GEANY_WORDCHARS, linebuf[startword - 1]))) startword--; linebuf[current] = '\0'; root = linebuf + startword; @@ -440,11 +440,13 @@ } else { // C and C++ tag autocompletion - while (! g_ascii_isspace(linebuf[line_pos - i])) i++; + gint i = 0; + + while ((line_pos - i >= 0) && ! g_ascii_isspace(linebuf[line_pos - i])) i++; if (i < 4) return FALSE; // go home if typed less than 4 chars tags = tm_workspace_find(root, tm_tag_max_t, NULL, TRUE); - if (NULL != tags) + if (NULL != tags && tags->len > 0) { GString *words = g_string_sized_new(150); TMTag *tag; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [413] trunk
by ntrel＠users.sourceforge.net 05 Jun '06

05 Jun '06

Revision: 413 Author: ntrel Date: 2006-06-05 10:39:58 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=413&view=rev Log Message: ----------- Added save current file behaviour when building Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.docbook Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-05 16:04:28 UTC (rev 412) +++ trunk/ChangeLog 2006-06-05 17:39:58 UTC (rev 413) @@ -1,3 +1,8 @@ +2006-06-05 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * doc/geany.docbook: Added save current file behaviour when building. + + 2006-06-05 Enrico Troeger <enrico.troeger(a)uvena.de> * src/dialog.c, src/callbacks.c: Added dialog to show defined keyboard Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2006-06-05 16:04:28 UTC (rev 412) +++ trunk/doc/geany.docbook 2006-06-05 17:39:58 UTC (rev 413) @@ -626,8 +626,13 @@ <section id="buildsystem"> <title>Build System</title> <para> - <application>&app;</application> has an integrated build system. When you compile, - link, syntax check or otherwise process a source file, the output will be captured + <application>&app;</application> has an integrated build system. + Firstly this means that the current source file will be saved before + it is processed. This is for convenience so that you don't need to keep saving + small changes to the current file before building. + </para> + <para> + Secondly the output for Compile, Build and Make actions will be captured in the Compiler notebook tab of the messages window (assuming you have it visible). If there are any warnings or errors with line numbers shown in the Compiler output tab, you can double click on them and <application>&app;</application> will switch to @@ -649,14 +654,17 @@ <section> <title>Compile</title> <para> - By default, the Compile command is setup to build binary object files for - compilable languages such as C and C++. + The Compile command has different uses for different kinds of files. </para> <para> - Java will be compiled to - class file bytecode. Interpreted languages such as Perl, Python, Ruby will + For compilable languages such as C and C++, the Compile command is setup + to compile the current source file into a binary object file. + </para> + <para> + Java source files will be compiled to class file bytecode. + Interpreted languages such as Perl, Python, Ruby will compile to bytecode if the language supports it, or will run a syntax check, - or failing that will run the file in the language interpreter. + or failing that will run the file in its language interpreter. </para> </section> <section> @@ -682,10 +690,10 @@ <section> <title>Build with make (custom target)</title> <para> - This is identical to running 'Build with "make"' but you will be prompted + This is similar to running Build with "make" but you will be prompted for the make target name to be passed to the Make tool. For example, - typing 'clean' in the dialog prompt will run "make clean" (but using the - full path to the Make tool set in Preferences). + typing 'clean' in the dialog prompt will run "make clean" (again using + the full path to the Make tool). </para> </section> <section> @@ -695,8 +703,11 @@ script in a terminal window. Note that the Terminal tool 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. + </para> + <para> 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. + press the return key. This allows you to review any text output from the program + before the terminal window is closed. </para> </section> <section> @@ -706,18 +717,20 @@ only the basic arguments needed by all programs. Using Set Includes and Arguments 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. Note that if - you are using the Build command to compile and link in one step, you will need + linker, and any arguments you want to use when running Execute. + </para> + <note><para> + If you are using the Build command to compile and link in one step, you will need to set both the compiler arguments and the linker arguments in the linker command setting. - </para> + </para></note> <para> These settings are not saved when <application>&app;</application> is shut down. See below for how to set permanent arguments. </para> <para> If you need complex settings for your build system, or several different - settings, then writing a Makefile and using 'Build with "make"' is recommended. + settings, then writing a Makefile and using Build with "make" is recommended. </para> </section> <section> @@ -725,7 +738,7 @@ <para> You can set the commands to run for compiling, building or executing by opening the relevant <filename>filetypes.*</filename> configuration file, - and checking the build_settings section. See <xref linkend="filetypes"/> for more + and checking the [build_settings] section. See <xref linkend="filetypes"/> for more information. </para> </section> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [412] trunk
by eht16＠users.sourceforge.net 05 Jun '06

05 Jun '06

Revision: 412 Author: eht16 Date: 2006-06-05 09:04:28 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=412&view=rev Log Message: ----------- fixed compiler warning "not enough variable arguments to fit a sentinel" Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-05 15:12:40 UTC (rev 411) +++ trunk/ChangeLog 2006-06-05 16:04:28 UTC (rev 412) @@ -5,6 +5,8 @@ link to the documentation. * src/main.c, src/document.c: Fixed wrong setting of filetype when using "All files" as filetype. + * src/dialogs.c: fixed compiler warning "not enough variable arguments + to fit a sentinel" 2006-06-04 Enrico Troeger <enrico.troeger(a)uvena.de> Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-06-05 15:12:40 UTC (rev 411) +++ trunk/src/dialogs.c 2006-06-05 16:04:28 UTC (rev 412) @@ -66,8 +66,8 @@ GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); gint i; - app->open_filesel = gtk_file_chooser_dialog_new(_("Open File"), NULL, - GTK_FILE_CHOOSER_ACTION_OPEN, NULL); + app->open_filesel = gtk_file_chooser_dialog_new(_("Open File"), GTK_WINDOW(app->window), + GTK_FILE_CHOOSER_ACTION_OPEN, NULL, NULL); viewbtn = gtk_button_new_with_mnemonic(_("_View")); gtk_tooltips_set_tip(tooltips, viewbtn, @@ -160,7 +160,7 @@ if (app->save_filesel == NULL) { - app->save_filesel = gtk_file_chooser_dialog_new(_("Save File"), NULL, + app->save_filesel = gtk_file_chooser_dialog_new(_("Save File"), GTK_WINDOW(app->window), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); gtk_window_set_modal(GTK_WINDOW(app->save_filesel), TRUE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2006