Commits November 2006

commits@lists.geany.org

3 participants
89 discussions

SF.net SVN: geany: [1028] trunk/src/prefs.c
by ntrel＠users.sourceforge.net 24 Nov '06

24 Nov '06

Revision: 1028 http://svn.sourceforge.net/geany/?rev=1028&view=rev Author: ntrel Date: 2006-11-24 03:55:26 -0800 (Fri, 24 Nov 2006) Log Message: ----------- Remove callbacks.h include. Modified Paths: -------------- trunk/src/prefs.c Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2006-11-24 11:47:29 UTC (rev 1027) +++ trunk/src/prefs.c 2006-11-24 11:55:26 UTC (rev 1028) @@ -38,7 +38,6 @@ #include "keybindings.h" #include "interface.h" #include "encodings.h" -#include "callbacks.h" #ifdef HAVE_VTE # include "vte.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1027] trunk
by ntrel＠users.sourceforge.net 24 Nov '06

24 Nov '06

Revision: 1027 http://svn.sourceforge.net/geany/?rev=1027&view=rev Author: ntrel Date: 2006-11-24 03:47:29 -0800 (Fri, 24 Nov 2006) Log Message: ----------- Move VTE preferences GUI code to vte.c. Move on_pref_tools_button_clicked() to prefs.c. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/prefs.c trunk/src/prefs.h trunk/src/vte.c trunk/src/vte.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-24 11:11:06 UTC (rev 1026) +++ trunk/ChangeLog 2006-11-24 11:47:29 UTC (rev 1027) @@ -3,6 +3,10 @@ * src/ui_utils.h, src/prefs.c, src/dialogs.c, src/ui_utils.c: Add frame for VTE Preferences tab, update packing. Replace ui_frame_new() with ui_frame_new_with_alignment(). + * src/callbacks.c, src/callbacks.h, src/vte.c, src/vte.h, src/prefs.c, + src/prefs.h: + Move VTE preferences GUI code to vte.c. + Move on_pref_tools_button_clicked() to prefs.c. 2006-11-23 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-11-24 11:11:06 UTC (rev 1026) +++ trunk/src/callbacks.c 2006-11-24 11:47:29 UTC (rev 1027) @@ -52,10 +52,6 @@ #include "main.h" #include "symbols.h" -#ifdef G_OS_WIN32 -# include "win32.h" -#endif - #ifdef HAVE_VTE # include "vte.h" #endif @@ -1440,55 +1436,6 @@ void -on_pref_tools_button_clicked (GtkButton *button, - gpointer item) -{ -#ifdef G_OS_WIN32 - win32_show_pref_file_dialog(item); -#else - GtkWidget *dialog; - gchar *filename, *tmp, **field; - - // initialize the dialog - dialog = gtk_file_chooser_dialog_new(_("Open File"), GTK_WINDOW(app->prefs_dialog), - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); - // cut the options from the command line - field = g_strsplit(gtk_entry_get_text(GTK_ENTRY(item)), " ", 2); - if (field[0]) - { - filename = g_find_program_in_path(field[0]); - if (filename) - { - gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(dialog), filename); - g_free(filename); - } - } - - // run it - if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) - { - tmp = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - if (g_strv_length(field) > 1) - filename = g_strconcat(tmp, " ", field[1], NULL); - else - { - filename = tmp; - tmp = NULL; - } - gtk_entry_set_text(GTK_ENTRY(item), filename); - g_free(filename); - g_free(tmp); - } - - g_strfreev(field); - gtk_widget_destroy(dialog); -#endif -} - - -void on_comments_function_activate (GtkMenuItem *menuitem, gpointer user_data) { Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2006-11-24 11:11:06 UTC (rev 1026) +++ trunk/src/callbacks.h 2006-11-24 11:47:29 UTC (rev 1027) @@ -370,11 +370,6 @@ gpointer user_data); void -on_pref_tools_button_clicked (GtkButton *button, - gpointer user_data); - - -void on_line_breaking1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2006-11-24 11:11:06 UTC (rev 1026) +++ trunk/src/prefs.c 2006-11-24 11:47:29 UTC (rev 1027) @@ -44,7 +44,11 @@ # include "vte.h" #endif +#ifdef G_OS_WIN32 +# include "win32.h" +#endif + gchar *dialog_key_name; static GtkListStore *store = NULL; static GtkTreeView *tree = NULL; @@ -927,186 +931,6 @@ } -#ifdef HAVE_VTE -static void create_vte_settings() -{ - if (vte_info.have_vte) - { - GtkWidget *notebook, *vbox, *label, *alignment, *table, *frame, *box; - GtkWidget *font_term, *color_fore, *color_back, *spin_scrollback, *entry_emulation; - GtkWidget *check_scroll_key, *check_scroll_out, *check_follow_path, *check_ignore_menu_key; - GtkWidget *entry_shell, *button_shell, *image_shell; - GtkTooltips *tooltips; - GtkObject *spin_scrollback_adj; - - tooltips = GTK_TOOLTIPS(lookup_widget(app->prefs_dialog, "tooltips")); - notebook = lookup_widget(app->prefs_dialog, "notebook2"); - - frame = ui_frame_new_with_alignment(_("Terminal plugin"), &alignment); - vbox = gtk_vbox_new(FALSE, 12); - gtk_container_add(GTK_CONTAINER(alignment), vbox); - - label = gtk_label_new(_("Terminal")); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, label); - - label = gtk_label_new(_("These settings for the virtual terminal emulator widget (VTE) only apply if the VTE library could be loaded.")); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 6); - gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_FILL); - gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - - table = gtk_table_new(6, 2, FALSE); - gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); - gtk_table_set_row_spacings(GTK_TABLE(table), 3); - gtk_table_set_col_spacings(GTK_TABLE(table), 10); - - label = gtk_label_new(_("Terminal font:")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - - font_term = gtk_font_button_new(); - gtk_table_attach(GTK_TABLE(table), font_term, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, font_term, _("Sets the font for the terminal widget."), NULL); - - label = gtk_label_new(_("Foreground color:")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - - label = gtk_label_new(_("Background color:")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - - color_fore = gtk_color_button_new(); - gtk_table_attach(GTK_TABLE(table), color_fore, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, color_fore, _("Sets the foreground color of the text in the terminal widget."), NULL); - gtk_color_button_set_title(GTK_COLOR_BUTTON(color_fore), _("Color Chooser")); - - color_back = gtk_color_button_new(); - gtk_table_attach(GTK_TABLE(table), color_back, 1, 2, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, color_back, _("Sets the background color of the text in the terminal widget."), NULL); - gtk_color_button_set_title(GTK_COLOR_BUTTON(color_back), _("Color Chooser")); - - label = gtk_label_new(_("Scrollback lines:")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - - spin_scrollback_adj = gtk_adjustment_new(500, 0, 5000, 1, 10, 10); - spin_scrollback = gtk_spin_button_new(GTK_ADJUSTMENT(spin_scrollback_adj), 1, 0); - gtk_table_attach(GTK_TABLE(table), spin_scrollback, 1, 2, 3, 4, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, spin_scrollback, _("Specifies the history in lines, which you can scroll back in the terminal widget."), NULL); - gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(spin_scrollback), TRUE); - gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spin_scrollback), TRUE); - - label = gtk_label_new(_("Terminal emulation:")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - - entry_emulation = gtk_entry_new(); - gtk_table_attach(GTK_TABLE(table), entry_emulation, 1, 2, 4, 5, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, entry_emulation, _("Controls how the terminal emulator should behave. xterm is a good start."), NULL); - - label = gtk_label_new(_("Shell:")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - - entry_shell = gtk_entry_new(); - gtk_tooltips_set_tip(tooltips, entry_shell, _("Sets the path to the shell which should be started inside the terminal emulation."), NULL); - - button_shell = gtk_button_new(); - gtk_widget_show(button_shell); - - box = gtk_hbox_new(FALSE, 6); - gtk_box_pack_start_defaults(GTK_BOX(box), entry_shell); - gtk_box_pack_start(GTK_BOX(box), button_shell, FALSE, FALSE, 0); - gtk_table_attach(GTK_TABLE(table), box, 1, 2, 5, 6, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - - image_shell = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image_shell); - gtk_container_add(GTK_CONTAINER(button_shell), image_shell); - - box = gtk_vbox_new(FALSE, 3); - check_scroll_key = gtk_check_button_new_with_mnemonic(_("Scroll on keystroke")); - gtk_tooltips_set_tip(tooltips, check_scroll_key, _("Whether to scroll to the bottom if a key was pressed."), NULL); - gtk_button_set_focus_on_click(GTK_BUTTON(check_scroll_key), FALSE); - gtk_container_add(GTK_CONTAINER(box), check_scroll_key); - - check_scroll_out = gtk_check_button_new_with_mnemonic(_("Scroll on output")); - gtk_tooltips_set_tip(tooltips, check_scroll_out, _("Whether to scroll to the bottom when output is generated."), NULL); - gtk_button_set_focus_on_click(GTK_BUTTON(check_scroll_out), FALSE); - gtk_container_add(GTK_CONTAINER(box), check_scroll_out); - - check_ignore_menu_key = gtk_check_button_new_with_mnemonic(_("Disable menu shortcut key (F10 by default)")); - gtk_tooltips_set_tip(tooltips, check_ignore_menu_key, _("This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE."), NULL); - gtk_button_set_focus_on_click(GTK_BUTTON(check_ignore_menu_key), FALSE); - gtk_container_add(GTK_CONTAINER(box), check_ignore_menu_key); - - check_follow_path = gtk_check_button_new_with_mnemonic(_("Follow the path of the current file")); - gtk_tooltips_set_tip(tooltips, check_follow_path, _("Whether to execute \"cd $path\" when you switch between opened files."), NULL); - gtk_button_set_focus_on_click(GTK_BUTTON(check_follow_path), FALSE); - gtk_container_add(GTK_CONTAINER(box), check_follow_path); - - gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 0); - - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "font_term", - gtk_widget_ref(font_term), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "color_fore", - gtk_widget_ref(color_fore), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "color_back", - gtk_widget_ref(color_back), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "spin_scrollback", - gtk_widget_ref(spin_scrollback), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "entry_emulation", - gtk_widget_ref(entry_emulation), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "entry_shell", - gtk_widget_ref(entry_shell), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "check_scroll_key", - gtk_widget_ref(check_scroll_key), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "check_scroll_out", - gtk_widget_ref(check_scroll_out), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "check_ignore_menu_key", - gtk_widget_ref(check_ignore_menu_key), (GDestroyNotify) gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->prefs_dialog), "check_follow_path", - gtk_widget_ref(check_follow_path), (GDestroyNotify) gtk_widget_unref); - - gtk_widget_show_all(frame); - - g_signal_connect((gpointer) font_term, "font-set", G_CALLBACK(on_prefs_font_choosed), - GINT_TO_POINTER(4)); - g_signal_connect((gpointer) color_fore, "color-set", G_CALLBACK(on_prefs_color_choosed), - GINT_TO_POINTER(2)); - g_signal_connect((gpointer) color_back, "color-set", G_CALLBACK(on_prefs_color_choosed), - GINT_TO_POINTER(3)); - g_signal_connect((gpointer) button_shell, "clicked", - G_CALLBACK(on_pref_tools_button_clicked), entry_shell); - } -} -#endif - - void dialogs_show_prefs_dialog(void) { if (app->prefs_dialog == NULL) @@ -1129,7 +953,7 @@ } #ifdef HAVE_VTE - create_vte_settings(); + vte_append_preferences_tab(); #endif g_signal_connect((gpointer) app->prefs_dialog, "response", G_CALLBACK(on_prefs_button_clicked), NULL); @@ -1144,15 +968,15 @@ "color-set", G_CALLBACK(on_prefs_color_choosed), GINT_TO_POINTER(1)); // file chooser buttons in the tools tab g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_make"), - "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_com_make")); + "clicked", G_CALLBACK(on_prefs_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_com_make")); g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_term"), - "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_com_term")); + "clicked", G_CALLBACK(on_prefs_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_com_term")); g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_browser"), - "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_browser")); + "clicked", G_CALLBACK(on_prefs_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_browser")); g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_print"), - "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_print")); + "clicked", G_CALLBACK(on_prefs_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_print")); g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "button_grep"), - "clicked", G_CALLBACK(on_pref_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_grep")); + "clicked", G_CALLBACK(on_prefs_tools_button_clicked), lookup_widget(app->prefs_dialog, "entry_grep")); g_signal_connect((gpointer) lookup_widget(app->prefs_dialog, "check_toolbar_show"), "toggled", G_CALLBACK(on_pref_toolbar_show_toggled), NULL); @@ -1164,3 +988,54 @@ prefs_init_dialog(); gtk_widget_show(app->prefs_dialog); } + + +void +on_prefs_tools_button_clicked (GtkButton *button, + gpointer item) +{ +#ifdef G_OS_WIN32 + win32_show_pref_file_dialog(item); +#else + GtkWidget *dialog; + gchar *filename, *tmp, **field; + + // initialize the dialog + dialog = gtk_file_chooser_dialog_new(_("Open File"), GTK_WINDOW(app->prefs_dialog), + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + // cut the options from the command line + field = g_strsplit(gtk_entry_get_text(GTK_ENTRY(item)), " ", 2); + if (field[0]) + { + filename = g_find_program_in_path(field[0]); + if (filename) + { + gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(dialog), filename); + g_free(filename); + } + } + + // run it + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) + { + tmp = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + if (g_strv_length(field) > 1) + filename = g_strconcat(tmp, " ", field[1], NULL); + else + { + filename = tmp; + tmp = NULL; + } + gtk_entry_set_text(GTK_ENTRY(item), filename); + g_free(filename); + g_free(tmp); + } + + g_strfreev(field); + gtk_widget_destroy(dialog); +#endif +} + + Modified: trunk/src/prefs.h =================================================================== --- trunk/src/prefs.h 2006-11-24 11:11:06 UTC (rev 1026) +++ trunk/src/prefs.h 2006-11-24 11:47:29 UTC (rev 1027) @@ -35,4 +35,6 @@ void dialogs_show_prefs_dialog(void); +void on_prefs_tools_button_clicked(GtkButton *button, gpointer user_data); + #endif Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2006-11-24 11:11:06 UTC (rev 1026) +++ trunk/src/vte.c 2006-11-24 11:47:29 UTC (rev 1027) @@ -32,6 +32,7 @@ #include "msgwindow.h" #include "support.h" #include "prefs.h" +#include "ui_utils.h" VteInfo vte_info; @@ -42,7 +43,9 @@ static struct VteFunctions *vf; static gboolean popup_menu_created = FALSE; static gchar *gtk_menu_key_accel = NULL; +static gint vte_prefs_tab_num = -1; +// use vte wordchars to select paths static const gchar VTE_WORDCHARS[] = "-A-Za-z0-9,./?%&#:_"; @@ -334,8 +337,7 @@ notebook = lookup_widget(app->prefs_dialog, "notebook2"); - gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), - gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook)) - 1); + gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), vte_prefs_tab_num); break; } } @@ -484,4 +486,182 @@ */ +void vte_append_preferences_tab() +{ + if (vte_info.have_vte) + { + GtkWidget *notebook, *vbox, *label, *alignment, *table, *frame, *box; + GtkWidget *font_term, *color_fore, *color_back, *spin_scrollback, *entry_emulation; + GtkWidget *check_scroll_key, *check_scroll_out, *check_follow_path, *check_ignore_menu_key; + GtkWidget *entry_shell, *button_shell, *image_shell; + GtkTooltips *tooltips; + GtkObject *spin_scrollback_adj; + + tooltips = GTK_TOOLTIPS(lookup_widget(app->prefs_dialog, "tooltips")); + notebook = lookup_widget(app->prefs_dialog, "notebook2"); + + frame = ui_frame_new_with_alignment(_("Terminal plugin"), &alignment); + vbox = gtk_vbox_new(FALSE, 12); + gtk_container_add(GTK_CONTAINER(alignment), vbox); + + label = gtk_label_new(_("Terminal")); + vte_prefs_tab_num = gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, label); + + label = gtk_label_new(_("These settings for the virtual terminal emulator widget (VTE) only apply if the VTE library could be loaded.")); + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 6); + gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_FILL); + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + + table = gtk_table_new(6, 2, FALSE); + gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); + gtk_table_set_row_spacings(GTK_TABLE(table), 3); + gtk_table_set_col_spacings(GTK_TABLE(table), 10); + + label = gtk_label_new(_("Terminal font:")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + + font_term = gtk_font_button_new(); + gtk_table_attach(GTK_TABLE(table), font_term, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip(tooltips, font_term, _("Sets the font for the terminal widget."), NULL); + + label = gtk_label_new(_("Foreground color:")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + + label = gtk_label_new(_("Background color:")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + + color_fore = gtk_color_button_new(); + gtk_table_attach(GTK_TABLE(table), color_fore, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip(tooltips, color_fore, _("Sets the foreground color of the text in the terminal widget."), NULL); + gtk_color_button_set_title(GTK_COLOR_BUTTON(color_fore), _("Color Chooser")); + + color_back = gtk_color_button_new(); + gtk_table_attach(GTK_TABLE(table), color_back, 1, 2, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip(tooltips, color_back, _("Sets the background color of the text in the terminal widget."), NULL); + gtk_color_button_set_title(GTK_COLOR_BUTTON(color_back), _("Color Chooser")); + + label = gtk_label_new(_("Scrollback lines:")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + + spin_scrollback_adj = gtk_adjustment_new(500, 0, 5000, 1, 10, 10); + spin_scrollback = gtk_spin_button_new(GTK_ADJUSTMENT(spin_scrollback_adj), 1, 0); + gtk_table_attach(GTK_TABLE(table), spin_scrollback, 1, 2, 3, 4, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip(tooltips, spin_scrollback, _("Specifies the history in lines, which you can scroll back in the terminal widget."), NULL); + gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(spin_scrollback), TRUE); + gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spin_scrollback), TRUE); + + label = gtk_label_new(_("Terminal emulation:")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + + entry_emulation = gtk_entry_new(); + gtk_table_attach(GTK_TABLE(table), entry_emulation, 1, 2, 4, 5, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip(tooltips, entry_emulation, _("Controls how the terminal emulator should behave. xterm is a good start."), NULL); + + label = gtk_label_new(_("Shell:")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + + entry_shell = gtk_entry_new(); + gtk_tooltips_set_tip(tooltips, entry_shell, _("Sets the path to the shell which should be started inside the terminal emulation."), NULL); + + button_shell = gtk_button_new(); + gtk_widget_show(button_shell); + + box = gtk_hbox_new(FALSE, 6); + gtk_box_pack_start_defaults(GTK_BOX(box), entry_shell); + gtk_box_pack_start(GTK_BOX(box), button_shell, FALSE, FALSE, 0); + gtk_table_attach(GTK_TABLE(table), box, 1, 2, 5, 6, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + + image_shell = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image_shell); + gtk_container_add(GTK_CONTAINER(button_shell), image_shell); + + box = gtk_vbox_new(FALSE, 3); + check_scroll_key = gtk_check_button_new_with_mnemonic(_("Scroll on keystroke")); + gtk_tooltips_set_tip(tooltips, check_scroll_key, _("Whether to scroll to the bottom if a key was pressed."), NULL); + gtk_button_set_focus_on_click(GTK_BUTTON(check_scroll_key), FALSE); + gtk_container_add(GTK_CONTAINER(box), check_scroll_key); + + check_scroll_out = gtk_check_button_new_with_mnemonic(_("Scroll on output")); + gtk_tooltips_set_tip(tooltips, check_scroll_out, _("Whether to scroll to the bottom when output is generated."), NULL); + gtk_button_set_focus_on_click(GTK_BUTTON(check_scroll_out), FALSE); + gtk_container_add(GTK_CONTAINER(box), check_scroll_out); + + check_ignore_menu_key = gtk_check_button_new_with_mnemonic(_("Disable menu shortcut key (F10 by default)")); + gtk_tooltips_set_tip(tooltips, check_ignore_menu_key, _("This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE."), NULL); + gtk_button_set_focus_on_click(GTK_BUTTON(check_ignore_menu_key), FALSE); + gtk_container_add(GTK_CONTAINER(box), check_ignore_menu_key); + + check_follow_path = gtk_check_button_new_with_mnemonic(_("Follow the path of the current file")); + gtk_tooltips_set_tip(tooltips, check_follow_path, _("Whether to execute \"cd $path\" when you switch between opened files."), NULL); + gtk_button_set_focus_on_click(GTK_BUTTON(check_follow_path), FALSE); + gtk_container_add(GTK_CONTAINER(box), check_follow_path); + + gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 0); + + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "font_term", + gtk_widget_ref(font_term), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "color_fore", + gtk_widget_ref(color_fore), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "color_back", + gtk_widget_ref(color_back), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "spin_scrollback", + gtk_widget_ref(spin_scrollback), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "entry_emulation", + gtk_widget_ref(entry_emulation), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "entry_shell", + gtk_widget_ref(entry_shell), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "check_scroll_key", + gtk_widget_ref(check_scroll_key), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "check_scroll_out", + gtk_widget_ref(check_scroll_out), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "check_ignore_menu_key", + gtk_widget_ref(check_ignore_menu_key), (GDestroyNotify) gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->prefs_dialog), "check_follow_path", + gtk_widget_ref(check_follow_path), (GDestroyNotify) gtk_widget_unref); + + gtk_widget_show_all(frame); + + g_signal_connect((gpointer) font_term, "font-set", G_CALLBACK(on_prefs_font_choosed), + GINT_TO_POINTER(4)); + g_signal_connect((gpointer) color_fore, "color-set", G_CALLBACK(on_prefs_color_choosed), + GINT_TO_POINTER(2)); + g_signal_connect((gpointer) color_back, "color-set", G_CALLBACK(on_prefs_color_choosed), + GINT_TO_POINTER(3)); + g_signal_connect((gpointer) button_shell, "clicked", + G_CALLBACK(on_prefs_tools_button_clicked), entry_shell); + } +} + + #endif Modified: trunk/src/vte.h =================================================================== --- trunk/src/vte.h 2006-11-24 11:11:06 UTC (rev 1026) +++ trunk/src/vte.h 2006-11-24 11:47:29 UTC (rev 1027) @@ -24,13 +24,14 @@ #ifndef GEANY_VTE_H #define GEANY_VTE_H 1 +#ifdef HAVE_VTE + /* include stdlib.h AND unistd.h, because on GNU/Linux pid_t seems to be * in stdlib.h, on FreeBSD in unistd.h */ #include <stdlib.h> #include <unistd.h> -#ifdef HAVE_VTE typedef struct { gboolean load_vte; @@ -59,7 +60,6 @@ GdkColor *colour_back; } VteConfig; VteConfig *vc; -#endif void vte_init(void); @@ -74,6 +74,8 @@ void vte_cwd(const gchar *filename); +void vte_append_preferences_tab(); + /* void vte_drag_data_received(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, GtkSelectionData *data, guint info, guint time); @@ -129,5 +131,6 @@ void (*vte_terminal_im_append_menuitems) (VteTerminal *terminal, GtkMenuShell *menushell); }; +#endif #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1026] trunk
by ntrel＠users.sourceforge.net 24 Nov '06

24 Nov '06

Revision: 1026 http://svn.sourceforge.net/geany/?rev=1026&view=rev Author: ntrel Date: 2006-11-24 03:11:06 -0800 (Fri, 24 Nov 2006) Log Message: ----------- Add frame for VTE Preferences tab, update packing. Replace ui_frame_new() with ui_frame_new_with_alignment(). Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c trunk/src/prefs.c trunk/src/ui_utils.c trunk/src/ui_utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-23 22:14:31 UTC (rev 1025) +++ trunk/ChangeLog 2006-11-24 11:11:06 UTC (rev 1026) @@ -1,3 +1,10 @@ +2006-11-24 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/ui_utils.h, src/prefs.c, src/dialogs.c, src/ui_utils.c: + Add frame for VTE Preferences tab, update packing. + Replace ui_frame_new() with ui_frame_new_with_alignment(). + + 2006-11-23 Enrico Tröger <enrico.troeger(a)uvena.de> * src/vte.c: Fixed segfault when opening the preferences dialog for Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-11-23 22:14:31 UTC (rev 1025) +++ trunk/src/dialogs.c 2006-11-24 11:11:06 UTC (rev 1026) @@ -718,14 +718,16 @@ if (ft->menu_items->can_compile || ft->menu_items->can_link || ft->menu_items->can_exec) { - GtkContainer *container; + GtkWidget *align, *frame; gchar *frame_title = g_strconcat(ft->title, _(" commands"), NULL); - container = ui_frame_new(GTK_CONTAINER(vbox), frame_title); + + frame = ui_frame_new_with_alignment(frame_title, &align); + gtk_container_add(GTK_CONTAINER(vbox), frame); g_free(frame_title); ft_table = gtk_table_new(3, 2, FALSE); gtk_table_set_row_spacings(GTK_TABLE(ft_table), 6); - gtk_container_add(container, ft_table); + gtk_container_add(GTK_CONTAINER(align), ft_table); row = 0; } Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2006-11-23 22:14:31 UTC (rev 1025) +++ trunk/src/prefs.c 2006-11-24 11:11:06 UTC (rev 1026) @@ -927,12 +927,12 @@ } +#ifdef HAVE_VTE static void create_vte_settings() { -#ifdef HAVE_VTE if (vte_info.have_vte) { - GtkWidget *notebook, *vbox, *label, *alignment, *table; + GtkWidget *notebook, *vbox, *label, *alignment, *table, *frame, *box; GtkWidget *font_term, *color_fore, *color_back, *spin_scrollback, *entry_emulation; GtkWidget *check_scroll_key, *check_scroll_out, *check_follow_path, *check_ignore_menu_key; GtkWidget *entry_shell, *button_shell, *image_shell; @@ -941,26 +941,26 @@ tooltips = GTK_TOOLTIPS(lookup_widget(app->prefs_dialog, "tooltips")); notebook = lookup_widget(app->prefs_dialog, "notebook2"); - vbox = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(notebook), vbox); - label = gtk_label_new(_("These are settings for the virtual terminal emulator widget (VTE). They only apply, if the VTE library could be loaded.")); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); + frame = ui_frame_new_with_alignment(_("Terminal plugin"), &alignment); + vbox = gtk_vbox_new(FALSE, 12); + gtk_container_add(GTK_CONTAINER(alignment), vbox); + + label = gtk_label_new(_("Terminal")); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, label); + + label = gtk_label_new(_("These settings for the virtual terminal emulator widget (VTE) only apply if the VTE library could be loaded.")); + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 6); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_FILL); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0.14, 0.19); - gtk_misc_set_padding(GTK_MISC(label), 0, 8); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - alignment = gtk_alignment_new(0.5, 0.5, 1, 1); - gtk_box_pack_start(GTK_BOX(vbox), alignment, FALSE, FALSE, 0); - gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, 12, 6); - - table = gtk_table_new(10, 3, FALSE); - gtk_container_add(GTK_CONTAINER(alignment), table); + table = gtk_table_new(6, 2, FALSE); + gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); gtk_table_set_row_spacings(GTK_TABLE(table), 3); gtk_table_set_col_spacings(GTK_TABLE(table), 10); - label = gtk_label_new(_("Terminal font")); + label = gtk_label_new(_("Terminal font:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -972,13 +972,13 @@ (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip(tooltips, font_term, _("Sets the font for the terminal widget."), NULL); - label = gtk_label_new(_("Foreground color")); + label = gtk_label_new(_("Foreground color:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - label = gtk_label_new(_("Background color")); + label = gtk_label_new(_("Background color:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -998,7 +998,7 @@ gtk_tooltips_set_tip(tooltips, color_back, _("Sets the background color of the text in the terminal widget."), NULL); gtk_color_button_set_title(GTK_COLOR_BUTTON(color_back), _("Color Chooser")); - label = gtk_label_new(_("Scrollback lines")); + label = gtk_label_new(_("Scrollback lines:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -1013,7 +1013,7 @@ gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(spin_scrollback), TRUE); gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spin_scrollback), TRUE); - label = gtk_label_new(_("Terminal emulation")); + label = gtk_label_new(_("Terminal emulation:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -1025,61 +1025,51 @@ (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip(tooltips, entry_emulation, _("Controls how the terminal emulator should behave. xterm is a good start."), NULL); - label = gtk_label_new(_("Shell")); + label = gtk_label_new(_("Shell:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); entry_shell = gtk_entry_new(); - gtk_table_attach(GTK_TABLE(table), entry_shell, 1, 2, 5, 6, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip(tooltips, entry_shell, _("Sets the path to the shell which should be started inside the terminal emulation."), NULL); button_shell = gtk_button_new(); gtk_widget_show(button_shell); - gtk_table_attach(GTK_TABLE(table), button_shell, 2, 3, 5, 6, - (GtkAttachOptions) (GTK_FILL), + + box = gtk_hbox_new(FALSE, 6); + gtk_box_pack_start_defaults(GTK_BOX(box), entry_shell); + gtk_box_pack_start(GTK_BOX(box), button_shell, FALSE, FALSE, 0); + gtk_table_attach(GTK_TABLE(table), box, 1, 2, 5, 6, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); image_shell = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); gtk_widget_show(image_shell); gtk_container_add(GTK_CONTAINER(button_shell), image_shell); + box = gtk_vbox_new(FALSE, 3); check_scroll_key = gtk_check_button_new_with_mnemonic(_("Scroll on keystroke")); - gtk_table_attach(GTK_TABLE(table), check_scroll_key, 1, 2, 6, 7, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip(tooltips, check_scroll_key, _("Whether to scroll to the bottom if a key was pressed."), NULL); gtk_button_set_focus_on_click(GTK_BUTTON(check_scroll_key), FALSE); + gtk_container_add(GTK_CONTAINER(box), check_scroll_key); check_scroll_out = gtk_check_button_new_with_mnemonic(_("Scroll on output")); - gtk_table_attach(GTK_TABLE(table), check_scroll_out, 1, 2, 7, 8, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, check_scroll_out, _("Whether to scroll to the bottom if an output was generated."), NULL); + gtk_tooltips_set_tip(tooltips, check_scroll_out, _("Whether to scroll to the bottom when output is generated."), NULL); gtk_button_set_focus_on_click(GTK_BUTTON(check_scroll_out), FALSE); + gtk_container_add(GTK_CONTAINER(box), check_scroll_out); check_ignore_menu_key = gtk_check_button_new_with_mnemonic(_("Disable menu shortcut key (F10 by default)")); - gtk_table_attach(GTK_TABLE(table), check_ignore_menu_key, 1, 2, 8, 9, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip(tooltips, check_ignore_menu_key, _("This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE."), NULL); gtk_button_set_focus_on_click(GTK_BUTTON(check_ignore_menu_key), FALSE); + gtk_container_add(GTK_CONTAINER(box), check_ignore_menu_key); check_follow_path = gtk_check_button_new_with_mnemonic(_("Follow the path of the current file")); - gtk_table_attach(GTK_TABLE(table), check_follow_path, 1, 2, 9, 10, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip(tooltips, check_follow_path, _("Whether to execute \"cd $path\" when you switch between opened files."), NULL); gtk_button_set_focus_on_click(GTK_BUTTON(check_follow_path), FALSE); + gtk_container_add(GTK_CONTAINER(box), check_follow_path); - label = gtk_label_new(_("Terminal")); - gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook), - gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), - gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook)) - 1), - label); + gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 0); g_object_set_data_full(G_OBJECT(app->prefs_dialog), "font_term", gtk_widget_ref(font_term), (GDestroyNotify) gtk_widget_unref); @@ -1102,7 +1092,7 @@ g_object_set_data_full(G_OBJECT(app->prefs_dialog), "check_follow_path", gtk_widget_ref(check_follow_path), (GDestroyNotify) gtk_widget_unref); - gtk_widget_show_all(vbox); + gtk_widget_show_all(frame); g_signal_connect((gpointer) font_term, "font-set", G_CALLBACK(on_prefs_font_choosed), GINT_TO_POINTER(4)); @@ -1113,8 +1103,8 @@ g_signal_connect((gpointer) button_shell, "clicked", G_CALLBACK(on_pref_tools_button_clicked), entry_shell); } -#endif } +#endif void dialogs_show_prefs_dialog(void) @@ -1138,7 +1128,9 @@ g_free(encoding_string); } +#ifdef HAVE_VTE create_vte_settings(); +#endif g_signal_connect((gpointer) app->prefs_dialog, "response", G_CALLBACK(on_prefs_button_clicked), NULL); g_signal_connect((gpointer) app->prefs_dialog, "delete_event", G_CALLBACK(on_prefs_delete_event), NULL); Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2006-11-23 22:14:31 UTC (rev 1025) +++ trunk/src/ui_utils.c 2006-11-24 11:11:06 UTC (rev 1026) @@ -994,16 +994,14 @@ } -/* Creates a GNOME HIG style frame (with no border and indented child alignment) - * and packs it into the parent container. - * Returns: the alignment container for the frame */ -GtkContainer *ui_frame_new(GtkContainer *parent, const gchar *label_text) +/* Creates a GNOME HIG style frame (with no border and indented child alignment). + * Returns the frame widget, setting the alignment container for packing child widgets */ +GtkWidget *ui_frame_new_with_alignment(const gchar *label_text, GtkWidget **alignment) { GtkWidget *label, *align; GtkWidget *frame = gtk_frame_new (NULL); gchar *label_markup; - gtk_container_add(GTK_CONTAINER(parent), frame); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); align = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -1016,7 +1014,8 @@ gtk_label_set_use_markup (GTK_LABEL (label), TRUE); g_free(label_markup); - return GTK_CONTAINER(align); + *alignment = align; + return frame; } Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2006-11-23 22:14:31 UTC (rev 1025) +++ trunk/src/ui_utils.h 2006-11-24 11:11:06 UTC (rev 1026) @@ -93,7 +93,7 @@ void ui_show_linenumber_margin(); -GtkContainer *ui_frame_new(GtkContainer *parent, const gchar *label_text); +GtkWidget *ui_frame_new_with_alignment(const gchar *label_text, GtkWidget **alignment); GtkWidget *ui_dialog_vbox_new(GtkDialog *dialog); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1025] trunk/po
by kretek＠users.sourceforge.net 23 Nov '06

23 Nov '06

Revision: 1025 http://svn.sourceforge.net/geany/?rev=1025&view=rev Author: kretek Date: 2006-11-23 14:14:31 -0800 (Thu, 23 Nov 2006) Log Message: ----------- Update of German translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2006-11-23 16:06:54 UTC (rev 1024) +++ trunk/po/ChangeLog 2006-11-23 22:14:31 UTC (rev 1025) @@ -1,3 +1,9 @@ +2006-11-23 Frank Lanitz <frank(a)frank.uvena.de> + + * de.po: Update of German translation (Thanks to Christoph Berg for + support) + + 2006-11-22 Frank Lanitz <frank(a)frank.uvena.de> * hu.po: Added Hungarian translation Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2006-11-23 16:06:54 UTC (rev 1024) +++ trunk/po/de.po 2006-11-23 22:14:31 UTC (rev 1025) @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: geany 0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-15 18:21+0100\n" -"PO-Revision-Date: 2006-11-14 21:35+0100\n" +"POT-Creation-Date: 2006-11-23 21:24+0100\n" +"PO-Revision-Date: 2006-11-23 22:38+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" @@ -29,9 +29,7 @@ #: src/main.c:90 msgid "don't open files in a running instance, force opening a new instance" -msgstr "" -"Dateien nicht in einer bereits laufenden Instanz, sondern in einer neuen " -"Instanz öffnen." +msgstr "Dateien nicht in einer bereits laufenden Instanz, sondern in einer neuen Instanz öffnen." #: src/main.c:92 msgid "set initial line number for the first opened file" @@ -91,7 +89,8 @@ msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." -#: src/interface.c:245 src/interface.c:1393 +#: src/interface.c:245 +#: src/interface.c:1393 msgid "Geany" msgstr "Geany" @@ -103,9 +102,15 @@ msgid "New (with _template)" msgstr "Neu (aus _Vorlage)" -#: src/interface.c:277 src/interface.c:296 src/interface.c:340 -#: src/interface.c:514 src/interface.c:560 src/interface.c:731 -#: src/interface.c:741 src/interface.c:1901 src/interface.c:1947 +#: src/interface.c:277 +#: src/interface.c:296 +#: src/interface.c:340 +#: src/interface.c:514 +#: src/interface.c:560 +#: src/interface.c:731 +#: src/interface.c:741 +#: src/interface.c:1901 +#: src/interface.c:1947 msgid "invisible" msgstr "unsichtbar" @@ -121,7 +126,9 @@ msgid "Saves all open files" msgstr "Speichert alle offenen Dateien" -#: src/interface.c:321 src/callbacks.c:460 src/utils.c:352 +#: src/interface.c:321 +#: src/callbacks.c:460 +#: src/utils.c:352 msgid "_Reload" msgstr "_Neu laden" @@ -141,7 +148,8 @@ msgid "Closes all open files" msgstr "Schließt alle offenen Dateien" -#: src/interface.c:388 src/interface.c:999 +#: src/interface.c:388 +#: src/interface.c:999 msgid "Quit Geany" msgstr "Geany beenden" @@ -149,11 +157,13 @@ msgid "_Edit" msgstr "_Bearbeiten" -#: src/interface.c:431 src/interface.c:1802 +#: src/interface.c:431 +#: src/interface.c:1802 msgid "Select _All" msgstr "A_lles auswählen" -#: src/interface.c:440 src/interface.c:1828 +#: src/interface.c:440 +#: src/interface.c:1828 msgid "_Format" msgstr "_Format" @@ -161,35 +171,43 @@ msgid "Convert the case of the current selection" msgstr "Ändert die Großschreibung der aktuellen Auswahl" -#: src/interface.c:448 src/interface.c:1835 +#: src/interface.c:448 +#: src/interface.c:1835 msgid "Convert Selection to _lower-case" msgstr "Auswahl in _Kleinbuchstaben umwandeln" -#: src/interface.c:452 src/interface.c:1839 +#: src/interface.c:452 +#: src/interface.c:1839 msgid "Convert Selection to _upper-case" msgstr "Auswahl in _Großbuchstaben umwandeln" -#: src/interface.c:461 src/interface.c:1848 +#: src/interface.c:461 +#: src/interface.c:1848 msgid "_Comment Line(s)" msgstr "Zeile(n) _auskommentieren" -#: src/interface.c:465 src/interface.c:1852 +#: src/interface.c:465 +#: src/interface.c:1852 msgid "U_ncomment Line(s)" msgstr "Zeile(n) _einkommentieren" -#: src/interface.c:469 src/interface.c:1856 +#: src/interface.c:469 +#: src/interface.c:1856 msgid "_Toggle line commentation" msgstr "Kommentierung _umschalten" -#: src/interface.c:473 src/interface.c:1860 +#: src/interface.c:473 +#: src/interface.c:1860 msgid "Du_plicate Line or Selection" msgstr "Zeile oder Auswahl kopieren" -#: src/interface.c:482 src/interface.c:1869 +#: src/interface.c:482 +#: src/interface.c:1869 msgid "_Increase Indent" msgstr "Einzug _erhöhen" -#: src/interface.c:490 src/interface.c:1877 +#: src/interface.c:490 +#: src/interface.c:1877 msgid "_Decrease Indent" msgstr "Einzug _verringern" @@ -201,49 +219,58 @@ msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: src/interface.c:528 src/interface.c:1915 +#: src/interface.c:528 +#: src/interface.c:1915 msgid "Insert ChangeLog entry" msgstr "ChangeLog-Eintrag hinzufügen" -#: src/interface.c:531 src/interface.c:1918 +#: src/interface.c:531 +#: src/interface.c:1918 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:533 src/interface.c:1920 +#: src/interface.c:533 +#: src/interface.c:1920 msgid "Insert file header" msgstr "Dateikopf einfügen" -#: src/interface.c:536 src/interface.c:1923 +#: src/interface.c:536 +#: src/interface.c:1923 msgid "Inserts a file header at the beginning of the file" msgstr "Fügt einen Dateikopf am Anfang einer neu erzeugten Datei ein" -#: src/interface.c:538 src/interface.c:1925 +#: src/interface.c:538 +#: src/interface.c:1925 msgid "Insert function description" msgstr "Funktionsbeschreibung einfügen" -#: src/interface.c:541 src/interface.c:1928 +#: src/interface.c:541 +#: src/interface.c:1928 msgid "Inserts a description before the current function" msgstr "Fügt eine Funktionsbeschreibung vor der Funktion ein." -#: src/interface.c:543 src/interface.c:1930 +#: src/interface.c:543 +#: src/interface.c:1930 msgid "Insert multiline comment" msgstr "Mehrzeiligen Kommentar einfügen" -#: src/interface.c:546 src/interface.c:1933 +#: src/interface.c:546 +#: src/interface.c:1933 msgid "Inserts a multiline comment" msgstr "Fügt einen mehrzeiligen Kommentar ein." -#: src/interface.c:548 src/interface.c:1935 +#: src/interface.c:548 +#: src/interface.c:1935 msgid "Insert GPL notice" msgstr "GPL-Hinweis am Dateianfang einfügen" -#: src/interface.c:551 src/interface.c:1938 +#: src/interface.c:551 +#: src/interface.c:1938 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:553 src/interface.c:1940 +#: src/interface.c:553 +#: src/interface.c:1940 msgid "Insert Dat_e" msgstr "_Datum einfügen" @@ -251,15 +278,16 @@ msgid "_Search" msgstr "_Suchen" -#: src/interface.c:583 src/search.c:270 +#: src/interface.c:583 msgid "Find _Next" msgstr "_Nächstes" -#: src/interface.c:587 src/search.c:264 +#: src/interface.c:587 msgid "Find _Previous" msgstr "_Vorheriges" -#: src/interface.c:591 src/search.c:381 +#: src/interface.c:591 +#: src/search.c:381 msgid "_Replace" msgstr "_Ersetzen" @@ -271,7 +299,8 @@ msgid "_Go to line" msgstr "Gehe zu _Zeile" -#: src/interface.c:621 src/dialogs.c:77 +#: src/interface.c:621 +#: src/dialogs.c:77 msgid "_View" msgstr "_Ansicht" @@ -293,8 +322,7 @@ #: src/interface.c:649 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:652 msgid "Show _Toolbar" @@ -313,12 +341,8 @@ msgstr "M_arkierungsrand anzeigen" #: src/interface.c:666 -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:669 msgid "Show _Line Numbers" @@ -336,15 +360,10 @@ msgid "_Line wrapping" msgstr "Zeilenu_mbruch" -#: src/interface.c:702 src/interface.c:3072 -msgid "" -"Wrap the line at the window border and continue it on the next line. Note: " -"line wrapping has a high performance cost for large documents so should be " -"disabled on slow machines." -msgstr "" -"Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile " -"fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel " -"Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." +#: src/interface.c:702 +#: src/interface.c:3141 +msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." +msgstr "Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." #: src/interface.c:705 msgid "_Use auto indentation" @@ -390,7 +409,8 @@ msgid "_Replace tabs by spaces" msgstr "_Tabulatoren durch Leerzeichen ersetzen" -#: src/interface.c:775 src/interface.c:3005 +#: src/interface.c:775 +#: src/interface.c:2913 msgid "Replaces all tabs in document by spaces." msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen" @@ -416,11 +436,11 @@ #: src/interface.c:800 msgid "Removes all error indicators in the current document." -msgstr "" -"Entfernt alle gesetzten (Fehler)-Markierungen innerhalb des Dokumentes." +msgstr "Entfernt alle gesetzten (Fehler)-Markierungen innerhalb des Dokumentes." #. build the code -#: src/interface.c:802 src/build.c:792 +#: src/interface.c:802 +#: src/build.c:793 msgid "_Build" msgstr "_Erstellen" @@ -432,23 +452,18 @@ msgid "_Colour Chooser" msgstr "_Farbwähler" -#: src/interface.c:816 src/interface.c:937 -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:816 +#: src/interface.c:937 +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:822 msgid "_Word Count" msgstr "_Wörter zählen" #: src/interface.c:825 -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:827 msgid "_Help" @@ -478,7 +493,8 @@ msgid "Save the current file" msgstr "Speichert die aktuelle Datei" -#: src/interface.c:879 src/keybindings.c:117 +#: src/interface.c:879 +#: src/keybindings.c:119 msgid "Save all" msgstr "Alle speichern" @@ -502,7 +518,8 @@ msgid "Redo the last modification" msgstr "Wiederholt die letzte Änderung." -#: src/interface.c:918 src/keybindings.c:165 +#: src/interface.c:918 +#: src/keybindings.c:167 msgid "Compile" msgstr "Kompilieren" @@ -510,7 +527,8 @@ msgid "Compile the current file" msgstr "Kompiliert die aktuelle Datei" -#: src/interface.c:926 src/build.c:852 +#: src/interface.c:926 +#: src/build.c:853 msgid "Run or view the current file" msgstr "Aktuelle Datei anzeigen oder ausführen" @@ -526,7 +544,8 @@ msgid "Zoom out the text" msgstr "Text verkleinern" -#: src/interface.c:964 src/interface.c:969 +#: src/interface.c:964 +#: src/interface.c:969 msgid "Find the entered text in the current file" msgstr "Findet den eingegebenen Text im aktuellen Dokument" @@ -538,11 +557,13 @@ msgid "Jump to the entered line number." msgstr "Springe zu angegebener Zeile" -#: src/interface.c:1026 src/treeviews.c:70 +#: src/interface.c:1026 +#: src/treeviews.c:70 msgid "Symbols" msgstr "Symbole" -#: src/interface.c:1039 src/treeviews.c:301 +#: src/interface.c:1039 +#: src/treeviews.c:301 msgid "Open files" msgstr "Geöffnete Dateien" @@ -562,23 +583,28 @@ msgid "Scribble" msgstr "Notizen" -#: src/interface.c:1623 src/interface.c:2846 +#: src/interface.c:1623 +#: src/interface.c:2768 msgid "Images and text" msgstr "Icons und Text" -#: src/interface.c:1629 src/interface.c:2854 +#: src/interface.c:1629 +#: src/interface.c:2800 msgid "Images only" msgstr "Nur Icons" -#: src/interface.c:1635 src/interface.c:2862 +#: src/interface.c:1635 +#: src/interface.c:2792 msgid "Text only" msgstr "Nur Text" -#: src/interface.c:1646 src/interface.c:2870 +#: src/interface.c:1646 +#: src/interface.c:2784 msgid "Large icons" msgstr "Große Symbole" -#: src/interface.c:1651 src/interface.c:2878 +#: src/interface.c:1651 +#: src/interface.c:2776 msgid "Small icons" msgstr "Kleine Symbole" @@ -598,15 +624,19 @@ msgid "Find usage" msgstr "Auftreten finden" -#: src/interface.c:1963 src/keybindings.c:231 +#: src/interface.c:1963 +#: src/keybindings.c:233 msgid "Go to tag definition" msgstr "Gehe zu Tag Definition" -#: src/interface.c:1967 src/keybindings.c:233 +#: src/interface.c:1967 +#: src/keybindings.c:235 msgid "Go to tag declaration" msgstr "Gehe zu Tag Deklaration" -#: src/interface.c:1976 src/dialogs.c:561 src/keybindings.c:145 +#: src/interface.c:1976 +#: src/dialogs.c:561 +#: src/keybindings.c:147 msgid "Go to line" msgstr "Gehe zu Zeile" @@ -614,608 +644,596 @@ msgid "Goto to the entered line" msgstr "Springe zu angegebener Zeile" -#: src/interface.c:2329 src/keybindings.c:135 +#: src/interface.c:2349 +#: src/keybindings.c:137 msgid "Preferences" msgstr "Einstellungen" -#: src/interface.c:2358 +#: src/interface.c:2382 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: src/interface.c:2362 +#: src/interface.c:2386 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: src/interface.c:2365 +#: src/interface.c:2389 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: src/interface.c:2369 +#: src/interface.c:2393 msgid "Saves the window position and geometry and restores it at the start" msgstr "Speichert die Fensterposition und -größe" -#: src/interface.c:2372 -msgid "Beep on errors or when compilation has finished" -msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" - -#: src/interface.c:2375 -msgid "" -"Whether to beep if an error occured or when the compilation process has " -"finished." -msgstr "" -"Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton " -"ausgegeben werden soll." - -#: src/interface.c:2378 -msgid "Switch to status message list at new message" -msgstr "Wechsele zum Statusmeldungsfenster bei neuer Meldung" - -#: src/interface.c:2381 -msgid "" -"Switch to the status message tab (in the notebook window at the bottom) if a " -"new status message arrives." -msgstr "" -"Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn " -"eine neue Statusmeldung vorliegt." - -#: src/interface.c:2384 +#: src/interface.c:2396 msgid "Load virtual terminal emulation at startup" msgstr "Starte die Virtual Terminal Emulation beim Starten" -#: src/interface.c:2386 -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:2398 +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:2389 +#: src/interface.c:2401 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: src/interface.c:2393 +#: src/interface.c:2405 msgid "Shows a confirmation dialog on exit." msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden." -#: src/interface.c:2414 -msgid "Placement of new file tabs: " -msgstr "Platzierung neuer Dateien:" +#: src/interface.c:2408 +msgid "Startup and shutdown" +msgstr "Start und Beenden " -#: src/interface.c:2418 src/interface.c:2695 src/interface.c:2705 -#: src/interface.c:2715 -msgid "Left" -msgstr "Links" +#: src/interface.c:2427 +msgid "Beep on errors or when compilation has finished" +msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: src/interface.c:2421 -msgid "New file tabs will be placed to the left of the tab list" -msgstr "Neue Dateien werden links von der Datei-Liste platziert." +#: src/interface.c:2430 +msgid "Whether to beep if an error occured or when the compilation process has finished." +msgstr "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton ausgegeben werden soll." -#: src/interface.c:2430 src/interface.c:2696 src/interface.c:2706 -#: src/interface.c:2716 -msgid "Right" -msgstr "Rechts" - #: src/interface.c:2433 -msgid "New file tabs will be placed to the right of the tab list" -msgstr "Neue Dateien werden rechts von der Datei-Liste platziert." +msgid "Switch to status message list at new message" +msgstr "Wechsele zum Statusmeldungsfenster bei neuer Meldung" -#: src/interface.c:2437 -msgid "Show file tabs" -msgstr "Zeige Liste mit geöffneten Dateien" +#: src/interface.c:2436 +msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives." +msgstr "Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn eine neue Statusmeldung vorliegt." -#: src/interface.c:2445 -msgid "Recent files list length:" -msgstr "Anzahl der \"Zuletzt geöffneten\" Dateien" +#: src/interface.c:2439 +#, fuzzy +msgid "Always wrap search and hide the Find dialog" +msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: src/interface.c:2454 -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:2443 +msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" +msgstr "" -#: src/interface.c:2463 +# Denke trifft es besser als »Eigenschaften« +#: src/interface.c:2446 +msgid "Behaviour" +msgstr "Funktionen" + +#: src/interface.c:2451 msgid "General" msgstr "Allgemein" -#: src/interface.c:2485 +#: src/interface.c:2473 msgid "Show symbol list" msgstr "Symbol-Ansicht anzeigen" -#: src/interface.c:2488 src/interface.c:2494 +#: src/interface.c:2476 +#: src/interface.c:2482 msgid "Toggle the symbol list on and off" msgstr "Schaltet die Symbol-Ansicht ein und aus." -#: src/interface.c:2491 +#: src/interface.c:2479 msgid "Show open files list" msgstr "Zeige Liste mit geöffneten Dateien" -#: src/interface.c:2497 +#: src/interface.c:2485 msgid "Sidebar" msgstr "Seitenleiste" -#: src/interface.c:2518 -msgid "Symbol list font" -msgstr "Schriftart der Symbol-Liste" +#: src/interface.c:2506 +msgid "Symbol list:" +msgstr "Symbol-Liste:" -#: src/interface.c:2525 -msgid "Message window font" -msgstr "Schriftart des Meldungsfenster" +#: src/interface.c:2513 +#: src/interface.c:2578 +msgid "Message window:" +msgstr "Meldungsfenster:" -#: src/interface.c:2537 +#: src/interface.c:2520 +#: src/interface.c:2585 +msgid "Editor:" +msgstr "Editor:" + +#: src/interface.c:2532 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster" -#: src/interface.c:2545 -msgid "Sets the font for symbol list window" -msgstr "Ändert die Schriftart für die Symbol-Ansicht" +#: src/interface.c:2540 +msgid "Sets the font for the symbol list" +msgstr "Legt die Schriftart für die Symbol-Ansicht fest. " #: src/interface.c:2548 -msgid "Editor font" -msgstr "Editor-Schriftart" +msgid "Sets the editor font" +msgstr "Legt die Schriftart des Editorfensters fest. " -#: src/interface.c:2560 -msgid "Sets the font for the editors windows" -msgstr "Ändert die Schriftart des Editors" - -#: src/interface.c:2562 +#: src/interface.c:2550 msgid "Fonts" msgstr "Schriftarten" -#: src/interface.c:2583 -msgid "Long line marker" -msgstr "Long line marker" +#: src/interface.c:2571 +msgid "Sidebar:" +msgstr "Seitenleiste:" -#: src/interface.c:2590 -msgid "Long line marker color" -msgstr "Long line marker Farbe" +#: src/interface.c:2592 +msgid "Show editor tabs" +msgstr "Zeige Liste mit geöffneten Dateien" #: src/interface.c:2603 -msgid "" -"The long line marker is a thin vertical line in the editor. It helps to mark " -"long lines, or as a hint to break the line. Set this value to a value " -"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 hinzuweisen. Werte größer als 0 geben die Spalte an, in der " -"die Linie angezeigt werden soll." - -#: src/interface.c:2607 -msgid "Type" -msgstr "Typ" - -#: src/interface.c:2620 -msgid "Line" -msgstr "Linie" - -# Ich kenne das dt. Wort für Monospace einfach nicht. Hoffe, das es richtig ist +#: src/interface.c:2613 #: src/interface.c:2623 -msgid "" -"Prints a vertical line in the editor window at the given cursor position " -"(see below)." -msgstr "" -"Zeichnet eine vertikale Linie im Editorfenster an der angegebenen Cursor-" -"Position (nur sinnvoll mit Festbreitenschriften)." +#: src/interface.c:2960 +msgid "Left" +msgstr "Links" -#: src/interface.c:2627 -msgid "Background" -msgstr "Hintergrund" +#: src/interface.c:2604 +#: src/interface.c:2614 +#: src/interface.c:2624 +#: src/interface.c:2968 +msgid "Right" +msgstr "Rechts" -#: src/interface.c:2630 -msgid "" -"The background colour of characters after the given cursor position (see " -"below) changed to the colour set below. (This is recommended if you use " -"proportional fonts)" -msgstr "" -"Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position" -"(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (das ist " -"nützlich für proportionale Schriftarten)." - -#: src/interface.c:2634 -msgid "Disabled" -msgstr "Deaktiviert" - -#: src/interface.c:2645 -msgid "Sets the color of the long line marker" -msgstr "Stellt die Farbe des \"long line markers\" ein." - -#: src/interface.c:2646 src/dialogs.c:494 src/prefs.c:1004 src/prefs.c:1011 -msgid "Color Chooser" -msgstr "Farbwähler" - -#: src/interface.c:2648 -msgid "Long line marker" -msgstr "Long line marker" - -#: src/interface.c:2669 src/interface.c:3118 -msgid "Editor" -msgstr "Editor" - -#: src/interface.c:2676 -msgid "Message window" -msgstr "Meldungsfenster" - -#: src/interface.c:2683 -msgid "Sidebar" -msgstr "Seitenleiste" - -#: src/interface.c:2697 src/interface.c:2707 src/interface.c:2717 +#: src/interface.c:2605 +#: src/interface.c:2615 +#: src/interface.c:2625 msgid "Top" msgstr "Oben" -#: src/interface.c:2698 src/interface.c:2708 src/interface.c:2718 +#: src/interface.c:2606 +#: src/interface.c:2616 +#: src/interface.c:2626 msgid "Bottom" msgstr "Unten" -#: src/interface.c:2720 +#: src/interface.c:2628 msgid "Tab placement" msgstr "Tab-Platzierung:" -#: src/interface.c:2725 +#: src/interface.c:2633 msgid "Interface" msgstr "Schnittstelle" -#: src/interface.c:2744 +#: src/interface.c:2652 msgid "Show Toolbar" msgstr "Werkzeugleiste anzeigen" -#: src/interface.c:2769 +#: src/interface.c:2677 msgid "Show file operation buttons" msgstr "Dateioperationssymbole anzeigen" -#: src/interface.c:2773 +#: src/interface.c:2681 msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" -msgstr "" -"Zeigt Symbole für Neu, Öffnen, Schließen und Neuladen in der Werkzeugleiste." +msgstr "Zeigt Symbole für Neu, Öffnen, Schließen und Neuladen in der Werkzeugleiste." -#: src/interface.c:2776 +#: src/interface.c:2684 msgid "Show Compile and Run" msgstr "Kompileren und Ausführen anzeigen" -#: src/interface.c:2780 +#: src/interface.c:2688 msgid "Display the Compile and Run buttons in the toolbar" msgstr "Zeigt die Symbole zum Kompilieren und Ausführen in der Werkzeugleiste." -#: src/interface.c:2783 +#: src/interface.c:2691 msgid "Show Colour Chooser button" msgstr "Farbwähler anzeigen" -#: src/interface.c:2787 +#: src/interface.c:2695 msgid "Display the Colour Chooser button in the toolbar" msgstr "Zeigt das Farbwählersymbol in der Werkzeugleiste." -#: src/interface.c:2790 +#: src/interface.c:2698 msgid "Show Zoom In and Zoom Out" msgstr "Heran- und Wegzoomen anzeigen" -#: src/interface.c:2794 +#: src/interface.c:2702 msgid "Display the Zoom In and Zoom Out buttons in the toolbar" msgstr "Zeigt die Symbole zum Heran- und Herauszoomen in der Werkzeugleiste." -#: src/interface.c:2797 +#: src/interface.c:2705 msgid "Show Redo and Undo buttons" msgstr "Rückgängig und Wiederholen anzeigen" -#: src/interface.c:2801 +#: src/interface.c:2709 msgid "Display the Redo and Undo buttons in the toolbar" -msgstr "" -"Zeigt die Symbole zum Rückgängigmachen und Wiederholen in der Werkzeugleiste." +msgstr "Zeigt die Symbole zum Rückgängigmachen und Wiederholen in der Werkzeugleiste." -#: src/interface.c:2804 +#: src/interface.c:2712 msgid "Show Search field" msgstr "Suchfeld anzeigen" -#: src/interface.c:2808 +#: src/interface.c:2716 msgid "Display the search field and button in the toolbar" msgstr "Zeige das Suchfeld in der Werkzeugleiste" -#: src/interface.c:2811 +#: src/interface.c:2719 msgid "Show Goto line field" msgstr "Zeilennummereingabefeld anzeigen" -#: src/interface.c:2815 +#: src/interface.c:2723 msgid "Display the line number field and button in the toolbar" msgstr "Zeige das Zeilennummereingabefeld in der Werkzeugleiste" -#: src/interface.c:2818 +#: src/interface.c:2726 msgid "Show Quit button" msgstr "Icon zum Beenden anzeigen" -#: src/interface.c:2822 +#: src/interface.c:2730 msgid "Display the quit button in the toolbar" msgstr "Zeigt das Icon zum Beenden von Geany in der Werkzeugleiste an." -#: src/interface.c:2825 +#: src/interface.c:2733 msgid "Items" msgstr "Symbole" -#: src/interface.c:2886 -msgid "Icon style" -msgstr "Symbolstil" +#: src/interface.c:2754 +msgid "Icon style:" +msgstr "Symbolstil:" -#: src/interface.c:2893 -msgid "Icon size" -msgstr "Symbolgröße" +#: src/interface.c:2761 +msgid "Icon size:" +msgstr "Symbolgröße:" -#: src/interface.c:2900 +#: src/interface.c:2808 msgid "Appearance" msgstr "Aussehen" -#: src/interface.c:2905 +#: src/interface.c:2813 msgid "Toolbar" msgstr "Werkzeugleiste" -#: src/interface.c:2933 +#: src/interface.c:2841 msgid "Tab Width:" msgstr "Tabulatorbreite" -#: src/interface.c:2940 -msgid "Default encoding:" -msgstr "Standardkodierung:" - -#: src/interface.c:2951 +#: src/interface.c:2853 msgid "Sets the default encoding for newly created files." msgstr "Setzt die Zeichenkodierung für neu erstellte Dateien" -#: src/interface.c:2963 +#: src/interface.c:2865 msgid "The width in chars, which one tab character will take" msgstr "Die Breite in Zeichen, die ein Tabalutar-Zeichen einnimmt" -#: src/interface.c:2968 +#: src/interface.c:2870 +msgid "Default encoding:" +msgstr "Standardkodierung:" + +#: src/interface.c:2876 msgid "New files" msgstr "Neue Dateien" -#: src/interface.c:2987 +#: src/interface.c:2895 msgid "Strip trailing spaces" msgstr "Leerzeichen am Zeilenende entfernen" -#: src/interface.c:2991 +#: src/interface.c:2899 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen an Zeilenenden" -#: src/interface.c:2994 +#: src/interface.c:2902 msgid "Ensure new line at file end" msgstr "Neue Zeile am Dateiende" -#: src/interface.c:2998 +#: src/interface.c:2906 msgid "Ensures that at the end of the file is a new line" msgstr "Fügt am Dateiende eine neue Zeile an (wenn keine vorhanden ist)" -#: src/interface.c:3001 src/keybindings.c:159 +#: src/interface.c:2909 +#: src/keybindings.c:161 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" -#: src/interface.c:3008 +#: src/interface.c:2916 msgid "Saving files" msgstr "Speichern" -#: src/interface.c:3027 +#: src/interface.c:2937 +msgid "Placement of new file tabs:" +msgstr "Platzierung neuer Dateien:" + +#: src/interface.c:2950 +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:2963 +msgid "File tabs will be placed on the left of the notebook" +msgstr "Neue Dateien werden links von der Datei-Liste platziert." + +#: src/interface.c:2971 +msgid "File tabs will be placed on the right of the notebook" +msgstr "Neue Dateien werden rechts von der Datei-Liste platziert." + +#: src/interface.c:2975 +msgid "Recent files list length:" +msgstr "Anzahl der \"Zuletzt geöffneten\" Dateien" + +#: src/interface.c:2983 +msgid "Misc." +msgstr "Sonstiges" + +#: src/interface.c:2988 +#: src/treeviews.c:107 +msgid "Files" +msgstr "Dateien" + +#: src/interface.c:3010 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: src/interface.c:3030 +#: src/interface.c:3013 msgid "Shows small dotted lines to help you to use the right indentation." msgstr "Blendet punktierte Linien ein, um die Einrückung zu erleichtern." -#: src/interface.c:3033 +#: src/interface.c:3016 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: src/interface.c:3036 +#: src/interface.c:3019 msgid "Marks spaces with dots and tabs with arrows." msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen." -#: src/interface.c:3039 +#: src/interface.c:3022 msgid "Show line endings" msgstr "Zeilenenden anzeigen" -#: src/interface.c:3042 +#: src/interface.c:3025 msgid "Show the line ending character" msgstr "Zeilenende-Zeichen anzeigen" -#: src/interface.c:3045 +#: src/interface.c:3028 msgid "Display" msgstr "Anzeige" -#: src/interface.c:3064 +#: src/interface.c:3049 +msgid "Long line marker:" +msgstr "Markierung für statischen Zeilenumbruch:" + +#: src/interface.c:3056 +msgid "Long line marker color:" +msgstr "Farbe der Markierung für statischen Zeilenumbruch:" + +#: src/interface.c:3063 +msgid "Type:" +msgstr "Typ:" + +#: src/interface.c:3075 +msgid "Sets the color of the long line marker" +msgstr "Stellt die Farbe des \"long line markers\" ein." + +#: src/interface.c:3076 +#: src/dialogs.c:494 +#: src/prefs.c:992 +#: src/prefs.c:999 +msgid "Color Chooser" +msgstr "Farbwähler" + +#: src/interface.c:3084 +msgid "The long line marker is a thin vertical line in the editor. It helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." +msgstr "Die Markierung für statischen Zeilenumbruch ist eine dünne Linie im Editorfenster. Sie hilft dabei, lange Zeilen zu markieren und dabei auf einen eventuell notwendigen Zeilenumbruch hinzuweisen. Werte größer als 0 geben die Spalte an, in der die Linie angezeigt werden soll." + +#: src/interface.c:3094 +msgid "Line" +msgstr "Linie" + +#: src/interface.c:3097 +msgid "Prints a vertical line in the editor window at the given cursor position (see below)." +msgstr "Zeichnet eine vertikale Linie im Editorfenster an der angegebenen Cursor-Position (nur sinnvoll mit Festbreitenschriften)." + +#: src/interface.c:3101 +msgid "Background" +msgstr "Hintergrund" + +#: src/interface.c:3104 +msgid "The background colour of characters after the given cursor position (see below) changed to the colour set below. (This is recommended if you use proportional fonts)" +msgstr "Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (das ist nützlich für proportionale Schriftarten)." + +#: src/interface.c:3108 +msgid "Disabled" +msgstr "Deaktiviert" + +#: src/interface.c:3114 +msgid "Long line marker" +msgstr "Markierung für statischen Zeilenumbruch" + +#: src/interface.c:3133 msgid "Auto indentation" msgstr "Automatische Einrückung benutzen" -#: src/interface.c:3067 +#: src/interface.c:3136 msgid "Add the same indentation as the previous line after pressing enter" -msgstr "" -"Fügt denselben Einzug wie in der vorherigen Zeile nach Drücken von Enter ein." +msgstr "Fügt denselben Einzug wie in der vorherigen Zeile nach Drücken von Enter ein." -#: src/interface.c:3069 +#: src/interface.c:3138 msgid "Line wrapping" msgstr "Zeilenumbruch" -#: src/interface.c:3074 -msgid "Construct auto completion" -msgstr "Autovervollständigung von Konstrukten" - -#: src/interface.c:3077 -msgid "Automatic completion of often used constructs like if and for" -msgstr "" -"Autovervollständigung von häufig benutzten Konstrukten wie if, for und " -"switch." - -#: src/interface.c:3080 -msgid "XML tag auto completion" -msgstr "XML-Tag Autovervollständigung" - -#: src/interface.c:3083 -msgid "Automatic completion of open XML tags (includes HTML tags)" -msgstr "Autovervollständigung von offenen XML-Tags, einschließlich HTML-Tags" - -#: src/interface.c:3086 +#: src/interface.c:3143 msgid "Enable folding" msgstr "Quellcode-Ausblendung aktivieren" -#: src/interface.c:3089 +#: src/interface.c:3146 msgid "Whether to enable folding the code" msgstr "Legt fest, ob es möglich sein soll, Teile des Quellcodes auszublenden." -#: src/interface.c:3092 +#: src/interface.c:3149 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen." -#: src/interface.c:3095 -msgid "" -"Whether to use indicators (a squiggly underline) to highlight the lines " -"where the compiler found a warning or an error." -msgstr "" -"Legt fest, ob Markierungen (wellige Unterstreichungen) benutzt werden " -"sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" +#: src/interface.c:3152 +msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error." +msgstr "Legt fest, ob Markierungen (wellige Unterstreichungen) benutzt werden sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" -#: src/interface.c:3102 -msgid "Rows of auto completion list:" -msgstr "Anzahl der Zeilen der Autovervollständigungsliste: " - -#: src/interface.c:3110 -msgid "Number of rows to display in the auto completion list." -msgstr "" -"Anzahl der Zeilen, die maximal angezeigt werden sollen, wenn die " -"Autovervollständigungsliste angezeigt wird." - # Denke trifft es besser als »Eigenschaften« -#: src/interface.c:3113 +#: src/interface.c:3155 msgid "Features" msgstr "Funktionen" -#: src/interface.c:3126 -msgid "" -"Enter here the paths to the make tool and the compiler\n" -"(tools you do not need can be let blank)" -msgstr "" -"Geben Sie hier die Pfade für make und den Compiler an.\n" -"(Programme, die nicht benötigt werden, können freigelassen werden)" +#: src/interface.c:3174 +msgid "Construct autocompletion" +msgstr "Autovervollständigung von Konstrukten" -#: src/interface.c:3137 -msgid "Make" -msgstr "Make" +#: src/interface.c:3177 +msgid "Automatic completion of often used constructs like if and for" +msgstr "Autovervollständigung von häufig benutzten Konstrukten wie if, for und switch." -#: src/interface.c:3144 src/prefs.c:1090 src/vte.c:168 -msgid "Terminal" -msgstr "Terminal" +#: src/interface.c:3180 +msgid "XML tag autocompletion" +msgstr "XML-Tag Autovervollständigung" -#: src/interface.c:3151 -msgid "Browser" -msgstr "Browser" +#: src/interface.c:3183 +msgid "Automatic completion of open XML tags (includes HTML tags)" +msgstr "Autovervollständigung von offenen XML-Tags, einschließlich HTML-Tags" -#: src/interface.c:3163 +#: src/interface.c:3190 +msgid "Rows of autocompletion list:" +msgstr "Anzahl der Zeilen der Autovervollständigungsliste: " + +#: src/interface.c:3199 +msgid "Number of rows to display in the autocompletion list." +msgstr "Anzahl der Zeilen, die maximal angezeigt werden sollen, wenn die Autovervollständigungsliste angezeigt wird." + +#: src/interface.c:3202 +msgid "Autocompletion" +msgstr "Autovervollständigung" + +#: src/interface.c:3207 +msgid "Editor" +msgstr "Editor" + +#: src/interface.c:3225 +msgid "Enter tool paths below. Tools you do not need can be left blank." +msgstr "Geben Sie hier die Pfade zu den einzelnen Werkzeugen an (Programme, die nicht benötigt werden, können freigelassen werden)" + +#: src/interface.c:3237 +msgid "Make:" +msgstr "Make:" + +#: src/interface.c:3244 +msgid "Terminal:" +msgstr "Terminal:" + +#: src/interface.c:3251 +msgid "Browser:" +msgstr "Browser:" + +#: src/interface.c:3263 msgid "Path and options for the make tool" msgstr "Pfad und spezielle Optionen und / oder Targets für \"make\" angeben." -#: src/interface.c:3170 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" -"Eine Terminal-Emulation wie z.B. xterm, gnome-terminal oder konsole (sie " -"sollte die Option -e akzeptieren)" +#: src/interface.c:3270 +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "Eine Terminal-Emulation wie z.B. xterm, gnome-terminal oder konsole (sie sollte die Option -e akzeptieren)" -#: src/interface.c:3177 +#: src/interface.c:3277 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pfad und evtl. Argumente zu Ihrem Lieblingsbrowser" -#: src/interface.c:3209 -msgid "Print command" -msgstr "Druckbefehl" +#: src/interface.c:3309 +msgid "Print command:" +msgstr "Druckbefehl:" -#: src/interface.c:3221 +#: src/interface.c:3321 #, c-format msgid "Path to the command for printing files (use %f for the filename)." msgstr "Pfad zum Druckbefehl (benutzen Sie %f für den Dateinamen)." -#: src/interface.c:3233 -msgid "Grep" -msgstr "Grep" +#: src/interface.c:3333 +msgid "Grep:" +msgstr "Grep:" -#: src/interface.c:3256 +#: src/interface.c:3356 +msgid "Tool paths" +msgstr "Pfade zu den Werkzeugen" + +#: src/interface.c:3361 msgid "Tools" msgstr "Werkzeuge" -#: src/interface.c:3264 -msgid "" -"Specify here information you want to use in templates.\n" -"See documentation if you don't know how templates work." +#: src/interface.c:3379 +msgid "Set the information to be used in templates. See the documentation for details." msgstr "" -"Geben Sie hier die Informationen an, die in den Vorlagen benutzt werden " -"sollen.\n" -"Konsultieren Sie die Dokumentation, um mehr über die Arbeitsweise der " -"Vorlagen zu erfahren." +"Geben Sie hier die Informationen an, die in den Vorlagen benutzt werden sollen.\n" +"Konsultieren Sie die Dokumentation, um mehr über die Arbeitsweise der Vorlagen zu erfahren." -#: src/interface.c:3280 +#: src/interface.c:3397 msgid "email address of the developer" msgstr "eMail-Adresse des Entwicklers" -#: src/interface.c:3287 +#: src/interface.c:3404 msgid "Initials of the developer name" msgstr "Initialen des Entwicklernames" -#: src/interface.c:3289 -msgid "Initial Version" -msgstr "Anfangsversion" +#: src/interface.c:3406 +msgid "Initial Version:" +msgstr "Anfangsversion:" -#: src/interface.c:3301 +#: src/interface.c:3418 msgid "Version number, which a new file initially has" msgstr "Versionsnummer, die eine neue Datei zu Beginn hat" -#: src/interface.c:3308 +#: src/interface.c:3425 msgid "Company name" msgstr "Firmenname" -#: src/interface.c:3310 -msgid "Developer" -msgstr "Entwickler" +#: src/interface.c:3427 +msgid "Developer:" +msgstr "Entwickler:" -#: src/interface.c:3317 -msgid "Company" -msgstr "Firma" +#: src/interface.c:3434 +msgid "Company:" +msgstr "Firma:" -#: src/interface.c:3324 -msgid "Mail address" -msgstr "Mail-Adresse" +#: src/interface.c:3441 +msgid "Mail address:" +msgstr "Mail-Adresse:" -#: src/interface.c:3331 -msgid "Initials" -msgstr "Initialen" +#: src/interface.c:3448 +msgid "Initials:" +msgstr "Initialen:" -#: src/interface.c:3343 +#: src/interface.c:3460 msgid "The name of the developer" msgstr "Der Name des Entwicklers" -#: src/interface.c:3345 -msgid "" -"Notice: For all changes you make here,\n" -"you need to restart Geany to take effect." -msgstr "" -"Hinweis: Sie müssen Geany neustarten,\n" -"wenn Sie hier Änderungen vornehmen." +#: src/interface.c:3462 +msgid "Notice: For all changes you make here to take effect, you need to restart Geany." +msgstr "Damit hier gemachte Eigenschaftsänderungen wirksam werden, muss Geany neu gestartet werden" -#: src/interface.c:3349 +#: src/interface.c:3469 +msgid "Template data" +msgstr "Daten für Vorlagen:" + +#: src/interface.c:3474 msgid "Templates" msgstr "Vorlagen" -#: src/interface.c:3357 -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 von " -"Geany 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:3492 +msgid "Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly." +msgstr "Hier können die Tastenkominationen für verschiedene Aktionen innerhalb von Geany festgelegt bzw. verändert werden. Um eine Tastenkombination zu ändern, einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können die Tastenkombinationen auch direkt eingegeben werden." -#: src/interface.c:3380 +#: src/interface.c:3515 msgid "Change" msgstr "Ändern" -#: src/interface.c:3384 +#: src/interface.c:3519 +msgid "Keyboard shortcuts" +msgstr "Tastaturkürzel" + +#: src/interface.c:3524 msgid "Keybindings" msgstr "Tastenkürzel" @@ -1248,41 +1266,51 @@ msgstr "Definition von \"%s()\" nicht gefunden." #. initialize the dialog -#: src/callbacks.c:1453 src/dialogs.c:74 +#: src/callbacks.c:1453 +#: src/dialogs.c:74 msgid "Open File" msgstr "Datei öffnen" -#: src/callbacks.c:1502 src/callbacks.c:1547 -msgid "" -"Please set the filetype for the current file before using this function." +#: src/callbacks.c:1502 +#: src/callbacks.c:1547 +msgid "Please set the filetype for the current file before using this function." msgstr "Bitte legen Sie den Dateityp fest, bevor Sie diese Funktion benutzen." -#: src/callbacks.c:1659 src/ui_utils.c:543 +#: src/callbacks.c:1659 +#: src/ui_utils.c:543 msgid "dd.mm.yyyy" msgstr "TT.MM.JJ" -#: src/callbacks.c:1661 src/ui_utils.c:544 +#: src/callbacks.c:1661 +#: src/ui_utils.c:544 msgid "mm.dd.yyyy" msgstr "MM.TT.JJ" -#: src/callbacks.c:1663 src/ui_utils.c:545 +#: src/callbacks.c:1663 +#: src/ui_utils.c:545 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: src/callbacks.c:1665 src/ui_utils.c:554 +#: src/callbacks.c:1665 +#: src/ui_utils.c:554 msgid "dd.mm.yyyy hh:mm:ss" msgstr "TT.MM.JJJJ Stunden:Minuten:Sekunden" -#: src/callbacks.c:1667 src/ui_utils.c:555 +#: src/callbacks.c:1667 +#: src/ui_utils.c:555 msgid "mm.dd.yyyy hh:mm:ss" msgstr "MM.TT.JJJJ Stunden:Minuten:Sekunden" -#: src/callbacks.c:1669 src/ui_utils.c:556 +#: src/callbacks.c:1669 +#: src/ui_utils.c:556 msgid "yyyy/mm/dd hh:mm:ss" msgstr "JJJJ/MM/TT Stunden:Minuten:Sekunden" -#: src/callbacks.c:1671 src/ui_utils.c:565 src/ui_utils.c:569 -#: src/ui_utils.c:573 src/ui_utils.c:577 +#: src/callbacks.c:1671 +#: src/ui_utils.c:565 +#: src/ui_utils.c:569 +#: src/ui_utils.c:573 +#: src/ui_utils.c:577 msgid "Use custom date format" msgstr "Benutze selbst erstelltes Zeitformat" @@ -1291,32 +1319,22 @@ msgstr "Benutzerdefiniertes Datumsformat" #: src/callbacks.c:1679 -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. See \"man " -"strftime\" for more information." -msgstr "" -"Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei " -"können alle Platzhalter verwendet werden, die auch in ANSI C strftime zum " -"Einsatz kommen." +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. See \"man strftime\" for more information." +msgstr "Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei können alle Platzhalter verwendet werden, die auch in ANSI C strftime zum Einsatz kommen." #: src/callbacks.c:1698 msgid "Date format string could not be converted (possibly too long)." -msgstr "" -"Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." +msgstr "Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." -#: 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:79 -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 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 schreibgeschützt. Wenn Sie mehrere Dateien wählen, werden alle schreibgeschützt geöffnet." #: src/dialogs.c:112 msgid "Detect by file extension" @@ -1337,16 +1355,11 @@ #: src/dialogs.c:191 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 "" -"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht " -"automatisch erkannt werden kann.\n" -"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit der " -"gewählten Zeichenkodierung geöffnet." +"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht automatisch erkannt werden kann.\n" +"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit der gewählten Zeichenkodierung geöffnet." #: src/dialogs.c:211 msgid "Set filetype:" @@ -1354,15 +1367,11 @@ #: src/dialogs.c:221 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:260 msgid "Save File" @@ -1417,17 +1426,16 @@ msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" #. arguments -#: src/dialogs.c:592 src/build.c:998 +#: src/dialogs.c:592 +#: src/build.c:997 msgid "Set Arguments" msgstr "Programm-Parameter angeben" #: src/dialogs.c:598 msgid "Set programs and options for compiling and viewing (La)TeX files." msgstr "" -"Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)" -"TeX-Dateien.\n" -"Der jeweilige Dateiname wird bei einem Aufruf automatisch an das Ende " -"angefügt." +"Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)TeX-Dateien.\n" +"Der jeweilige Dateiname wird bei einem Aufruf automatisch an das Ende angefügt." #: src/dialogs.c:609 msgid "DVI creation:" @@ -1445,16 +1453,15 @@ msgid "PDF preview:" msgstr "PDF-Vorschau:" -#: src/dialogs.c:682 src/dialogs.c:795 +#: src/dialogs.c:682 +#: src/dialogs.c:795 #, c-format msgid "" "%f will be replaced by the current filename, e.g. test_file.c\n" "%e will be replaced by the filename without extension, e.g. test_file" msgstr "" -"%f wird durch den aktuellen Dateinamen ersetzt. Zum Beispiel: meine_Datei." -"c \n" -"%e wird durch den Dateinamen ohne Dateiendung ersetzt. Zum Beispiel " -"meine_Datei " +"%f wird durch den aktuellen Dateinamen ersetzt. Zum Beispiel: meine_Datei.c \n" +"%e wird durch den Dateinamen ohne Dateiendung ersetzt. Zum Beispiel meine_Datei " #: src/dialogs.c:709 msgid "Set Includes and Arguments" @@ -1476,21 +1483,25 @@ msgid "Build:" msgstr "Erstellen:" -#: src/dialogs.c:777 src/dialogs.c:1048 +#: src/dialogs.c:777 +#: src/dialogs.c:1048 msgid "Execute:" msgstr "Ausführen:" #: src/dialogs.c:842 -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, ungespeicherten Datei)." +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, ungespeicherten Datei)." -#: src/dialogs.c:861 src/dialogs.c:862 src/dialogs.c:863 src/dialogs.c:869 -#: src/dialogs.c:870 src/dialogs.c:871 src/utils.c:499 src/utils.c:553 -#: src/ui_utils.c:108 src/ui_utils.c:110 +#: src/dialogs.c:861 +#: src/dialogs.c:862 +#: src/dialogs.c:863 +#: src/dialogs.c:869 +#: src/dialogs.c:870 +#: src/dialogs.c:871 +#: src/utils.c:499 +#: src/utils.c:553 +#: src/ui_utils.c:108 +#: src/ui_utils.c:110 msgid "unknown" msgstr "unbekannt" @@ -1522,11 +1533,13 @@ msgid "Encoding:" msgstr "Kodierung:" -#: src/dialogs.c:969 src/ui_utils.c:109 +#: src/dialogs.c:969 +#: src/ui_utils.c:109 msgid "(with BOM)" msgstr "(mit BOM)" -#: src/dialogs.c:969 src/ui_utils.c:109 +#: src/dialogs.c:969 +#: src/ui_utils.c:109 msgid "(without BOM)" msgstr "(ohne BOM)" @@ -1578,116 +1591,111 @@ msgid "The following keyboard shortcuts are defined:" msgstr "Folgende Tastenkürzel sind definiert: " -#: src/document.c:367 +#: src/document.c:368 #, c-format msgid "File %s closed." msgstr "Datei %s wurde geschlossen." -#: src/document.c:449 +#: src/document.c:450 msgid "New file opened." msgstr "Neue Datei geöffnet." -#: src/document.c:597 +#: src/document.c:598 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: src/document.c:622 +#: src/document.c:623 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei '%s' nicht öffnen(%s)." -#: src/document.c:646 +#: src/document.c:647 #, c-format msgid "" -"The file \"%s\" could not opened properly and probably was truncated. Be " -"aware that saving it can cause data loss.\n" +"The file \"%s\" could not opened properly and probably was truncated. Be aware that saving it can cause data loss.\n" "The file was set to read-only." msgstr "" -"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde evtl. " -"nicht vollständig abgeschnitten. Die kann zu Datenvelust beim Speichern " -"führen!\n" +"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde evtl. nicht vollständig abgeschnitten. Die kann zu Datenvelust beim Speichern führen!\n" "Die Datei wird schreibgeschützt geöffnet." -#: src/document.c:669 +#: src/document.c:670 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Die Datei \"%s\" ist kein gültiges %s." -#: src/document.c:680 +#: src/document.c:681 #, c-format -msgid "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"Die Datei \"%s\" scheint keine Textdatei zu sein, oder das Format wird nicht " -"unterstützt." +msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." +msgstr "Die Datei \"%s\" scheint keine Textdatei zu sein, oder das Format wird nicht unterstützt." -#: src/document.c:751 +#: src/document.c:752 #, c-format msgid "File %s reloaded." msgstr "Datei %s neu geladen." -#: src/document.c:753 +#: src/document.c:754 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei %s geöffnet(%d%s)." -#: src/document.c:755 +#: src/document.c:756 msgid ", read-only" msgstr ", schreibgeschützt" -#: src/document.c:796 src/document.c:877 +#: src/document.c:831 +#: src/document.c:912 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: src/document.c:841 +#: src/document.c:876 #, c-format msgid "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file " -"remains unsaved.\n" +"An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved.\n" "Error message: %s\n" msgstr "" -"Beim Konvertieren der Datei von UTF-8 in \"%s\" ist ein Fehler aufgetreten. " -"Die Datei bleibt ungespeichert.\n" +"Beim Konvertieren der Datei von UTF-8 in \"%s\" ist ein Fehler aufgetreten. Die Datei bleibt ungespeichert.\n" "Fehlermeldung: %s\n" -#: src/document.c:865 +#: src/document.c:900 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: src/document.c:904 +#: src/document.c:939 #, c-format msgid "File %s saved." msgstr "Datei %s wurde gespeichert." -#: src/document.c:952 src/document.c:1004 src/document.c:1014 +#: src/document.c:987 +#: src/document.c:1041 +#: src/document.c:1052 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" wurde nicht gefunden." -#: src/document.c:1013 +#: src/document.c:1052 msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: src/document.c:1126 src/document.c:1133 +#: src/document.c:1171 +#: src/document.c:1178 #, c-format msgid "Replaced %d occurrences of \"%s\" with \"%s\"." msgstr "%d mal \"%s\" gegen \"%s\" ausgetauscht." -#: src/document.c:1304 +#: src/document.c:1349 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: src/document.c:1305 +#: src/document.c:1350 msgid "Mac (CR)" msgstr "Mac (CR)" -#: src/document.c:1307 +#: src/document.c:1352 msgid "Unix (LF)" msgstr "Unix (LF)" -#: src/document.c:1403 +#: src/document.c:1448 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -1698,12 +1706,12 @@ "\n" "%s" -#: src/document.c:1412 +#: src/document.c:1457 #, c-format msgid "Printing of \"%s\" failed (return code: %d)." msgstr "Drucken der Datei \"%s\" ist fehlgeschlagen (Rückgabewert: %d)." -#: src/document.c:1417 +#: src/document.c:1462 #, c-format msgid "File %s printed." msgstr "Datei %s wurde gedruckt." @@ -1717,18 +1725,12 @@ msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." -msgstr "" -"Die Datei '%s' auf dem Datenträger ist aktueller als die momentan geöffnete " -"Version." +msgstr "Die Datei '%s' auf dem Datenträger ist aktueller als die momentan geöffnete Version." #: src/ui_utils.c:100 #, c-format -msgid "" -"%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. " -"function: %s encoding: %s %s filetype: %s" -msgstr "" -"%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. " -"Funktion: %s Kodierung: %s %s Dateityp: %s" +msgid "%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. function: %s encoding: %s %s filetype: %s" +msgstr "%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. Funktion: %s Kodierung: %s %s Dateityp: %s" #: src/ui_utils.c:104 msgid "OVR" @@ -1738,7 +1740,8 @@ msgid "INS" msgstr "EINF" -#: src/ui_utils.c:130 src/geany.h:47 +#: src/ui_utils.c:130 +#: src/geany.h:47 msgid "untitled" msgstr "unbenannt" @@ -1899,7 +1902,8 @@ msgid "Error" msgstr "Fehler" -#: src/win32.c:339 src/win32.c:380 +#: src/win32.c:339 +#: src/win32.c:380 msgid "Question" msgstr "Frage" @@ -1916,167 +1920,167 @@ msgid "%s configuration file, edit as you need" msgstr "%s Konfigurationsdatei. Bei Bedarf anpassen." -#: src/keyfile.c:328 +#: src/keyfile.c:329 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/keyfile.c:550 +#: src/keyfile.c:552 msgid "Failed to load one or more session files." -msgstr "" -"Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen " -"werden." +msgstr "Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen werden." #: src/msgwindow.c:89 msgid "Status messages" msgstr "Meldungen" -#: src/build.c:136 +#: src/build.c:137 #, c-format 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:169 src/build.c:547 +#: src/build.c:170 +#: src/build.c:548 #, 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:183 src/build.c:579 +#: src/build.c:184 +#: src/build.c:580 #, c-format msgid "Failed to execute %s (start-script could not be created)" msgstr "Konnte %s nicht ausführen (Start-Script konnte nicht erzeugt werden)" -#: src/build.c:211 src/build.c:427 src/build.c:604 src/search.c:1046 +#: src/build.c:212 +#: src/build.c:428 +#: src/build.c:605 +#: src/search.c:1048 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" -#: src/build.c:336 +#: src/build.c:337 #, c-format msgid "Something very strange is occurred, could not stat %s (%s)." msgstr "Ein Fehler ist aufgetreten, konnte Datei %s nicht prüfen (%s)." -#: src/build.c:415 +#: src/build.c:416 #, c-format msgid "%s (in directory: %s)" msgstr "%s (im Verzeichnis: %s)" -#: src/build.c:523 +#: src/build.c:524 #, c-format msgid "Failed to execute %s (make sure it is already built)" msgstr "Konnte %s nicht ausführen (die Datei muss bereits erzeugt worden sein)" -#: src/build.c:561 +#: src/build.c:562 #, c-format msgid "Failed to change the working directory to %s" msgstr "Konnte nicht in Arbeitsverzeichnis %s wechseln" -#: src/build.c:701 +#: src/build.c:702 msgid "Compilation failed." msgstr "Kompilierung fehlgeschlagen." -#: src/build.c:706 +#: src/build.c:707 msgid "Compilation finished successfully." msgstr "Kompilierung beendet - erfolgreich." #. compile the code -#: src/build.c:778 +#: src/build.c:779 msgid "_Compile" msgstr "_Kompilieren" -#: src/build.c:781 +#: src/build.c:782 msgid "Compiles the current file" msgstr "Kompiliert die aktuelle Datei" -#: src/build.c:796 +#: src/build.c:797 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/build.c:810 src/build.c:932 +#: src/build.c:811 +#: src/build.c:931 msgid "_Make all" msgstr "_Make all" -#: src/build.c:813 src/build.c:935 +#: src/build.c:814 +#: src/build.c:934 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 custom -#: src/build.c:821 src/build.c:943 +#: src/build.c:822 +#: src/build.c:942 msgid "Make custom _target" msgstr "Make eigenes _Target" -#: src/build.c:825 src/build.c:947 +#: src/build.c:826 +#: src/build.c:946 msgid "Builds the current file with the make tool and the specified target" msgstr "Erstellt die aktuelle Datei mit \"make\" und dem angegebenem Target" #. build the code with make object -#: src/build.c:832 +#: src/build.c:833 msgid "Make _object" msgstr "Make _Objekt-Datei" -#: src/build.c:836 +#: src/build.c:837 msgid "Compiles the current file using the make tool" msgstr "Kompiliert die aktuelle Datei mittels make " -#: src/build.c:867 +#: src/build.c:868 msgid "_Set Includes and Arguments" msgstr "_Programm-Parameter angeben" -#: src/build.c:872 -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/build.c:873 +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/build.c:897 +#: src/build.c:896 msgid "LaTeX -> DVI" msgstr "LaTeX -> DVI" -#: src/build.c:900 +#: src/build.c:899 msgid "Compiles the current file into a DVI file" msgstr "Kompiliert die aktuelle Datei als DVI-Datei." #. PDF -#: src/build.c:911 +#: src/build.c:910 msgid "LaTeX -> PDF" msgstr "LaTeX -> PDF" -#: src/build.c:914 +#: src/build.c:913 msgid "Compiles the current file into a PDF file" msgstr "Kompiliert die aktuelle Datei als PDF-Datei." #. DVI view -#: src/build.c:962 +#: src/build.c:961 msgid "View DVI file" msgstr "DVI-Datei anzeigen" -#: src/build.c:969 src/build.c:984 +#: src/build.c:968 +#: src/build.c:983 msgid "Compiles and view the current file" msgstr "Kompiliert und zeigt die aktuelle Datei an." #. PDF view -#: src/build.c:978 +#: src/build.c:977 msgid "View PDF file" msgstr "PDF-Datei anzeigen" -#: src/build.c:1005 +#: src/build.c:1004 msgid "Sets the program paths and arguments" msgstr "Programm-Parameter angeben" -#: src/build.c:1179 src/keybindings.c:172 +#: src/build.c:1178 +#: src/keybindings.c:174 msgid "Make custom target" msgstr "Make mit eigenem Target" -#: src/build.c:1180 -msgid "" -"Enter custom options here, all entered text is passed to the make command." +#: src/build.c:1179 +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/build.c:1218 @@ -2087,189 +2091,169 @@ msgid "Failed to execute the terminal program" msgstr "Konnte das Terminal-Programm nicht ausführen." -#: src/build.c:1349 +#: src/build.c:1350 #, c-format msgid "Process could not be stopped (%s)." msgstr "Der Prozess konnte nicht angehalten werden (%s)." -#: src/prefs.c:298 +#: src/prefs.c:301 msgid "Action" msgstr "Aktion" -#: src/prefs.c:303 +#: src/prefs.c:306 msgid "Shortcut" msgstr "Tastenkürzel" -#: src/prefs.c:769 +#: src/prefs.c:775 msgid "Grab key" msgstr "Tasten festlegen" -#: src/prefs.c:773 +#: src/prefs.c:779 #, 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:897 +#: src/prefs.c:903 #, 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." +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/prefs.c:959 -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/prefs.c:947 +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/prefs.c:975 +#: src/prefs.c:963 msgid "Terminal font" msgstr "Terminal Schriftart" -#: src/prefs.c:985 +#: src/prefs.c:973 msgid "Sets the font for the terminal widget." msgstr "Ändert die Schriftart des Terminals." -#: src/prefs.c:987 +#: src/prefs.c:975 msgid "Foreground color" msgstr "Vordergrundfarbe" -#: src/prefs.c:993 +#: src/prefs.c:981 msgid "Background color" msgstr "Hintergrundfarbe" -#: src/prefs.c:1003 +#: src/prefs.c:991 msgid "Sets the foreground color of the text in the terminal widget." msgstr "Setzt die Vordergrundfarbe für das Terminal." -#: src/prefs.c:1010 +#: src/prefs.c:998 msgid "Sets the background color of the text in the terminal widget." msgstr "Setzt die Hintergrundfarbe für das Terminal." -#: src/prefs.c:1013 +#: src/prefs.c:1001 msgid "Scrollback lines" msgstr "Zeilen zum Zurückrollen" -#: src/prefs.c:1024 -msgid "" -"Specifies the history in lines, which you can scroll back in the terminal " -"widget." +#: src/prefs.c:1012 +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ückrollen kann." -#: src/prefs.c:1028 +#: src/prefs.c:1016 msgid "Terminal emulation" msgstr "Terminalemulation" -#: src/prefs.c:1038 -msgid "" -"Controls how the terminal emulator should behave. xterm is a good start." -msgstr "" -"Steuert wie sich das Terminal verhalten soll. In der Regel ist »xterm« ein " -"guter Startwert." +#: src/prefs.c:1026 +msgid "Controls how the terminal emulator should behave. xterm is a good start." +msgstr "Steuert wie sich das Terminal verhalten soll. In der Regel ist »xterm« ein guter Startwert." -#: src/prefs.c:1040 +#: src/prefs.c:1028 msgid "Shell" msgstr "Shell" -#: src/prefs.c:1050 -msgid "" -"Sets the path to the shell which should be started inside the terminal " -"emulation." +#: src/prefs.c:1038 +msgid "Sets the path to the shell which should be started inside the terminal emulation." msgstr "Setzt den Pfad zu der Shell, die in der VTE benutzt werden soll." -#: src/prefs.c:1062 +#: src/prefs.c:1050 msgid "Scroll on keystroke" msgstr "Bei Tastendruck scrollen" -#: src/prefs.c:1066 +#: src/prefs.c:1054 msgid "Whether to scroll to the bottom if a key was pressed." -msgstr "" -"Legt fest, ob das Fenster bei einem Tastendruck bis zum Ende gescrollt " -"werden soll." +msgstr "Legt fest, ob das Fenster bei einem Tastendruck bis zum Ende gescrollt werden soll." -#: src/prefs.c:1069 +#: src/prefs.c:1057 msgid "Scroll on output" msgstr "Bei Ausgabe scrollen" -#: src/prefs.c:1073 +#: src/prefs.c:1061 msgid "Whether to scroll to the bottom if an output was generated." -msgstr "" -"Legt fest, ob das Fenster bei Ausgabe bis zum Ende gescrollt werden soll." +msgstr "Legt fest, ob das Fenster bei Ausgabe bis zum Ende gescrollt werden soll." -#: src/prefs.c:1076 +#: src/prefs.c:1064 msgid "Disable menu shortcut key (F10 by default)" msgstr "Me_nütastenkombination deaktivieren (Vorgabe ist F10)" -#: src/prefs.c:1080 -msgid "" -"This option disables the keybinding to popup the menu bar (default is F10). " -"Disabling it can be useful if you use, for example, Midnight Commander " -"within the VTE." -msgstr "" -"Diese Option deaktiviert bestimmte Tastenkombinationen des Menüs. Eine " -"Deaktivierung kann sinnvoll sein, wenn Sie zum Beispiel den Midnight " -"Commander in der VTE benutzen möchten." +#: src/prefs.c:1068 +msgid "This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE." +msgstr "Diese Option deaktiviert bestimmte Tastenkombinationen des Menüs. Eine Deaktivierung kann sinnvoll sein, wenn Sie zum Beispiel den Midnight Commander in der VTE benutzen möchten." -#: src/prefs.c:1083 +#: src/prefs.c:1071 msgid "Follow the path of the current file" msgstr "Pfad der aktuellen Datei setzen" -#: src/prefs.c:1087 +#: src/prefs.c:1075 msgid "Whether to execute \"cd $path\" when you switch between opened files." -msgstr "" -"Legt fest, ob \"cd $path\" in der VTE ausgeführt werden soll, wenn Sie " -"zwischen geöffneten Dateien wechseln." +msgstr "Legt fest, ob \"cd $path\" in der VTE ausgeführt werden soll, wenn Sie zwischen geöffneten Dateien wechseln." -#: src/about.c:113 +#: src/prefs.c:1078 +#: src/vte.c:168 +msgid "Terminal" +msgstr "Terminal" + +#: src/about.c:117 msgid "About Geany" msgstr "Über Geany" -#: src/about.c:161 +#: src/about.c:165 msgid "A fast and lightweight IDE" msgstr "Eine kleine und schnelle Entwicklungsumgebung" -#: src/about.c:182 +#: src/about.c:186 #, c-format msgid "(built on %s)" msgstr "(kompiliert am %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: src/about.c:213 +#: src/about.c:217 msgid "Info" msgstr "Info" -#: src/about.c:225 +#: src/about.c:229 msgid "Developers" msgstr "Entwickler" -#: src/about.c:225 +#: src/about.c:229 msgid "Maintainer" msgstr "Hauptentwickler" -#: src/about.c:225 +#: src/about.c:229 msgid "developer" msgstr "Entwickler" -#: src/about.c:226 +#: src/about.c:230 msgid "translation maintainer" msgstr "Übersetzungskoordinator" -#: src/about.c:226 +#: src/about.c:230 msgid "Translators" msgstr "Übersetzer" -#: src/about.c:227 +#: src/about.c:231 msgid "language" msgstr "Sprache" -#: src/about.c:233 +#: src/about.c:237 msgid "Credits" msgstr "Credits" -#: src/about.c:246 +#: src/about.c:250 msgid "License" msgstr "Lizenz" @@ -2277,7 +2261,8 @@ msgid "Celtic" msgstr "Keltisch" -#: src/encodings.c:52 src/encodings.c:53 +#: src/encodings.c:52 +#: src/encodings.c:53 msgid "Greek" msgstr "Griechisch" @@ -2289,19 +2274,29 @@ msgid "South European" msgstr "Südeuropäisch" -#: src/encodings.c:56 src/encodings.c:57 src/encodings.c:58 src/encodings.c:59 +#: src/encodings.c:56 +#: src/encodings.c:57 +#: src/encodings.c:58 +#: src/encodings.c:59 msgid "Western" msgstr "Westlich" -#: src/encodings.c:61 src/encodings.c:62 src/encodings.c:63 +#: src/encodings.c:61 +#: src/encodings.c:62 +#: src/encodings.c:63 msgid "Baltic" msgstr "Baltisch" -#: src/encodings.c:64 src/encodings.c:65 src/encodings.c:66 +#: src/encodings.c:64 +#: src/encodings.c:65 +#: src/encodings.c:66 msgid "Central European" msgstr "Mitteleuropäisch" -#: src/encodings.c:67 src/encodings.c:68 src/encodings.c:69 src/encodings.c:70 +#: src/encodings.c:67 +#: src/encodings.c:68 +#: src/encodings.c:69 +#: src/encodings.c:70 #: src/encodings.c:71 msgid "Cyrillic" msgstr "Kyrillisch" @@ -2318,11 +2313,15 @@ msgid "Romanian" msgstr "Rumänisch" -#: src/encodings.c:76 src/encodings.c:77 src/encodings.c:78 +#: src/encodings.c:76 +#: src/encodings.c:77 +#: src/encodings.c:78 msgid "Arabic" msgstr "Arabisch" -#: src/encodings.c:79 src/encodings.c:80 src/encodings.c:81 +#: src/encodings.c:79 +#: src/encodings.c:80 +#: src/encodings.c:81 msgid "Hebrew" msgstr "Hebräisch" @@ -2342,34 +2341,51 @@ msgid "Thai" msgstr "Thai" -#: src/encodings.c:87 src/encodings.c:88 src/encodings.c:89 +#: src/encodings.c:87 +#: src/encodings.c:88 +#: src/encodings.c:89 msgid "Turkish" msgstr "Türkisch" -#: src/encodings.c:90 src/encodings.c:91 src/encodings.c:92 +#: src/encodings.c:90 +#: src/encodings.c:91 +#: src/encodings.c:92 msgid "Vietnamese" msgstr "Vietnamesisch" -#: src/encodings.c:94 src/encodings.c:95 src/encodings.c:96 src/encodings.c:97 -#: src/encodings.c:98 src/encodings.c:99 src/encodings.c:100 +#: src/encodings.c:94 +#: src/encodings.c:95 +#: src/encodings.c:96 +#: src/encodings.c:97 +#: src/encodings.c:98 +#: src/encodings.c:99 +#: src/encodings.c:100 #: src/encodings.c:101 msgid "Unicode" msgstr "Unicode" -#: src/encodings.c:103 src/encodings.c:104 src/encodings.c:105 +#: src/encodings.c:103 +#: src/encodings.c:104 +#: src/encodings.c:105 #: src/encodings.c:106 msgid "Chinese Simplified" msgstr "Chinesisch vereinfacht" -#: src/encodings.c:107 src/encodings.c:108 src/encodings.c:109 +#: src/encodings.c:107 +#: src/encodings.c:108 +#: src/encodings.c:109 msgid "Chinese Traditional" msgstr "Chinesisch traditionell" -#: src/encodings.c:110 src/encodings.c:111 src/encodings.c:112 +#: src/encodings.c:110 +#: src/encodings.c:111 +#: src/encodings.c:112 msgid "Japanese" msgstr "Japanisch" -#: src/encodings.c:113 src/encodings.c:114 src/encodings.c:115 +#: src/encodings.c:113 +#: src/encodings.c:114 +#: src/encodings.c:115 #: src/encodings.c:116 msgid "Korean" msgstr "Koreanisch" @@ -2402,15 +2418,12 @@ msgid "_Unicode" msgstr "_Unicode" -#: src/treeviews.c:107 -msgid "Files" -msgstr "Dateien" - #: src/treeviews.c:113 msgid "Chapter" msgstr "Kapitel" -#: src/treeviews.c:115 src/treeviews.c:137 +#: src/treeviews.c:115 +#: src/treeviews.c:137 msgid "Section" msgstr "Section" @@ -2430,7 +2443,9 @@ msgid "Appendix" msgstr "Anhang" -#: src/treeviews.c:125 src/treeviews.c:147 src/treeviews.c:235 +#: src/treeviews.c:125 +#: src/treeviews.c:147 +#: src/treeviews.c:235 #: src/treeviews.c:276 msgid "Other" msgstr "Sonstiges" @@ -2459,7 +2474,8 @@ msgid "Function" msgstr "Funktion" -#: src/treeviews.c:155 src/treeviews.c:218 +#: src/treeviews.c:155 +#: src/treeviews.c:218 msgid "Package" msgstr "Package" @@ -2475,11 +2491,15 @@ msgid "Our" msgstr "Our" -#: src/treeviews.c:174 src/treeviews.c:199 src/treeviews.c:221 +#: src/treeviews.c:174 +#: src/treeviews.c:199 +#: src/treeviews.c:221 msgid "Methods" msgstr "Methoden" -#: src/treeviews.c:176 src/treeviews.c:197 src/treeviews.c:223 +#: src/treeviews.c:176 +#: src/treeviews.c:197 +#: src/treeviews.c:223 #: src/treeviews.c:264 msgid "Classes" msgstr "Klassen" @@ -2499,15 +2519,21 @@ #. 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, _("Macros"), -1); #. -#: src/treeviews.c:182 src/treeviews.c:249 src/treeviews.c:270 +#: src/treeviews.c:182 +#: src/treeviews.c:249 +#: src/treeviews.c:270 msgid "Variables" msgstr "Variablen" -#: src/treeviews.c:184 src/treeviews.c:227 src/treeviews.c:266 +#: src/treeviews.c:184 +#: src/treeviews.c:227 +#: src/treeviews.c:266 msgid "Members" msgstr "Instanzvariablen" -#: src/treeviews.c:195 src/treeviews.c:241 src/treeviews.c:262 +#: src/treeviews.c:195 +#: src/treeviews.c:241 +#: src/treeviews.c:262 msgid "Functions" msgstr "Funktionen" @@ -2531,11 +2557,13 @@ msgid "Structs / Typedefs" msgstr "Structs / Typedefs" -#: src/treeviews.c:390 src/treeviews.c:442 +#: src/treeviews.c:390 +#: src/treeviews.c:442 msgid "Hide" msgstr "Verbergen" -#: src/treeviews.c:398 src/treeviews.c:450 +#: src/treeviews.c:398 +#: src/treeviews.c:450 msgid "Hide sidebar" msgstr "Seitenleiste verbergen" @@ -2543,203 +2571,206 @@ msgid "Reload" msgstr "Neu laden" -#: src/vte.c:369 +#: src/vte.c:376 msgid "_Input Methods" msgstr "_Eingabemethoden" -#: src/keybindings.c:111 +#: src/keybindings.c:113 msgid "New" msgstr "Neu" -#: src/keybindings.c:113 +#: src/keybindings.c:115 msgid "Open" msgstr "Öffnen" -#: src/keybindings.c:115 +#: src/keybindings.c:117 msgid "Save" msgstr "Speichern" -#: src/keybindings.c:119 +#: src/keybindings.c:121 msgid "Print" msgstr "Drucken" -#: src/keybindings.c:121 +#: src/keybindings.c:123 msgid "Close" msgstr "Schließen" -#: src/keybindings.c:123 +#: src/keybindings.c:125 msgid "Close all" msgstr "Alle Schließen" -#: src/keybindings.c:125 +#: src/keybindings.c:127 msgid "Reload file" msgstr "Neu laden" -#: src/keybindings.c:127 +#: src/keybindings.c:129 msgid "Undo" msgstr "Zurück" -#: src/keybindings.c:129 +#: src/keybindings.c:131 msgid "Redo" msgstr "Wiederholen" -#: src/keybindings.c:131 +#: src/keybindings.c:133 msgid "Select All" msgstr "Alles ersetzen" -#: src/keybindings.c:133 +#: src/keybindings.c:135 msgid "Insert date" msgstr "Datum einfügen" -#: src/keybindings.c:137 +#: src/keybindings.c:139 msgid "Find Next" msgstr "Weitersuchen" -#: src/keybindings.c:139 +#: src/keybindings.c:141 msgid "Find Previous" msgstr "Vorheriges" -#: src/keybindings.c:141 src/search.c:372 +#: src/keybindings.c:143 +#: src/search.c:372 msgid "Replace" msgstr "Ersetzen" -#: src/keybindings.c:143 src/search.c:506 +#: src/keybindings.c:145 +#: src/search.c:506 msgid "Find in files" msgstr "In Dateien suchen" -#: src/keybindings.c:147 +#: src/keybindings.c:149 msgid "Show Colour Chooser" msgstr "Farbwähler öffnen" -#: src/keybindings.c:149 +#: src/keybindings.c:151 msgid "Fullscreen" msgstr "Vollbild" -#: src/keybindings.c:151 +#: src/keybindings.c:153 msgid "Toggle Messages Window" msgstr "Meldungsfenster verstecken" -#: src/keybindings.c:153 +#: src/keybindings.c:155 msgid "Toggle Sidebar" msgstr "Seitenleiste ausblenden" -#: src/keybindings.c:155 +#: src/keybindings.c:157 msgid "Zoom In" msgstr "Hineinzoomen" -#: src/keybindings.c:157 +#: src/keybindings.c:159 msgid "Zoom Out" msgstr "Herauszoomen" -#: src/keybindings.c:161 +#: src/keybindings.c:163 msgid "Fold all" msgstr "Alle einklappen" -#: src/keybindings.c:163 +#: src/keybindings.c:165 msgid "Unfold all" msgstr "Alle ausklappen" -#: src/keybindings.c:167 +#: src/keybindings.c:169 msgid "Build" msgstr "Erstellen" -#: src/keybindings.c:169 +#: src/keybindings.c:171 msgid "Make all" msgstr "Make all" -#: src/keybindings.c:174 +#: src/keybindings.c:176 msgid "Make object" msgstr "Make Objekt-Datei" -#: src/keybindings.c:176 +#: src/keybindings.c:178 msgid "Run" msgstr "Ausführen" -#: src/keybindings.c:178 +#: src/keybindings.c:180 msgid "Run (alternative command)" msgstr "Ausführen (alternativer Befehl)" -#: src/keybindings.c:180 +#: src/keybindings.c:182 msgid "Build options" msgstr "Optionen bei der Erzeugung" -#: src/keybindings.c:182 +#: src/keybindings.c:184 msgid "Reload symbol list" msgstr "Symbol-Ansicht neuladen" -#: src/keybindings.c:184 +#: src/keybindings.c:186 msgid "Switch to Editor" msgstr "Zum Editor wechseln" -#: src/keybindings.c:186 +#: src/keybindings.c:188 msgid "Switch to Scribble" msgstr "Zu den Notizen wechseln " -#: src/keybindings.c:188 +#: src/keybindings.c:190 msgid "Switch to VTE" msgstr "Zur VTE wechseln" -#: src/keybindings.c:190 +#: src/keybindings.c:192 msgid "Switch to left document" msgstr "Zum linken Dokument wechseln" -#: src/keybindings.c:192 +#: src/keybindings.c:194 msgid "Switch to right document" msgstr "Zum rechten Dokument wechseln" -#: src/keybindings.c:195 +#: src/keybindings.c:197 msgid "Duplicate line or selection" msgstr "Zeile oder Auswahl kopieren" -#: src/keybindings.c:197 +#: src/keybindings.c:199 msgid "Convert Selection to lower-case" msgstr "Auswahl in _Kleinbuchstaben umwandeln" -#: src/keybindings.c:199 +#: src/keybindings.c:201 msgid "Convert Selection to upper-case" msgstr "Auswahl in _Großbuchstaben umwandeln" -#: src/keybindings.c:201 +#: src/keybindings.c:203 msgid "Toggle line commentation" msgstr "Kommentierung umschalten" -#: src/keybindings.c:203 +#: src/keybindings.c:205 msgid "Comment line(s)" msgstr "Zeile(n) auskommentieren" -#: src/keybindings.c:205 +#: src/keybindings.c:207 msgid "Uncomment line(s)" msgstr "Zeile(n) einkommentieren" -#: src/keybindings.c:207 +#: src/keybindings.c:209 msgid "Increase indent" msgstr "Einzug erhöhen" -#: src/keybindings.c:209 +#: src/keybindings.c:211 msgid "Decrease indent" msgstr "Einzug verringern" -#: src/keybindings.c:212 +#: src/keybindings.c:214 msgid "Goto matching brace" msgstr "Springe zur passenden Klammer" -#: src/keybindings.c:214 +#: src/keybindings.c:216 msgid "Complete word" msgstr "Vervollständige Wort" -#: src/keybindings.c:218 src/keybindings.c:221 +#: src/keybindings.c:220 +#: src/keybindings.c:223 msgid "Show calltip" msgstr "Calltip anzeigen" -#: src/keybindings.c:224 +#: src/keybindings.c:226 msgid "Show macro list" msgstr "Zeige Makroliste" -#: src/keybindings.c:226 +#: src/keybindings.c:228 msgid "Suppress auto completion" msgstr "Autovervollständigung abstellen" -#: src/keybindings.c:229 +#: src/keybindings.c:231 msgid "Find Usage" msgstr "Auftreten finden" @@ -2748,12 +2779,8 @@ msgstr "Reguläre Ausdrücke _benutzen" #: src/search.c:154 -msgid "" -"Use POSIX-like regular expressions. For detailed information about using " -"regular expressions, please read the documentation." -msgstr "" -"Benutze POSIX-ähnliche reguläre Ausdrücke. Für weitere Informationen über " -"reguläre Ausdrücke lesen Sie bitte die Dokumentation." +msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." +msgstr "Benutze POSIX-ähnliche reguläre Ausdrücke. Für weitere Informationen über reguläre Ausdrücke lesen Sie bitte die Dokumentation." #: src/search.c:161 msgid "_Search backwards" @@ -2765,17 +2792,19 @@ #: src/search.c:180 msgid "" -"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " -"corresponding control characters." +"Replace \\\\, \\t, \\n" +", \\r and \\uXXXX (Unicode chararacters) with the corresponding control characters." msgstr "" -"Ersetzt \\\\, \\t, \\n, \\r und \\uXXXX (Unicode-Zeichen) mit den " -"entsprechenden Sonderzeichen." +"Ersetzt \\\\, \\t, \\n" +", \\r und \\uXXXX (Unicode-Zeichen) mit den entsprechenden Sonderzeichen." -#: src/search.c:189 src/search.c:579 +#: src/search.c:189 +#: src/search.c:579 msgid "_Case sensitive" msgstr "_Groß- / Kleinschreibung beachten" -#: src/search.c:194 src/search.c:585 +#: src/search.c:194 +#: src/search.c:585 msgid "Match only a _whole word" msgstr "Nur _ganze Wörter finden" @@ -2787,7 +2816,17 @@ msgid "Find" msgstr "Suchen" -#: src/search.c:274 src/search.c:388 src/search.c:536 +#: src/search.c:264 +msgid "_Previous" +msgstr "_Vorheriges" + +#: src/search.c:270 +msgid "_Next" +msgstr "_Nächstes" + +#: src/search.c:274 +#: src/search.c:388 +#: src/search.c:536 msgid "Search for:" msgstr "Suchen nach:" @@ -2800,20 +2839,24 @@ msgid "_Mark" msgstr "_Markieren" -#: src/search.c:310 src/search.c:446 +#: src/search.c:310 +#: src/search.c:446 msgid "In Sessi_on" msgstr "In Sessi_on finden" -#: src/search.c:315 src/search.c:451 +#: src/search.c:315 +#: src/search.c:451 msgid "In F_ile" msgstr "In Datei" #. close window checkbox -#: src/search.c:321 src/search.c:457 +#: src/search.c:321 +#: src/search.c:457 msgid "Close _dialog" msgstr "Diesen Dialog _schließen." -#: src/search.c:326 src/search.c:462 +#: src/search.c:326 +#: src/search.c:462 msgid "Disable this option to do not close this dialog." msgstr "Diese Option deaktivieren, um den Dialog nicht zu schließen." @@ -2850,10 +2893,10 @@ msgid "_Grep regular expressions" msgstr "Reguläre Ausdrücke _benutzen (grep)" -#: src/search.c:568 src/search.c:575 +#: src/search.c:568 +#: src/search.c:575 msgid "See grep's manual page for more information." -msgstr "" -"Schlagen Sie in der Dokumentation zu »grep« für mehr Informationen nach." +msgstr "Schlagen Sie in der Dokumentation zu »grep« für mehr Informationen nach." #: src/search.c:573 msgid "_Extended regular expressions" @@ -2871,49 +2914,52 @@ msgid "Select folder" msgstr "Ordner wählen" -#: src/search.c:940 +#: src/search.c:942 msgid "Invalid directory for find in files." msgstr "Ungültiges Verzeichnis." -#: src/search.c:970 +#: src/search.c:972 msgid "No text to find." msgstr "Kein Text zum Suchen angegeben." -#: src/search.c:998 +#: src/search.c:1000 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." -msgstr "" -"Konnte das grep Kommando '%s' nicht finden (Pfad zum Grep Kommando in den " -"Einstellungen überprüfen)." +msgstr "Konnte das grep Kommando '%s' nicht finden (Pfad zum Grep Kommando in den Einstellungen überprüfen)." -#: src/search.c:1113 +#: src/search.c:1115 #, c-format msgid "Could not open directory (%s)" msgstr "Konnte Verzeichnis nicht öffnen (%s)." -#: src/search.c:1158 +#: src/search.c:1160 msgid "Search failed." msgstr "Suche schlug fehl." -#: src/search.c:1164 +#: src/search.c:1166 msgid "Search completed." msgstr "Suche abgeschlossen." -#: src/search.c:1165 +#: src/search.c:1167 msgid "No matches found." msgstr "Keine Treffer gefunden." -#: src/search.c:1240 +#: src/search.c:1242 #, c-format msgid "No matches found for '%s'." msgstr "Keine Treffer für '%s' gefunden." +#~ msgid "Symbol list font" +#~ msgstr "Schriftart der Symbol-Liste" +#~ msgid "Message window font" +#~ msgstr "Schriftart des Meldungsfenster" +#~ msgid "Sets the font for the editors windows" +#~ msgstr "Ändert die Schriftart des Editors" #~ msgid "Du_plicate Line" #~ msgstr "_Zeile kopieren" - #~ msgid "The dialog window won't be closed when you start the operation." #~ msgstr "" #~ "Wenn diese Option aktiv ist. wird das Dialogfenster nicht geschlossen." - #~ msgid "Begin" #~ msgstr "Begin" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1024] trunk/src/notebook.c
by ntrel＠users.sourceforge.net 23 Nov '06

23 Nov '06

Revision: 1024 http://svn.sourceforge.net/geany/?rev=1024&view=rev Author: ntrel Date: 2006-11-23 08:06:54 -0800 (Thu, 23 Nov 2006) Log Message: ----------- Make tab_count_changed() slightly more efficient. Modified Paths: -------------- trunk/src/notebook.c Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2006-11-23 15:48:02 UTC (rev 1023) +++ trunk/src/notebook.c 2006-11-23 16:06:54 UTC (rev 1024) @@ -271,23 +271,25 @@ } -// call this whenever the number of tabs in app->notebook changes. +// call this after the number of tabs in app->notebook changes. static void tab_count_changed() { - if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) == 0) + switch (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook))) { + case 0: /* Enables DnD for dropping files into the empty notebook widget */ gtk_drag_dest_set(app->notebook, GTK_DEST_DEFAULT_ALL, files_drop_targets, G_N_ELEMENTS(files_drop_targets), GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK | GDK_ACTION_ASK); - } - else - { + break; + + case 1: /* Disables DnD for dropping files into the notebook widget and enables the DnD for moving file * tabs. Files can still be dropped into the notebook widget because it will be handled by the * active Scintilla Widget (only dropping to the tab bar is not possible but it should be ok) */ gtk_drag_dest_set(app->notebook, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, drag_targets, G_N_ELEMENTS(drag_targets), GDK_ACTION_MOVE); + break; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1023] trunk
by ntrel＠users.sourceforge.net 23 Nov '06

23 Nov '06

Revision: 1023 http://svn.sourceforge.net/geany/?rev=1023&view=rev Author: ntrel Date: 2006-11-23 07:48:02 -0800 (Thu, 23 Nov 2006) Log Message: ----------- Add underscore to default wordchars again (oops). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.asm trunk/data/filetypes.c trunk/data/filetypes.caml trunk/data/filetypes.conf trunk/data/filetypes.cpp trunk/data/filetypes.css trunk/data/filetypes.d trunk/data/filetypes.diff trunk/data/filetypes.docbook trunk/data/filetypes.ferite trunk/data/filetypes.fortran trunk/data/filetypes.html trunk/data/filetypes.java trunk/data/filetypes.latex trunk/data/filetypes.makefile trunk/data/filetypes.oms trunk/data/filetypes.pascal trunk/data/filetypes.perl trunk/data/filetypes.php trunk/data/filetypes.python trunk/data/filetypes.ruby trunk/data/filetypes.sh trunk/data/filetypes.sql trunk/data/filetypes.tcl trunk/data/filetypes.vhdl trunk/data/filetypes.xml trunk/src/geany.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/ChangeLog 2006-11-23 15:48:02 UTC (rev 1023) @@ -13,6 +13,8 @@ * src/keybindings.c: Add switching to a notebook tab number using Alt-1 to Alt-9; Alt-0 switches to the last tab. + * src/geany.h, data/filetypes.*: + Add underscore to default wordchars again (oops). 2006-11-22 Frank Lanitz <frank(a)frank.uvena.de> Modified: trunk/data/filetypes.asm =================================================================== --- trunk/data/filetypes.asm 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.asm 2006-11-23 15:48:02 UTC (rev 1023) @@ -27,7 +27,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=; Modified: trunk/data/filetypes.c =================================================================== --- trunk/data/filetypes.c 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.c 2006-11-23 15:48:02 UTC (rev 1023) @@ -31,7 +31,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=// Modified: trunk/data/filetypes.caml =================================================================== --- trunk/data/filetypes.caml 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.caml 2006-11-23 15:48:02 UTC (rev 1023) @@ -24,7 +24,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=(* Modified: trunk/data/filetypes.conf =================================================================== --- trunk/data/filetypes.conf 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.conf 2006-11-23 15:48:02 UTC (rev 1023) @@ -13,7 +13,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.cpp =================================================================== --- trunk/data/filetypes.cpp 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.cpp 2006-11-23 15:48:02 UTC (rev 1023) @@ -31,7 +31,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=// Modified: trunk/data/filetypes.css =================================================================== --- trunk/data/filetypes.css 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.css 2006-11-23 15:48:02 UTC (rev 1023) @@ -26,7 +26,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=/* Modified: trunk/data/filetypes.d =================================================================== --- trunk/data/filetypes.d 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.d 2006-11-23 15:48:02 UTC (rev 1023) @@ -31,7 +31,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=// Modified: trunk/data/filetypes.diff =================================================================== --- trunk/data/filetypes.diff 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.diff 2006-11-23 15:48:02 UTC (rev 1023) @@ -12,7 +12,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # only the text before the first --- is a comment comment_open= Modified: trunk/data/filetypes.docbook =================================================================== --- trunk/data/filetypes.docbook 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.docbook 2006-11-23 15:48:02 UTC (rev 1023) @@ -39,7 +39,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=<!-- Modified: trunk/data/filetypes.ferite =================================================================== --- trunk/data/filetypes.ferite 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.ferite 2006-11-23 15:48:02 UTC (rev 1023) @@ -29,7 +29,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=// Modified: trunk/data/filetypes.fortran =================================================================== --- trunk/data/filetypes.fortran 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.fortran 2006-11-23 15:48:02 UTC (rev 1023) @@ -28,7 +28,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=c Modified: trunk/data/filetypes.html =================================================================== --- trunk/data/filetypes.html 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.html 2006-11-23 15:48:02 UTC (rev 1023) @@ -5,7 +5,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank # these comments are used for PHP, the comments used in HTML are in filetypes.xml Modified: trunk/data/filetypes.java =================================================================== --- trunk/data/filetypes.java 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.java 2006-11-23 15:48:02 UTC (rev 1023) @@ -30,7 +30,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=/* Modified: trunk/data/filetypes.latex =================================================================== --- trunk/data/filetypes.latex 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.latex 2006-11-23 15:48:02 UTC (rev 1023) @@ -14,7 +14,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=% Modified: trunk/data/filetypes.makefile =================================================================== --- trunk/data/filetypes.makefile 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.makefile 2006-11-23 15:48:02 UTC (rev 1023) @@ -14,7 +14,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.oms =================================================================== --- trunk/data/filetypes.oms 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.oms 2006-11-23 15:48:02 UTC (rev 1023) @@ -20,7 +20,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.pascal =================================================================== --- trunk/data/filetypes.pascal 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.pascal 2006-11-23 15:48:02 UTC (rev 1023) @@ -20,7 +20,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open={ Modified: trunk/data/filetypes.perl =================================================================== --- trunk/data/filetypes.perl 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.perl 2006-11-23 15:48:02 UTC (rev 1023) @@ -25,7 +25,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.php =================================================================== --- trunk/data/filetypes.php 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.php 2006-11-23 15:48:02 UTC (rev 1023) @@ -5,7 +5,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank # these comments are used for PHP, the comments used in HTML are in filetypes.xml Modified: trunk/data/filetypes.python =================================================================== --- trunk/data/filetypes.python 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.python 2006-11-23 15:48:02 UTC (rev 1023) @@ -23,7 +23,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.ruby =================================================================== --- trunk/data/filetypes.ruby 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.ruby 2006-11-23 15:48:02 UTC (rev 1023) @@ -28,7 +28,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.sh =================================================================== --- trunk/data/filetypes.sh 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.sh 2006-11-23 15:48:02 UTC (rev 1023) @@ -19,7 +19,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.sql =================================================================== --- trunk/data/filetypes.sql 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.sql 2006-11-23 15:48:02 UTC (rev 1023) @@ -24,7 +24,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=/* Modified: trunk/data/filetypes.tcl =================================================================== --- trunk/data/filetypes.tcl 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.tcl 2006-11-23 15:48:02 UTC (rev 1023) @@ -30,7 +30,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.vhdl =================================================================== --- trunk/data/filetypes.vhdl 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.vhdl 2006-11-23 15:48:02 UTC (rev 1023) @@ -29,7 +29,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=-- Modified: trunk/data/filetypes.xml =================================================================== --- trunk/data/filetypes.xml 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/data/filetypes.xml 2006-11-23 15:48:02 UTC (rev 1023) @@ -76,7 +76,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=<!-- Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-11-23 15:04:10 UTC (rev 1022) +++ trunk/src/geany.h 2006-11-23 15:48:02 UTC (rev 1023) @@ -40,7 +40,7 @@ #define GEANY_HOMEPAGE "http://geany.uvena.de/" #define GEANY_USE_WIN32_DIALOG 0 #define GEANY_CHECK_FILE_DELAY 30 -#define GEANY_WORDCHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" +#define GEANY_WORDCHARS "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" #define GEANY_MAX_WORD_LENGTH 192 #define GEANY_MAX_AUTOCOMPLETE_WORDS 30 #define GEANY_MAX_AUTOCOMPLETE_HEIGHT 10 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1022] trunk
by eht16＠users.sourceforge.net 23 Nov '06

23 Nov '06

Revision: 1022 http://svn.sourceforge.net/geany/?rev=1022&view=rev Author: eht16 Date: 2006-11-23 07:04:10 -0800 (Thu, 23 Nov 2006) Log Message: ----------- Fixed segfault when opening the preferences dialog for the first time from the VTE widget. Modified Paths: -------------- trunk/ChangeLog trunk/src/vte.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-23 12:23:36 UTC (rev 1021) +++ trunk/ChangeLog 2006-11-23 15:04:10 UTC (rev 1022) @@ -1,3 +1,9 @@ +2006-11-23 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/vte.c: Fixed segfault when opening the preferences dialog for + the first time from the VTE widget. + + 2006-11-23 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/highlighting.c, src/geany.h, doc/geany.docbook, @@ -12,7 +18,7 @@ 2006-11-22 Frank Lanitz <frank(a)frank.uvena.de> * po/hu.po, src/about.c, THANKS, configure.in: - Added Hungarian translation (Thanks to Gabor Kmetyko aka + Added Hungarian translation (Thanks to Gabor Kmetyko aka kilo <kg_kilo(a)freemail.hu>). Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2006-11-23 12:23:36 UTC (rev 1021) +++ trunk/src/vte.c 2006-11-23 15:04:10 UTC (rev 1022) @@ -31,7 +31,7 @@ #include "vte.h" #include "msgwindow.h" #include "support.h" -#include "callbacks.h" +#include "prefs.h" VteInfo vte_info; @@ -328,10 +328,12 @@ } case 2: { - GtkWidget *notebook = - lookup_widget(app->prefs_dialog, "notebook2"); + GtkWidget *notebook; - on_preferences1_activate(menuitem, NULL); + dialogs_show_prefs_dialog(); + + notebook = lookup_widget(app->prefs_dialog, "notebook2"); + gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook)) - 1); break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1021] trunk
by ntrel＠users.sourceforge.net 23 Nov '06

23 Nov '06

Revision: 1021 http://svn.sourceforge.net/geany/?rev=1021&view=rev Author: ntrel Date: 2006-11-23 04:23:36 -0800 (Thu, 23 Nov 2006) Log Message: ----------- Add switching to a notebook tab number using Alt-1 to Alt-9; Alt-0 switches to the last tab. Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-23 11:42:10 UTC (rev 1020) +++ trunk/ChangeLog 2006-11-23 12:23:36 UTC (rev 1021) @@ -4,6 +4,9 @@ data/filetypes.*: Only use [a-zA-Z0-9] chars for default wordchars, to avoid problems with word matching when using Find & Replace functions. + * src/keybindings.c: + Add switching to a notebook tab number using Alt-1 to Alt-9; Alt-0 + switches to the last tab. 2006-11-22 Frank Lanitz <frank(a)frank.uvena.de> Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-11-23 11:42:10 UTC (rev 1020) +++ trunk/src/keybindings.c 2006-11-23 12:23:36 UTC (rev 1021) @@ -41,7 +41,9 @@ #endif +const gboolean swap_alt_tab_order = FALSE; + /* simple convenience function to allocate and fill the struct */ static binding *fill(KBCallback func, guint key, GdkModifierType mod, const gchar *name, const gchar *label); @@ -373,11 +375,35 @@ } +static gboolean check_fixed_kb(GdkEventKey *event) +{ + // check alt-0 to alt-9 for setting current notebook page + if (event->state & GDK_MOD1_MASK && event->keyval >= GDK_0 && event->keyval <= GDK_9) + { + gint page = event->keyval - GDK_0 - 1; + gint npages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)); + + // alt-0 is for the rightmost tab + if (event->keyval == GDK_0) + page = npages - 1; + // invert the order if tabs are added on the other side + if (swap_alt_tab_order && ! app->tab_order_ltr) + page = (npages - 1) - page; + + gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), page); + return TRUE; + } + return FALSE; +} + + /* central keypress event handler, almost all keypress events go to this function */ gboolean keybindings_got_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data) { guint i, k; + if (check_fixed_kb(event)) return TRUE; + for (i = 0; i < GEANY_MAX_KEYS; i++) { // ugly hack to get around that CTRL+Shift+r results in 'R' not 'r' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1020] trunk
by ntrel＠users.sourceforge.net 23 Nov '06

23 Nov '06

Revision: 1020 http://svn.sourceforge.net/geany/?rev=1020&view=rev Author: ntrel Date: 2006-11-23 03:42:10 -0800 (Thu, 23 Nov 2006) Log Message: ----------- Only use [a-zA-Z0-9] chars for default wordchars, to avoid problems with word matching when using Find & Replace functions. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.asm trunk/data/filetypes.c trunk/data/filetypes.caml trunk/data/filetypes.conf trunk/data/filetypes.cpp trunk/data/filetypes.css trunk/data/filetypes.d trunk/data/filetypes.diff trunk/data/filetypes.docbook trunk/data/filetypes.ferite trunk/data/filetypes.fortran trunk/data/filetypes.html trunk/data/filetypes.java trunk/data/filetypes.latex trunk/data/filetypes.makefile trunk/data/filetypes.oms trunk/data/filetypes.pascal trunk/data/filetypes.perl trunk/data/filetypes.php trunk/data/filetypes.python trunk/data/filetypes.ruby trunk/data/filetypes.sh trunk/data/filetypes.sql trunk/data/filetypes.tcl trunk/data/filetypes.vhdl trunk/data/filetypes.xml trunk/doc/geany.docbook trunk/src/geany.h trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/ChangeLog 2006-11-23 11:42:10 UTC (rev 1020) @@ -1,3 +1,11 @@ +2006-11-23 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/highlighting.c, src/geany.h, doc/geany.docbook, + data/filetypes.*: + Only use [a-zA-Z0-9] chars for default wordchars, to avoid problems + with word matching when using Find & Replace functions. + + 2006-11-22 Frank Lanitz <frank(a)frank.uvena.de> * po/hu.po, src/about.c, THANKS, configure.in: Modified: trunk/data/filetypes.asm =================================================================== --- trunk/data/filetypes.asm 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.asm 2006-11-23 11:42:10 UTC (rev 1020) @@ -27,7 +27,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=; Modified: trunk/data/filetypes.c =================================================================== --- trunk/data/filetypes.c 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.c 2006-11-23 11:42:10 UTC (rev 1020) @@ -31,7 +31,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=// Modified: trunk/data/filetypes.caml =================================================================== --- trunk/data/filetypes.caml 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.caml 2006-11-23 11:42:10 UTC (rev 1020) @@ -24,7 +24,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=(* Modified: trunk/data/filetypes.conf =================================================================== --- trunk/data/filetypes.conf 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.conf 2006-11-23 11:42:10 UTC (rev 1020) @@ -13,7 +13,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.cpp =================================================================== --- trunk/data/filetypes.cpp 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.cpp 2006-11-23 11:42:10 UTC (rev 1020) @@ -31,7 +31,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=// Modified: trunk/data/filetypes.css =================================================================== --- trunk/data/filetypes.css 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.css 2006-11-23 11:42:10 UTC (rev 1020) @@ -26,7 +26,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=/* Modified: trunk/data/filetypes.d =================================================================== --- trunk/data/filetypes.d 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.d 2006-11-23 11:42:10 UTC (rev 1020) @@ -31,7 +31,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=// Modified: trunk/data/filetypes.diff =================================================================== --- trunk/data/filetypes.diff 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.diff 2006-11-23 11:42:10 UTC (rev 1020) @@ -12,7 +12,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # only the text before the first --- is a comment comment_open= Modified: trunk/data/filetypes.docbook =================================================================== --- trunk/data/filetypes.docbook 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.docbook 2006-11-23 11:42:10 UTC (rev 1020) @@ -39,7 +39,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=<!-- Modified: trunk/data/filetypes.ferite =================================================================== --- trunk/data/filetypes.ferite 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.ferite 2006-11-23 11:42:10 UTC (rev 1020) @@ -29,7 +29,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=@_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=// Modified: trunk/data/filetypes.fortran =================================================================== --- trunk/data/filetypes.fortran 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.fortran 2006-11-23 11:42:10 UTC (rev 1020) @@ -28,7 +28,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=c Modified: trunk/data/filetypes.html =================================================================== --- trunk/data/filetypes.html 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.html 2006-11-23 11:42:10 UTC (rev 1020) @@ -5,7 +5,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank # these comments are used for PHP, the comments used in HTML are in filetypes.xml Modified: trunk/data/filetypes.java =================================================================== --- trunk/data/filetypes.java 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.java 2006-11-23 11:42:10 UTC (rev 1020) @@ -30,7 +30,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=/* Modified: trunk/data/filetypes.latex =================================================================== --- trunk/data/filetypes.latex 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.latex 2006-11-23 11:42:10 UTC (rev 1020) @@ -14,7 +14,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=% Modified: trunk/data/filetypes.makefile =================================================================== --- trunk/data/filetypes.makefile 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.makefile 2006-11-23 11:42:10 UTC (rev 1020) @@ -14,7 +14,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.oms =================================================================== --- trunk/data/filetypes.oms 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.oms 2006-11-23 11:42:10 UTC (rev 1020) @@ -20,7 +20,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.pascal =================================================================== --- trunk/data/filetypes.pascal 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.pascal 2006-11-23 11:42:10 UTC (rev 1020) @@ -20,7 +20,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open={ Modified: trunk/data/filetypes.perl =================================================================== --- trunk/data/filetypes.perl 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.perl 2006-11-23 11:42:10 UTC (rev 1020) @@ -25,7 +25,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.php =================================================================== --- trunk/data/filetypes.php 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.php 2006-11-23 11:42:10 UTC (rev 1020) @@ -5,7 +5,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_$#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank # these comments are used for PHP, the comments used in HTML are in filetypes.xml Modified: trunk/data/filetypes.python =================================================================== --- trunk/data/filetypes.python 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.python 2006-11-23 11:42:10 UTC (rev 1020) @@ -23,7 +23,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.ruby =================================================================== --- trunk/data/filetypes.ruby 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.ruby 2006-11-23 11:42:10 UTC (rev 1020) @@ -28,7 +28,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.sh =================================================================== --- trunk/data/filetypes.sh 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.sh 2006-11-23 11:42:10 UTC (rev 1020) @@ -19,7 +19,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.sql =================================================================== --- trunk/data/filetypes.sql 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.sql 2006-11-23 11:42:10 UTC (rev 1020) @@ -24,7 +24,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=/* Modified: trunk/data/filetypes.tcl =================================================================== --- trunk/data/filetypes.tcl 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.tcl 2006-11-23 11:42:10 UTC (rev 1020) @@ -30,7 +30,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=# Modified: trunk/data/filetypes.vhdl =================================================================== --- trunk/data/filetypes.vhdl 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.vhdl 2006-11-23 11:42:10 UTC (rev 1020) @@ -29,7 +29,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=-- Modified: trunk/data/filetypes.xml =================================================================== --- trunk/data/filetypes.xml 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/data/filetypes.xml 2006-11-23 11:42:10 UTC (rev 1020) @@ -76,7 +76,7 @@ [settings] # the following characters are these which a "word" can contains, see documentation -wordchars=_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank comment_open=<!-- Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/doc/geany.docbook 2006-11-23 11:42:10 UTC (rev 1020) @@ -759,7 +759,11 @@ <tbody> <row> <entry>GEANY_WORDCHARS</entry> - <entry>These characters define word boundaries.</entry> + <entry> + These characters define word boundaries when + making selections and searching using word matching + options. + </entry> <entry>(look at sourcecode)</entry> </row> <row> @@ -1453,10 +1457,12 @@ <tbody> <row> <entry>wordchars</entry> - <entry>Word delimiting characters. These characters define - word boundaries. + <entry> + These characters define word boundaries when + making selections and searching using word matching + options. </entry> - <entry>(look at sourcecode)</entry> + <entry>(look at system filetypes.* files)</entry> </row> <row> <entry>comment_open</entry> Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/src/geany.h 2006-11-23 11:42:10 UTC (rev 1020) @@ -40,7 +40,7 @@ #define GEANY_HOMEPAGE "http://geany.uvena.de/" #define GEANY_USE_WIN32_DIALOG 0 #define GEANY_CHECK_FILE_DELAY 30 -#define GEANY_WORDCHARS "_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\\" +#define GEANY_WORDCHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" #define GEANY_MAX_WORD_LENGTH 192 #define GEANY_MAX_AUTOCOMPLETE_WORDS 30 #define GEANY_MAX_AUTOCOMPLETE_HEIGHT 10 Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-11-22 23:10:18 UTC (rev 1019) +++ trunk/src/highlighting.c 2006-11-23 11:42:10 UTC (rev 1020) @@ -162,14 +162,13 @@ } -static void get_keyfile_wordchars(GKeyFile *config, GKeyFile *configh, - const gchar *default_value, gchar **wordchars) +static void get_keyfile_wordchars(GKeyFile *config, GKeyFile *configh, gchar **wordchars) { gchar *result; if (config == NULL || configh == NULL) { - *wordchars = g_strdup(default_value); + *wordchars = g_strdup(GEANY_WORDCHARS); return; } @@ -178,7 +177,7 @@ if (result == NULL) { - *wordchars = g_strdup(default_value); + *wordchars = g_strdup(GEANY_WORDCHARS); } else *wordchars = result; @@ -404,7 +403,7 @@ common_style_set.folding_style.draw_line = tmp_style.foreground; } - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, &common_style_set.wordchars); + get_keyfile_wordchars(config, config_home, &common_style_set.wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_ALL); g_key_file_free(config); @@ -632,7 +631,7 @@ get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_C, 1, "TODO FIXME"); style_sets[GEANY_FILETYPES_C].keywords[2] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_C].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_C); @@ -720,7 +719,7 @@ get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_CPP, 1, "TODO FIXME"); style_sets[GEANY_FILETYPES_CPP].keywords[2] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_CPP].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_CPP); @@ -820,7 +819,7 @@ asm unit interface implementation procedure function object try class"); style_sets[GEANY_FILETYPES_PASCAL].keywords[1] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_PASCAL].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_PASCAL); @@ -880,7 +879,7 @@ style_sets[GEANY_FILETYPES_MAKE].keywords = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_MAKE].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_MAKE); @@ -926,7 +925,7 @@ style_sets[GEANY_FILETYPES_DIFF].keywords = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_DIFF].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_DIFF); @@ -973,7 +972,7 @@ get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_LATEX, 0, "section subsection begin item"); style_sets[GEANY_FILETYPES_LATEX].keywords[1] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_LATEX].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_LATEX); @@ -1014,7 +1013,7 @@ style_sets[GEANY_FILETYPES_PHP].styling = NULL; style_sets[GEANY_FILETYPES_PHP].keywords = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_PHP].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_PHP); @@ -1054,7 +1053,7 @@ style_sets[GEANY_FILETYPES_HTML].styling = NULL; style_sets[GEANY_FILETYPES_HTML].keywords = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_HTML].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_HTML); @@ -1159,7 +1158,7 @@ get_keyfile_keywords(config, config_home, "keywords", "sgml", GEANY_FILETYPES_XML, 5, "ELEMENT DOCTYPE ATTLIST ENTITY NOTATION"); style_sets[GEANY_FILETYPES_XML].keywords[6] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS"$", + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_XML].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_XML); @@ -1413,7 +1412,7 @@ get_keyfile_keywords(config, config_home, "keywords", "typedefs", GEANY_FILETYPES_JAVA, 3, ""); style_sets[GEANY_FILETYPES_JAVA].keywords[4] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_JAVA].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_JAVA); @@ -1524,7 +1523,7 @@ x xor y"); style_sets[GEANY_FILETYPES_PERL].keywords[1] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_PERL].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_PERL); @@ -1595,7 +1594,7 @@ get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_PYTHON, 0, "and assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while yield"); style_sets[GEANY_FILETYPES_PYTHON].keywords[1] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_PYTHON].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_PYTHON); @@ -1667,7 +1666,7 @@ get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_RUBY, 0, "load define_method attr_accessor attr_writer attr_reader include __FILE__ and def end in or self unless __LINE__ begin defined? ensure module redo super until BEGIN break do false next rescue then when END case else for nil require retry true while alias class elsif if not return undef yield"); style_sets[GEANY_FILETYPES_RUBY].keywords[1] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_RUBY].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_RUBY); @@ -1733,7 +1732,7 @@ get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_SH, 0, "break case continue do done elif else esac eval exit export fi for goto if in integer return set shift then until while"); style_sets[GEANY_FILETYPES_SH].keywords[1] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_SH].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_SH); @@ -1882,7 +1881,7 @@ get_keyfile_keywords(config, config_home, "keywords", "dtd", GEANY_FILETYPES_DOCBOOK, 1, "ELEMENT DOCTYPE ATTLIST ENTITY NOTATION"); style_sets[GEANY_FILETYPES_DOCBOOK].keywords[2] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_DOCBOOK].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_DOCBOOK); @@ -2007,7 +2006,7 @@ speak-punctuation speak-numeral"); style_sets[GEANY_FILETYPES_CSS].keywords[3] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_CSS].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_CSS); @@ -2067,7 +2066,7 @@ style_sets[GEANY_FILETYPES_CONF].keywords = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_CONF].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_CONF); @@ -2128,7 +2127,7 @@ get_keyfile_keywords(config, config_home, "keywords", "directives", GEANY_FILETYPES_ASM, 2, "ORG LIST NOLIST PAGE EQUIVALENT WORD TEXT"); style_sets[GEANY_FILETYPES_ASM].keywords[3] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_ASM].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_ASM); @@ -2202,7 +2201,7 @@ get_keyfile_keywords(config, config_home, "keywords", "user_functions", GEANY_FILETYPES_FORTRAN, 2, ""); style_sets[GEANY_FILETYPES_FORTRAN].keywords[3] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_FORTRAN].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_FORTRAN); @@ -2300,7 +2299,7 @@ value values varchar variable varying view when whenever where with without work write"); style_sets[GEANY_FILETYPES_SQL].keywords[1] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_SQL].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_SQL); @@ -2373,7 +2372,7 @@ get_keyfile_keywords(config, config_home, "keywords", "keywords_optional", GEANY_FILETYPES_CAML, 1, "option Some None ignore ref"); style_sets[GEANY_FILETYPES_CAML].keywords[2] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_CAML].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_CAML); @@ -2441,7 +2440,7 @@ addcontrol addcontrol delwin fillrows function gaspect conjdir"); style_sets[GEANY_FILETYPES_OMS].keywords[1] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_OMS].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_OMS); @@ -2512,7 +2511,7 @@ get_keyfile_keywords(config, config_home, "keywords", "expand", GEANY_FILETYPES_TCL, 4, ""); style_sets[GEANY_FILETYPES_TCL].keywords[5] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_TCL].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_TCL); @@ -2569,7 +2568,7 @@ get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_D, 1, "TODO FIXME"); style_sets[GEANY_FILETYPES_D].keywords[2] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_D].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_D); @@ -2650,7 +2649,7 @@ get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_FERITE, 2, "brief class declaration description end example extends function group implements modifies module namespace param protocol return return static type variable warning"); style_sets[GEANY_FILETYPES_FERITE].keywords[3] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_FERITE].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_FERITE); @@ -2760,7 +2759,7 @@ get_keyfile_keywords(config, config_home, "keywords", "userwords", GEANY_FILETYPES_VHDL, 6, ""); style_sets[GEANY_FILETYPES_VHDL].keywords[7] = NULL; - get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_VHDL].wordchars); filetypes_get_config(config, config_home, GEANY_FILETYPES_VHDL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1019] trunk
by kretek＠users.sourceforge.net 23 Nov '06

23 Nov '06

Revision: 1019 http://svn.sourceforge.net/geany/?rev=1019&view=rev Author: kretek Date: 2006-11-22 15:10:18 -0800 (Wed, 22 Nov 2006) Log Message: ----------- Update of ChangeLog Modified Paths: -------------- trunk/ChangeLog trunk/po/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-22 23:09:12 UTC (rev 1018) +++ trunk/ChangeLog 2006-11-22 23:10:18 UTC (rev 1019) @@ -1,3 +1,10 @@ +2006-11-22 Frank Lanitz <frank(a)frank.uvena.de> + + * po/hu.po, src/about.c, THANKS, configure.in: + Added Hungarian translation (Thanks to Gabor Kmetyko aka + kilo <kg_kilo(a)freemail.hu>). + + 2006-11-22 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/notebook.c, src/notebook.h, src/document.c: Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2006-11-22 23:09:12 UTC (rev 1018) +++ trunk/po/ChangeLog 2006-11-22 23:10:18 UTC (rev 1019) @@ -1,3 +1,9 @@ +2006-11-22 Frank Lanitz <frank(a)frank.uvena.de> + + * hu.po: Added Hungarian translation + (Thanks to Gabor Kmetyko aka kilo <kg_kilo(a)freemail.hu>) + + 2006-11-19 Frank Lanitz <frank(a)frank.uvena.de> * zh_TW.po: Update of traditionel Chinese translation This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2006